Don't autoload classes in AutoloadStructureTest

Autoloading classes is a 100% accurate way to ensure the autoloader
worked, but there are cases where if optional dependencies aren't
installed, then autoloading the class will fail. We can re-implement the
logic behind the PSR-4 autoloader, and ensure that classes will be
autoloadable by turning the filename into a class name, and making sure
that class name is the one we found in the file.

Bug: T195823
Change-Id: I5df378180e567c257386482383ef73812592f989

diff --git a/tests/phpunit/structure/AutoLoaderStructureTest.php b/tests/phpunit/structure/AutoLoaderStructureTest.php
index 50ec5fa..2800d02 100644 (file)
--- a/tests/phpunit/structure/AutoLoaderStructureTest.php
+++ b/tests/phpunit/structure/AutoLoaderStructureTest.php
@@ -22,7 +22,7 @@ class AutoLoaderStructureTest extends MediaWikiTestCase {
        public function providePSR4Completeness() {
                foreach ( AutoLoader::$psr4Namespaces as $prefix => $dir ) {
                        foreach ( $this->recurseFiles( $dir ) as $file ) {
-                               yield [ $prefix, $file ];
+                               yield [ $prefix, $dir, $file ];
                        }
                }
        }
@@ -34,7 +34,7 @@ class AutoLoaderStructureTest extends MediaWikiTestCase {
        /**
         * @dataProvider providePSR4Completeness
         */
-       public function testPSR4Completeness( $prefix, $file ) {
+       public function testPSR4Completeness( $prefix, $dir, $file ) {
                global $wgAutoloadLocalClasses, $wgAutoloadClasses;
                $contents = file_get_contents( $file );
                list( $classesInFile, $aliasesInFile ) = self::parseFile( $contents );
@@ -43,11 +43,18 @@ class AutoLoaderStructureTest extends MediaWikiTestCase {
                        $this->assertCount( 1, $classes,
                                "Only one class per file in PSR-4 autoloaded classes ($file)" );
 
-                       $this->assertStringStartsWith( $prefix, $classes[0] );
-                       $this->assertTrue(
-                               class_exists( $classes[0] ) || interface_exists( $classes[0] ) || trait_exists( $classes[0] ),
-                               "Class {$classes[0]} not autoloaded properly"
+                       // Check that the expected class name (based on the filename) is the
+                       // same as the one we found.
+                       // Strip directory prefix from front of filename, and .php extension
+                       $abbrFileName = substr( substr( $file, strlen( $dir ) ), 0, -4 );
+                       $expectedClassName = $prefix . str_replace( '/', '\\', $abbrFileName );
+
+                       $this->assertSame(
+                               $expectedClassName,
+                               $classes[0],
+                               "Class not autoloaded properly"
                        );
+
                } else {
                        // Dummy assertion so this test isn't marked in risky
                        // if the file has no classes nor aliases in it