X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=tests%2FTestsAutoLoader.php;h=4858703b9244b2309aef35734e5ed7b094d7167c;hb=fdd40afc4221cd723fd61b97eeb836e34051ee2e;hp=2bb1d2ef218b0ede8c8734685c59f5f84c6990e3;hpb=425090d4eb0b9de89ad6818f40ab8295368f645e;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/TestsAutoLoader.php b/tests/TestsAutoLoader.php
index 2bb1d2ef21..4858703b92 100644
--- a/tests/TestsAutoLoader.php
+++ b/tests/TestsAutoLoader.php
@@ -26,18 +26,6 @@ $testDir = __DIR__;
 
 $wgAutoloadClasses += [
 
-	# tests
-	'DbTestPreviewer' => "$testDir/testHelpers.inc",
-	'DbTestRecorder' => "$testDir/testHelpers.inc",
-	'DelayedParserTest' => "$testDir/testHelpers.inc",
-	'ParserTestResult' => "$testDir/parser/ParserTestResult.php",
-	'TestFileIterator' => "$testDir/testHelpers.inc",
-	'TestFileDataProvider' => "$testDir/testHelpers.inc",
-	'TestRecorder' => "$testDir/testHelpers.inc",
-	'ITestRecorder' => "$testDir/testHelpers.inc",
-	'DjVuSupport' => "$testDir/testHelpers.inc",
-	'TidySupport' => "$testDir/testHelpers.inc",
-
 	# tests/phpunit
 	'MediaWikiTestCase' => "$testDir/phpunit/MediaWikiTestCase.php",
 	'MediaWikiPHPUnitTestListener' => "$testDir/phpunit/MediaWikiPHPUnitTestListener.php",
@@ -45,6 +33,7 @@ $wgAutoloadClasses += [
 	'ResourceLoaderTestCase' => "$testDir/phpunit/ResourceLoaderTestCase.php",
 	'ResourceLoaderTestModule' => "$testDir/phpunit/ResourceLoaderTestCase.php",
 	'ResourceLoaderFileModuleTestModule' => "$testDir/phpunit/ResourceLoaderTestCase.php",
+	'EmptyResourceLoader' => "$testDir/phpunit/ResourceLoaderTestCase.php",
 	'TestUser' => "$testDir/phpunit/includes/TestUser.php",
 	'TestUserRegistry' => "$testDir/phpunit/includes/TestUserRegistry.php",
 	'LessFileCompilationTest' => "$testDir/phpunit/LessFileCompilationTest.php",
@@ -134,17 +123,28 @@ $wgAutoloadClasses += [
 	'MockSvgHandler' => "$testDir/phpunit/mocks/media/MockSvgHandler.php",
 	'MockDjVuHandler' => "$testDir/phpunit/mocks/media/MockDjVuHandler.php",
 	'MockOggHandler' => "$testDir/phpunit/mocks/media/MockOggHandler.php",
+	'MockMediaHandlerFactory' => "$testDir/phpunit/mocks/media/MockMediaHandlerFactory.php",
 	'MockWebRequest' => "$testDir/phpunit/mocks/MockWebRequest.php",
 	'MediaWiki\\Session\\DummySessionBackend'
 		=> "$testDir/phpunit/mocks/session/DummySessionBackend.php",
 	'DummySessionProvider' => "$testDir/phpunit/mocks/session/DummySessionProvider.php",
 
 	# tests/parser
-	'NewParserTest' => "$testDir/phpunit/includes/parser/NewParserTest.php",
+	'DbTestPreviewer' => "$testDir/parser/DbTestPreviewer.php",
+	'DbTestRecorder' => "$testDir/parser/DbTestRecorder.php",
+	'DelayedParserTest' => "$testDir/parser/DelayedParserTest.php",
+	'DjVuSupport' => "$testDir/parser/DjVuSupport.php",
+	'ITestRecorder' => "$testDir/parser/ITestRecorder.php",
 	'MediaWikiParserTest' => "$testDir/phpunit/includes/parser/MediaWikiParserTest.php",
-	'ParserTest' => "$testDir/parser/parserTest.inc",
-	'ParserTestResultNormalizer' => "$testDir/parser/parserTest.inc",
-	'ParserTestParserHook' => "$testDir/parser/parserTestsParserHook.php",
+	'NewParserTest' => "$testDir/phpunit/includes/parser/NewParserTest.php",
+	'ParserTest' => "$testDir/parser/ParserTest.php",
+	'ParserTestParserHook' => "$testDir/parser/ParserTestParserHook.php",
+	'ParserTestResult' => "$testDir/parser/ParserTestResult.php",
+	'ParserTestResultNormalizer' => "$testDir/parser/ParserTestResultNormalizer.php",
+	'TestFileDataProvider' => "$testDir/parser/TestFileDataProvider.php",
+	'TestFileIterator' => "$testDir/parser/TestFileIterator.php",
+	'TestRecorder' => "$testDir/parser/TestRecorder.php",
+	'TidySupport' => "$testDir/parser/TidySupport.php",
 
 	# tests/phpunit/includes/site
 	'SiteTest' => "$testDir/phpunit/includes/site/SiteTest.php",