YamlTest: adding support for configuring resource (inputfile) base path.

Author: piotrszul

fhirpath/src/test/java/au/csiro/pathling/fhirpath/yaml/YamlFhirpathTest.java

@@ -1,5 +1,6 @@
 package au.csiro.pathling.fhirpath.yaml;
 
+import au.csiro.pathling.test.yaml.YamlConfig;
 import au.csiro.pathling.test.yaml.YamlSpec;
 import au.csiro.pathling.test.yaml.YamlSpecTestBase;
 import jakarta.annotation.Nonnull;
@@ -9,6 +10,9 @@
 
 @Slf4j
 @Tag("UnitTest")
+@YamlConfig(
+    resourceBase = "fhirpath-ptl/resources"
+)
 public class YamlFhirpathTest extends YamlSpecTestBase {
 
   @YamlSpec("fhirpath-ptl/cases/literals.yaml")

fhirpath/src/test/java/au/csiro/pathling/fhirpath/yaml/YamlReferenceImplTest.java

@@ -15,7 +15,10 @@
 
 @Slf4j
 @Tag("YamlTest")
-@YamlConfig("fhirpath-js/config.yaml")
+@YamlConfig(
+    config = "fhirpath-js/config.yaml",
+    resourceBase = "fhirpath-js/resources"
+)
 public class YamlReferenceImplTest extends YamlSpecCachedTestBase {
 
 

fhirpath/src/test/java/au/csiro/pathling/test/yaml/YamlConfig.java

@@ -6,5 +6,7 @@
 @Retention(RetentionPolicy.RUNTIME)
 public @interface YamlConfig {
 
-  String value();
+  String config() default "";
+
+  String resourceBase() default "";
 }

fhirpath/src/test/java/au/csiro/pathling/test/yaml/YamlSpecTestBase.java

@@ -27,6 +27,7 @@
 import ca.uhn.fhir.parser.IParser;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
+import java.io.File;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.List;
@@ -342,8 +343,17 @@ public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
 
       final Optional<String> testConfigPath = context.getTestClass()
           .flatMap(c -> Optional.ofNullable(c.getAnnotation(YamlConfig.class)))
-          .map(YamlConfig::value);
+          .map(YamlConfig::config)
+          .filter(s -> !s.isBlank());
+
+      final Optional<String> resourceBase = context.getTestClass()
+          .flatMap(c -> Optional.ofNullable(c.getAnnotation(YamlConfig.class)))
+          .map(YamlConfig::resourceBase)
+          .filter(s -> !s.isBlank());
+      
       testConfigPath.ifPresent(s -> log.info("Loading test config from: {}", s));
+      resourceBase.ifPresent(s -> log.info("Resource base : {}", s));
+
       final TestConfig testConfig = testConfigPath
           .map(TestResources::getResourceAsString)
           .map(TestConfig::fromYaml)
@@ -376,7 +386,7 @@ public Stream<? extends Arguments> provideArguments(ExtensionContext context) {
           .map(ts -> StdRuntimeCase.of(ts,
               Optional.ofNullable(ts.getInputFile())
                   .map(f -> (Function<RuntimeContext, ResourceResolver>) FhirResolverFactory.of(
-                      getResourceAsString("fhirpath-js/resources/" + f)))
+                      getResourceAsString(resourceBase.orElse("") + File.separator + f)))
                   .orElse(defaultResolverFactory),
               excluder.apply(ts)
           ))