Merge "Only use "*Test.php" for actual PHPUnit tests"

diff --combined tests/common/TestsAutoLoader.php
index f9b84d7,d864fc0..8385d7a
--- 1/tests/common/TestsAutoLoader.php
--- 2/tests/common/TestsAutoLoader.php
+++ b/tests/common/TestsAutoLoader.php
@@@ -51,23 -51,20 +51,23 @@@ $wgAutoloadClasses += 
        'TidySupport' => "$testDir/parser/TidySupport.php",
  
        # tests/phpunit
 -      'MediaWikiTestCase' => "$testDir/phpunit/MediaWikiTestCase.php",
 -      'MediaWikiPHPUnitTestListener' => "$testDir/phpunit/MediaWikiPHPUnitTestListener.php",
 +      'EmptyResourceLoader' => "$testDir/phpunit/ResourceLoaderTestCase.php",
 +      'HamcrestPHPUnitIntegration' => "$testDir/phpunit/HamcrestPHPUnitIntegration.php",
 +      'LessFileCompilationTest' => "$testDir/phpunit/LessFileCompilationTest.php",
 +      'MediaWikiCoversValidator' => "$testDir/phpunit/MediaWikiCoversValidator.php",
        'MediaWikiLangTestCase' => "$testDir/phpunit/MediaWikiLangTestCase.php",
 +      'MediaWikiPHPUnitCommand' => "$testDir/phpunit/MediaWikiPHPUnitCommand.php",
 +      'MediaWikiPHPUnitTestListener' => "$testDir/phpunit/MediaWikiPHPUnitTestListener.php",
 +      'MediaWikiTestCase' => "$testDir/phpunit/MediaWikiTestCase.php",
 +      'MediaWikiTestResult' => "$testDir/phpunit/MediaWikiTestResult.php",
 +      'MediaWikiTestRunner' => "$testDir/phpunit/MediaWikiTestRunner.php",
 +      'PHPUnit4And6Compat' => "$testDir/phpunit/PHPUnit4And6Compat.php",
 +      'ResourceLoaderFileModuleTestModule' => "$testDir/phpunit/ResourceLoaderTestCase.php",
 +      'ResourceLoaderFileTestModule' => "$testDir/phpunit/ResourceLoaderTestCase.php",
        'ResourceLoaderTestCase' => "$testDir/phpunit/ResourceLoaderTestCase.php",
        'ResourceLoaderTestModule' => "$testDir/phpunit/ResourceLoaderTestCase.php",
 -      'ResourceLoaderFileTestModule' => "$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",
 -      'MediaWikiCoversValidator' => "$testDir/phpunit/MediaWikiCoversValidator.php",
 -      'PHPUnit4And6Compat' => "$testDir/phpunit/PHPUnit4And6Compat.php",
 -      'HamcrestPHPUnitIntegration' => "$testDir/phpunit/HamcrestPHPUnitIntegration.php",
  
        # tests/phpunit/includes
        'PageArchiveTestBase' => "$testDir/phpunit/includes/page/PageArchiveTestBase.php",
@@@ -117,7 -114,6 +117,7 @@@
        'TestDeprecatedSubclass' => "$testDir/phpunit/includes/debug/TestDeprecatedSubclass.php",
  
        # tests/phpunit/includes/diff
 +      'CustomDifferenceEngine' => "$testDir/phpunit/includes/diff/CustomDifferenceEngine.php",
        'FakeDiffOp' => "$testDir/phpunit/includes/diff/FakeDiffOp.php",
  
        # tests/phpunit/includes/externalstore
@@@ -130,7 -126,7 +130,7 @@@
        'WikiPageDbTestBase' => "$testDir/phpunit/includes/page/WikiPageDbTestBase.php",
  
        # tests/phpunit/includes/parser
-       'ParserIntegrationTest' => "$testDir/phpunit/includes/parser/ParserIntegrationTest.php",
+       'ParserIntegrationTest' => "$testDir/phpunit/suites/ParserIntegrationTest.php",
  
        # tests/phpunit/includes/password
        'PasswordTestCase' => "$testDir/phpunit/includes/password/PasswordTestCase.php",

diff --combined tests/phpunit/suite.xml
index 1917674,a7d5001..de68fec
--- 1/tests/phpunit/suite.xml
--- 2/tests/phpunit/suite.xml
+++ b/tests/phpunit/suite.xml
@@@ -20,8 -20,6 +20,6 @@@
        <testsuites>
                <testsuite name="includes">
                        <directory>includes</directory>
-                       <!-- Parser tests must be invoked via their suite -->
-                       <exclude>includes/parser/ParserIntegrationTest.php</exclude>
                </testsuite>
                <testsuite name="languages">
                        <directory>languages</directory>
@@@ -73,8 -71,6 +71,8 @@@
                        <directory suffix=".php">../../maintenance</directory>
                        <exclude>
                                <directory suffix=".php">../../languages/messages</directory>
 +                              <file>../../languages/data/normalize-ar.php</file>
 +                              <file>../../languages/data/normalize-ml.php</file>
                        </exclude>
                </whitelist>
        </filter>