fix test and remove those deprecated

dhis2 · Nov 26, 2024 · a7aeb3e · a7aeb3e
1 parent a4572db
commit a7aeb3e
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 56 deletions.
diff --git a/form/src/main/java/org/dhis2/form/model/OptionSetDialogViewModel.kt b/form/src/main/java/org/dhis2/form/model/OptionSetDialogViewModel.kt
@@ -37,9 +37,7 @@ class OptionSetDialogViewModel(
             searchOptionSetOption(
                 field.optionSet,
                 textToSearch,
-                /*field.optionSetConfiguration?.optionsToShow ?:*/
                 emptyList(),
-                /*field.optionSetConfiguration?.optionsToHide ?:*/
                 emptyList(),
             )
         }

diff --git a/form/src/test/java/org/dhis2/form/integration/ProgramRulesTest.kt b/form/src/test/java/org/dhis2/form/integration/ProgramRulesTest.kt
@@ -359,6 +359,16 @@ class ProgramRulesTest {
             ),
         )
 
+        whenever(
+            dataEntryRepository.options(
+                any(),
+                any(),
+                any(),
+                any(),
+                any(),
+            ),
+        )doReturn emptyFlow()
+
         val intent = FormIntent.OnSave(
             uid = "uid004",
             value = "value04",
@@ -401,6 +411,16 @@ class ProgramRulesTest {
             ),
         )
 
+        whenever(
+            dataEntryRepository.options(
+                any(),
+                any(),
+                any(),
+                any(),
+                any(),
+            ),
+        )doReturn emptyFlow()
+
         val intent = FormIntent.OnSave(
             uid = "uid004",
             value = "value04",
@@ -409,7 +429,7 @@ class ProgramRulesTest {
 
         whenever(formValueStore.deleteOptionValueIfSelected(any(), any())) doReturn StoreResult(
             "uid007",
-            ValueStoreResult.VALUE_CHANGED,
+            ValueStoreResult.VALUE_HAS_NOT_CHANGED,
         )
 
         formViewModel.submitIntent(intent)

diff --git a/form/src/test/java/org/dhis2/form/model/OptionSetDialogViewModelTest.kt b/form/src/test/java/org/dhis2/form/model/OptionSetDialogViewModelTest.kt
@@ -4,7 +4,6 @@ import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.flow.emptyFlow
 import kotlinx.coroutines.test.StandardTestDispatcher
 import kotlinx.coroutines.test.resetMain
 import kotlinx.coroutines.test.setMain
@@ -92,58 +91,6 @@ class OptionSetDialogViewModelTest {
         )
     }
 
-    @Test
-    fun `Should search and filter options to hide`() {
-        val optionsToHide = listOf("Option1")
-        whenever(field.optionSetConfiguration) doReturn OptionSetConfiguration(
-            emptyFlow(),
-        )
-        viewModel.onSearchingOption("test")
-        testingDispatcher.scheduler.advanceUntilIdle()
-        assertTrue(viewModel.searchValue.value == "test")
-        verify(searchOptionSetOption, times(1))(
-            optionSetUid,
-            "test",
-            emptyList(),
-            optionsToHide,
-        )
-    }
-
-    @Test
-    fun `Should search and filter options to show`() {
-        val optionsToShow = listOf("Option1")
-        whenever(field.optionSetConfiguration) doReturn OptionSetConfiguration(
-            emptyFlow(),
-        )
-        viewModel.onSearchingOption("test")
-        assertTrue(viewModel.searchValue.value == "test")
-        testingDispatcher.scheduler.advanceUntilIdle()
-        verify(searchOptionSetOption, times(1))(
-            optionSetUid,
-            "test",
-            optionsToShow,
-            emptyList(),
-        )
-    }
-
-    @Test
-    fun `Should search and filter options to show and hide`() {
-        val optionsToShow = listOf("Option1")
-        val optionsToHide = listOf("Option1")
-        whenever(field.optionSetConfiguration) doReturn OptionSetConfiguration(
-            emptyFlow(),
-        )
-        viewModel.onSearchingOption("test")
-        testingDispatcher.scheduler.advanceUntilIdle()
-        assertTrue(viewModel.searchValue.value == "test")
-        verify(searchOptionSetOption, times(1))(
-            optionSetUid,
-            "test",
-            optionsToShow,
-            optionsToHide,
-        )
-    }
-
     private val mockedOptions = mutableListOf<Option>().apply {
         repeat(times = 5) { index ->
             add(