X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2Fparser%2FPreprocessorTest.php;h=6710b1929b6a6720a34e32f4ecb4f028d264de56;hb=65d7d79d1ba09afc362f9e542b7df97b7ecc9c3e;hp=420460195d52991194d35b119e8fc6697b579d6f;hpb=e208cf80304ae3df66fc118ae133ebb683e87f19;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/includes/parser/PreprocessorTest.php b/tests/phpunit/includes/parser/PreprocessorTest.php
index 420460195d..6710b1929b 100644
--- a/tests/phpunit/includes/parser/PreprocessorTest.php
+++ b/tests/phpunit/includes/parser/PreprocessorTest.php
@@ -1,5 +1,29 @@
 <?php
 
+/**
+ * @covers Preprocessor
+ *
+ * @covers Preprocessor_DOM
+ * @covers PPDStack
+ * @covers PPDStackElement
+ * @covers PPDPart
+ * @covers PPFrame_DOM
+ * @covers PPTemplateFrame_DOM
+ * @covers PPCustomFrame_DOM
+ * @covers PPNode_DOM
+ *
+ * @covers Preprocessor_Hash
+ * @covers PPDStack_Hash
+ * @covers PPDStackElement_Hash
+ * @covers PPDPart_Hash
+ * @covers PPFrame_Hash
+ * @covers PPTemplateFrame_Hash
+ * @covers PPCustomFrame_Hash
+ * @covers PPNode_Hash_Tree
+ * @covers PPNode_Hash_Text
+ * @covers PPNode_Hash_Array
+ * @covers PPNode_Hash_Attr
+ */
 class PreprocessorTest extends MediaWikiTestCase {
 	protected $mTitle = 'Page title';
 	protected $mPPNodeCount = 0;
@@ -8,28 +32,44 @@ class PreprocessorTest extends MediaWikiTestCase {
 	 */
 	protected $mOptions;
 	/**
-	 * @var Preprocessor
+	 * @var array
 	 */
-	protected $mPreprocessor;
+	protected $mPreprocessors;
+
+	protected static $classNames = [
+		'Preprocessor_DOM',
+		'Preprocessor_Hash'
+	];
 
 	protected function setUp() {
-		global $wgParserConf, $wgContLang;
+		global $wgContLang;
 		parent::setUp();
 		$this->mOptions = ParserOptions::newFromUserAndLang( new User, $wgContLang );
-		$name = isset( $wgParserConf['preprocessorClass'] )
-			? $wgParserConf['preprocessorClass']
-			: 'Preprocessor_DOM';
 
-		$this->mPreprocessor = new $name( $this );
+		$this->mPreprocessors = [];
+		foreach ( self::$classNames as $className ) {
+			$this->mPreprocessors[$className] = new $className( $this );
+		}
 	}
 
 	function getStripList() {
 		return [ 'gallery', 'display map' /* Used by Maps, see r80025 CR */, '/foo' ];
 	}
 
+	protected static function addClassArg( $testCases ) {
+		$newTestCases = [];
+		foreach ( self::$classNames as $className ) {
+			foreach ( $testCases as $testCase ) {
+				array_unshift( $testCase, $className );
+				$newTestCases[] = $testCase;
+			}
+		}
+		return $newTestCases;
+	}
+
 	public static function provideCases() {
 		// @codingStandardsIgnoreStart Ignore Generic.Files.LineLength.TooLong
-		return [
+		return self::addClassArg( [
 			[ "Foo", "<root>Foo</root>" ],
 			[ "<!-- Foo -->", "<root><comment>&lt;!-- Foo --&gt;</comment></root>" ],
 			[ "<!-- Foo --><!-- Bar -->", "<root><comment>&lt;!-- Foo --&gt;</comment><comment>&lt;!-- Bar --&gt;</comment></root>" ],
@@ -48,7 +88,7 @@ class PreprocessorTest extends MediaWikiTestCase {
 			[ "<noinclude> Foo bar </noinclude>", "<root><ignore>&lt;noinclude&gt;</ignore> Foo bar <ignore>&lt;/noinclude&gt;</ignore></root>" ],
 			[ "<noinclude>\n{{Foo}}\n</noinclude>", "<root><ignore>&lt;noinclude&gt;</ignore>\n<template lineStart=\"1\"><title>Foo</title></template>\n<ignore>&lt;/noinclude&gt;</ignore></root>" ],
 			[ "<noinclude>\n{{Foo}}\n</noinclude>\n", "<root><ignore>&lt;noinclude&gt;</ignore>\n<template lineStart=\"1\"><title>Foo</title></template>\n<ignore>&lt;/noinclude&gt;</ignore>\n</root>" ],
-			[ "<gallery>foo bar", "<root><ext><name>gallery</name><attr></attr><inner>foo bar</inner></ext></root>" ],
+			[ "<gallery>foo bar", "<root>&lt;gallery&gt;foo bar</root>" ],
 			[ "<{{foo}}>", "<root>&lt;<template><title>foo</title></template>&gt;</root>" ],
 			[ "<{{{foo}}}>", "<root>&lt;<tplarg><title>foo</title></tplarg>&gt;</root>" ],
 			[ "<gallery></gallery</gallery>", "<root><ext><name>gallery</name><attr></attr><inner>&lt;/gallery</inner><close>&lt;/gallery&gt;</close></ext></root>" ],
@@ -115,7 +155,7 @@ class PreprocessorTest extends MediaWikiTestCase {
 			[ "{{Foo|} Bar=", "<root>{{Foo|} Bar=</root>" ],
 			[ "{{Foo|} Bar=}}", "<root><template><title>Foo</title><part><name>} Bar</name>=<value></value></part></template></root>" ],
 			/* [ file_get_contents( __DIR__ . '/QuoteQuran.txt' ], file_get_contents( __DIR__ . '/QuoteQuranExpanded.txt' ) ], */
-		];
+		] );
 		// @codingStandardsIgnoreEnd
 	}
 
@@ -123,15 +163,17 @@ class PreprocessorTest extends MediaWikiTestCase {
 	 * Get XML preprocessor tree from the preprocessor (which may not be the
 	 * native XML-based one).
 	 *
+	 * @param string $className
 	 * @param string $wikiText
 	 * @return string
 	 */
-	protected function preprocessToXml( $wikiText ) {
-		if ( method_exists( $this->mPreprocessor, 'preprocessToXml' ) ) {
-			return $this->normalizeXml( $this->mPreprocessor->preprocessToXml( $wikiText ) );
+	protected function preprocessToXml( $className, $wikiText ) {
+		$preprocessor = $this->mPreprocessors[$className];
+		if ( method_exists( $preprocessor, 'preprocessToXml' ) ) {
+			return $this->normalizeXml( $preprocessor->preprocessToXml( $wikiText ) );
 		}
 
-		$dom = $this->mPreprocessor->preprocessToObj( $wikiText );
+		$dom = $preprocessor->preprocessToObj( $wikiText );
 		if ( is_callable( [ $dom, 'saveXML' ] ) ) {
 			return $dom->saveXML();
 		} else {
@@ -146,15 +188,20 @@ class PreprocessorTest extends MediaWikiTestCase {
 	 * @return string
 	 */
 	protected function normalizeXml( $xml ) {
-		return preg_replace( '!<([a-z]+)/>!', '<$1></$1>', str_replace( ' />', '/>', $xml ) );
+		// Normalize self-closing tags
+		$xml = preg_replace( '!<([a-z]+)/>!', '<$1></$1>', str_replace( ' />', '/>', $xml ) );
+		// Remove <equals> tags, which only occur in Preprocessor_Hash and
+		// have no semantic value
+		$xml = preg_replace( '!</?equals>!', '', $xml );
+		return $xml;
 	}
 
 	/**
 	 * @dataProvider provideCases
-	 * @covers Preprocessor_DOM::preprocessToXml
 	 */
-	public function testPreprocessorOutput( $wikiText, $expectedXml ) {
-		$this->assertEquals( $this->normalizeXml( $expectedXml ), $this->preprocessToXml( $wikiText ) );
+	public function testPreprocessorOutput( $className, $wikiText, $expectedXml ) {
+		$this->assertEquals( $this->normalizeXml( $expectedXml ),
+			$this->preprocessToXml( $className, $wikiText ) );
 	}
 
 	/**
@@ -162,24 +209,23 @@ class PreprocessorTest extends MediaWikiTestCase {
 	 */
 	public static function provideFiles() {
 		// @codingStandardsIgnoreStart Ignore Generic.Files.LineLength.TooLong
-		return [
+		return self::addClassArg( [
 			[ "QuoteQuran" ], # http://en.wikipedia.org/w/index.php?title=Template:QuoteQuran/sandbox&oldid=237348988 GFDL + CC BY-SA by Striver
 			[ "Factorial" ], # http://en.wikipedia.org/w/index.php?title=Template:Factorial&oldid=98548758 GFDL + CC BY-SA by Polonium
 			[ "All_system_messages" ], # http://tl.wiktionary.org/w/index.php?title=Suleras:All_system_messages&oldid=2765 GPL text generated by MediaWiki
 			[ "Fundraising" ], # http://tl.wiktionary.org/w/index.php?title=MediaWiki:Sitenotice&oldid=5716 GFDL + CC BY-SA, copied there by Sky Harbor.
 			[ "NestedTemplates" ], # bug 27936
-		];
+		] );
 		// @codingStandardsIgnoreEnd
 	}
 
 	/**
 	 * @dataProvider provideFiles
-	 * @covers Preprocessor_DOM::preprocessToXml
 	 */
-	public function testPreprocessorOutputFiles( $filename ) {
+	public function testPreprocessorOutputFiles( $className, $filename ) {
 		$folder = __DIR__ . "/../../../parser/preprocess";
 		$wikiText = file_get_contents( "$folder/$filename.txt" );
-		$output = $this->preprocessToXml( $wikiText );
+		$output = $this->preprocessToXml( $className, $wikiText );
 
 		$expectedFilename = "$folder/$filename.expected";
 		if ( file_exists( $expectedFilename ) ) {
@@ -197,7 +243,8 @@ class PreprocessorTest extends MediaWikiTestCase {
 	 */
 	public static function provideHeadings() {
 		// @codingStandardsIgnoreStart Ignore Generic.Files.LineLength.TooLong
-		return [ /* These should become headings: */
+		return self::addClassArg( [
+			/* These should become headings: */
 			[ "== h ==<!--c1-->", "<root><h level=\"2\" i=\"1\">== h ==<comment>&lt;!--c1--&gt;</comment></h></root>" ],
 			[ "== h == 	<!--c1-->", "<root><h level=\"2\" i=\"1\">== h == 	<comment>&lt;!--c1--&gt;</comment></h></root>" ],
 			[ "== h ==<!--c1--> 	", "<root><h level=\"2\" i=\"1\">== h ==<comment>&lt;!--c1--&gt;</comment> 	</h></root>" ],
@@ -233,15 +280,15 @@ class PreprocessorTest extends MediaWikiTestCase {
 			[ "== h == x <!--c1--><!--c2--><!--c3-->  ", "<root>== h == x <comment>&lt;!--c1--&gt;</comment><comment>&lt;!--c2--&gt;</comment><comment>&lt;!--c3--&gt;</comment>  </root>" ],
 			[ "== h ==<!--c1--> x <!--c2--><!--c3-->  ", "<root>== h ==<comment>&lt;!--c1--&gt;</comment> x <comment>&lt;!--c2--&gt;</comment><comment>&lt;!--c3--&gt;</comment>  </root>" ],
 			[ "== h ==<!--c1--><!--c2--><!--c3--> x ", "<root>== h ==<comment>&lt;!--c1--&gt;</comment><comment>&lt;!--c2--&gt;</comment><comment>&lt;!--c3--&gt;</comment> x </root>" ],
-		];
+		] );
 		// @codingStandardsIgnoreEnd
 	}
 
 	/**
 	 * @dataProvider provideHeadings
-	 * @covers Preprocessor_DOM::preprocessToXml
 	 */
-	public function testHeadings( $wikiText, $expectedXml ) {
-		$this->assertEquals( $this->normalizeXml( $expectedXml ), $this->preprocessToXml( $wikiText ) );
+	public function testHeadings( $className, $wikiText, $expectedXml ) {
+		$this->assertEquals( $this->normalizeXml( $expectedXml ),
+			$this->preprocessToXml( $className, $wikiText ) );
 	}
 }