From: addshore <addshorewiki@gmail.com>
Date: Tue, 10 Oct 2017 15:55:13 +0000 (+0100)
Subject: RevisionTest code style fixes & file split
X-Git-Tag: 1.31.0-rc.0~1818^2
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/modifier.php?a=commitdiff_plain;h=1bdc9e1d6bc4064f38fbc40d76cb1007bb160d8a;p=lhc%2Fweb%2Fwiklou.git

RevisionTest code style fixes & file split

Change-Id: I054a6810e29225e4341c518631a6dba9f40a1531
---

diff --git a/tests/common/TestsAutoLoader.php b/tests/common/TestsAutoLoader.php
index 8f752df68b..a965d3e493 100644
--- a/tests/common/TestsAutoLoader.php
+++ b/tests/common/TestsAutoLoader.php
@@ -64,6 +64,8 @@ $wgAutoloadClasses += [
 	'LessFileCompilationTest' => "$testDir/phpunit/LessFileCompilationTest.php",
 
 	# tests/phpunit/includes
+	'RevisionTestModifyableContent' => "$testDir/phpunit/includes/RevisionTestModifyableContent.php",
+	'RevisionTestModifyableContentHandler' => "$testDir/phpunit/includes/RevisionTestModifyableContentHandler.php",
 	'RevisionStorageTest' => "$testDir/phpunit/includes/RevisionStorageTest.php",
 	'TestLogger' => "$testDir/phpunit/includes/TestLogger.php",
 
diff --git a/tests/phpunit/includes/RevisionTest.php b/tests/phpunit/includes/RevisionTest.php
index 386f219b4f..ba19f3b2ae 100644
--- a/tests/phpunit/includes/RevisionTest.php
+++ b/tests/phpunit/includes/RevisionTest.php
@@ -4,6 +4,7 @@
  * @group ContentHandler
  */
 class RevisionTest extends MediaWikiTestCase {
+
 	protected function setUp() {
 		global $wgContLang;
 
@@ -42,14 +43,16 @@ class RevisionTest extends MediaWikiTestCase {
 		);
 
 		MWNamespace::clearCaches();
-		$wgContLang->resetNamespaces(); # reset namespace cache
+		// Reset namespace cache
+		$wgContLang->resetNamespaces();
 	}
 
-	function tearDown() {
+	protected function tearDown() {
 		global $wgContLang;
 
 		MWNamespace::clearCaches();
-		$wgContLang->resetNamespaces(); # reset namespace cache
+		// Reset namespace cache
+		$wgContLang->resetNamespaces();
 
 		parent::tearDown();
 	}
@@ -183,7 +186,7 @@ class RevisionTest extends MediaWikiTestCase {
 	 *
 	 * @return Revision
 	 */
-	function newTestRevision( $text, $title = "Test",
+	private function newTestRevision( $text, $title = "Test",
 		$model = CONTENT_MODEL_WIKITEXT, $format = null
 	) {
 		if ( is_string( $title ) ) {
@@ -210,7 +213,7 @@ class RevisionTest extends MediaWikiTestCase {
 		return $rev;
 	}
 
-	function dataGetContentModel() {
+	public function dataGetContentModel() {
 		// NOTE: we expect the help namespace to always contain wikitext
 		return [
 			[ 'hello world', 'Help:Hello', null, null, CONTENT_MODEL_WIKITEXT ],
@@ -230,7 +233,7 @@ class RevisionTest extends MediaWikiTestCase {
 		$this->assertEquals( $expectedModel, $rev->getContentModel() );
 	}
 
-	function dataGetContentFormat() {
+	public function dataGetContentFormat() {
 		// NOTE: we expect the help namespace to always contain wikitext
 		return [
 			[ 'hello world', 'Help:Hello', null, null, CONTENT_FORMAT_WIKITEXT ],
@@ -251,7 +254,7 @@ class RevisionTest extends MediaWikiTestCase {
 		$this->assertEquals( $expectedFormat, $rev->getContentFormat() );
 	}
 
-	function dataGetContentHandler() {
+	public function dataGetContentHandler() {
 		// NOTE: we expect the help namespace to always contain wikitext
 		return [
 			[ 'hello world', 'Help:Hello', null, null, 'WikitextContentHandler' ],
@@ -271,7 +274,7 @@ class RevisionTest extends MediaWikiTestCase {
 		$this->assertEquals( $expectedClass, get_class( $rev->getContentHandler() ) );
 	}
 
-	function dataGetContent() {
+	public function dataGetContent() {
 		// NOTE: we expect the help namespace to always contain wikitext
 		return [
 			[ 'hello world', 'Help:Hello', null, null, Revision::FOR_PUBLIC, 'hello world' ],
@@ -400,9 +403,11 @@ class RevisionTest extends MediaWikiTestCase {
 			]
 		);
 
+		/** @var RevisionTestModifyableContent $content */
 		$content = $rev->getContent( Revision::RAW );
 		$content->setText( "bar" );
 
+		/** @var RevisionTestModifyableContent $content2 */
 		$content2 = $rev->getContent( Revision::RAW );
 		// content is mutable, expect clone
 		$this->assertNotSame( $content, $content2, "expected a clone" );
@@ -410,7 +415,8 @@ class RevisionTest extends MediaWikiTestCase {
 		$this->assertEquals( "foo", $content2->getText() );
 
 		$content2->setText( "bla bla" );
-		$this->assertEquals( "bar", $content->getText() ); // clones should be independent
+		// clones should be independent
+		$this->assertEquals( "bar", $content->getText() );
 	}
 
 	/**
@@ -428,38 +434,3 @@ class RevisionTest extends MediaWikiTestCase {
 		$this->assertSame( $content, $content2 );
 	}
 }
-
-class RevisionTestModifyableContent extends TextContent {
-	public function __construct( $text ) {
-		parent::__construct( $text, "RevisionTestModifyableContent" );
-	}
-
-	public function copy() {
-		return new RevisionTestModifyableContent( $this->mText );
-	}
-
-	public function getText() {
-		return $this->mText;
-	}
-
-	public function setText( $text ) {
-		$this->mText = $text;
-	}
-}
-
-class RevisionTestModifyableContentHandler extends TextContentHandler {
-
-	public function __construct() {
-		parent::__construct( "RevisionTestModifyableContent", [ CONTENT_FORMAT_TEXT ] );
-	}
-
-	public function unserializeContent( $text, $format = null ) {
-		$this->checkFormat( $format );
-
-		return new RevisionTestModifyableContent( $text );
-	}
-
-	public function makeEmptyContent() {
-		return new RevisionTestModifyableContent( '' );
-	}
-}
diff --git a/tests/phpunit/includes/RevisionTestModifyableContent.php b/tests/phpunit/includes/RevisionTestModifyableContent.php
new file mode 100644
index 0000000000..11e4e183f3
--- /dev/null
+++ b/tests/phpunit/includes/RevisionTestModifyableContent.php
@@ -0,0 +1,21 @@
+<?php
+
+class RevisionTestModifyableContent extends TextContent {
+
+	public function __construct( $text ) {
+		parent::__construct( $text, "RevisionTestModifyableContent" );
+	}
+
+	public function copy() {
+		return new RevisionTestModifyableContent( $this->mText );
+	}
+
+	public function getText() {
+		return $this->mText;
+	}
+
+	public function setText( $text ) {
+		$this->mText = $text;
+	}
+
+}
diff --git a/tests/phpunit/includes/RevisionTestModifyableContentHandler.php b/tests/phpunit/includes/RevisionTestModifyableContentHandler.php
new file mode 100644
index 0000000000..e262b40d05
--- /dev/null
+++ b/tests/phpunit/includes/RevisionTestModifyableContentHandler.php
@@ -0,0 +1,19 @@
+<?php
+
+class RevisionTestModifyableContentHandler extends TextContentHandler {
+
+	public function __construct() {
+		parent::__construct( "RevisionTestModifyableContent", [ CONTENT_FORMAT_TEXT ] );
+	}
+
+	public function unserializeContent( $text, $format = null ) {
+		$this->checkFormat( $format );
+
+		return new RevisionTestModifyableContent( $text );
+	}
+
+	public function makeEmptyContent() {
+		return new RevisionTestModifyableContent( '' );
+	}
+
+}