From 2bb355108279197dd61ae928555b5409d0f95f91 Mon Sep 17 00:00:00 2001
From: Aryeh Gregor <ayg@aryeh.name>
Date: Thu, 9 Aug 2018 17:38:13 +0300
Subject: [PATCH] Only use "*Test.php" for actual PHPUnit tests

Otherwise I get errors every time I try to run PHPUnit on includes/ or
includes/parser, because it tries to run ParserIntegrationTest.php and
fails.  Apparently the <exclude> in suite.xml doesn't work if PHPUnit is
invoked on a directory.

Bug: T201278
Change-Id: I7d09576bee2705d8516152e8fa671da8dac40233
---
 tests/common/TestsAutoLoader.php                                | 2 +-
 tests/phpunit/suite.xml                                         | 2 --
 .../{includes/parser => suites}/ParserIntegrationTest.php       | 0
 3 files changed, 1 insertion(+), 3 deletions(-)
 rename tests/phpunit/{includes/parser => suites}/ParserIntegrationTest.php (100%)

diff --git a/tests/common/TestsAutoLoader.php b/tests/common/TestsAutoLoader.php
index 0cb042a553..d864fc06b2 100644
--- a/tests/common/TestsAutoLoader.php
+++ b/tests/common/TestsAutoLoader.php
@@ -126,7 +126,7 @@ $wgAutoloadClasses += [
 	'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 --git a/tests/phpunit/suite.xml b/tests/phpunit/suite.xml
index e125b8a314..a7d5001e5e 100644
--- a/tests/phpunit/suite.xml
+++ b/tests/phpunit/suite.xml
@@ -20,8 +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>
diff --git a/tests/phpunit/includes/parser/ParserIntegrationTest.php b/tests/phpunit/suites/ParserIntegrationTest.php
similarity index 100%
rename from tests/phpunit/includes/parser/ParserIntegrationTest.php
rename to tests/phpunit/suites/ParserIntegrationTest.php
-- 
2.20.1