Skip to content

Commit 69b3b26

Browse files
committed
test config registry retrieve plandef and structureMap from config map
1 parent 51d2d75 commit 69b3b26

File tree

3 files changed

+25
-9
lines changed

3 files changed

+25
-9
lines changed

android/engine/src/main/java/org/smartregister/fhircore/engine/task/FhirCarePlanGenerator.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ constructor(
103103
resourceId = planDefinitionId,
104104
)
105105
} else defaultRepository.loadResource<PlanDefinition>(planDefinitionId)
106+
106107
return planDefinition?.let {
107108
generateOrUpdateCarePlan(
108109
planDefinition = it,

android/engine/src/test/java/org/smartregister/fhircore/engine/configuration/ConfigurationRegistryTest.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,17 +129,18 @@ class ConfigurationRegistryTest : RobolectricTest() {
129129
val resource = configRegistry.retrieveResourceBundleConfiguration("nonexistent")
130130
Assert.assertNull(resource)
131131
}
132+
132133
@Test
133134
fun testRetrieveResourceFromConfigMap() {
134135
val resourceId = "myResourceId"
135136

136137
configRegistry.configsJsonMap[resourceId] =
137-
"{\"resourceType\": \"Questionnaire\", \"id\": \"$resourceId\"}"
138+
"{\"resourceType\": \"List\", \"id\": \"$resourceId\"}"
138139

139140
val resource = configRegistry.retrieveResourceFromConfigMap<Resource>(resourceId)
140141
val resourceIdOnly = resource?.id?.substringAfterLast('/')
141142

142-
resource?.let { assertEquals("myResourceId", resourceIdOnly) }
143+
resource?.let { assertEquals(resourceId, resourceIdOnly) }
143144
}
144145

145146
@Test

android/engine/src/test/java/org/smartregister/fhircore/engine/task/FhirCarePlanGeneratorTest.kt

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,6 @@ import org.smartregister.fhircore.engine.util.DispatcherProvider
117117
import org.smartregister.fhircore.engine.util.SharedPreferencesHelper
118118
import org.smartregister.fhircore.engine.util.extension.REFERENCE
119119
import org.smartregister.fhircore.engine.util.extension.SDF_YYYY_MM_DD
120-
import org.smartregister.fhircore.engine.util.extension.appIdExistsAndIsNotNull
121120
import org.smartregister.fhircore.engine.util.extension.asReference
122121
import org.smartregister.fhircore.engine.util.extension.decodeResourceFromString
123122
import org.smartregister.fhircore.engine.util.extension.encodeResourceToString
@@ -2163,15 +2162,30 @@ class FhirCarePlanGeneratorTest : RobolectricTest() {
21632162

21642163
@Test
21652164
fun testRetrievePlanDefinitionFromConfigMap() = runTest {
2166-
val sharedPreferencesHelper = mockk<SharedPreferencesHelper>()
2167-
val planDefinitionId = PlanDefinition().apply { id = "plan-1" }
2165+
val planDefinitionId = "myPlanDefId"
21682166

2169-
coEvery { appIdExistsAndIsNotNull(sharedPreferencesHelper) } returns true
2167+
configurationRegistry.configsJsonMap[planDefinitionId] =
2168+
"{\"resourceType\": \"PlanDefinition\", \"id\": \"$planDefinitionId\"}"
21702169

2171-
configurationRegistry.configsJsonMap[planDefinitionId.id] = "PlanDefinition"
21722170
val planDefinition =
2173-
configurationRegistry.retrieveResourceFromConfigMap<PlanDefinition>("PlanDef")
2174-
planDefinition?.let { assertEquals("PlanDefinition", planDefinition.id) }
2171+
configurationRegistry.retrieveResourceFromConfigMap<PlanDefinition>(planDefinitionId)
2172+
val planDefIdOnly = planDefinition?.id?.substringAfterLast('/')
2173+
2174+
planDefinition?.let { assertEquals(planDefinitionId, planDefIdOnly) }
2175+
}
2176+
2177+
@Test
2178+
fun testRetrieveStructureMapFromConfigMap() = runTest {
2179+
val structureMapId = "myStructureMapId"
2180+
2181+
configurationRegistry.configsJsonMap[structureMapId] =
2182+
"{\"resourceType\": \"StructureMap\", \"id\": \"$structureMapId\"}"
2183+
2184+
val structureMap =
2185+
configurationRegistry.retrieveResourceFromConfigMap<StructureMap>(structureMapId)
2186+
val structureMapIdOnly = structureMap?.id?.substringAfterLast('/')
2187+
2188+
structureMap?.let { assertEquals(structureMapId, structureMapIdOnly) }
21752189
}
21762190

21772191
@Test

0 commit comments

Comments
 (0)