From 92668eb25b0f9ad62dd89c422dbebe0ef6134c52 Mon Sep 17 00:00:00 2001
From: addshore <addshorewiki@gmail.com>
Date: Wed, 11 Oct 2017 15:55:04 +0100
Subject: [PATCH] Delete RevisionStorageTestContentHandlerUseDB

Due to this test file not ending in Test.php it doesn't
get run with all of the other phpunit tests.

When changing the name so that the test are run they fail:
https://gerrit.wikimedia.org/r/#/c/383587/
I119e80c6674b22dc3eb02a023a346f842ef8cd21

It is likely these tests have actually never run.

Rather than try to fix these 5 year olds tests lets just scrap
them and start fresh.

Change-Id: I0318614127d6b4d9661b875ab53af3f6e286ac95
---
 ...RevisionStorageTestContentHandlerUseDB.php | 89 -------------------
 1 file changed, 89 deletions(-)
 delete mode 100644 tests/phpunit/includes/RevisionStorageTestContentHandlerUseDB.php

diff --git a/tests/phpunit/includes/RevisionStorageTestContentHandlerUseDB.php b/tests/phpunit/includes/RevisionStorageTestContentHandlerUseDB.php
deleted file mode 100644
index 9e667f2186..0000000000
--- a/tests/phpunit/includes/RevisionStorageTestContentHandlerUseDB.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-
-/**
- * @group ContentHandler
- * @group Database
- * ^--- important, causes temporary tables to be used instead of the real database
- */
-class RevisionTestContentHandlerUseDB extends RevisionStorageTest {
-
-	protected function setUp() {
-		$this->setMwGlobals( 'wgContentHandlerUseDB', false );
-
-		$dbw = wfGetDB( DB_MASTER );
-
-		$page_table = $dbw->tableName( 'page' );
-		$revision_table = $dbw->tableName( 'revision' );
-		$archive_table = $dbw->tableName( 'archive' );
-
-		if ( $dbw->fieldExists( $page_table, 'page_content_model' ) ) {
-			$dbw->query( "alter table $page_table drop column page_content_model" );
-			$dbw->query( "alter table $revision_table drop column rev_content_model" );
-			$dbw->query( "alter table $revision_table drop column rev_content_format" );
-			$dbw->query( "alter table $archive_table drop column ar_content_model" );
-			$dbw->query( "alter table $archive_table drop column ar_content_format" );
-		}
-
-		parent::setUp();
-	}
-
-	/**
-	 * @covers Revision::selectFields
-	 */
-	public function testSelectFields() {
-		$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' );
-
-		$this->assertFalse(
-			in_array( 'rev_content_model', $fields ),
-			'missing rev_content_model in list of fields'
-		);
-		$this->assertFalse(
-			in_array( 'rev_content_format', $fields ),
-			'missing rev_content_format in list of fields'
-		);
-	}
-
-	/**
-	 * @covers Revision::getContentModel
-	 */
-	public function testGetContentModel() {
-		try {
-			$this->makeRevision( [ 'text' => 'hello hello.',
-				'content_model' => CONTENT_MODEL_JAVASCRIPT ] );
-
-			$this->fail( "Creating JavaScript content on a wikitext page should fail with "
-				. "\$wgContentHandlerUseDB disabled" );
-		} catch ( MWException $ex ) {
-			$this->assertTrue( true ); // ok
-		}
-	}
-
-	/**
-	 * @covers Revision::getContentFormat
-	 */
-	public function testGetContentFormat() {
-		try {
-			// @todo change this to test failure on using a non-standard (but supported) format
-			//       for a content model supported in the given location. As of 1.21, there are
-			//       no alternative formats for any of the standard content models that could be
-			//       used for this though.
-
-			$this->makeRevision( [ 'text' => 'hello hello.',
-				'content_model' => CONTENT_MODEL_JAVASCRIPT,
-				'content_format' => 'text/javascript' ] );
-
-			$this->fail( "Creating JavaScript content on a wikitext page should fail with "
-				. "\$wgContentHandlerUseDB disabled" );
-		} catch ( MWException $ex ) {
-			$this->assertTrue( true ); // ok
-		}
-	}
-}
-- 
2.20.1