From 2e44b49a2db3026050b136de9b00f749dd3ff939 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Fri, 25 Apr 2014 06:26:49 +0200
Subject: Update to MediaWiki 1.22.6

---
 .../includes/installer/InstallDocFormatterTest.php | 65 ----------------------
 .../includes/installer/OracleInstallerTest.php     | 48 ----------------
 2 files changed, 113 deletions(-)
 delete mode 100644 tests/phpunit/includes/installer/InstallDocFormatterTest.php
 delete mode 100644 tests/phpunit/includes/installer/OracleInstallerTest.php

(limited to 'tests/phpunit/includes/installer')

diff --git a/tests/phpunit/includes/installer/InstallDocFormatterTest.php b/tests/phpunit/includes/installer/InstallDocFormatterTest.php
deleted file mode 100644
index 0e5f2671..00000000
--- a/tests/phpunit/includes/installer/InstallDocFormatterTest.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-
-class InstallDocFormatterTest extends MediaWikiTestCase {
-	/**
-	 * @covers InstallDocFormatter::format
-	 * @dataProvider provideDocFormattingTests
-	 */
-	public function testFormat( $expected, $unformattedText, $message = '' ) {
-		$this->assertEquals(
-			$expected,
-			InstallDocFormatter::format( $unformattedText ),
-			$message
-		);
-	}
-
-	/**
-	 * Provider for testFormat()
-	 */
-	public static function provideDocFormattingTests() {
-		# Format: (expected string, unformattedText string, optional message)
-		return array(
-			# Escape some wikitext
-			array( 'Install &lt;tag>', 'Install <tag>', 'Escaping <' ),
-			array( 'Install &#123;&#123;template}}', 'Install {{template}}', 'Escaping [[' ),
-			array( 'Install &#91;&#91;page]]', 'Install [[page]]', 'Escaping {{' ),
-			array( 'Install &#95;&#95;TOC&#95;&#95;', 'Install __TOC__', 'Escaping __' ),
-			array( 'Install ', "Install \r", 'Removing \r' ),
-
-			# Transform \t{1,2} into :{1,2}
-			array( ':One indentation', "\tOne indentation", 'Replacing a single \t' ),
-			array( '::Two indentations', "\t\tTwo indentations", 'Replacing 2 x \t' ),
-
-			# Transform 'bug 123' links
-			array(
-				'<span class="config-plainlink">[https://bugzilla.wikimedia.org/123 bug 123]</span>',
-				'bug 123', 'Testing bug 123 links' ),
-			array(
-				'(<span class="config-plainlink">[https://bugzilla.wikimedia.org/987654 bug 987654]</span>)',
-				'(bug 987654)', 'Testing (bug 987654) links' ),
-
-			# "bug abc" shouldn't work
-			array( 'bug foobar', 'bug foobar', "Don't match bug followed by non-digits" ),
-			array( 'bug !!fakefake!!', 'bug !!fakefake!!', "Don't match bug followed by non-digits" ),
-
-			# Transform '$wgFooBar' links
-			array(
-				'<span class="config-plainlink">[http://www.mediawiki.org/wiki/Manual:$wgFooBar $wgFooBar]</span>',
-				'$wgFooBar', 'Testing basic $wgFooBar' ),
-			array(
-				'<span class="config-plainlink">[http://www.mediawiki.org/wiki/Manual:$wgFooBar45 $wgFooBar45]</span>',
-				'$wgFooBar45', 'Testing $wgFooBar45 (with numbers)' ),
-			array(
-				'<span class="config-plainlink">[http://www.mediawiki.org/wiki/Manual:$wgFoo_Bar $wgFoo_Bar]</span>',
-				'$wgFoo_Bar', 'Testing $wgFoo_Bar (with underscore)' ),
-
-			# Icky variables that shouldn't link
-			array( '$myAwesomeVariable', '$myAwesomeVariable', 'Testing $myAwesomeVariable (not starting with $wg)' ),
-			array( '$()not!a&Var', '$()not!a&Var', 'Testing $()not!a&Var (obviously not a variable)' ),
-		);
-	}
-}
diff --git a/tests/phpunit/includes/installer/OracleInstallerTest.php b/tests/phpunit/includes/installer/OracleInstallerTest.php
deleted file mode 100644
index 66e65592..00000000
--- a/tests/phpunit/includes/installer/OracleInstallerTest.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-/**
- * Tests for OracleInstaller
- *
- * @group Database
- * @group Installer
- */
-
-class OracleInstallerTest extends MediaWikiTestCase {
-
-	/**
-	 * @dataProvider provideOracleConnectStrings
-	 * @covers OracleInstaller::checkConnectStringFormat
-	 */
-	public function testCheckConnectStringFormat( $expected, $connectString, $msg = '' ) {
-		$validity = $expected ? 'should be valid' : 'should NOT be valid';
-		$msg = "'$connectString' ($msg) $validity.";
-		$this->assertEquals( $expected,
-			OracleInstaller::checkConnectStringFormat( $connectString ),
-			$msg
-		);
-	}
-
-	/**
-	 * Provider to test OracleInstaller::checkConnectStringFormat()
-	 */
-	function provideOracleConnectStrings() {
-		// expected result, connectString[, message]
-		return array(
-			array( true, 'simple_01', 'Simple TNS name' ),
-			array( true, 'simple_01.world', 'TNS name with domain' ),
-			array( true, 'simple_01.domain.net', 'TNS name with domain' ),
-			array( true, 'host123', 'Host only' ),
-			array( true, 'host123.domain.net', 'FQDN only' ),
-			array( true, '//host123.domain.net', 'FQDN URL only' ),
-			array( true, '123.223.213.132', 'Host IP only' ),
-			array( true, 'host:1521', 'Host and port' ),
-			array( true, 'host:1521/service', 'Host, port and service' ),
-			array( true, 'host:1521/service:shared', 'Host, port, service and shared server type' ),
-			array( true, 'host:1521/service:dedicated', 'Host, port, service and dedicated server type' ),
-			array( true, 'host:1521/service:pooled', 'Host, port, service and pooled server type' ),
-			array( true, 'host:1521/service:shared/instance1', 'Host, port, service, server type and instance' ),
-			array( true, 'host:1521//instance1', 'Host, port and instance' ),
-		);
-	}
-
-}
-- 
cgit v1.2.3-54-g00ecf