make tests work

Helium314 · Mar 30, 2024 · a7b8110 · a7b8110
1 parent e6879cc
commit a7b8110
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 5 deletions.
diff --git a/...test/java/de/westnordost/streetcomplete/data/osm/edits/upload/ElementEditsUploaderTest.kt b/...test/java/de/westnordost/streetcomplete/data/osm/edits/upload/ElementEditsUploaderTest.kt
@@ -15,7 +15,7 @@ import de.westnordost.streetcomplete.testutils.any
 import de.westnordost.streetcomplete.testutils.edit
 import de.westnordost.streetcomplete.testutils.eq
 import de.westnordost.streetcomplete.testutils.mock
-import de.westnordost.streetcomplete.testutils.mockPrefs
+import de.westnordost.streetcomplete.testutils.mockPrefs2
 import de.westnordost.streetcomplete.testutils.node
 import de.westnordost.streetcomplete.testutils.on
 import kotlinx.coroutines.cancelAndJoin
@@ -49,7 +49,7 @@ class ElementEditsUploaderTest {
 
         listener = mock()
 
-        uploader = ElementEditsUploader(elementEditsController, noteEditsController, mapDataController, singleUploader, mapDataApi, statisticsController, mock(), mock(), mockPrefs())
+        uploader = ElementEditsUploader(elementEditsController, noteEditsController, mapDataController, singleUploader, mapDataApi, statisticsController, mock(), mock(), mockPrefs2())
         uploader.uploadedChangeListener = listener
     }
 

diff --git a/...java/de/westnordost/streetcomplete/data/osmnotes/notequests/OsmNoteQuestControllerTest.kt b/...java/de/westnordost/streetcomplete/data/osmnotes/notequests/OsmNoteQuestControllerTest.kt
@@ -162,7 +162,6 @@ class OsmNoteQuestControllerTest {
             comment(text = "test", user = User(id = 1, "Blubbi"))
         )))
         on(userDataSource.userId).thenReturn(1)
-        on(notesPreferences.showOnlyNotesPhrasedAsQuestions).thenReturn(true)
 
         assertNull(ctrl.getVisible(1))
     }

diff --git a/app/src/test/java/de/westnordost/streetcomplete/data/quest/VisibleQuestsSourceTest.kt b/app/src/test/java/de/westnordost/streetcomplete/data/quest/VisibleQuestsSourceTest.kt
@@ -20,7 +20,7 @@ import de.westnordost.streetcomplete.testutils.any
 import de.westnordost.streetcomplete.testutils.bbox
 import de.westnordost.streetcomplete.testutils.eq
 import de.westnordost.streetcomplete.testutils.mock
-import de.westnordost.streetcomplete.testutils.mockPrefs
+import de.westnordost.streetcomplete.testutils.mockPrefs2
 import de.westnordost.streetcomplete.testutils.on
 import de.westnordost.streetcomplete.testutils.osmNoteQuest
 import de.westnordost.streetcomplete.testutils.osmQuest
@@ -93,7 +93,7 @@ class VisibleQuestsSourceTest {
             Unit
         }
 
-        source = VisibleQuestsSource(questTypeRegistry, osmQuestSource, osmNoteQuestSource, visibleQuestTypeSource, teamModeQuestFilter, selectedOverlaySource, levelFilter, dayNightFilter, mockPrefs(), mock())
+        source = VisibleQuestsSource(questTypeRegistry, osmQuestSource, osmNoteQuestSource, visibleQuestTypeSource, teamModeQuestFilter, selectedOverlaySource, levelFilter, dayNightFilter, mockPrefs2(), mock())
 
         listener = mock()
         source.addListener(listener)

diff --git a/app/src/test/java/de/westnordost/streetcomplete/testutils/Mockito.kt b/app/src/test/java/de/westnordost/streetcomplete/testutils/Mockito.kt
@@ -1,6 +1,7 @@
 package de.westnordost.streetcomplete.testutils
 
 import android.content.SharedPreferences
+import com.russhwolf.settings.ObservableSettings
 import org.mockito.ArgumentCaptor
 import org.mockito.ArgumentMatcher
 import org.mockito.ArgumentMatchers
@@ -31,3 +32,14 @@ fun mockPrefs(): SharedPreferences {
     on(prefs.getBoolean(ArgumentMatchers.anyString(), eq(false))).thenAnswer { false }
     return prefs
 }
+
+fun mockPrefs2(): ObservableSettings {
+    val prefs: ObservableSettings = mock()
+    on(prefs.getString(ArgumentMatchers.anyString(), ArgumentMatchers.anyString())).thenAnswer { inv -> inv.getArgument(1, String::class.java) }
+    on(prefs.getInt(ArgumentMatchers.anyString(), ArgumentMatchers.anyInt())).thenAnswer { inv -> inv.getArgument(1, Integer::class.java) }
+    on(prefs.getLong(ArgumentMatchers.anyString(), ArgumentMatchers.anyLong())).thenAnswer { inv -> inv.getArgument(1, Long::class.java) }
+    // style above doesn't work for boolean ("Cannot cast java.lang.Boolean to boolean")
+    on(prefs.getBoolean(ArgumentMatchers.anyString(), eq(true))).thenAnswer { true }
+    on(prefs.getBoolean(ArgumentMatchers.anyString(), eq(false))).thenAnswer { false }
+    return prefs
+}