From 93e7bc4c44bd7477c12a1e1c77172a85f2fabc15 Mon Sep 17 00:00:00 2001
From: Daniel Werner <daniel.werner@wikimedia.de>
Date: Sat, 20 Apr 2013 22:22:26 +0200
Subject: [PATCH] Improved readability of MediaWikiParserTest::suite code

Change-Id: Ic74048bcce71c2eeb8adfca872b978c3f0de094b
---
 .../includes/parser/MediaWikiParserTest.php   | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/tests/phpunit/includes/parser/MediaWikiParserTest.php b/tests/phpunit/includes/parser/MediaWikiParserTest.php
index 067a7c4e7f..c5c7cf2079 100644
--- a/tests/phpunit/includes/parser/MediaWikiParserTest.php
+++ b/tests/phpunit/includes/parser/MediaWikiParserTest.php
@@ -16,17 +16,27 @@ class MediaWikiParserTest {
 
 		$suite = new PHPUnit_Framework_TestSuite;
 
-		foreach ( $wgParserTestFiles as $filename ) {
-			$testsName = basename( $filename, '.txt' );
+		foreach ( $wgParserTestFiles as $fileName ) {
+			$testsName = basename( $fileName, '.txt' );
+			$escapedFileName = strtr( $fileName, array( "'" => "\\'", '\\' => '\\\\' ) );
 			/* This used to be ucfirst( basename( dirname( $filename ) ) )
 			 * and then was ucfirst( basename( $filename, '.txt' )
 			 * but that didn't work with names like foo.tests.txt
 			 */
-			$className = str_replace( '.', '_', ucfirst( $testsName ) );
+			$parserTestClassName = str_replace( '.', '_', ucfirst( $testsName ) );
+			$parserTestClassDefinition = <<<EOT
+/**
+ * @group Database
+ * @group Parser
+ */
+class $parserTestClassName extends NewParserTest {
+	protected \$file = '$escapedFileName';
+}
+EOT;
 
-			eval( "/** @group Database\n@group Parser\n*/ class $className extends NewParserTest { protected \$file = '" . strtr( $filename, array( "'" => "\\'", '\\' => '\\\\' ) ) . "'; } " );
+			eval( $parserTestClassDefinition );
 
-			$parserTester = new $className( $testsName );
+			$parserTester = new $parserTestClassName( $testsName );
 			$suite->addTestSuite( new ReflectionClass ( $parserTester ) );
 		}
 		return $suite;
-- 
2.20.1