From aabe31aeaed00ce9acfe7c6ae66bf5777ff16730 Mon Sep 17 00:00:00 2001 From: Grzegorz Orczykowski Date: Thu, 21 Nov 2024 20:34:45 +0100 Subject: [PATCH 1/2] Improved tests --- .../org/odk/collect/entities/LocalEntityUseCasesTest.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/entities/src/test/java/org/odk/collect/entities/LocalEntityUseCasesTest.kt b/entities/src/test/java/org/odk/collect/entities/LocalEntityUseCasesTest.kt index 85182680910..ebbadeff116 100644 --- a/entities/src/test/java/org/odk/collect/entities/LocalEntityUseCasesTest.kt +++ b/entities/src/test/java/org/odk/collect/entities/LocalEntityUseCasesTest.kt @@ -108,7 +108,7 @@ class LocalEntityUseCasesTest { } @Test - fun `updateLocalEntitiesFromForm updates properties and does not change label on update if label is empty`() { + fun `updateLocalEntitiesFromForm updates properties and does not change label on update if label is blank`() { entitiesRepository.save( "things", Entity.New( @@ -120,7 +120,7 @@ class LocalEntityUseCasesTest { ) val formEntity = - FormEntity(EntityAction.UPDATE, "things", "id", "", listOf("prop" to "value 2")) + FormEntity(EntityAction.UPDATE, "things", "id", " ", listOf("prop" to "value 2")) val formEntities = EntitiesExtra(listOf(formEntity)) LocalEntityUseCases.updateLocalEntitiesFromForm(formEntities, entitiesRepository) @@ -189,9 +189,9 @@ class LocalEntityUseCasesTest { } @Test - fun `updateLocalEntitiesFromForm does not create entity that has an empty label`() { + fun `updateLocalEntitiesFromForm does not create entity that has a blank label`() { val formEntity = - FormEntity(EntityAction.CREATE, "things", "1", "", emptyList()) + FormEntity(EntityAction.CREATE, "things", "1", " ", emptyList()) val formEntities = EntitiesExtra(listOf(formEntity)) entitiesRepository.addList("things") From 7d09fb767d35ad464f76a51603ac297af3eedc96 Mon Sep 17 00:00:00 2001 From: Grzegorz Orczykowski Date: Thu, 21 Nov 2024 20:35:12 +0100 Subject: [PATCH 2/2] Do not create entities with blank labels --- .../main/java/org/odk/collect/entities/LocalEntityUseCases.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/entities/src/main/java/org/odk/collect/entities/LocalEntityUseCases.kt b/entities/src/main/java/org/odk/collect/entities/LocalEntityUseCases.kt index 68e0ed5a5c8..bdae997147b 100644 --- a/entities/src/main/java/org/odk/collect/entities/LocalEntityUseCases.kt +++ b/entities/src/main/java/org/odk/collect/entities/LocalEntityUseCases.kt @@ -24,7 +24,7 @@ object LocalEntityUseCases { if (id != null) { when (formEntity.action) { EntityAction.CREATE -> { - if (!label.isNullOrEmpty()) { + if (!label.isNullOrBlank()) { val entity = Entity.New( id, label,