Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use also $wgAutoloadClasses in tests for module names

Browse source 
Extensions using $wgAutoloadClasses where this test will fail

Follow-Up: If1125cd5fa4ed836fe15fc79480d78ebd899be4e
Change-Id: Ic2024605d7d59890c527cc0580a49da73f8516c8
This commit is contained in:
umherirrender 2014-12-19 17:25:05 +01:00 committed by Hashar
parent b4550b162d
commit 00624415be
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
tests/phpunit/includes/api/ApiMainTest.php
View file

@ -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)'
);
}

7
tests/phpunit/includes/api/query/ApiQueryTest.php
View file

@ -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)'
);
}