Fix SMW_PHPUNIT_DIR (#5862)

* Fix SMW_PHPUNIT_DIR For some reason under MW 1.41+ is failing with finding this define, even tho it is in bootstrap. Adding it to Setup seems to have fixed it. * Update SetupCheckTest.php
SemanticMediaWiki · Dec 20, 2024 · a0b2b45 · a0b2b45
1 parent ca34df0
commit a0b2b45
Show file tree

Hide file tree

Showing 14 changed files with 36 additions and 39 deletions.
diff --git a/src/Setup.php b/src/Setup.php
@@ -167,6 +167,10 @@ private function addDefaultConfigurations( &$vars, $rootDir ) {
 			define( 'SMW_PHPUNIT_AUTOLOADER_FILE', "$smwDir/tests/autoloader.php" );
 		}
 
+		if ( !defined( 'SMW_PHPUNIT_DIR' ) ) {
+			define( 'SMW_PHPUNIT_DIR', __DIR__ . '/../tests/phpunit' );
+		}
+
 		$vars['wgLogTypes'][] = 'smw';
 		$vars['wgFilterLogTypes']['smw'] = true;
 

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -35,7 +35,6 @@
 	'SMW\Maintenance\updateEntityCountMap'       => __DIR__ . '/../maintenance/updateEntityCountMap.php'
 ] );
 
-define( 'SMW_PHPUNIT_DIR', __DIR__ . '/phpunit' );
 // define( 'SMW_PHPUNIT_TABLE_PREFIX', 'sunittest_' );
 // define( 'SMW_PHPUNIT_TABLE_PREFIX', '' );
 

diff --git a/tests/phpunit/Exception/JSONFileParseExceptionTest.php b/tests/phpunit/Exception/JSONFileParseExceptionTest.php
@@ -20,7 +20,7 @@ class JSONFileParseExceptionTest extends \PHPUnit\Framework\TestCase {
 
 	public function testCanConstruct() {
 		$instance = new JSONFileParseException(
-			SMW_PHPUNIT_DIR . '/Fixtures/Exception/invalid.trailing.comma.json'
+			\SMW_PHPUNIT_DIR . '/Fixtures/Exception/invalid.trailing.comma.json'
 		);
 
 		$this->assertContains(

diff --git a/tests/phpunit/Integration/Importer/JsonFileDirReaderTest.php b/tests/phpunit/Integration/Importer/JsonFileDirReaderTest.php
@@ -44,7 +44,7 @@ public function testGetContentList() {
 			$this->contentModeller,
 			$this->fileFetcher,
 			$this->file,
-			[ SMW_PHPUNIT_DIR . '/Fixtures/Importer/Others/ValidTextContent' ]
+			[ \SMW_PHPUNIT_DIR . '/Fixtures/Importer/Others/ValidTextContent' ]
 		);
 
 		$contents = $instance->getContentList();
@@ -69,7 +69,7 @@ public function testGetContentListOnFalseImportFormat() {
 			$this->contentModeller,
 			$this->fileFetcher,
 			$this->file,
-			[ SMW_PHPUNIT_DIR . '/Fixtures/Importer/Others/NoImportFormat' ]
+			[ \SMW_PHPUNIT_DIR . '/Fixtures/Importer/Others/NoImportFormat' ]
 		);
 
 		$this->assertEmpty(
@@ -82,7 +82,7 @@ public function testGetContentListOnMissingSections() {
 			$this->contentModeller,
 			$this->fileFetcher,
 			$this->file,
-			[ SMW_PHPUNIT_DIR . '/Fixtures/Importer/Others/MissingSections' ]
+			[ \SMW_PHPUNIT_DIR . '/Fixtures/Importer/Others/MissingSections' ]
 		);
 
 		$contents = $instance->getContentList();
@@ -98,7 +98,7 @@ public function testGetContentListWithInvalidPath() {
 			$this->contentModeller,
 			$this->fileFetcher,
 			$this->file,
-			[ SMW_PHPUNIT_DIR . '/Fixtures/Importer/Others/InvalidPath' ]
+			[ \SMW_PHPUNIT_DIR . '/Fixtures/Importer/Others/InvalidPath' ]
 		);
 
 		$this->assertEmpty(
@@ -111,7 +111,7 @@ public function testGetContentListOnInvalidJson_Error() {
 			$this->contentModeller,
 			$this->fileFetcher,
 			$this->file,
-			[ SMW_PHPUNIT_DIR . '/Fixtures/Importer/Others/InvalidJsonContent' ]
+			[ \SMW_PHPUNIT_DIR . '/Fixtures/Importer/Others/InvalidJsonContent' ]
 		);
 
 		$instance->getContentList();

diff --git a/tests/phpunit/Integration/Localizer/CopyLocalMessagesTest.php b/tests/phpunit/Integration/Localizer/CopyLocalMessagesTest.php
@@ -20,19 +20,19 @@ class CopyLocalMessagesTest extends \PHPUnit\Framework\TestCase {
 	private $translatedMessages;
 
 	protected function setUp(): void {
-		$this->canonicalMessages = file_get_contents( SMW_PHPUNIT_DIR . '/Fixtures/Localizer/en.json' );
-		$this->translatedMessages = file_get_contents( SMW_PHPUNIT_DIR . '/Fixtures/Localizer/test.json' );
+		$this->canonicalMessages = file_get_contents( \SMW_PHPUNIT_DIR . '/Fixtures/Localizer/en.json' );
+		$this->translatedMessages = file_get_contents( \SMW_PHPUNIT_DIR . '/Fixtures/Localizer/test.json' );
 	}
 
 	protected function tearDown(): void {
-		file_put_contents( SMW_PHPUNIT_DIR . '/Fixtures/Localizer/en.json', $this->canonicalMessages );
-		file_put_contents( SMW_PHPUNIT_DIR . '/Fixtures/Localizer/test.json', $this->translatedMessages );
+		file_put_contents( \SMW_PHPUNIT_DIR . '/Fixtures/Localizer/en.json', $this->canonicalMessages );
+		file_put_contents( \SMW_PHPUNIT_DIR . '/Fixtures/Localizer/test.json', $this->translatedMessages );
 	}
 
 	public function testCopyCanonicalMessages() {
 		$instance = new CopyLocalMessages(
 			'test.json',
-			SMW_PHPUNIT_DIR . '/Fixtures/Localizer'
+			\SMW_PHPUNIT_DIR . '/Fixtures/Localizer'
 		);
 
 		$this->assertEquals(
@@ -41,7 +41,7 @@ public function testCopyCanonicalMessages() {
 		);
 
 		$canonicalMessages = json_decode(
-			file_get_contents( SMW_PHPUNIT_DIR . '/Fixtures/Localizer/en.json' ),
+			file_get_contents( \SMW_PHPUNIT_DIR . '/Fixtures/Localizer/en.json' ),
 			true
 		);
 
@@ -60,7 +60,7 @@ public function testCopyCanonicalMessages() {
 	public function tesCopyTranslatedMessages() {
 		$instance = new CopyLocalMessages(
 			'test.json',
-			SMW_PHPUNIT_DIR . '/Fixtures/Localizer'
+			\SMW_PHPUNIT_DIR . '/Fixtures/Localizer'
 		);
 
 		$this->assertEquals(
@@ -72,7 +72,7 @@ public function tesCopyTranslatedMessages() {
 		);
 
 		$translatedMessages = json_decode(
-			file_get_contents( SMW_PHPUNIT_DIR . '/Fixtures/Localizer/test.json' ),
+			file_get_contents( \SMW_PHPUNIT_DIR . '/Fixtures/Localizer/test.json' ),
 			true
 		);
 

diff --git a/tests/phpunit/Integration/Localizer/LocalLanguage/PartialLanguageFallback.php b/tests/phpunit/Integration/Localizer/LocalLanguage/PartialLanguageFallback.php
@@ -37,7 +37,7 @@ protected function tearDown(): void {
 	public function testDeclarationsLoadedPartiallyFromFallback() {
 		$JsonContentsFileReader = new JsonContentsFileReader(
 			null,
-			SMW_PHPUNIT_DIR . '/Fixtures/Localizer/LocalLanguage/'
+			\SMW_PHPUNIT_DIR . '/Fixtures/Localizer/LocalLanguage/'
 		);
 
 		$languageContents = new LanguageContents(

diff --git a/tests/phpunit/Integration/Schema/CompartmentIteratorSchemaListTest.php b/tests/phpunit/Integration/Schema/CompartmentIteratorSchemaListTest.php
@@ -25,14 +25,14 @@ protected function setUp(): void {
 
 		$schema = new SchemaDefinition(
 			'fake_iterator_schema',
-			json_decode( file_get_contents( SMW_PHPUNIT_DIR . '/Fixtures/Schema/fake_iterator_schema.json' ), true )
+			json_decode( file_get_contents( \SMW_PHPUNIT_DIR . '/Fixtures/Schema/fake_iterator_schema.json' ), true )
 		);
 
 		$this->schemaList->add( $schema );
 
 		$schema = new SchemaDefinition(
 			'fake_iterator_schema_extra',
-			json_decode( file_get_contents( SMW_PHPUNIT_DIR . '/Fixtures/Schema/fake_iterator_schema.json' ), true )
+			json_decode( file_get_contents( \SMW_PHPUNIT_DIR . '/Fixtures/Schema/fake_iterator_schema.json' ), true )
 		);
 
 		$this->schemaList->add( $schema );

diff --git a/tests/phpunit/Integration/Schema/FilteredSchemaListTest.php b/tests/phpunit/Integration/Schema/FilteredSchemaListTest.php
@@ -48,7 +48,7 @@ protected function setUp(): void {
 	private function newSchemaDefinition( $name ) {
 		return new SchemaDefinition(
 			$name,
-			json_decode( file_get_contents( SMW_PHPUNIT_DIR . "/Fixtures/Schema/$name.json" ), true )
+			json_decode( file_get_contents( \SMW_PHPUNIT_DIR . "/Fixtures/Schema/$name.json" ), true )
 		);
 	}
 

diff --git a/tests/phpunit/Integration/Utils/FileFetcherRoundTripTest.php b/tests/phpunit/Integration/Utils/FileFetcherRoundTripTest.php
@@ -74,7 +74,7 @@ public function testRoundTrip_Sort_Desc() {
 
 	public function testRoundTrip_Sort_Desc_SubDir() {
 		$fileFetcher = new FileFetcher(
-			FileFetcher::normalize( SMW_PHPUNIT_DIR . '/Fixtures/Utils/' )
+			FileFetcher::normalize( \SMW_PHPUNIT_DIR . '/Fixtures/Utils/' )
 		);
 
 		$fileFetcher->sort( 'desc' );
@@ -84,9 +84,9 @@ public function testRoundTrip_Sort_Desc_SubDir() {
 
 		$this->assertEquals(
 			[
-				[ FileFetcher::normalize( SMW_PHPUNIT_DIR . '/Fixtures/Utils/zzz.json' ) ],
-				[ FileFetcher::normalize( SMW_PHPUNIT_DIR . '/Fixtures/Utils/subDir/bbb.json' ) ],
-				[ FileFetcher::normalize( SMW_PHPUNIT_DIR . '/Fixtures/Utils/aaa.json' ) ]
+				[ FileFetcher::normalize( \SMW_PHPUNIT_DIR . '/Fixtures/Utils/zzz.json' ) ],
+				[ FileFetcher::normalize( \SMW_PHPUNIT_DIR . '/Fixtures/Utils/subDir/bbb.json' ) ],
+				[ FileFetcher::normalize( \SMW_PHPUNIT_DIR . '/Fixtures/Utils/aaa.json' ) ]
 			],
 			$files
 		);

diff --git a/tests/phpunit/Localizer/LocalMessageProviderTest.php b/tests/phpunit/Localizer/LocalMessageProviderTest.php
@@ -27,7 +27,7 @@ public function testCanConstruct() {
 
 	public function testMsg() {
 		$instance = new LocalMessageProvider( 'test.json', 'en' );
-		$instance->setLanguageFileDir( SMW_PHPUNIT_DIR . '/Fixtures/Localizer' );
+		$instance->setLanguageFileDir( \SMW_PHPUNIT_DIR . '/Fixtures/Localizer' );
 		$instance->setLanguageCode( 'ja' );
 		$instance->loadMessages();
 
@@ -39,7 +39,7 @@ public function testMsg() {
 
 	public function testMsg_Fallback() {
 		$instance = new LocalMessageProvider( 'test.json', 'en' );
-		$instance->setLanguageFileDir( SMW_PHPUNIT_DIR . '/Fixtures/Localizer' );
+		$instance->setLanguageFileDir( \SMW_PHPUNIT_DIR . '/Fixtures/Localizer' );
 		$instance->setLanguageCode( 'foo' );
 		$instance->loadMessages();
 
@@ -51,7 +51,7 @@ public function testMsg_Fallback() {
 
 	public function testMsg_WithArgs() {
 		$instance = new LocalMessageProvider( 'test.json', 'en' );
-		$instance->setLanguageFileDir( SMW_PHPUNIT_DIR . '/Fixtures/Localizer' );
+		$instance->setLanguageFileDir( \SMW_PHPUNIT_DIR . '/Fixtures/Localizer' );
 		$instance->setLanguageCode( 'ja' );
 		$instance->loadMessages();
 
@@ -63,7 +63,7 @@ public function testMsg_WithArgs() {
 
 	public function testMsg_NoValidKey() {
 		$instance = new LocalMessageProvider( 'test.json', 'en' );
-		$instance->setLanguageFileDir( SMW_PHPUNIT_DIR . '/Fixtures/Localizer' );
+		$instance->setLanguageFileDir( \SMW_PHPUNIT_DIR . '/Fixtures/Localizer' );
 		$instance->loadMessages();
 
 		$this->assertEquals(

diff --git a/tests/phpunit/Schema/SchemaValidatorTest.php b/tests/phpunit/Schema/SchemaValidatorTest.php
@@ -65,7 +65,7 @@ public function testValidate_IsValid() {
 		$instance = new SchemaValidator( $jsonSchemaValidator );
 
 		$info = [
-			SchemaDefinition::SCHEMA_VALIDATION_FILE => SMW_PHPUNIT_DIR . '/Fixtures/Schema/empty_schema.json'
+			SchemaDefinition::SCHEMA_VALIDATION_FILE => \SMW_PHPUNIT_DIR . '/Fixtures/Schema/empty_schema.json'
 		];
 
 		$this->assertEmpty(
@@ -93,7 +93,7 @@ public function testValidate_Error() {
 		$instance = new SchemaValidator( $jsonSchemaValidator );
 
 		$info = [
-			SchemaDefinition::SCHEMA_VALIDATION_FILE => SMW_PHPUNIT_DIR . '/Fixtures/Schema/empty_schema.json'
+			SchemaDefinition::SCHEMA_VALIDATION_FILE => \SMW_PHPUNIT_DIR . '/Fixtures/Schema/empty_schema.json'
 		];
 
 		$this->assertNotEmpty(

diff --git a/tests/phpunit/SetupCheckTest.php b/tests/phpunit/SetupCheckTest.php
@@ -24,12 +24,6 @@ class SetupCheckTest extends \PHPUnit\Framework\TestCase {
 	protected function setUp(): void {
 		parent::setUp();
 
-		// Don't know why this is undefined but it is required by
-		// testReadFromFile_InvalidJSON_ThrowsException()
-		if ( !defined( 'SMW_PHPUNIT_DIR' ) ) {
-			define( 'SMW_PHPUNIT_DIR', __DIR__ );
-		}
-
 		$this->setupFile = $this->getMockBuilder( '\SMW\SetupFile' )
 			->disableOriginalConstructor()
 			->getMock();

diff --git a/tests/phpunit/Structure/PHPUnitCheckRunnerTest.php b/tests/phpunit/Structure/PHPUnitCheckRunnerTest.php
@@ -18,7 +18,7 @@ class PHPUnitCheckRunnerTest extends \PHPUnit\Framework\TestCase {
 
 	public static function setUpBeforeClass(): void {
 		$fileFetcher = new FileFetcher(
-			SMW_PHPUNIT_DIR
+			\SMW_PHPUNIT_DIR
 		);
 
 		self::$iterator = $fileFetcher->findByExtension( 'php' );

diff --git a/tests/phpunit/Utils/TemplateEngineTest.php b/tests/phpunit/Utils/TemplateEngineTest.php
@@ -33,7 +33,7 @@ public function testCode_ThrowsException() {
 	}
 
 	public function testLoad() {
-		$instance = new TemplateEngine( SMW_PHPUNIT_DIR );
+		$instance = new TemplateEngine( \SMW_PHPUNIT_DIR );
 		$instance->load( '/Fixtures/readable.file', 'Foo' );
 
 		$instance->compile( 'Foo', [] );
@@ -45,7 +45,7 @@ public function testLoad() {
 	}
 
 	public function testBulkLoad() {
-		$instance = new TemplateEngine( SMW_PHPUNIT_DIR );
+		$instance = new TemplateEngine( \SMW_PHPUNIT_DIR );
 		$instance->clearTemplates();
 
 		$instance->bulkLoad( [ '/Fixtures/readable.file' => 'Foo' ] );
@@ -58,7 +58,7 @@ public function testBulkLoad() {
 	}
 
 	public function testHtmlTidy() {
-		$instance = new TemplateEngine( SMW_PHPUNIT_DIR );
+		$instance = new TemplateEngine( \SMW_PHPUNIT_DIR );
 		$instance->clearTemplates();
 
 		$instance->setContents( __METHOD__, "{{foo}}<span>\n    </span>" );