X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=tests%2Fphpunit%2Fsuites%2FParserTestTopLevelSuite.php;h=07b18f594efe58665a740f61fac647b653720c97;hb=716814a5d501efcc99b09fbb7e26caaf9a395d26;hp=09052f3c610476bad71edacf1329f71c24ead326;hpb=f4a53c54065c385172363416eb3cb44b67585ca2;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/suites/ParserTestTopLevelSuite.php b/tests/phpunit/suites/ParserTestTopLevelSuite.php
index 09052f3c61..07b18f594e 100644
--- a/tests/phpunit/suites/ParserTestTopLevelSuite.php
+++ b/tests/phpunit/suites/ParserTestTopLevelSuite.php
@@ -82,15 +82,15 @@ class ParserTestTopLevelSuite extends PHPUnit_Framework_TestSuite {
 
 		# Filter out .txt files
 		$files = ParserTestRunner::getParserTestFiles();
-		foreach ( $files as $parserTestFile ) {
+		foreach ( $files as $extName => $parserTestFile ) {
 			$isCore = ( 0 === strpos( $parserTestFile, $mwTestDir ) );
 
 			if ( $isCore && $wantsCore ) {
 				self::debug( "included core parser tests: $parserTestFile" );
-				$filesToTest[] = $parserTestFile;
+				$filesToTest[$extName] = $parserTestFile;
 			} elseif ( !$isCore && $wantsRest ) {
 				self::debug( "included non core parser tests: $parserTestFile" );
-				$filesToTest[] = $parserTestFile;
+				$filesToTest[$extName] = $parserTestFile;
 			} else {
 				self::debug( "skipped parser tests: $parserTestFile" );
 			}
@@ -100,12 +100,13 @@ class ParserTestTopLevelSuite extends PHPUnit_Framework_TestSuite {
 
 		$testList = [];
 		$counter = 0;
-		foreach ( $filesToTest as $fileName ) {
-			// Call the highest level directory the extension name.
-			// It may or may not actually be, but it should be close
-			// enough to cause there to be separate names for different
-			// things, which is good enough for our purposes.
-			$extensionName = basename( dirname( $fileName ) );
+		foreach ( $filesToTest as $extensionName => $fileName ) {
+			if ( is_int( $extensionName ) ) {
+				// If there's no extension name because this is coming
+				// from the legacy global, then assume the next level directory
+				// is the extension name (e.g. extensions/FooBar/parserTests.txt).
+				$extensionName = basename( dirname( $fileName ) );
+			}
 			$testsName = $extensionName . '__' . basename( $fileName, '.txt' );
 			$parserTestClassName = ucfirst( $testsName );
 
@@ -154,6 +155,6 @@ class ParserTestTopLevelSuite extends PHPUnit_Framework_TestSuite {
 	 * @param string $msg Message to log
 	 */
 	protected static function debug( $msg ) {
-		return wfDebugLog( 'tests-parser', wfGetCaller() . ' ' . $msg );
+		wfDebugLog( 'tests-parser', wfGetCaller() . ' ' . $msg );
 	}
 }