From 4ac9fa081a7c045f6a9f1cfc529d82423f485b2e Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sun, 8 Dec 2013 09:55:49 +0100
Subject: Update to MediaWiki 1.22.0

---
 tests/phpunit/includes/MessageTest.php | 78 +++++++++++++++++++++++++++++-----
 1 file changed, 67 insertions(+), 11 deletions(-)

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

diff --git a/tests/phpunit/includes/MessageTest.php b/tests/phpunit/includes/MessageTest.php
index c378bb8e..1e18f975 100644
--- a/tests/phpunit/includes/MessageTest.php
+++ b/tests/phpunit/includes/MessageTest.php
@@ -10,7 +10,7 @@ class MessageTest extends MediaWikiLangTestCase {
 		) );
 	}
 
-	function testExists() {
+	public function testExists() {
 		$this->assertTrue( wfMessage( 'mainpage' )->exists() );
 		$this->assertTrue( wfMessage( 'mainpage' )->params( array() )->exists() );
 		$this->assertTrue( wfMessage( 'mainpage' )->rawParams( 'foo', 123 )->exists() );
@@ -19,7 +19,7 @@ class MessageTest extends MediaWikiLangTestCase {
 		$this->assertFalse( wfMessage( 'i-dont-exist-evar' )->rawParams( 'foo', 123 )->exists() );
 	}
 
-	function testKey() {
+	public function testKey() {
 		$this->assertInstanceOf( 'Message', wfMessage( 'mainpage' ) );
 		$this->assertInstanceOf( 'Message', wfMessage( 'i-dont-exist-evar' ) );
 		$this->assertEquals( 'Main Page', wfMessage( 'mainpage' )->text() );
@@ -28,47 +28,103 @@ class MessageTest extends MediaWikiLangTestCase {
 		$this->assertEquals( '&lt;i-dont-exist-evar&gt;', wfMessage( 'i-dont-exist-evar' )->escaped() );
 	}
 
-	function testInLanguage() {
+	public function testInLanguage() {
 		$this->assertEquals( 'Main Page', wfMessage( 'mainpage' )->inLanguage( 'en' )->text() );
 		$this->assertEquals( 'Заглавная страница', wfMessage( 'mainpage' )->inLanguage( 'ru' )->text() );
 		$this->assertEquals( 'Main Page', wfMessage( 'mainpage' )->inLanguage( Language::factory( 'en' ) )->text() );
 		$this->assertEquals( 'Заглавная страница', wfMessage( 'mainpage' )->inLanguage( Language::factory( 'ru' ) )->text() );
 	}
 
-	function testMessageParams() {
+	public function testMessageParams() {
 		$this->assertEquals( 'Return to $1.', wfMessage( 'returnto' )->text() );
 		$this->assertEquals( 'Return to $1.', wfMessage( 'returnto', array() )->text() );
 		$this->assertEquals( 'You have foo (bar).', wfMessage( 'youhavenewmessages', 'foo', 'bar' )->text() );
 		$this->assertEquals( 'You have foo (bar).', wfMessage( 'youhavenewmessages', array( 'foo', 'bar' ) )->text() );
 	}
 
-	function testMessageParamSubstitution() {
+	public function testMessageParamSubstitution() {
 		$this->assertEquals( '(Заглавная страница)', wfMessage( 'parentheses', 'Заглавная страница' )->plain() );
 		$this->assertEquals( '(Заглавная страница $1)', wfMessage( 'parentheses', 'Заглавная страница $1' )->plain() );
 		$this->assertEquals( '(Заглавная страница)', wfMessage( 'parentheses' )->rawParams( 'Заглавная страница' )->plain() );
 		$this->assertEquals( '(Заглавная страница $1)', wfMessage( 'parentheses' )->rawParams( 'Заглавная страница $1' )->plain() );
 	}
 
-	function testDeliciouslyManyParams() {
+	public function testDeliciouslyManyParams() {
 		$msg = new RawMessage( '$1$2$3$4$5$6$7$8$9$10$11$12' );
 		// One less than above has placeholders
 		$params = array( 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k' );
 		$this->assertEquals( 'abcdefghijka2', $msg->params( $params )->plain(), 'Params > 9 are replaced correctly' );
 	}
 
-	function testInContentLanguage() {
-		global $wgLang, $wgForceUIMsgAsContentMsg;
-		$wgLang = Language::factory( 'fr' );
+	/**
+	 * FIXME: This should not need database, but Language#formatExpiry does (bug 55912)
+	 * @group Database
+	 */
+	public function testMessageParamTypes() {
+		$lang = Language::factory( 'en' );
+
+		$msg = new RawMessage( '$1' );
+		$this->assertEquals(
+			$lang->formatNum( 123456.789 ),
+			$msg->inLanguage( $lang )->numParams( 123456.789 )->plain(),
+			'numParams is handled correctly'
+		);
+
+		$msg = new RawMessage( '$1' );
+		$this->assertEquals(
+			$lang->formatDuration( 1234 ),
+			$msg->inLanguage( $lang )->durationParams( 1234 )->plain(),
+			'durationParams is handled correctly'
+		);
+
+		$msg = new RawMessage( '$1' );
+		$this->assertEquals(
+			$lang->formatExpiry( wfTimestampNow() ),
+			$msg->inLanguage( $lang )->expiryParams( wfTimestampNow() )->plain(),
+			'expiryParams is handled correctly'
+		);
+
+		$msg = new RawMessage( '$1' );
+		$this->assertEquals(
+			$lang->formatTimePeriod( 1234 ),
+			$msg->inLanguage( $lang )->timeperiodParams( 1234 )->plain(),
+			'timeperiodParams is handled correctly'
+		);
+
+		$msg = new RawMessage( '$1' );
+		$this->assertEquals(
+			$lang->formatSize( 123456 ),
+			$msg->inLanguage( $lang )->sizeParams( 123456 )->plain(),
+			'sizeParams is handled correctly'
+		);
+
+		$msg = new RawMessage( '$1' );
+		$this->assertEquals(
+			$lang->formatBitrate( 123456 ),
+			$msg->inLanguage( $lang )->bitrateParams( 123456 )->plain(),
+			'bitrateParams is handled correctly'
+		);
+	}
+
+	public function testInContentLanguageDisabled() {
+		$this->setMwGlobals( 'wgLang', Language::factory( 'fr' ) );
 
 		$this->assertEquals( 'Main Page', wfMessage( 'mainpage' )->inContentLanguage()->plain(), 'ForceUIMsg disabled' );
-		$wgForceUIMsgAsContentMsg['testInContentLanguage'] = 'mainpage';
+	}
+
+	public function testInContentLanguageEnabled() {
+		$this->setMwGlobals( array(
+			'wgLang' => Language::factory( 'fr' ),
+			'wgForceUIMsgAsContentMsg' => array( 'mainpage' ),
+		) );
+
 		$this->assertEquals( 'Accueil', wfMessage( 'mainpage' )->inContentLanguage()->plain(), 'ForceUIMsg enabled' );
 	}
 
 	/**
 	 * @expectedException MWException
 	 */
-	function testInLanguageThrows() {
+	public function testInLanguageThrows() {
 		wfMessage( 'foo' )->inLanguage( 123 );
 	}
 }
-- 
cgit v1.2.3-54-g00ecf