From 08aa4418c30cfc18ccc69a0f0f9cb9e17be6c196 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Mon, 12 Aug 2013 09:28:15 +0200
Subject: Update to MediaWiki 1.21.1

---
 tests/phpunit/includes/ResourceLoaderTest.php | 91 ---------------------------
 1 file changed, 91 deletions(-)
 delete mode 100644 tests/phpunit/includes/ResourceLoaderTest.php

(limited to 'tests/phpunit/includes/ResourceLoaderTest.php')

diff --git a/tests/phpunit/includes/ResourceLoaderTest.php b/tests/phpunit/includes/ResourceLoaderTest.php
deleted file mode 100644
index ab704839..00000000
--- a/tests/phpunit/includes/ResourceLoaderTest.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-
-class ResourceLoaderTest extends MediaWikiTestCase {
-
-	protected static $resourceLoaderRegisterModulesHook;
-
-	/* Hook Methods */
-
-	/**
-	 * ResourceLoaderRegisterModules hook
-	 */
-	public static function resourceLoaderRegisterModules( &$resourceLoader ) {
-		self::$resourceLoaderRegisterModulesHook = true;
-		return true;
-	}
-
-	/* Provider Methods */
-	public function provideValidModules() {
-		return array(
-			array( 'TEST.validModule1', new ResourceLoaderTestModule() ),
-		);
-	}
-
-	/* Test Methods */
-
-	/**
-	 * Ensures that the ResourceLoaderRegisterModules hook is called when a new ResourceLoader object is constructed
-	 * @covers ResourceLoader::__construct
-	 */
-	public function testCreatingNewResourceLoaderCallsRegistrationHook() {
-		self::$resourceLoaderRegisterModulesHook = false;
-		$resourceLoader = new ResourceLoader();
-		$this->assertTrue( self::$resourceLoaderRegisterModulesHook );
-		return $resourceLoader;
-	}
-
-	/**
-	 * @dataProvider provideValidModules
-	 * @depends testCreatingNewResourceLoaderCallsRegistrationHook
-	 * @covers ResourceLoader::register
-	 * @covers ResourceLoader::getModule
-	 */
-	public function testRegisteredValidModulesAreAccessible(
-		$name, ResourceLoaderModule $module, ResourceLoader $resourceLoader
-	) {
-		$resourceLoader->register( $name, $module );
-		$this->assertEquals( $module, $resourceLoader->getModule( $name ) );
-	}
-
-	/**
-	 * @dataProvider providePackedModules
-	 */
-	public function testMakePackedModulesString( $desc, $modules, $packed ) {
-		$this->assertEquals( $packed, ResourceLoader::makePackedModulesString( $modules ), $desc );
-	}
-
-	/**
-	 * @dataProvider providePackedModules
-	 */
-	public function testexpandModuleNames( $desc, $modules, $packed ) {
-		$this->assertEquals( $modules, ResourceLoaderContext::expandModuleNames( $packed ), $desc );
-	}
-
-	public function providePackedModules() {
-		return array(
-			array(
-				'Example from makePackedModulesString doc comment',
-				array( 'foo.bar', 'foo.baz', 'bar.baz', 'bar.quux' ),
-				'foo.bar,baz|bar.baz,quux',
-			),
-			array(
-				'Example from expandModuleNames doc comment',
-				array( 'jquery.foo', 'jquery.bar', 'jquery.ui.baz', 'jquery.ui.quux' ),
-				'jquery.foo,bar|jquery.ui.baz,quux',
-			),
-			array(
-				'Regression fixed in r88706 with dotless names',
-				array( 'foo', 'bar', 'baz' ),
-				'foo,bar,baz',
-			)
-		);
-	}
-}
-
-/* Stubs */
-
-class ResourceLoaderTestModule extends ResourceLoaderModule { }
-
-/* Hooks */
-global $wgHooks;
-$wgHooks['ResourceLoaderRegisterModules'][] = 'ResourceLoaderTest::resourceLoaderRegisterModules';
-- 
cgit v1.2.3-54-g00ecf