Fixed tests

getodk · Oct 16, 2024 · e16f39a · e16f39a
1 parent 710b1e5
commit e16f39a
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 13 deletions.
diff --git a/collect_app/.attach_pid25568 b/collect_app/.attach_pid25568
diff --git a/collect_app/.attach_pid28460 b/collect_app/.attach_pid28460
diff --git a/collect_app/.attach_pid29559 b/collect_app/.attach_pid29559
diff --git a/collect_app/src/test/java/org/odk/collect/android/external/FormUriActivityTest.kt b/collect_app/src/test/java/org/odk/collect/android/external/FormUriActivityTest.kt
@@ -1064,7 +1064,7 @@ class FormUriActivityTest {
             ).build()
         )
 
-        changeLock.lock()
+        changeLock.tryLock()
         val scenario = launcherRule.launchForResult<FormUriActivity>(getBlankFormIntent(project.uuid, form.dbId))
         fakeScheduler.flush()
 
@@ -1093,7 +1093,7 @@ class FormUriActivityTest {
                 .build()
         )
 
-        changeLock.lock()
+        changeLock.tryLock()
         val scenario = launcherRule.launchForResult<FormUriActivity>(getSavedIntent(project.uuid, instance.dbId))
         fakeScheduler.flush()
 

diff --git a/collect_app/src/test/java/org/odk/collect/android/formmanagement/FormsDataServiceTest.kt b/collect_app/src/test/java/org/odk/collect/android/formmanagement/FormsDataServiceTest.kt
@@ -114,7 +114,7 @@ class FormsDataServiceTest {
         val isSyncing = formsDataService.isSyncing(project.uuid)
 
         val changeLock = changeLockProvider.create(project.uuid).formsLock as BooleanChangeLock
-        changeLock.lock()
+        changeLock.tryLock()
 
         isSyncing.recordValues { projectValues ->
             formsDataService.downloadUpdates(project.uuid)
@@ -131,7 +131,7 @@ class FormsDataServiceTest {
         val isSyncing = formsDataService.isSyncing(project.uuid)
 
         val changeLock = changeLockProvider.create(project.uuid).formsLock as BooleanChangeLock
-        changeLock.lock()
+        changeLock.tryLock()
 
         isSyncing.recordValues { projectValues ->
             formsDataService.matchFormsWithServer(project.uuid)
@@ -150,7 +150,7 @@ class FormsDataServiceTest {
     @Test
     fun `matchFormsWithServer() returns false when change lock is locked`() {
         val changeLock = changeLockProvider.create(project.uuid).formsLock as BooleanChangeLock
-        changeLock.lock()
+        changeLock.tryLock()
 
         assertThat(formsDataService.matchFormsWithServer(project.uuid), equalTo(false))
     }
@@ -225,7 +225,7 @@ class FormsDataServiceTest {
         val isSyncing = formsDataService.isSyncing(project.uuid)
 
         val changeLock = changeLockProvider.create(project.uuid).formsLock as BooleanChangeLock
-        changeLock.lock()
+        changeLock.tryLock()
 
         isSyncing.recordValues { projectValues ->
             formsDataService.update(project.uuid)

diff --git a/collect_app/src/test/java/org/odk/collect/android/formmanagement/ServerFormUseCasesTest.kt b/collect_app/src/test/java/org/odk/collect/android/formmanagement/ServerFormUseCasesTest.kt
@@ -34,7 +34,7 @@ class ServerFormUseCasesTest {
         val changeLock = BooleanChangeLock()
         val formDownloader = mock<FormDownloader>()
 
-        changeLock.lock()
+        changeLock.tryLock()
 
         val serverForm =
             ServerFormDetails("", "", "", "", "", false, true, ManifestFile("", emptyList()))

diff --git a/..._app/src/test/java/org/odk/collect/android/instancemanagement/InstancesDataServiceTest.kt b/..._app/src/test/java/org/odk/collect/android/instancemanagement/InstancesDataServiceTest.kt
@@ -68,7 +68,7 @@ class InstancesDataServiceTest {
 
     @Test
     fun `instances should not be deleted if the instances database is locked`() {
-        (projectDependencyModule.instancesLock as BooleanChangeLock).lock()
+        (projectDependencyModule.instancesLock as BooleanChangeLock).tryLock()
         val result = instancesDataService.deleteInstances("projectId", longArrayOf(1))
         assertThat(result, equalTo(false))
     }

diff --git a/collect_app/src/test/java/org/odk/collect/android/projects/ProjectDeleterTest.kt b/collect_app/src/test/java/org/odk/collect/android/projects/ProjectDeleterTest.kt
@@ -153,7 +153,7 @@ class ProjectDeleterTest {
     @Test
     fun `If there are running background jobs that use blank forms the project should not be deleted`() {
         val formChangeLock = BooleanChangeLock().apply {
-            lock()
+            tryLock()
         }
         whenever(changeLockProvider.getFormLock(any())).thenReturn(formChangeLock)
 
@@ -166,7 +166,7 @@ class ProjectDeleterTest {
     @Test
     fun `If there are running background jobs that use saved forms the project should not be deleted`() {
         val changeLock = BooleanChangeLock().apply {
-            lock()
+            tryLock()
         }
         whenever(changeLockProvider.getInstanceLock(any())).thenReturn(changeLock)
 

diff --git a/collect_app/src/test/java/org/odk/collect/android/projects/ProjectResetterTest.kt b/collect_app/src/test/java/org/odk/collect/android/projects/ProjectResetterTest.kt
@@ -202,7 +202,7 @@ class ProjectResetterTest {
         saveTestInstanceFiles(currentProjectId)
         setupTestInstancesDatabase(currentProjectId)
 
-        (changeLockProvider.create(currentProjectId).instancesLock as BooleanChangeLock).lock()
+        (changeLockProvider.create(currentProjectId).instancesLock as BooleanChangeLock).tryLock()
         val failedResetActions = projectResetter.reset(listOf(ProjectResetter.ResetAction.RESET_INSTANCES))
         assertEquals(1, failedResetActions.size)
 

diff --git a/test-shared/src/main/java/org/odk/collect/testshared/BooleanChangeLock.kt b/test-shared/src/main/java/org/odk/collect/testshared/BooleanChangeLock.kt
@@ -11,8 +11,12 @@ class BooleanChangeLock : ChangeLock {
     }
 
     override fun tryLock(): Boolean {
-        isLocked = true
-        return true
+        if (!isLocked) {
+            isLocked = true
+            return true
+        } else {
+            return false
+        }
     }
 
     override fun unlock() {