Introduced InMemReferenceLayerRepository to make tests clearer

gradle.properties

@@ -1,10 +1,21 @@
-#You can override this in ~/.gradle/gradle.properties
-android.useAndroidX=true
+## For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+#
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+# Default value: -Xmx1024m -XX:MaxPermSize=256m
+# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+#
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. For more details, visit
+# https://developer.android.com/r/tools/gradle-multi-project-decoupled-projects
+# org.gradle.parallel=true
+#Wed Oct 02 20:32:07 CEST 2024
 android.enableJetifier=true
-#https://issuetracker.google.com/issues/283715193
-android.jetifier.ignorelist = jackson-core
-org.gradle.jvmargs=-Xmx1536m
+android.injected.androidTest.leaveApksInstalledAfterRun=true
+android.jetifier.ignorelist=jackson-core
+android.nonTransitiveRClass=true
+android.useAndroidX=true
+org.gradle.jvmargs=-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx2048M"
 org.gradle.parallel=true
 test.heap.max=1g
-android.nonTransitiveRClass=true
-android.injected.androidTest.leaveApksInstalledAfterRun=true

maps/src/test/java/org/odk/collect/maps/layers/InMemReferenceLayerRepository.kt

@@ -0,0 +1,29 @@
+package org.odk.collect.maps.layers
+
+import java.io.File
+
+class InMemReferenceLayerRepository : ReferenceLayerRepository {
+    val sharedLayers = mutableListOf<ReferenceLayer>()
+    val projectLayers = mutableListOf<ReferenceLayer>()
+
+    override fun getAll(): List<ReferenceLayer> {
+        return sharedLayers + projectLayers
+    }
+
+    override fun get(id: String): ReferenceLayer? {
+        return sharedLayers.find { it.id == id } ?: projectLayers.find { it.id == id }
+    }
+
+    override fun addLayer(file: File, shared: Boolean) {
+        if (shared) {
+            sharedLayers.add(ReferenceLayer(file.absolutePath, file, file.name))
+        } else {
+            projectLayers.add(ReferenceLayer(file.absolutePath, file, file.name))
+        }
+    }
+
+    override fun delete(id: String) {
+        sharedLayers.removeIf { it.id == id }
+        projectLayers.removeIf { it.id == id }
+    }
+}

maps/src/test/java/org/odk/collect/maps/layers/OfflineMapLayersImporterDialogFragmentTest.kt

@@ -16,13 +16,10 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import org.hamcrest.CoreMatchers.equalTo
 import org.hamcrest.CoreMatchers.not
 import org.hamcrest.MatcherAssert.assertThat
+import org.hamcrest.Matchers.containsInAnyOrder
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.mockito.kotlin.argumentCaptor
-import org.mockito.kotlin.mock
-import org.mockito.kotlin.times
-import org.mockito.kotlin.verify
 import org.odk.collect.androidshared.ui.FragmentFactoryBuilder
 import org.odk.collect.fragmentstest.FragmentScenarioLauncherRule
 import org.odk.collect.settings.InMemSettingsProvider
@@ -34,12 +31,11 @@ import org.odk.collect.testshared.Interactions
 import org.odk.collect.testshared.RecyclerViewMatcher
 import org.odk.collect.testshared.RecyclerViewMatcher.Companion.withRecyclerView
 import org.odk.collect.testshared.RobolectricHelpers
-import java.io.File
 
 @RunWith(AndroidJUnit4::class)
 class OfflineMapLayersImporterDialogFragmentTest {
     private val scheduler = FakeScheduler()
-    private val referenceLayerRepository = mock<ReferenceLayerRepository>()
+    private val referenceLayerRepository = InMemReferenceLayerRepository()
     private val settingsProvider = InMemSettingsProvider()
 
     @get:Rule
@@ -275,17 +271,10 @@ class OfflineMapLayersImporterDialogFragmentTest {
         Interactions.clickOn(withId(org.odk.collect.maps.R.id.add_layer_button))
         scheduler.flush()
 
-        val fileCaptor = argumentCaptor<File>()
-        val booleanCaptor = argumentCaptor<Boolean>()
-
-        verify(referenceLayerRepository, times(2)).addLayer(
-            fileCaptor.capture(),
-            booleanCaptor.capture()
-        )
-        assertThat(fileCaptor.allValues.any { file -> file.name == file1.name }, equalTo(true))
-        assertThat(fileCaptor.allValues.any { file -> file.name == file2.name }, equalTo(true))
-        assertThat(booleanCaptor.firstValue, equalTo(true))
-        assertThat(booleanCaptor.secondValue, equalTo(true))
+        assertThat(referenceLayerRepository.projectLayers.size, equalTo(0))
+        assertThat(referenceLayerRepository.sharedLayers.size, equalTo(2))
+        val filesInSharedLayersDir = referenceLayerRepository.sharedLayers.map { it.file.name }
+        assertThat(filesInSharedLayersDir, containsInAnyOrder(file1.name, file2.name))
     }
 
     @Test
@@ -306,17 +295,10 @@ class OfflineMapLayersImporterDialogFragmentTest {
         Interactions.clickOn(withId(org.odk.collect.maps.R.id.add_layer_button))
         scheduler.flush()
 
-        val fileCaptor = argumentCaptor<File>()
-        val booleanCaptor = argumentCaptor<Boolean>()
-
-        verify(referenceLayerRepository, times(2)).addLayer(
-            fileCaptor.capture(),
-            booleanCaptor.capture()
-        )
-        assertThat(fileCaptor.allValues.any { file -> file.name == file1.name }, equalTo(true))
-        assertThat(fileCaptor.allValues.any { file -> file.name == file2.name }, equalTo(true))
-        assertThat(booleanCaptor.firstValue, equalTo(false))
-        assertThat(booleanCaptor.secondValue, equalTo(false))
+        assertThat(referenceLayerRepository.sharedLayers.size, equalTo(0))
+        assertThat(referenceLayerRepository.projectLayers.size, equalTo(2))
+        val filesInProjectLayersDir = referenceLayerRepository.projectLayers.map { it.file.name }
+        assertThat(filesInProjectLayersDir, containsInAnyOrder(file1.name, file2.name))
     }
 
     @Test