From 720a3569b852fc4a5fc71e1ccc7d0ea156e24f7d Mon Sep 17 00:00:00 2001
From: addshore <addshorewiki@gmail.com>
Date: Sat, 14 Oct 2017 13:35:05 +0100
Subject: [PATCH] RevisionUnittest for select*Fields methods

Change-Id: I8ec1d35bb5e4706e5cfe72684bcac73c9f3d63cc
---
 .../includes/RevisionIntegrationTest.php      |  24 ---
 tests/phpunit/includes/RevisionUnitTest.php   | 152 ++++++++++++++++++
 2 files changed, 152 insertions(+), 24 deletions(-)

diff --git a/tests/phpunit/includes/RevisionIntegrationTest.php b/tests/phpunit/includes/RevisionIntegrationTest.php
index bdd4561dc2..ac7331a0f5 100644
--- a/tests/phpunit/includes/RevisionIntegrationTest.php
+++ b/tests/phpunit/includes/RevisionIntegrationTest.php
@@ -330,30 +330,6 @@ class RevisionIntegrationTest extends MediaWikiTestCase {
 		$this->assertArrayHasKey( $id, $rows, 'missing revision with id ' . $id );
 	}
 
-	/**
-	 * @covers Revision::selectFields
-	 */
-	public function testSelectFields() {
-		global $wgContentHandlerUseDB;
-
-		$fields = Revision::selectFields();
-
-		$this->assertTrue( in_array( 'rev_id', $fields ), 'missing rev_id in list of fields' );
-		$this->assertTrue( in_array( 'rev_page', $fields ), 'missing rev_page in list of fields' );
-		$this->assertTrue(
-			in_array( 'rev_timestamp', $fields ),
-			'missing rev_timestamp in list of fields'
-		);
-		$this->assertTrue( in_array( 'rev_user', $fields ), 'missing rev_user in list of fields' );
-
-		if ( $wgContentHandlerUseDB ) {
-			$this->assertTrue( in_array( 'rev_content_model', $fields ),
-				'missing rev_content_model in list of fields' );
-			$this->assertTrue( in_array( 'rev_content_format', $fields ),
-				'missing rev_content_format in list of fields' );
-		}
-	}
-
 	/**
 	 * @covers Revision::getPage
 	 */
diff --git a/tests/phpunit/includes/RevisionUnitTest.php b/tests/phpunit/includes/RevisionUnitTest.php
index 47dcf6591c..5282ae626f 100644
--- a/tests/phpunit/includes/RevisionUnitTest.php
+++ b/tests/phpunit/includes/RevisionUnitTest.php
@@ -222,4 +222,156 @@ class RevisionUnitTest extends MediaWikiTestCase {
 		);
 	}
 
+	public function provideSelectFields() {
+		yield [
+			true,
+			[
+				'rev_id',
+				'rev_page',
+				'rev_text_id',
+				'rev_timestamp',
+				'rev_user_text',
+				'rev_user',
+				'rev_minor_edit',
+				'rev_deleted',
+				'rev_len',
+				'rev_parent_id',
+				'rev_sha1',
+				'rev_comment_text' => 'rev_comment',
+				'rev_comment_data' => 'NULL',
+				'rev_comment_cid' => 'NULL',
+				'rev_content_format',
+				'rev_content_model',
+			]
+		];
+		yield [
+			false,
+			[
+				'rev_id',
+				'rev_page',
+				'rev_text_id',
+				'rev_timestamp',
+				'rev_user_text',
+				'rev_user',
+				'rev_minor_edit',
+				'rev_deleted',
+				'rev_len',
+				'rev_parent_id',
+				'rev_sha1',
+				'rev_comment_text' => 'rev_comment',
+				'rev_comment_data' => 'NULL',
+				'rev_comment_cid' => 'NULL',
+			]
+		];
+	}
+
+	/**
+	 * @dataProvider provideSelectFields
+	 * @covers Revision::selectFields
+	 * @todo a true unit test would mock CommentStore
+	 */
+	public function testSelectFields( $contentHandlerUseDB, $expected ) {
+		$this->setMwGlobals( 'wgContentHandlerUseDB', $contentHandlerUseDB );
+		$this->assertEquals( $expected, Revision::selectFields() );
+	}
+
+	public function provideSelectArchiveFields() {
+		yield [
+			true,
+			[
+				'ar_id',
+				'ar_page_id',
+				'ar_rev_id',
+				'ar_text',
+				'ar_text_id',
+				'ar_timestamp',
+				'ar_user_text',
+				'ar_user',
+				'ar_minor_edit',
+				'ar_deleted',
+				'ar_len',
+				'ar_parent_id',
+				'ar_sha1',
+				'ar_comment_text' => 'ar_comment',
+				'ar_comment_data' => 'NULL',
+				'ar_comment_cid' => 'NULL',
+				'ar_content_format',
+				'ar_content_model',
+			]
+		];
+		yield [
+			false,
+			[
+				'ar_id',
+				'ar_page_id',
+				'ar_rev_id',
+				'ar_text',
+				'ar_text_id',
+				'ar_timestamp',
+				'ar_user_text',
+				'ar_user',
+				'ar_minor_edit',
+				'ar_deleted',
+				'ar_len',
+				'ar_parent_id',
+				'ar_sha1',
+				'ar_comment_text' => 'ar_comment',
+				'ar_comment_data' => 'NULL',
+				'ar_comment_cid' => 'NULL',
+			]
+		];
+	}
+
+	/**
+	 * @dataProvider provideSelectArchiveFields
+	 * @covers Revision::selectArchiveFields
+	 * @todo a true unit test would mock CommentStore
+	 */
+	public function testSelectArchiveFields( $contentHandlerUseDB, $expected ) {
+		$this->setMwGlobals( 'wgContentHandlerUseDB', $contentHandlerUseDB );
+		$this->assertEquals( $expected, Revision::selectArchiveFields() );
+	}
+
+	/**
+	 * @covers Revision::selectTextFields
+	 */
+	public function testSelectTextFields() {
+		$this->assertEquals(
+			[
+				'old_text',
+				'old_flags',
+			],
+			Revision::selectTextFields()
+		);
+	}
+
+	/**
+	 * @covers Revision::selectPageFields
+	 */
+	public function testSelectPageFields() {
+		$this->assertEquals(
+			[
+				'page_namespace',
+				'page_title',
+				'page_id',
+				'page_latest',
+				'page_is_redirect',
+				'page_len',
+			],
+			Revision::selectPageFields()
+		);
+	}
+
+	/**
+	 * @covers Revision::selectUserFields
+	 */
+	public function testSelectUserFields() {
+		$this->assertEquals(
+			[
+				'user_name',
+			],
+			Revision::selectUserFields()
+		);
+	}
+
 }
-- 
2.20.1