From: Antoine Musso <hashar@users.mediawiki.org>
Date: Tue, 31 May 2011 19:51:48 +0000 (+0000)
Subject: NewParserTest.php can now work independently
X-Git-Tag: 1.31.0-rc.0~29825
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/pie.php?a=commitdiff_plain;h=d24a26e713082d4d22518be3fe361c72224f103e;p=lhc%2Fweb%2Fwiklou.git

NewParserTest.php can now work independently

PHPUnit load class according to their order on the filesystem I guess.
On the cruisecontrol host, it first load NewParserTest.php and run
the test then load MediaWikiParserTest.php which run the tests too!

On my host the order is reversed, and NewParserTest.php is never run
for a reason I have not investigated.

Anyway, deleting the MediaWikiParserTest.php is harmless since it is
redundant with NewParserTest.php

(should fix cruise control)
---

diff --git a/tests/phpunit/includes/parser/MediaWikiParserTest.php b/tests/phpunit/includes/parser/MediaWikiParserTest.php
deleted file mode 100644
index 8d6230d188..0000000000
--- a/tests/phpunit/includes/parser/MediaWikiParserTest.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-require_once( dirname( __FILE__ ) . '/ParserHelpers.php' );
-require_once( dirname( __FILE__ ) . '/NewParserTest.php' );
-require_once( dirname(dirname(dirname( __FILE__ ))) . '/bootstrap.php' );
-
-/**
- * The UnitTest must be either a class that inherits from PHPUnit_Framework_TestCase 
- * or a class that provides a public static suite() method which returns 
- * an PHPUnit_Framework_Test object
- * 
- * @group Parser
- * @group Database
- */
-class MediaWikiParserTest {
-
-	public static function suite() {
-		global $wgParserTestFiles;
-
-		$suite = new PHPUnit_Framework_TestSuite;
-
-		foreach ( $wgParserTestFiles as $filename ) {
-			$testsName = basename( $filename, '.txt' );
-			$className = /*ucfirst( basename( dirname( $filename ) ) ) .*/ ucfirst( basename( $filename, '.txt' ) );
-			
-			eval( "/** @group Database\n@group Parser\n*/ class $className extends NewParserTest { protected \$file = \"" . addslashes( $filename ) . "\"; } " );
-
-			$parserTester = new $className( $testsName );
-			$suite->addTestSuite( new ReflectionClass ( $parserTester ) );
-		}
-		
-
-		return $suite;
-	}
-}