FhirpathRefTests: Addding non-numbered tests and exlusions for 'facto…

…ry.yaml' and 'hasValue.yaml'
aehrc · Feb 14, 2025 · 2992ba7 · 2992ba7
1 parent a71bd94
commit 2992ba7
Show file tree

Hide file tree

Showing 2 changed files with 61 additions and 7 deletions.
diff --git a/fhirpath/src/test/java/au/csiro/pathling/fhirpath/yaml/YamlReferenceImplTest.java b/fhirpath/src/test/java/au/csiro/pathling/fhirpath/yaml/YamlReferenceImplTest.java
@@ -5,6 +5,7 @@
 import au.csiro.pathling.test.yaml.YamlSpecTestBase;
 import jakarta.annotation.Nonnull;
 import lombok.extern.slf4j.Slf4j;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Tag;
 
 
@@ -37,13 +38,6 @@ public class YamlReferenceImplTest extends YamlSpecTestBase {
   // 6.6_math.yaml
   // 7_aggregate.yaml
   // 8_variables.yaml
-  //   extensions.yaml
-  //   factory.yaml
-  //   fhir-quantity.yaml
-  //   fhir-r4.yaml
-  //   hasValue.yaml
-  //   simple.yaml
-
 
   @YamlSpec("fhirpath-js/cases/3.2_paths.yaml")
   void testPaths(@Nonnull final RuntimeCase testCase) {
@@ -145,4 +139,49 @@ void testVariables(@Nonnull final RuntimeCase testCase) {
     run(testCase);
   }
 
+  //
+  // OTHER TEST CASES
+  //
+
+  //   extensions.yaml
+  //   factory.yaml
+  //   fhir-quantity.yaml
+  //   fhir-r4.yaml
+  //   hasValue.yaml
+  //   simple.yaml
+
+  @Disabled
+  @YamlSpec("fhirpath-js/cases/extensions.yaml")
+  void testExtension(@Nonnull final RuntimeCase testCase) {
+    run(testCase);
+  }
+
+  @YamlSpec("fhirpath-js/cases/factory.yaml")
+  void testFactory(@Nonnull final RuntimeCase testCase) {
+    run(testCase);
+  }
+
+  @Disabled
+  @YamlSpec("fhirpath-js/cases/fhir-r4.yaml")
+  void testFhirR4(@Nonnull final RuntimeCase testCase) {
+    run(testCase);
+  }
+
+  @Disabled
+  @YamlSpec("fhirpath-js/cases/fhir-quantity.yaml")
+  void testFhirQuantity(@Nonnull final RuntimeCase testCase) {
+    run(testCase);
+  }
+
+  @YamlSpec("fhirpath-js/cases/hasValue.yaml")
+  void testHasValue(@Nonnull final RuntimeCase testCase) {
+    run(testCase);
+  }
+
+  @Disabled
+  @YamlSpec("fhirpath-js/cases/simple.yaml")
+  void testSimple(@Nonnull final RuntimeCase testCase) {
+    run(testCase);
+  }
+
 }
diff --git a/fhirpath/src/test/resources/fhirpath-js/config.yaml b/fhirpath/src/test/resources/fhirpath-js/config.yaml
@@ -546,3 +546,18 @@ excludeSet:
         type: framework-gap
         spel:
           - "#testCase.context == 'g1'"
+  - title: Factory exclusions
+    glob: 'fhirpath-js/cases/factory.yaml'
+    exclude:
+      - title: 'Custom factory not supported'
+        type: feature
+        expression:
+          - "%factory(\\W|$)"
+  - title: Has Value Exclusions
+    glob: 'fhirpath-js/cases/hasValue.yaml'
+    exclude:
+      - title: 'hasValue() not supported'
+        type: ???
+        comment: "hasValue() is not defined in FHIRSpec ???"
+        function:
+          - "hasValue"