start of tests

Author: anthony-nhs

dual/pom.xml

@@ -217,22 +217,27 @@
                         <groupId>ca.uhn.hapi.fhir</groupId>
                         <artifactId>hapi-fhir-validation-resources-r4</artifactId>
                         <version>${current.fhir.version}</version>
-                    </dependency>
-                    <dependency>
+                </dependency>
+                <dependency>
                         <groupId>ca.uhn.hapi.fhir</groupId>
                         <artifactId>hapi-fhir-structures-r4</artifactId>
                         <version>${current.fhir.version}</version>
-                    </dependency>
-                    <dependency>
+                </dependency>
+                <dependency>
                         <groupId>ca.uhn.hapi.fhir</groupId>
                         <artifactId>hapi-fhir-validation</artifactId>
                         <version>${current.fhir.version}</version>
-                    </dependency>
-                    <dependency>
+                </dependency>
+                <dependency>
                         <groupId>ca.uhn.hapi.fhir</groupId>
                         <artifactId>hapi-fhir-base</artifactId>
                         <version>${current.fhir.version}</version>
                 </dependency>
+                <dependency>
+                    <groupId>ca.uhn.hapi.fhir</groupId>
+                    <artifactId>hapi-fhir-caching-caffeine</artifactId>
+                    <version>${current.fhir.version}</version>
+                </dependency>
             </dependencies>
         </profile>
     </profiles>

dual/src/main/resources/uk_core.manifest.json

@@ -1,6 +1,6 @@
 [
     {
         "packageName": "fhir.r4.ukcore.stu3.currentbuild",
-        "version": "0.0.9-pre-release"
+        "version": "0.0.3-pre-release"
     }
 ]

dual/src/test/java/software/nhs/fhirvalidator/HandlerTest.java

@@ -12,6 +12,7 @@
 import nl.altindag.log.LogCaptor;
 import software.nhs.fhirvalidator.handler.HandlerStream;
 import software.nhs.fhirvalidator.util.ResourceUtils;
+import ca.uhn.fhir.util.VersionUtil;
 
 import com.amazonaws.services.lambda.runtime.Context;
 import com.google.gson.JsonObject;
@@ -33,6 +34,8 @@ void logStartupMessage() {
 
     @Test
     void handlerCanProcessEvent() throws IOException {
+        VersionUtil versionUtil = new VersionUtil();
+        String versionNumber = versionUtil.getVersion();
         String stepFunctionEvent = ResourceUtils.getResourceContent("examples/stepFunctionEvent.json");
         HandlerStream handlerStream = new HandlerStream();
 
@@ -43,7 +46,7 @@ void handlerCanProcessEvent() throws IOException {
 
         JsonObject actualJsonResult = JsonParser.parseString(outputStream.toString()).getAsJsonObject();
 
-        String expectedResult = ResourceUtils.getResourceContent("results/stepFunctionResult.json");
+        String expectedResult = ResourceUtils.getResourceContent(String.format("results/%s/stepFunctionResult.json", versionNumber));
         JsonObject expectedJsonResult = JsonParser.parseString(expectedResult).getAsJsonObject();
 
         assertEquals(expectedJsonResult, actualJsonResult);

dual/src/test/resources/results/5.4.2/stepFunctionResult.json

@@ -0,0 +1,14 @@
+{
+    "resourceType": "OperationOutcome",
+    "issue": [
+        {
+            "severity": "information",
+            "code": "processing",
+            "diagnostics": "Binding for path Bundle.entry[0].resource.ofType(Task).businessStatus has no source, so can't be checked",
+            "location": [
+                "Bundle.entry[0].resource.ofType(Task).businessStatus",
+                "Line 1, Col 407"
+            ]
+        }
+    ]
+}