fix tests

opensrp · Jan 25, 2024 · 4fb8642 · 4fb8642
1 parent a8cd46e
commit 4fb8642
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 14 deletions.
diff --git a/...main/java/org/smartregister/fhircore/engine/configuration/app/ApplicationConfiguration.kt b/...main/java/org/smartregister/fhircore/engine/configuration/app/ApplicationConfiguration.kt
@@ -34,7 +34,8 @@ data class ApplicationConfiguration(
   var appLogoIconResourceFile: String = "ic_default_logo",
   var count: String = ConfigurationRegistry.DEFAULT_COUNT,
   var patientTypeFilterTagViaMetaCodingSystem: String = "",
-  var taskOrderFilterTagViaMetaCodingSystem: String = DEFAULT_TASK_ORDER_FILTER_TAG_META_CODING_SYSTEM,
+  var taskOrderFilterTagViaMetaCodingSystem: String =
+    DEFAULT_TASK_ORDER_FILTER_TAG_META_CODING_SYSTEM,
   var taskFilterTagViaMetaCodingSystem: String = DEFAULT_TASK_FILTER_TAG_META_CODING_SYSTEM
 ) : Configuration
 

diff --git a/...src/main/java/org/smartregister/fhircore/engine/data/local/register/dao/HivRegisterDao.kt b/...src/main/java/org/smartregister/fhircore/engine/data/local/register/dao/HivRegisterDao.kt
@@ -165,13 +165,17 @@ constructor(
       phoneContacts = patient.extractTelecom(),
       chwAssigned = patient.generalPractitionerFirstRep,
       showIdentifierInProfile = true,
-      healthStatus = patient.extractHealthStatusFromMeta(configuration.patientTypeFilterTagViaMetaCodingSystem),
+      healthStatus =
+        patient.extractHealthStatusFromMeta(configuration.patientTypeFilterTagViaMetaCodingSystem),
       tasks =
         patient
           .activeTasks()
           .sortedWith(
             compareBy(
-              { it.clinicVisitOrder(configuration.taskOrderFilterTagViaMetaCodingSystem) ?: Double.MAX_VALUE },
+              {
+                it.clinicVisitOrder(configuration.taskOrderFilterTagViaMetaCodingSystem)
+                  ?: Double.MAX_VALUE
+              },
               // tasks with no clinicVisitOrder, would be sorted with Task#description
               { it.description }
             )

diff --git a/...test/java/org/smartregister/fhircore/engine/ui/questionnaire/QuestionnaireActivityTest.kt b/...test/java/org/smartregister/fhircore/engine/ui/questionnaire/QuestionnaireActivityTest.kt
@@ -33,6 +33,7 @@ import ca.uhn.fhir.context.FhirContext
 import ca.uhn.fhir.context.FhirVersionEnum
 import com.google.android.fhir.datacapture.QuestionnaireFragment
 import com.google.android.fhir.datacapture.validation.QuestionnaireResponseValidator.checkQuestionnaireResponse
+import com.google.android.fhir.logicalId
 import dagger.hilt.android.testing.BindValue
 import dagger.hilt.android.testing.HiltAndroidRule
 import dagger.hilt.android.testing.HiltAndroidTest
@@ -343,6 +344,7 @@ class QuestionnaireActivityTest : ActivityRobolectricTest() {
     val questionnaireResponse =
       questionnaireViewModel2.generateQuestionnaireResponse(questionnaire, populationIntent)
     questionnaireResponse.distinctifyLinkId()
+    questionnaireResponse.questionnaire = "${questionnaire.resourceType}/${questionnaire.logicalId}"
     checkQuestionnaireResponse(questionnaire, questionnaireResponse)
   }
 

diff --git a/...ngine/src/test/java/org/smartregister/fhircore/engine/ui/settings/SettingsScreenKtTest.kt b/...ngine/src/test/java/org/smartregister/fhircore/engine/ui/settings/SettingsScreenKtTest.kt
@@ -24,6 +24,7 @@ import androidx.test.core.app.ApplicationProvider
 import io.mockk.coEvery
 import io.mockk.mockk
 import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.UnconfinedTestDispatcher
 import kotlinx.coroutines.test.runTest
 import org.junit.Rule
 import org.junit.Test
@@ -42,16 +43,19 @@ class SettingsScreenKtTest : RobolectricTest() {
   private val devMenuViewModel = mockk<DevViewModel>()
 
   @Test
-  fun testSettingsScreenShowsUserProfileRows() = runTest {
-    coEvery { devMenuViewModel.getResourcesToReport() } returns emptyMap()
-    coEvery { settingsViewModel.profileData } returns MutableLiveData()
-    composeRule.setContent {
-      SettingsScreen(settingsViewModel = settingsViewModel, devViewModel = devMenuViewModel)
-    }
+  fun testSettingsScreenShowsUserProfileRows() =
+    runTest(UnconfinedTestDispatcher()) {
+      coEvery { devMenuViewModel.getResourcesToReport() } returns emptyMap()
+      coEvery { settingsViewModel.profileData } returns MutableLiveData()
+      composeRule.setContent {
+        SettingsScreen(settingsViewModel = settingsViewModel, devViewModel = devMenuViewModel)
+      }
 
-    composeRule.onNodeWithText(appContext.getString(R.string.re_fetch_practitioner)).assertExists()
-    composeRule.onNodeWithText(appContext.getString(R.string.sync)).assertExists()
-    composeRule.onNodeWithText(appContext.getString(R.string.dev_menu)).assertExists()
-    composeRule.onNodeWithText(appContext.getString(R.string.logout)).assertExists()
-  }
+      composeRule
+        .onNodeWithText(appContext.getString(R.string.re_fetch_practitioner))
+        .assertExists()
+      composeRule.onNodeWithText(appContext.getString(R.string.sync)).assertExists()
+      composeRule.onNodeWithText(appContext.getString(R.string.dev_menu)).assertExists()
+      composeRule.onNodeWithText(appContext.getString(R.string.logout)).assertExists()
+    }
 }