From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Tue, 15 Nov 2016 22:47:23 +0000 (+0000)
Subject: Merge "parserTests: Use a mock parser during article insertion"
X-Git-Tag: 1.31.0-rc.0~4857
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/banques/ajouter.php?a=commitdiff_plain;h=37751ee23e7b7019307eafe36f18c8450bf2e420;hp=d571769c9550d689959bc196ea6f0c31e5770ef6;p=lhc%2Fweb%2Fwiklou.git

Merge "parserTests: Use a mock parser during article insertion"
---

diff --git a/tests/common/TestsAutoLoader.php b/tests/common/TestsAutoLoader.php
index 0bfa318081..66df315e10 100644
--- a/tests/common/TestsAutoLoader.php
+++ b/tests/common/TestsAutoLoader.php
@@ -35,6 +35,7 @@ $wgAutoloadClasses += [
 	'DjVuSupport' => "$testDir/parser/DjVuSupport.php",
 	'TestRecorder' => "$testDir/parser/TestRecorder.php",
 	'MultiTestRecorder' => "$testDir/parser/MultiTestRecorder.php",
+	'ParserTestMockParser' => "$testDir/parser/ParserTestMockParser.php",
 	'ParserTestRunner' => "$testDir/parser/ParserTestRunner.php",
 	'ParserTestParserHook' => "$testDir/parser/ParserTestParserHook.php",
 	'ParserTestPrinter' => "$testDir/parser/ParserTestPrinter.php",
diff --git a/tests/parser/ParserTestMockParser.php b/tests/parser/ParserTestMockParser.php
new file mode 100644
index 0000000000..0757b34cfb
--- /dev/null
+++ b/tests/parser/ParserTestMockParser.php
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * A parser used during article insertion which does nothing, to avoid
+ * unnecessary log noise and other interference with debugging.
+ */
+class ParserTestMockParser {
+	public function preSaveTransform( $text, Title $title, User $user,
+		ParserOptions $options, $clearState = true
+	) {
+		return $text;
+	}
+
+	public function parse(
+		$text, Title $title, ParserOptions $options,
+		$linestart = true, $clearState = true, $revid = null
+	) {
+		return new ParserOutput;
+	}
+}
diff --git a/tests/parser/ParserTestRunner.php b/tests/parser/ParserTestRunner.php
index e433c2ed9a..04c142ab77 100644
--- a/tests/parser/ParserTestRunner.php
+++ b/tests/parser/ParserTestRunner.php
@@ -426,7 +426,7 @@ class ParserTestRunner {
 	 * @param ScopedCallback|null A ScopedCallback to consume
 	 * @return ScopedCallback
 	 */
-	protected function createTeardownObject( $teardown, $nextTeardown ) {
+	protected function createTeardownObject( $teardown, $nextTeardown = null ) {
 		return new ScopedCallback( function() use ( $teardown, $nextTeardown ) {
 			// Schedule teardown snippets in reverse order
 			$teardown = array_reverse( $teardown );
@@ -1503,7 +1503,14 @@ class ParserTestRunner {
 			throw new MWException( "duplicate article '$name' at $file:$line\n" );
 		}
 
+		// Use mock parser, to make debugging of actual parser tests simpler.
+		// But initialise the MessageCache clone first, don't let MessageCache
+		// get a reference to the mock object.
+		MessageCache::singleton()->getParser();
+		$restore = $this->executeSetupSnippets( [ 'wgParser' => new ParserTestMockParser ] );
 		$status = $page->doEditContent( ContentHandler::makeContent( $text, $title ), '', EDIT_NEW );
+		$restore();
+
 		if ( !$status->isOK() ) {
 			throw new MWException( $status->getWikiText( false, false, 'en' ) );
 		}