Provide missing QuestionnaireResponse in bundle param for FhirCarePlanGenerator#conditionallyUpdateResourceStatus

android/engine/src/main/AndroidManifest.xml

@@ -14,12 +14,6 @@
     <uses-permission android:name="android.permission.CALL_PHONE" />
 
     <application>
-
-        <activity
-            android:name=".HiltActivityForTest"
-            android:exported="false"
-            android:theme="@style/AppTheme" />
-
         <provider
             android:name="androidx.startup.InitializationProvider"
             android:authorities="${applicationId}.androidx-startup"

android/engine/src/test/java/org/smartregister/fhircore/engine/sync/SyncListenerManagerTest.kt

@@ -16,8 +16,10 @@
 
 package org.smartregister.fhircore.engine.sync
 
+import androidx.test.core.app.ApplicationProvider
 import dagger.hilt.android.testing.HiltAndroidRule
 import dagger.hilt.android.testing.HiltAndroidTest
+import dagger.hilt.android.testing.HiltTestApplication
 import javax.inject.Inject
 import org.junit.After
 import org.junit.Assert
@@ -26,6 +28,7 @@ import org.junit.Rule
 import org.junit.Test
 import org.robolectric.Robolectric
 import org.smartregister.fhircore.engine.HiltActivityForTest
+import org.smartregister.fhircore.engine.R
 import org.smartregister.fhircore.engine.app.fakes.Faker
 import org.smartregister.fhircore.engine.configuration.ConfigurationRegistry
 import org.smartregister.fhircore.engine.configuration.app.ConfigService
@@ -53,6 +56,7 @@ class SyncListenerManagerTest : RobolectricTest() {
   fun setUp() {
     hiltAndroidRule.inject()
     hiltActivityForTest = activityController.get()
+    ApplicationProvider.getApplicationContext<HiltTestApplication>().setTheme(R.style.AppTheme)
     syncListenerManager =
       SyncListenerManager(
         configService = configService,

android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModel.kt

@@ -231,7 +231,7 @@ constructor(
         fhirCarePlanGenerator.conditionallyUpdateResourceStatus(
           questionnaireConfig = questionnaireConfig,
           subject = subject,
-          bundle = bundle,
+          bundle = newBundle,
         )
       }
 

android/quest/src/test/java/org/smartregister/fhircore/quest/HiltActivityForTest.kt

@@ -0,0 +1,31 @@
+/*
+ * Copyright 2021-2023 Ona Systems, Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.smartregister.fhircore.quest
+
+import androidx.appcompat.app.AppCompatActivity
+import com.google.android.fhir.sync.SyncJobStatus
+import dagger.hilt.android.AndroidEntryPoint
+import org.smartregister.fhircore.engine.sync.OnSyncListener
+import org.smartregister.fhircore.engine.util.annotation.ExcludeFromJacocoGeneratedReport
+
+@ExcludeFromJacocoGeneratedReport
+@AndroidEntryPoint
+class HiltActivityForTest : AppCompatActivity(), OnSyncListener {
+  override fun onSync(syncJobStatus: SyncJobStatus) {
+    // DO nothing. This activity implements OnSyncListener for testing purposes
+  }
+}

android/quest/src/test/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireActivityTest.kt

@@ -30,7 +30,6 @@ import io.mockk.just
 import io.mockk.mockk
 import io.mockk.runs
 import io.mockk.spyk
-import javax.inject.Inject
 import kotlinx.coroutines.test.runTest
 import org.hl7.fhir.r4.model.Enumerations
 import org.hl7.fhir.r4.model.Questionnaire
@@ -51,7 +50,6 @@ import org.smartregister.fhircore.engine.domain.model.ActionParameter
 import org.smartregister.fhircore.engine.domain.model.ActionParameterType
 import org.smartregister.fhircore.engine.domain.model.QuestionnaireType
 import org.smartregister.fhircore.engine.domain.model.RuleConfig
-import org.smartregister.fhircore.engine.rulesengine.ResourceDataRulesExecutor
 import org.smartregister.fhircore.engine.util.DefaultDispatcherProvider
 import org.smartregister.fhircore.engine.util.DispatcherProvider
 import org.smartregister.fhircore.engine.util.extension.decodeResourceFromString
@@ -62,8 +60,6 @@ class QuestionnaireActivityTest : RobolectricTest() {
 
   @get:Rule(order = 0) var hiltRule = HiltAndroidRule(this)
 
-  @Inject lateinit var resourceDataRulesExecutor: ResourceDataRulesExecutor
-
   private val context: Application = ApplicationProvider.getApplicationContext()
   private lateinit var questionnaireConfig: QuestionnaireConfig
   private lateinit var questionnaireJson: String

android/quest/src/test/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModelTest.kt

@@ -326,6 +326,13 @@ class QuestionnaireViewModelTest : RobolectricTest() {
       onSuccessfulSubmission(capture(idsTypesSlot), questionnaireResponse)
     }
 
+    // Captured bundle slot should contain QuestionnaireResponse
+    Assert.assertTrue(
+      bundleSlot.captured.entry.any {
+        it.resource.resourceType == ResourceType.QuestionnaireResponse
+      },
+    )
+
     // ID of extracted resources passed to the onSuccessfulSubmission callback
     Assert.assertEquals(idsTypesSlot.captured.firstOrNull()?.idPart, patient.logicalId)