From 00624415be0a6079194dd2c9dbce8df521a93856 Mon Sep 17 00:00:00 2001 From: umherirrender Date: Fri, 19 Dec 2014 17:25:05 +0100 Subject: [PATCH] Use also $wgAutoloadClasses in tests for module names Extensions using $wgAutoloadClasses where this test will fail Follow-Up: If1125cd5fa4ed836fe15fc79480d78ebd899be4e Change-Id: Ic2024605d7d59890c527cc0580a49da73f8516c8 --- tests/phpunit/includes/api/ApiMainTest.php | 7 +++++-- tests/phpunit/includes/api/query/ApiQueryTest.php | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/tests/phpunit/includes/api/ApiMainTest.php b/tests/phpunit/includes/api/ApiMainTest.php index 51d03ed219..e91edcb7db 100644 --- a/tests/phpunit/includes/api/ApiMainTest.php +++ b/tests/phpunit/includes/api/ApiMainTest.php @@ -65,7 +65,10 @@ class ApiMainTest extends ApiTestCase { * Test if all classes in the main module manager exists */ public function testClassNamesInModuleManager() { - global $wgAutoloadLocalClasses; + global $wgAutoloadLocalClasses, $wgAutoloadClasses; + + // wgAutoloadLocalClasses has precedence, just like in includes/AutoLoader.php + $classes = $wgAutoloadLocalClasses + $wgAutoloadClasses; $api = new ApiMain( new FauxRequest( array( 'action' => 'query', 'meta' => 'siteinfo' ) ) @@ -74,7 +77,7 @@ class ApiMainTest extends ApiTestCase { foreach( $modules as $name => $class ) { $this->assertArrayHasKey( $class, - $wgAutoloadLocalClasses, + $classes, 'Class ' . $class . ' for api module ' . $name . ' not in autoloader (with exact case)' ); } diff --git a/tests/phpunit/includes/api/query/ApiQueryTest.php b/tests/phpunit/includes/api/query/ApiQueryTest.php index 3ab1334bef..5f061b50e9 100644 --- a/tests/phpunit/includes/api/query/ApiQueryTest.php +++ b/tests/phpunit/includes/api/query/ApiQueryTest.php @@ -121,7 +121,10 @@ class ApiQueryTest extends ApiTestCase { * Test if all classes in the query module manager exists */ public function testClassNamesInModuleManager() { - global $wgAutoloadLocalClasses; + global $wgAutoloadLocalClasses, $wgAutoloadClasses; + + // wgAutoloadLocalClasses has precedence, just like in includes/AutoLoader.php + $classes = $wgAutoloadLocalClasses + $wgAutoloadClasses; $api = new ApiMain( new FauxRequest( array( 'action' => 'query', 'meta' => 'siteinfo' ) ) @@ -131,7 +134,7 @@ class ApiQueryTest extends ApiTestCase { foreach( $modules as $name => $class ) { $this->assertArrayHasKey( $class, - $wgAutoloadLocalClasses, + $classes, 'Class ' . $class . ' for api module ' . $name . ' not in autoloader (with exact case)' ); } -- 2.20.1