tests still need some work.

dcarbone · dcarbone · commit 90fd2e6b9091 · 2024-12-24T10:29:04.000-06:00
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -1,13 +1,2 @@
-# These are supported funding model platforms
-
 github: dcarbone
-patreon: # Replace with a single Patreon username
-open_collective: # Replace with a single Open Collective username
-ko_fi: dcarbone
-tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
-community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
-liberapay: # Replace with a single Liberapay username
-issuehunt: # Replace with a single IssueHunt username
-otechie: # Replace with a single Otechie username
-lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
-custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
+ko_fi: dcarbone
diff --git a/files/constants.php b/files/constants.php
@@ -155,6 +155,10 @@
 const PHPFHIR_TEST_CLASSNAME_TYPE_MAP = PHPFHIR_CLASSNAME_VERSION_TYPE_MAP . 'Test';
 const PHPFHIR_TEST_CLASSNAME_FACTORY_CONFIG = PHPFHIR_CLASSNAME_FACTORY_CONFIG . 'Test';
 
+// Test constant names
+const PHPFHIR_TEST_CONSTANT_INTEGRATION_ENDPOINT = 'PHPFHIR_TEST_INTEGRATION_ENDPOINT';
+const PHPFHIR_TEST_CONSTANT_RESOURCE_DOWNLOAD_DIR = 'PHPFHIR_TEST_RESOURCE_DOWNLOAD_DIR';
+
 // Date & time formats
 const PHPFHIR_DATE_FORMAT_YEAR = 'Y';
 const PHPFHIR_DATE_FORMAT_YEAR_MONTH = 'Y-m';
diff --git a/phpunit/bootstrap.php b/phpunit/bootstrap.php
@@ -18,20 +18,34 @@
  * limitations under the License.
  */
 
-const COMPOSER_AUTOLOADER_PATH = __DIR__ . '/../vendor/autoload.php';
-const GENERATED_AUTOLOADER_PATH = __DIR__ . '/../output/DCarbone/PHPFHIRGenerated/Autoloader.php';
+const PHPFHIR_TEST_CONFIG_ROOT_DIR = __DIR__;
+const PHPFHIR_TEST_RESOURCE_DOWNLOAD_DIR = PHPFHIR_TEST_CONFIG_ROOT_DIR . '/../output/tests/resources';
 
-$composerAutoloader = realpath(COMPOSER_AUTOLOADER_PATH);
-$generatedAutoloader = realpath(GENERATED_AUTOLOADER_PATH);
+echo 'Creating test resource download dir: ' . PHPFHIR_TEST_CONFIG_ROOT_DIR . '/../output/tests/resources' . PHP_EOL;
+
+if (!mkdir(PHPFHIR_TEST_RESOURCE_DOWNLOAD_DIR, 0755, true)) {
+    throw new \RuntimeException(sprintf('Failed to create test resource download directory: %s', PHPFHIR_TEST_RESOURCE_DOWNLOAD_DIR));
+}
+
+# define env to be used in tests
+putenv('PHPFHIR_TEST_RESOURCE_DOWNLOAD_DIR='.PHPFHIR_TEST_RESOURCE_DOWNLOAD_DIR);
+
+const PHPFHIR_TEST_COMPOSER_AUTOLOADER_PATH = __DIR__ . '/../vendor/autoload.php';
+const PHPFHIR_TETS_GENERATED_AUTOLOADER_PATH = __DIR__ . '/../output/DCarbone/PHPFHIRGenerated/Autoloader.php';
+
+$composerAutoloader = realpath(PHPFHIR_TEST_COMPOSER_AUTOLOADER_PATH);
+$generatedAutoloader = realpath(PHPFHIR_TETS_GENERATED_AUTOLOADER_PATH);
 
 if (!$composerAutoloader) {
-    throw new \RuntimeException(sprintf('Copmoser autoloader class file not found at expected path: %s', COMPOSER_AUTOLOADER_PATH));
+    throw new \RuntimeException(sprintf('Copmoser autoloader class file not found at expected path: %s', PHPFHIR_TEST_COMPOSER_AUTOLOADER_PATH));
 }
 if (!$generatedAutoloader) {
-    throw new \RuntimeException(sprintf('Generated autoloader class file not found at expected path: %s', GENERATED_AUTOLOADER_PATH));
+    throw new \RuntimeException(sprintf('Generated autoloader class file not found at expected path: %s', PHPFHIR_TETS_GENERATED_AUTOLOADER_PATH));
 }
 
 echo "Requiring composer autoloader: {$composerAutoloader}\n";
 require $composerAutoloader;
 echo "Requiring generated autoloader: {$generatedAutoloader}\n";
 require $generatedAutoloader;
+
+unset($composerAutoloader, $generatedAutoloader);
diff --git a/src/Version/Definition/Decorator/ChoiceElementElementPropertyDecorator.php b/src/Version/Definition/Decorator/ChoiceElementElementPropertyDecorator.php
@@ -45,9 +45,9 @@ public static function decorate(
         Types $types,
         Type $type,
         \SimpleXMLElement $element,
-        ?string $minOccurs,
-        ?string $maxOccurs,
-        \SimpleXMLElement $annotationElement = null
+        null|string $minOccurs,
+        null|string $maxOccurs,
+        null|\SimpleXMLElement $annotationElement = null
     ): void {
         $property = new Property($type, $element, $type->getSourceFilename());
 
diff --git a/src/Version/Definition/Type.php b/src/Version/Definition/Type.php
@@ -114,7 +114,7 @@ public function __construct(
         Config $config,
         Version $version,
         string $fhirName,
-        SimpleXMLElement $sourceSXE = null,
+        null|SimpleXMLElement $sourceSXE = null,
         string $sourceFilename = ''
     ) {
         if ('' === ($fhirName = trim($fhirName))) {
diff --git a/template/versions/types/tests/integration/class.php b/template/versions/types/tests/integration/class.php
@@ -67,13 +67,14 @@
 ?>
 
 
-use <?php echo $bundleType->getFullyQualifiedClassName(false); ?>;
-use <?php echo $type->getFullyQualifiedClassName(false); ?>;
 use <?php echo $config->getFullyQualifiedName(false, PHPFHIR_CLASSNAME_API_CLIENT); ?>;
+use <?php echo $config->getFullyQualifiedName(false, PHPFHIR_CLASSNAME_API_CLIENT_CONFIG); ?>;
 use <?php echo $config->getFullyQualifiedName(false, PHPFHIR_ENUM_API_FORMAT); ?>;
+use <?php echo $config->getFullyQualifiedName(false, PHPFHIR_CLASSNAME_RESPONSE_PARSER); ?>;
+use <?php echo $bundleType->getFullyQualifiedClassName(false); ?>;
+use <?php echo $type->getFullyQualifiedClassName(false); ?>;
 use <?php echo $version->getFullyQualifiedName(false, PHPFHIR_CLASSNAME_VERSION_API_CLIENT); ?>;
 use <?php echo $version->getFullyQualifiedName(false, PHPFHIR_ENUM_VERSION_TYPE); ?>;
-use <?php echo $config->getFullyQualifiedName(false, PHPFHIR_CLASSNAME_RESPONSE_PARSER); ?>;
 use <?php echo $version->getFullyQualifiedName(false, PHPFHIR_CLASSNAME_VERSION); ?>;
 use PHPUnit\Framework\AssertionFailedError;
 use PHPUnit\Framework\TestCase;
@@ -92,6 +93,9 @@ class <?php echo $testClassname; ?> extends TestCase
     /** @var <?php echo $version->getFullyQualifiedName(true, PHPFHIR_CLASSNAME_VERSION); ?> */
     private <?php echo PHPFHIR_CLASSNAME_VERSION; ?> $_version;
 
+    /** @var <?php echo $config->getFullyQualifiedName(true, PHPFHIR_CLASSNAME_API_CLIENT_CONFIG); ?> */
+    private <?php echo PHPFHIR_CLASSNAME_API_CLIENT_CONFIG; ?> $_clientConfig;
+
     /** @var <?php echo $config->getFullyQualifiedName(true, PHPFHIR_CLASSNAME_API_CLIENT); ?> */
     private <?php echo PHPFHIR_CLASSNAME_API_CLIENT; ?> $_baseClient;
 
@@ -103,13 +107,14 @@ class <?php echo $testClassname; ?> extends TestCase
 
     protected function setUp(): void
     {
-        $endpoint = trim((string)getenv('PHPFHIR_TEST_INTEGRATION_ENDPOINT'));
+        $endpoint = trim((string)getenv('<?php echo PHPFHIR_TEST_CONSTANT_INTEGRATION_ENDPOINT; ?>'));
         if ('' === $endpoint) {
-            $this->markTestIncomplete('Environment variable PHPFHIR_TEST_INTEGRATION_ENDPOINT is not defined or empty');
+            $this->markTestIncomplete('Environment variable <?php echo PHPFHIR_TEST_CONSTANT_INTEGRATION_ENDPOINT; ?> is not defined or empty');
         }
         $this->_testEndpoint = $endpoint;
         $this->_version = new <?php echo PHPFHIR_CLASSNAME_VERSION ?>();
-        $this->_baseClient = new <?php echo PHPFHIR_CLASSNAME_API_CLIENT; ?>($endpoint);
+        $this->_clientConfig = new <?php echo PHPFHIR_CLASSNAME_API_CLIENT_CONFIG ?>(address: $endpoint);
+        $this->_baseClient = new <?php echo PHPFHIR_CLASSNAME_API_CLIENT; ?>($this->_clientConfig);
         $this->_client = new <?php echo PHPFHIR_CLASSNAME_VERSION_API_CLIENT ?>(
             $this->_baseClient,
             $this->_version,
@@ -119,6 +124,7 @@ protected function setUp(): void
     /**
      * @param string $format Either xml or json
      * @return string
+     * @throws \Exception
      */
     protected function fetchResourceBundle(string $format): string
     {
@@ -140,8 +146,13 @@ protected function fetchResourceBundle(string $format): string
         }
         $this->assertIsString($rc->resp);
         $this->_fetchedResources[$format] = $rc->resp;
-        // $fname = sprintf('%s%s<?php echo $type->getFHIRName(); ?>-<?php echo $version->getSourceMetadata()->getFHIRVersion(false); ?>-source.%s', PHPFHIR_OUTPUT_TMP_DIR, DIRECTORY_SEPARATOR, $format);
-        // file_put_contents($fname, $rc->resp);
+        $dlDir = trim((string)getenv('<?php echo PHPFHIR_TEST_CONSTANT_RESOURCE_DOWNLOAD_DIR; ?>'));
+        if ('' !== $dlDir) {
+            $this->assertDirectoryExists($dlDir, sprintf('Configured test resource download directory "%s" does not exist.', $dlDir));
+            $fname = sprintf('%s%s<?php echo $type->getFHIRName(); ?>-<?php echo $version->getSourceMetadata()->getFHIRVersion(false); ?>-source.%s', $dlDir, DIRECTORY_SEPARATOR, $format);
+            file_put_contents($fname, $rc->resp);
+            $this->assertFileExists($fname, sprintf('Failed to write fetched resource bundle to "%s"', $fname));
+        }
         return $rc->resp;
     }
 
@@ -164,6 +175,9 @@ function_exists('json_last_error_msg') ? json_last_error_msg() : ('Code: '.json_
         return $decoded;
     }
 
+    /**
+     * @throws \Exception
+     */
     public function testXML(): void
     {
         $sourceXML = $this->fetchResourceBundle('xml');
@@ -222,6 +236,9 @@ public function testXML(): void
         }
     }
 
+    /**
+     * @throws \Exception
+     */
     public function testJSON(): void
     {
         $sourceJSON = $this->fetchResourceBundle('json');
@@ -270,6 +287,9 @@ public function testJSON(): void
         }
     }
 
+    /**
+     * @throws \Exception
+     */
     public function testValidationXML(): void
     {
         $sourceXML = $this->fetchResourceBundle('xml');
@@ -307,6 +327,9 @@ public function testValidationXML(): void
         }
     }
 
+    /**
+     * @throws \Exception
+     */
     public function testValidationJSON(): void
     {
         $sourceJSON = $this->fetchResourceBundle('json');
@@ -345,6 +368,9 @@ public function testValidationJSON(): void
         }
     }
 
+    /**
+     * @throws \Exception
+     */
     public function testResponseParserXML(): void
     {
         $sourceXML = $this->fetchResourceBundle('xml');
@@ -403,6 +429,9 @@ public function testResponseParserXML(): void
         }
     }
 
+    /**
+     * @throws \Exception
+     */
     public function testResponseParserJSON(): void
     {
         $sourceJSON = $this->fetchResourceBundle('json');

Original file line number	Diff line number	Diff line change
`@@ -67,13 +67,14 @@`
`67`	`67`	`?>`
`68`	`68`
`69`	`69`
`70`		`-use <?php echo $bundleType->getFullyQualifiedClassName(false); ?>;`
`71`		`-use <?php echo $type->getFullyQualifiedClassName(false); ?>;`
`72`	`70`	`use <?php echo $config->getFullyQualifiedName(false, PHPFHIR_CLASSNAME_API_CLIENT); ?>;`
	`71`	`+use <?php echo $config->getFullyQualifiedName(false, PHPFHIR_CLASSNAME_API_CLIENT_CONFIG); ?>;`
`73`	`72`	`use <?php echo $config->getFullyQualifiedName(false, PHPFHIR_ENUM_API_FORMAT); ?>;`
	`73`	`+use <?php echo $config->getFullyQualifiedName(false, PHPFHIR_CLASSNAME_RESPONSE_PARSER); ?>;`
	`74`	`+use <?php echo $bundleType->getFullyQualifiedClassName(false); ?>;`
	`75`	`+use <?php echo $type->getFullyQualifiedClassName(false); ?>;`
`74`	`76`	`use <?php echo $version->getFullyQualifiedName(false, PHPFHIR_CLASSNAME_VERSION_API_CLIENT); ?>;`
`75`	`77`	`use <?php echo $version->getFullyQualifiedName(false, PHPFHIR_ENUM_VERSION_TYPE); ?>;`
`76`		`-use <?php echo $config->getFullyQualifiedName(false, PHPFHIR_CLASSNAME_RESPONSE_PARSER); ?>;`
`77`	`78`	`use <?php echo $version->getFullyQualifiedName(false, PHPFHIR_CLASSNAME_VERSION); ?>;`
`78`	`79`	`use PHPUnit\Framework\AssertionFailedError;`
`79`	`80`	`use PHPUnit\Framework\TestCase;`
`@@ -92,6 +93,9 @@ class <?php echo $testClassname; ?> extends TestCase`
`92`	`93`	`/** @var <?php echo $version->getFullyQualifiedName(true, PHPFHIR_CLASSNAME_VERSION); ?> */`
`93`	`94`	`private <?php echo PHPFHIR_CLASSNAME_VERSION; ?> $_version;`
`94`	`95`
	`96`	`+ /** @var <?php echo $config->getFullyQualifiedName(true, PHPFHIR_CLASSNAME_API_CLIENT_CONFIG); ?> */`
	`97`	`+ private <?php echo PHPFHIR_CLASSNAME_API_CLIENT_CONFIG; ?> $_clientConfig;`
	`98`	`+`
`95`	`99`	`/** @var <?php echo $config->getFullyQualifiedName(true, PHPFHIR_CLASSNAME_API_CLIENT); ?> */`
`96`	`100`	`private <?php echo PHPFHIR_CLASSNAME_API_CLIENT; ?> $_baseClient;`
`97`	`101`
`@@ -103,13 +107,14 @@ class <?php echo $testClassname; ?> extends TestCase`
`103`	`107`
`104`	`108`	`protected function setUp(): void`
`105`	`109`	`{`
`106`		`- $endpoint = trim((string)getenv('PHPFHIR_TEST_INTEGRATION_ENDPOINT'));`
	`110`	`+ $endpoint = trim((string)getenv('<?php echo PHPFHIR_TEST_CONSTANT_INTEGRATION_ENDPOINT; ?>'));`
`107`	`111`	`if ('' === $endpoint) {`
`108`		`- $this->markTestIncomplete('Environment variable PHPFHIR_TEST_INTEGRATION_ENDPOINT is not defined or empty');`
	`112`	`+ $this->markTestIncomplete('Environment variable <?php echo PHPFHIR_TEST_CONSTANT_INTEGRATION_ENDPOINT; ?> is not defined or empty');`
`109`	`113`	`}`
`110`	`114`	`$this->_testEndpoint = $endpoint;`
`111`	`115`	`$this->_version = new <?php echo PHPFHIR_CLASSNAME_VERSION ?>();`
`112`		`- $this->_baseClient = new <?php echo PHPFHIR_CLASSNAME_API_CLIENT; ?>($endpoint);`
	`116`	`+ $this->_clientConfig = new <?php echo PHPFHIR_CLASSNAME_API_CLIENT_CONFIG ?>(address: $endpoint);`
	`117`	`+ $this->_baseClient = new <?php echo PHPFHIR_CLASSNAME_API_CLIENT; ?>($this->_clientConfig);`
`113`	`118`	`$this->_client = new <?php echo PHPFHIR_CLASSNAME_VERSION_API_CLIENT ?>(`
`114`	`119`	`$this->_baseClient,`
`115`	`120`	`$this->_version,`
`@@ -119,6 +124,7 @@ protected function setUp(): void`
`119`	`124`	`/**`
`120`	`125`	`* @param string $format Either xml or json`
`121`	`126`	`* @return string`
	`127`	`+ * @throws \Exception`
`122`	`128`	`*/`
`123`	`129`	`protected function fetchResourceBundle(string $format): string`
`124`	`130`	`{`
`@@ -140,8 +146,13 @@ protected function fetchResourceBundle(string $format): string`
`140`	`146`	`}`
`141`	`147`	`$this->assertIsString($rc->resp);`
`142`	`148`	`$this->_fetchedResources[$format] = $rc->resp;`
`143`		`- // $fname = sprintf('%s%s<?php echo $type->getFHIRName(); ?>-<?php echo $version->getSourceMetadata()->getFHIRVersion(false); ?>-source.%s', PHPFHIR_OUTPUT_TMP_DIR, DIRECTORY_SEPARATOR, $format);`
`144`		`- // file_put_contents($fname, $rc->resp);`
	`149`	`+ $dlDir = trim((string)getenv('<?php echo PHPFHIR_TEST_CONSTANT_RESOURCE_DOWNLOAD_DIR; ?>'));`
	`150`	`+ if ('' !== $dlDir) {`
	`151`	`+ $this->assertDirectoryExists($dlDir, sprintf('Configured test resource download directory "%s" does not exist.', $dlDir));`
	`152`	`+ $fname = sprintf('%s%s<?php echo $type->getFHIRName(); ?>-<?php echo $version->getSourceMetadata()->getFHIRVersion(false); ?>-source.%s', $dlDir, DIRECTORY_SEPARATOR, $format);`
	`153`	`+ file_put_contents($fname, $rc->resp);`
	`154`	`+ $this->assertFileExists($fname, sprintf('Failed to write fetched resource bundle to "%s"', $fname));`
	`155`	`+ }`
`145`	`156`	`return $rc->resp;`
`146`	`157`	`}`
`147`	`158`
`@@ -164,6 +175,9 @@ function_exists('json_last_error_msg') ? json_last_error_msg() : ('Code: '.json_`
`164`	`175`	`return $decoded;`
`165`	`176`	`}`
`166`	`177`
	`178`	`+ /**`
	`179`	`+ * @throws \Exception`
	`180`	`+ */`
`167`	`181`	`public function testXML(): void`
`168`	`182`	`{`
`169`	`183`	`$sourceXML = $this->fetchResourceBundle('xml');`
`@@ -222,6 +236,9 @@ public function testXML(): void`
`222`	`236`	`}`
`223`	`237`	`}`
`224`	`238`
	`239`	`+ /**`
	`240`	`+ * @throws \Exception`
	`241`	`+ */`
`225`	`242`	`public function testJSON(): void`
`226`	`243`	`{`
`227`	`244`	`$sourceJSON = $this->fetchResourceBundle('json');`
`@@ -270,6 +287,9 @@ public function testJSON(): void`
`270`	`287`	`}`
`271`	`288`	`}`
`272`	`289`
	`290`	`+ /**`
	`291`	`+ * @throws \Exception`
	`292`	`+ */`
`273`	`293`	`public function testValidationXML(): void`
`274`	`294`	`{`
`275`	`295`	`$sourceXML = $this->fetchResourceBundle('xml');`
`@@ -307,6 +327,9 @@ public function testValidationXML(): void`
`307`	`327`	`}`
`308`	`328`	`}`
`309`	`329`
	`330`	`+ /**`
	`331`	`+ * @throws \Exception`
	`332`	`+ */`
`310`	`333`	`public function testValidationJSON(): void`
`311`	`334`	`{`
`312`	`335`	`$sourceJSON = $this->fetchResourceBundle('json');`
`@@ -345,6 +368,9 @@ public function testValidationJSON(): void`
`345`	`368`	`}`
`346`	`369`	`}`
`347`	`370`
	`371`	`+ /**`
	`372`	`+ * @throws \Exception`
	`373`	`+ */`
`348`	`374`	`public function testResponseParserXML(): void`
`349`	`375`	`{`
`350`	`376`	`$sourceXML = $this->fetchResourceBundle('xml');`
`@@ -403,6 +429,9 @@ public function testResponseParserXML(): void`
`403`	`429`	`}`
`404`	`430`	`}`
`405`	`431`
	`432`	`+ /**`
	`433`	`+ * @throws \Exception`
	`434`	`+ */`
`406`	`435`	`public function testResponseParserJSON(): void`
`407`	`436`	`{`
`408`	`437`	`$sourceJSON = $this->fetchResourceBundle('json');`