Updating resources to fix build errors

google · Jun 8, 2024 · a52bc97 · a52bc97
1 parent 03f7e1e
commit a52bc97
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 10 deletions.
diff --git a/workflow-testing/src/main/java/com/google/android/fhir/workflow/testing/PlanDefinition.kt b/workflow-testing/src/main/java/com/google/android/fhir/workflow/testing/PlanDefinition.kt
@@ -378,10 +378,10 @@ object PlanDefinition : Loadable() {
       assertEquals(count, generatedCarePlan.contained.size)
     }
 
-    fun hasOperationOutcome() {
+    fun hasRequestGroup() {
       assertTrue(
         generatedCarePlan.getContained().stream().anyMatch { r ->
-          r.resourceType.equals(ResourceType.OperationOutcome)
+          r.resourceType.equals(ResourceType.RequestGroup)
         },
       )
     }

diff --git a/...src/main/resources/plan-definition/base-repo/tests/CarePlan-hello-world-patient-view.json b/...src/main/resources/plan-definition/base-repo/tests/CarePlan-hello-world-patient-view.json
@@ -11,10 +11,10 @@
       "status": "draft",
       "intent": "proposal",
       "subject": {
-        "reference": "helloworld-patient-1"
+        "reference": "Patient/helloworld-patient-1"
       },
       "encounter": {
-        "reference": "helloworld-patient-1-encounter-1"
+        "reference": "Encounter/helloworld-patient-1-encounter-1"
       },
       "action": [
         {
@@ -40,10 +40,10 @@
   "status": "draft",
   "intent": "proposal",
   "subject": {
-    "reference": "helloworld-patient-1"
+    "reference": "Patient/helloworld-patient-1"
   },
   "encounter": {
-    "reference": "helloworld-patient-1-encounter-1"
+    "reference": "Encounter/helloworld-patient-1-encounter-1"
   },
   "activity": [
     {

diff --git a/workflow/build.gradle.kts b/workflow/build.gradle.kts
@@ -63,6 +63,7 @@ android {
         "META-INF/sun-jaxb.episode",
         "META-INF/*.kotlin_module",
         "readme.html",
+        "META-INF/INDEX.LIST",
       ),
     )
   }

diff --git a/...c/androidTest/java/com/google/android/fhir/workflow/PlanDefinitionProcessorAndroidTest.kt b/...c/androidTest/java/com/google/android/fhir/workflow/PlanDefinitionProcessorAndroidTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2023 Google LLC
+ * Copyright 2022-2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -181,7 +181,7 @@ class PlanDefinitionProcessorAndroidTest {
       .withRepositoryPath("/plan-definition/base-repo")
       .withParameters(parameters)
       .apply()
-      .hasOperationOutcome()
+      .hasRequestGroup()
   }
 
   @Test

diff --git a/workflow/src/test/java/com/google/android/fhir/workflow/PlanDefinitionProcessorJavaTest.kt b/workflow/src/test/java/com/google/android/fhir/workflow/PlanDefinitionProcessorJavaTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2023 Google LLC
+ * Copyright 2022-2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -176,7 +176,7 @@ class PlanDefinitionProcessorJavaTest {
       .withRepositoryPath("/plan-definition/base-repo")
       .withParameters(parameters)
       .apply()
-      .hasOperationOutcome()
+      .hasRequestGroup()
   }
 
   @Test