Removed redundant BooleanChangeLock

Author: grzesiek2010

collect_app/src/test/java/org/odk/collect/android/external/FormUriActivityTest.kt

@@ -62,8 +62,8 @@ import org.odk.collect.settings.InMemSettingsProvider
 import org.odk.collect.settings.SettingsProvider
 import org.odk.collect.settings.keys.ProtectedProjectKeys
 import org.odk.collect.shared.TempFiles
+import org.odk.collect.shared.locks.ThreadSafeBooleanChangeLock
 import org.odk.collect.shared.strings.UUIDGenerator
-import org.odk.collect.testshared.BooleanChangeLock
 import org.odk.collect.testshared.FakeScheduler
 import java.io.File
 import java.text.SimpleDateFormat
@@ -85,7 +85,7 @@ class FormUriActivityTest {
     private val savepointsRepositoryProvider = mock<SavepointsRepositoryProvider>().apply {
         whenever(create()).thenReturn(savepointsRepository)
     }
-    private val changeLock = BooleanChangeLock()
+    private val changeLock = ThreadSafeBooleanChangeLock()
     private val changeLockProvider = ChangeLockProvider { changeLock }
 
     @get:Rule

collect_app/src/test/java/org/odk/collect/android/formentry/FormEntryViewModelTest.java

@@ -36,7 +36,7 @@
 import org.odk.collect.androidshared.data.Consumable;
 import org.odk.collect.forms.FormsRepository;
 import org.odk.collect.formstest.InMemFormsRepository;
-import org.odk.collect.testshared.BooleanChangeLock;
+import org.odk.collect.shared.locks.ThreadSafeBooleanChangeLock;
 import org.odk.collect.testshared.FakeScheduler;
 
 import java.io.FileNotFoundException;
@@ -54,7 +54,7 @@ public class FormEntryViewModelTest {
     private FakeScheduler scheduler;
     private final FormSessionRepository formSessionRepository = new InMemFormSessionRepository();
     private final FormsRepository formsRepository = new InMemFormsRepository();
-    private final ChangeLocks changeLocks = new ChangeLocks(new BooleanChangeLock(), new BooleanChangeLock());
+    private final ChangeLocks changeLocks = new ChangeLocks(new ThreadSafeBooleanChangeLock(), new ThreadSafeBooleanChangeLock());
 
     @Rule
     public InstantTaskExecutorRule instantTaskExecutorRule = new InstantTaskExecutorRule();

collect_app/src/test/java/org/odk/collect/android/formlists/blankformlist/BlankFormListViewModelTest.kt

@@ -25,8 +25,8 @@ import org.odk.collect.formstest.FormUtils
 import org.odk.collect.formstest.InMemInstancesRepository
 import org.odk.collect.settings.enums.FormUpdateMode
 import org.odk.collect.settings.keys.ProjectKeys
+import org.odk.collect.shared.locks.ThreadSafeBooleanChangeLock
 import org.odk.collect.shared.settings.InMemSettings
-import org.odk.collect.testshared.BooleanChangeLock
 import org.odk.collect.testshared.FakeScheduler
 import org.odk.collect.testshared.getOrAwaitValue
 
@@ -47,7 +47,7 @@ class BlankFormListViewModelTest {
     private val changeLockProvider: ChangeLockProvider = mock()
     private val projectId = "projectId"
 
-    private val changeLock = BooleanChangeLock()
+    private val changeLock = ThreadSafeBooleanChangeLock()
     private lateinit var viewModel: BlankFormListViewModel
 
     @Test

collect_app/src/test/java/org/odk/collect/android/formmanagement/FormsDataServiceTest.kt

@@ -32,8 +32,8 @@ import org.odk.collect.forms.FormSourceException
 import org.odk.collect.formstest.FormUtils
 import org.odk.collect.projects.Project
 import org.odk.collect.settings.keys.ProjectKeys
+import org.odk.collect.shared.locks.ThreadSafeBooleanChangeLock
 import org.odk.collect.shared.strings.Md5.getMd5Hash
-import org.odk.collect.testshared.BooleanChangeLock
 
 @RunWith(AndroidJUnit4::class)
 class FormsDataServiceTest {
@@ -50,7 +50,7 @@ class FormsDataServiceTest {
     private val notifier = mock<Notifier>()
     private val analytics = mock<Analytics>()
 
-    private val changeLockProvider = ChangeLockProvider { BooleanChangeLock() }
+    private val changeLockProvider = ChangeLockProvider { ThreadSafeBooleanChangeLock() }
 
     private val formSource = mock<FormSource> {
         on { fetchFormList() } doReturn emptyList()
@@ -113,7 +113,7 @@ class FormsDataServiceTest {
     fun `downloadUpdates() does nothing when change lock is locked`() {
         val isSyncing = formsDataService.isSyncing(project.uuid)
 
-        val changeLock = changeLockProvider.create(project.uuid).formsLock as BooleanChangeLock
+        val changeLock = changeLockProvider.create(project.uuid).formsLock as ThreadSafeBooleanChangeLock
         changeLock.tryLock()
 
         isSyncing.recordValues { projectValues ->
@@ -130,7 +130,7 @@ class FormsDataServiceTest {
     fun `matchFormsWithServer() does nothing when change lock is locked`() {
         val isSyncing = formsDataService.isSyncing(project.uuid)
 
-        val changeLock = changeLockProvider.create(project.uuid).formsLock as BooleanChangeLock
+        val changeLock = changeLockProvider.create(project.uuid).formsLock as ThreadSafeBooleanChangeLock
         changeLock.tryLock()
 
         isSyncing.recordValues { projectValues ->
@@ -149,7 +149,7 @@ class FormsDataServiceTest {
      */
     @Test
     fun `matchFormsWithServer() returns false when change lock is locked`() {
-        val changeLock = changeLockProvider.create(project.uuid).formsLock as BooleanChangeLock
+        val changeLock = changeLockProvider.create(project.uuid).formsLock as ThreadSafeBooleanChangeLock
         changeLock.tryLock()
 
         assertThat(formsDataService.matchFormsWithServer(project.uuid), equalTo(false))
@@ -224,7 +224,7 @@ class FormsDataServiceTest {
     fun `update() does nothing when change lock is locked`() {
         val isSyncing = formsDataService.isSyncing(project.uuid)
 
-        val changeLock = changeLockProvider.create(project.uuid).formsLock as BooleanChangeLock
+        val changeLock = changeLockProvider.create(project.uuid).formsLock as ThreadSafeBooleanChangeLock
         changeLock.tryLock()
 
         isSyncing.recordValues { projectValues ->

collect_app/src/test/java/org/odk/collect/android/instancemanagement/InstancesDataServiceTest.kt

@@ -23,8 +23,8 @@ import org.odk.collect.formstest.InMemInstancesRepository
 import org.odk.collect.formstest.InstanceFixtures
 import org.odk.collect.projects.ProjectDependencyFactory
 import org.odk.collect.settings.keys.ProjectKeys
+import org.odk.collect.shared.locks.ThreadSafeBooleanChangeLock
 import org.odk.collect.shared.settings.InMemSettings
-import org.odk.collect.testshared.BooleanChangeLock
 
 @RunWith(AndroidJUnit4::class)
 class InstancesDataServiceTest {
@@ -33,7 +33,7 @@ class InstancesDataServiceTest {
         it.save(ProjectKeys.KEY_SERVER_URL, "http://example.com")
     }
 
-    private val changeLocks = ChangeLocks(BooleanChangeLock(), BooleanChangeLock())
+    private val changeLocks = ChangeLocks(ThreadSafeBooleanChangeLock(), ThreadSafeBooleanChangeLock())
     private val formsRepository = InMemFormsRepository()
     private val instancesRepository = InMemInstancesRepository()
 
@@ -68,7 +68,7 @@ class InstancesDataServiceTest {
 
     @Test
     fun `instances should not be deleted if the instances database is locked`() {
-        (projectDependencyModule.instancesLock as BooleanChangeLock).tryLock()
+        (projectDependencyModule.instancesLock as ThreadSafeBooleanChangeLock).tryLock()
         val result = instancesDataService.deleteInstances("projectId", longArrayOf(1))
         assertThat(result, equalTo(false))
     }

collect_app/src/test/java/org/odk/collect/android/projects/ProjectDeleterTest.kt

@@ -24,7 +24,7 @@ import org.odk.collect.settings.keys.MetaKeys
 import org.odk.collect.settings.keys.ProjectKeys
 import org.odk.collect.settings.keys.ProtectedProjectKeys
 import org.odk.collect.shared.TempFiles
-import org.odk.collect.testshared.BooleanChangeLock
+import org.odk.collect.shared.locks.ThreadSafeBooleanChangeLock
 import java.io.File
 
 class ProjectDeleterTest {
@@ -44,8 +44,8 @@ class ProjectDeleterTest {
         whenever(getProjectRootDirPath(project1.uuid)).thenReturn("")
     }
     private val changeLockProvider = mock<ChangeLockProvider> {
-        on { getFormLock(any()) } doReturn BooleanChangeLock()
-        on { getInstanceLock(any()) } doReturn BooleanChangeLock()
+        on { getFormLock(any()) } doReturn ThreadSafeBooleanChangeLock()
+        on { getInstanceLock(any()) } doReturn ThreadSafeBooleanChangeLock()
     }
     private val deleter = ProjectDeleter(
         projectsRepository,
@@ -152,7 +152,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 {
+        val formChangeLock = ThreadSafeBooleanChangeLock().apply {
             tryLock()
         }
         whenever(changeLockProvider.getFormLock(any())).thenReturn(formChangeLock)
@@ -165,7 +165,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 {
+        val changeLock = ThreadSafeBooleanChangeLock().apply {
             tryLock()
         }
         whenever(changeLockProvider.getInstanceLock(any())).thenReturn(changeLock)

collect_app/src/test/java/org/odk/collect/android/projects/ProjectResetterTest.kt

@@ -33,8 +33,8 @@ import org.odk.collect.projects.Project
 import org.odk.collect.settings.SettingsProvider
 import org.odk.collect.settings.keys.ProjectKeys
 import org.odk.collect.settings.keys.ProtectedProjectKeys
+import org.odk.collect.shared.locks.ThreadSafeBooleanChangeLock
 import org.odk.collect.shared.settings.Settings
-import org.odk.collect.testshared.BooleanChangeLock
 import java.io.File
 
 @RunWith(AndroidJUnit4::class)
@@ -49,7 +49,7 @@ class ProjectResetterTest {
     private lateinit var anotherProjectId: String
 
     private val propertyManager = mock<PropertyManager>()
-    private val changeLockProvider = ChangeLockProvider { BooleanChangeLock() }
+    private val changeLockProvider = ChangeLockProvider { ThreadSafeBooleanChangeLock() }
 
     @Before
     fun setup() {
@@ -202,7 +202,7 @@ class ProjectResetterTest {
         saveTestInstanceFiles(currentProjectId)
         setupTestInstancesDatabase(currentProjectId)
 
-        (changeLockProvider.create(currentProjectId).instancesLock as BooleanChangeLock).tryLock()
+        (changeLockProvider.create(currentProjectId).instancesLock as ThreadSafeBooleanChangeLock).tryLock()
         val failedResetActions = projectResetter.reset(listOf(ProjectResetter.ResetAction.RESET_INSTANCES))
         assertEquals(1, failedResetActions.size)