Skip to content

Commit 9cdf22b

Browse files
committed
fixup! refactor: add GlobalsAccessor abstraction for OpenEMR globals access
1 parent aa0ea9f commit 9cdf22b

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

tests/E2E/RealVocabularyImportE2ETest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
namespace OpenCoreEMR\CLI\ImportCodes\Tests\E2E;
2323

2424
use OpenCoreEMR\CLI\ImportCodes\Command\ImportCodesCommand;
25+
use OpenCoreEMR\CLI\ImportCodes\Config\GlobalsAccessor;
2526
use OpenCoreEMR\CLI\ImportCodes\Service\OpenEMRConnector;
2627
use PHPUnit\Framework\Attributes\Group;
2728
use PHPUnit\Framework\Attributes\Test;
@@ -61,7 +62,7 @@ protected function setUp(): void
6162
$this->markTestSkipped('OpenEMR not available. Run inside Docker: task dev:start');
6263
}
6364

64-
$this->connector = new OpenEMRConnector();
65+
$this->connector = new OpenEMRConnector(new GlobalsAccessor());
6566
try {
6667
$this->connector->initialize(self::OPENEMR_PATH, self::SITE);
6768
} catch (\Exception $e) {

tests/E2E/VocabularyImportE2ETest.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
namespace OpenCoreEMR\CLI\ImportCodes\Tests\E2E;
1818

1919
use OpenCoreEMR\CLI\ImportCodes\Command\ImportCodesCommand;
20+
use OpenCoreEMR\CLI\ImportCodes\Config\GlobalsAccessor;
2021
use OpenCoreEMR\CLI\ImportCodes\Service\OpenEMRConnector;
2122
use PHPUnit\Framework\Attributes\Group;
2223
use PHPUnit\Framework\Attributes\RequiresPhpExtension;
@@ -52,7 +53,7 @@ protected function setUp(): void
5253
);
5354
}
5455

55-
$this->connector = new OpenEMRConnector();
56+
$this->connector = new OpenEMRConnector(new GlobalsAccessor());
5657
try {
5758
$this->connector->initialize(self::OPENEMR_PATH, self::SITE);
5859
} catch (\Exception $e) {
@@ -268,7 +269,7 @@ public function cleanupRemovesTemporaryFiles(): void
268269
$this->assertEquals(0, $result);
269270

270271
// Verify temp directory was cleaned up
271-
$tempDir = $GLOBALS['temporary_files_dir'] . '/CQM_VALUESET';
272+
$tempDir = $this->connector->getTempDir() . '/CQM_VALUESET';
272273
$this->assertDirectoryDoesNotExist($tempDir, 'Temp directory should be removed after cleanup');
273274
}
274275

tests/Integration/ImportCodesIntegrationTest.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
namespace OpenCoreEMR\CLI\ImportCodes\Tests\Integration;
1818

1919
use OpenCoreEMR\CLI\ImportCodes\Command\ImportCodesCommand;
20+
use OpenCoreEMR\CLI\ImportCodes\Config\GlobalsAccessor;
2021
use OpenCoreEMR\CLI\ImportCodes\Service\CodeImporter;
2122
use OpenCoreEMR\CLI\ImportCodes\Service\MetadataDetector;
2223
use OpenCoreEMR\CLI\ImportCodes\Service\OpenEMRConnector;
@@ -54,7 +55,7 @@ protected function setUp(): void
5455
}
5556

5657
// Try to initialize the connector
57-
$this->connector = new OpenEMRConnector();
58+
$this->connector = new OpenEMRConnector(new GlobalsAccessor());
5859
try {
5960
$this->connector->initialize(self::OPENEMR_PATH, self::SITE);
6061
$this->openemrAvailable = true;
@@ -92,7 +93,7 @@ public function openEmrConnectorCanGetTempDir(): void
9293
#[Test]
9394
public function codeImporterCanCheckIfVocabularyLoaded(): void
9495
{
95-
$importer = new CodeImporter();
96+
$importer = new CodeImporter(new GlobalsAccessor());
9697

9798
// Should not throw exception when database is available
9899
$result = $importer->isVocabularyLoaded('RXNORM');
@@ -103,7 +104,7 @@ public function codeImporterCanCheckIfVocabularyLoaded(): void
103104
#[Test]
104105
public function codeImporterCanCheckIfAlreadyLoaded(): void
105106
{
106-
$importer = new CodeImporter();
107+
$importer = new CodeImporter(new GlobalsAccessor());
107108

108109
// Check with fake data - should return false
109110
$result = $importer->isAlreadyLoaded(

0 commit comments

Comments
 (0)