slightly better test config runtime

dcarbone · Jan 21, 2025 · 9d246ac · 9d246ac
1 parent 083593f
commit 9d246ac
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 13 deletions.
diff --git a/phpunit/Versions.xml b/phpunit/Versions.xml
@@ -15,13 +15,7 @@
     </php>
     <testsuites>
         <testsuite name="Versions">
-            <directory>../output/tests/Tests/DCarbone/PHPFHIRGenerated/Tests/Versions</directory>
-            <exclude>../output/tests/Tests/DCarbone/PHPFHIRGenerated/Tests/Versions/DSTU1</exclude>
-            <exclude>../output/tests/Tests/DCarbone/PHPFHIRGenerated/Tests/Versions/DSTU2</exclude>
-            <exclude>../output/tests/Tests/DCarbone/PHPFHIRGenerated/Tests/Versions/STU3</exclude>
-            <exclude>../output/tests/Tests/DCarbone/PHPFHIRGenerated/Tests/Versions/R4</exclude>
-            <exclude>../output/tests/Tests/DCarbone/PHPFHIRGenerated/Tests/Versions/R4B</exclude>
-            <exclude>../output/tests/Tests/DCarbone/PHPFHIRGenerated/Tests/Versions/R5</exclude>
+            <directory>../output/tests/Tests/DCarbone/PHPFHIRGenerated/Versions</directory>
         </testsuite>
     </testsuites>
 </phpunit>
diff --git a/phpunit/config.php b/phpunit/config.php
@@ -19,15 +19,16 @@
 
 return array_merge(
     require __DIR__ . '/../bin/config.php',
-    [
-        'versions' => match (getenv('PHPFHIR_TEST_TARGET')) {
-            'Core' => [],
-            default => [
+    match (getenv('PHPFHIR_TEST_TARGET')) {
+        'Core' => ['versions' => []],
+        'Versions' => [],
+        default => [
+            'versions' => [
                 [
                     'name' => getenv('PHPFHIR_TEST_TARGET'),
                     'schemaPath' => __DIR__ . '/../input/' . getenv('PHPFHIR_TEST_TARGET'),
                 ],
             ],
-        },
-    ]
+        ],
+    },
 );