Modifying to test with mulitple variables in the expression.

google · Jul 20, 2023 · 2f50763 · 2f50763
1 parent 84d32f3
commit 2f50763
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt
@@ -633,9 +633,7 @@ internal class QuestionnaireViewModel(application: Application, state: SavedStat
         )
       }
     val options = item.extractAnswerOptions(data)
-    if (expression.isXFhirQuery) {
-      answerExpressionMap[xFhirExpressionString] = options
-    }
+    if (expression.isXFhirQuery) answerExpressionMap[xFhirExpressionString] = options
     return options
   }
 

diff --git a/...ure/src/test/java/com/google/android/fhir/datacapture/fhirpath/ExpressionEvaluatorTest.kt b/...ure/src/test/java/com/google/android/fhir/datacapture/fhirpath/ExpressionEvaluatorTest.kt
@@ -875,6 +875,16 @@ class ExpressionEvaluatorTest {
                 }
               )
             }
+            addExtension().apply {
+              url = EXTENSION_VARIABLE_URL
+              setValue(
+                Expression().apply {
+                  name = "B"
+                  language = "text/fhirpath"
+                  expression = "2"
+                }
+              )
+            }
             addItem(
               Questionnaire.QuestionnaireItemComponent().apply {
                 linkId = "an-item"
@@ -885,7 +895,7 @@ class ExpressionEvaluatorTest {
                   setValue(
                     Expression().apply {
                       language = "application/x-fhir-query"
-                      expression = "Patient?address-city={{%A}}"
+                      expression = "Patient?address-city={{%A}}&gender={{%B}}"
                     }
                   )
                 }
@@ -905,6 +915,6 @@ class ExpressionEvaluatorTest {
         null
       )
 
-    assertThat(result).isEqualTo("Patient?address-city=1")
+    assertThat(result).isEqualTo("Patient?address-city=1&gender=2")
   }
 }