X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2FStatusTest.php;h=782fab0c6bbd0bf689f6d098670ac38224faf4d8;hb=873def9a99386db0adb78438774855955b0d9f74;hp=f5d0480e89bd4a7d5a8fa02e6a115c1ea9fee82f;hpb=a218a56b774ffa5163c0a01f092a12990132c48d;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/includes/StatusTest.php b/tests/phpunit/includes/StatusTest.php
index f5d0480e89..782fab0c6b 100644
--- a/tests/phpunit/includes/StatusTest.php
+++ b/tests/phpunit/includes/StatusTest.php
@@ -22,13 +22,13 @@ class StatusTest extends MediaWikiLangTestCase {
 	}
 
 	public static function provideValues() {
-		return array(
-			array(),
-			array( 'foo' ),
-			array( array( 'foo' => 'bar' ) ),
-			array( new Exception() ),
-			array( 1234 ),
-		);
+		return [
+			[],
+			[ 'foo' ],
+			[ [ 'foo' => 'bar' ] ],
+			[ new Exception() ],
+			[ 1234 ],
+		];
 	}
 
 	/**
@@ -65,13 +65,13 @@ class StatusTest extends MediaWikiLangTestCase {
 		$status = Status::newFatal( 'foo', 1, 2 );
 		$this->assertFalse( $status->ok );
 		$this->assertArrayEquals(
-			array(
-				array(
+			[
+				[
 					'type' => 'error',
 					'message' => 'foo',
-					'params' => array( 1, 2 )
-				)
-			),
+					'params' => [ 1, 2 ]
+				]
+			],
 			$status->errors
 		);
 	}
@@ -88,12 +88,12 @@ class StatusTest extends MediaWikiLangTestCase {
 	}
 
 	public static function provideSetResult() {
-		return array(
-			array( true ),
-			array( false ),
-			array( true, 'value' ),
-			array( false, 'value' ),
-		);
+		return [
+			[ true ],
+			[ false ],
+			[ true, 'value' ],
+			[ false, 'value' ],
+		];
 	}
 
 	/**
@@ -107,10 +107,10 @@ class StatusTest extends MediaWikiLangTestCase {
 	}
 
 	public static function provideIsOk() {
-		return array(
-			array( true ),
-			array( false ),
-		);
+		return [
+			[ true ],
+			[ false ],
+		];
 	}
 
 	/**
@@ -136,12 +136,12 @@ class StatusTest extends MediaWikiLangTestCase {
 	}
 
 	public static function provideIsGood() {
-		return array(
-			array( true, array(), true ),
-			array( true, array( 'foo' ), false ),
-			array( false, array(), false ),
-			array( false, array( 'foo' ), false ),
-		);
+		return [
+			[ true, [], true ],
+			[ true, [ 'foo' ], false ],
+			[ false, [], false ],
+			[ false, [ 'foo' ], false ],
+		];
 	}
 
 	/**
@@ -161,7 +161,7 @@ class StatusTest extends MediaWikiLangTestCase {
 
 		$this->assertEquals( count( $messages ), count( $warnings ) );
 		foreach ( $messages as $key => $message ) {
-			$expectedArray = array_merge( array( $message->getKey() ), $message->getParams() );
+			$expectedArray = array_merge( [ $message->getKey() ], $message->getParams() );
 			$this->assertEquals( $warnings[$key], $expectedArray );
 		}
 	}
@@ -183,7 +183,7 @@ class StatusTest extends MediaWikiLangTestCase {
 
 		$this->assertEquals( count( $messages ), count( $errors ) );
 		foreach ( $messages as $key => $message ) {
-			$expectedArray = array_merge( array( $message->getKey() ), $message->getParams() );
+			$expectedArray = array_merge( [ $message->getKey() ], $message->getParams() );
 			$this->assertEquals( $errors[$key], $expectedArray );
 		}
 	}
@@ -205,13 +205,13 @@ class StatusTest extends MediaWikiLangTestCase {
 
 		$this->assertEquals( count( $messages ), count( $errors ) );
 		foreach ( $messages as $key => $message ) {
-			$expectedArray = array_merge( array( $message->getKey() ), $message->getParams() );
+			$expectedArray = array_merge( [ $message->getKey() ], $message->getParams() );
 			$this->assertEquals( $errors[$key], $expectedArray );
 		}
 		$this->assertFalse( $status->isOK() );
 	}
 
-	protected function getMockMessage( $key = 'key', $params = array() ) {
+	protected function getMockMessage( $key = 'key', $params = [] ) {
 		$message = $this->getMockBuilder( 'Message' )
 			->disableOriginalConstructor()
 			->getMock();
@@ -229,7 +229,7 @@ class StatusTest extends MediaWikiLangTestCase {
 	 * @return Message[]
 	 */
 	protected function getMockMessages( $messageDetails ) {
-		$messages = array();
+		$messages = [];
 		foreach ( $messageDetails as $key => $paramsArray ) {
 			$messages[] = $this->getMockMessage( $key, $paramsArray );
 		}
@@ -237,10 +237,10 @@ class StatusTest extends MediaWikiLangTestCase {
 	}
 
 	public static function provideMockMessageDetails() {
-		return array(
-			array( array( 'key1' => array( 'foo' => 'bar' ) ) ),
-			array( array( 'key1' => array( 'foo' => 'bar' ), 'key2' => array( 'foo2' => 'bar2' ) ) ),
-		);
+		return [
+			[ [ 'key1' => [ 'foo' => 'bar' ] ] ],
+			[ [ 'key1' => [ 'foo' => 'bar' ], 'key2' => [ 'foo2' => 'bar2' ] ] ],
+		];
 	}
 
 	/**
@@ -312,33 +312,34 @@ class StatusTest extends MediaWikiLangTestCase {
 			return '-' . $value . '-';
 		};
 
-		return array(
-			array( false, array( 'foo' => 'bar' ), array( 'foo' => 'bar' ) ),
-			array( $cleanCallback, array( 'foo' => 'bar' ), array( 'foo' => '-bar-' ) ),
-		);
+		return [
+			[ false, [ 'foo' => 'bar' ], [ 'foo' => 'bar' ] ],
+			[ $cleanCallback, [ 'foo' => 'bar' ], [ 'foo' => '-bar-' ] ],
+		];
 	}
 
 	/**
 	 * @dataProvider provideGetWikiTextAndHtml
 	 * @covers Status::getWikiText
-	 * @todo test long and short context messages generated through this method
-	 *       this can not really be done now due to use of wfMessage()->plain()
-	 *       It is possible to mock such methods but only if namespaces are used
 	 */
-	public function testGetWikiText( Status $status, $wikitext, $html ) {
+	public function testGetWikiText(
+		Status $status, $wikitext, $wrappedWikitext, $html, $wrappedHtml
+	) {
 		$this->assertEquals( $wikitext, $status->getWikiText() );
+
+		$this->assertEquals( $wrappedWikitext, $status->getWikiText( 'wrap-short', 'wrap-long', 'qqx' ) );
 	}
 
 	/**
 	 * @dataProvider provideGetWikiTextAndHtml
 	 * @covers Status::getHtml
-	 * @todo test long and short context messages generated through this method
-	 *   this can not really be done now due to use of $this->getWikiText using
-	 *   wfMessage()->plain(). It is possible to mock such methods but only if
-	 *   namespaces are used.
 	 */
-	public function testGetHtml( Status $status, $wikitext, $html ) {
+	public function testGetHtml(
+		Status $status, $wikitext, $wrappedWikitext, $html, $wrappedHtml
+	) {
 		$this->assertEquals( $html, $status->getHTML() );
+
+		$this->assertEquals( $wrappedHtml, $status->getHTML( 'wrap-short', 'wrap-long', 'qqx' ) );
 	}
 
 	/**
@@ -347,69 +348,114 @@ class StatusTest extends MediaWikiLangTestCase {
 	 *    1 => expected string (with no context)
 	 */
 	public static function provideGetWikiTextAndHtml() {
-		$testCases = array();
+		$testCases = [];
 
-		$testCases['GoodStatus'] = array(
+		$testCases['GoodStatus'] = [
 			new Status(),
 			"Internal error: Status::getWikiText called for a good result, this is incorrect\n",
+			"(wrap-short: (internalerror_info: Status::getWikiText called for a good result, " .
+				"this is incorrect\n))",
 			"<p>Internal error: Status::getWikiText called for a good result, this is incorrect\n</p>",
-		);
+			"<p>(wrap-short: (internalerror_info: Status::getWikiText called for a good result, " .
+				"this is incorrect\n))\n</p>",
+		];
 
 		$status = new Status();
 		$status->ok = false;
-		$testCases['GoodButNoError'] = array(
+		$testCases['GoodButNoError'] = [
 			$status,
 			"Internal error: Status::getWikiText: Invalid result object: no error text but not OK\n",
+			"(wrap-short: (internalerror_info: Status::getWikiText: Invalid result object: " .
+				"no error text but not OK\n))",
 			"<p>Internal error: Status::getWikiText: Invalid result object: no error text but not OK\n</p>",
-		);
+			"<p>(wrap-short: (internalerror_info: Status::getWikiText: Invalid result object: " .
+				"no error text but not OK\n))\n</p>",
+		];
 
 		$status = new Status();
 		$status->warning( 'fooBar!' );
-		$testCases['1StringWarning'] = array(
+		$testCases['1StringWarning'] = [
 			$status,
 			"<fooBar!>",
+			"(wrap-short: (fooBar!))",
 			"<p>&lt;fooBar!&gt;\n</p>",
-		);
+			"<p>(wrap-short: (fooBar!))\n</p>",
+		];
 
 		$status = new Status();
 		$status->warning( 'fooBar!' );
 		$status->warning( 'fooBar2!' );
-		$testCases['2StringWarnings'] = array(
+		$testCases['2StringWarnings'] = [
 			$status,
 			"* <fooBar!>\n* <fooBar2!>\n",
+			"(wrap-long: * (fooBar!)\n* (fooBar2!)\n)",
 			"<ul><li> &lt;fooBar!&gt;</li>\n<li> &lt;fooBar2!&gt;</li></ul>\n",
-		);
+			"<p>(wrap-long: * (fooBar!)\n</p>\n<ul><li> (fooBar2!)</li></ul>\n<p>)\n</p>",
+		];
 
 		$status = new Status();
-		$status->warning( new Message( 'fooBar!', array( 'foo', 'bar' ) ) );
-		$testCases['1MessageWarning'] = array(
+		$status->warning( new Message( 'fooBar!', [ 'foo', 'bar' ] ) );
+		$testCases['1MessageWarning'] = [
 			$status,
 			"<fooBar!>",
+			"(wrap-short: (fooBar!: foo, bar))",
 			"<p>&lt;fooBar!&gt;\n</p>",
-		);
+			"<p>(wrap-short: (fooBar!: foo, bar))\n</p>",
+		];
 
 		$status = new Status();
-		$status->warning( new Message( 'fooBar!', array( 'foo', 'bar' ) ) );
+		$status->warning( new Message( 'fooBar!', [ 'foo', 'bar' ] ) );
 		$status->warning( new Message( 'fooBar2!' ) );
-		$testCases['2MessageWarnings'] = array(
+		$testCases['2MessageWarnings'] = [
 			$status,
 			"* <fooBar!>\n* <fooBar2!>\n",
+			"(wrap-long: * (fooBar!: foo, bar)\n* (fooBar2!)\n)",
 			"<ul><li> &lt;fooBar!&gt;</li>\n<li> &lt;fooBar2!&gt;</li></ul>\n",
-		);
+			"<p>(wrap-long: * (fooBar!: foo, bar)\n</p>\n<ul><li> (fooBar2!)</li></ul>\n<p>)\n</p>",
+		];
 
 		return $testCases;
 	}
 
+	private static function sanitizedMessageParams( Message $message ) {
+		return array_map( function ( $p ) {
+			return $p instanceof Message
+				? [
+					'key' => $p->getKey(),
+					'params' => self::sanitizedMessageParams( $p ),
+					'lang' => $p->getLanguage()->getCode(),
+				]
+				: $p;
+		}, $message->getParams() );
+	}
+
 	/**
 	 * @dataProvider provideGetMessage
 	 * @covers Status::getMessage
-	 * @todo test long and short context messages generated through this method
 	 */
-	public function testGetMessage( Status $status, $expectedParams = array(), $expectedKey ) {
-		$message = $status->getMessage();
+	public function testGetMessage(
+		Status $status, $expectedParams = [], $expectedKey, $expectedWrapper
+	) {
+		$message = $status->getMessage( null, null, 'qqx' );
 		$this->assertInstanceOf( 'Message', $message );
-		$this->assertEquals( $expectedParams, $message->getParams(), 'Message::getParams' );
+		$this->assertEquals( $expectedParams, self::sanitizedMessageParams( $message ),
+			'Message::getParams' );
 		$this->assertEquals( $expectedKey, $message->getKey(), 'Message::getKey' );
+
+		$message = $status->getMessage( 'wrapper-short', 'wrapper-long' );
+		$this->assertInstanceOf( 'Message', $message );
+		$this->assertEquals( $expectedWrapper, $message->getKey(), 'Message::getKey with wrappers' );
+		$this->assertCount( 1, $message->getParams(), 'Message::getParams with wrappers' );
+
+		$message = $status->getMessage( 'wrapper' );
+		$this->assertInstanceOf( 'Message', $message );
+		$this->assertEquals( 'wrapper', $message->getKey(), 'Message::getKey with wrappers' );
+		$this->assertCount( 1, $message->getParams(), 'Message::getParams with wrappers' );
+
+		$message = $status->getMessage( false, 'wrapper' );
+		$this->assertInstanceOf( 'Message', $message );
+		$this->assertEquals( 'wrapper', $message->getKey(), 'Message::getKey with wrappers' );
+		$this->assertCount( 1, $message->getParams(), 'Message::getParams with wrappers' );
 	}
 
 	/**
@@ -419,60 +465,67 @@ class StatusTest extends MediaWikiLangTestCase {
 	 *    2 => expected Message key
 	 */
 	public static function provideGetMessage() {
-		$testCases = array();
+		$testCases = [];
 
-		$testCases['GoodStatus'] = array(
+		$testCases['GoodStatus'] = [
 			new Status(),
-			array( "Status::getMessage called for a good result, this is incorrect\n" ),
-			'internalerror_info'
-		);
+			[ "Status::getMessage called for a good result, this is incorrect\n" ],
+			'internalerror_info',
+			'wrapper-short'
+		];
 
 		$status = new Status();
 		$status->ok = false;
-		$testCases['GoodButNoError'] = array(
+		$testCases['GoodButNoError'] = [
 			$status,
-			array( "Status::getMessage: Invalid result object: no error text but not OK\n" ),
-			'internalerror_info'
-		);
+			[ "Status::getMessage: Invalid result object: no error text but not OK\n" ],
+			'internalerror_info',
+			'wrapper-short'
+		];
 
 		$status = new Status();
 		$status->warning( 'fooBar!' );
-		$testCases['1StringWarning'] = array(
+		$testCases['1StringWarning'] = [
 			$status,
-			array(),
-			'fooBar!'
-		);
+			[],
+			'fooBar!',
+			'wrapper-short'
+		];
 
-		// FIXME: Assertion tries to compare a StubUserLang with a Language object, because
-		// "data providers are executed before both the call to the setUpBeforeClass static method
-		// and the first call to the setUp method. Because of that you can't access any variables
-		// you create there from within a data provider."
-		// http://phpunit.de/manual/3.7/en/writing-tests-for-phpunit.html
-// 		$status = new Status();
-// 		$status->warning( 'fooBar!' );
-// 		$status->warning( 'fooBar2!' );
-// 		$testCases[ '2StringWarnings' ] = array(
-// 			$status,
-// 			array( new Message( 'fooBar!' ), new Message( 'fooBar2!' ) ),
-// 			"* \$1\n* \$2"
-// 		);
+		$status = new Status();
+		$status->warning( 'fooBar!' );
+		$status->warning( 'fooBar2!' );
+		$testCases[ '2StringWarnings' ] = [
+			$status,
+			[
+				[ 'key' => 'fooBar!', 'params' => [], 'lang' => 'qqx' ],
+				[ 'key' => 'fooBar2!', 'params' => [], 'lang' => 'qqx' ]
+			],
+			"* \$1\n* \$2",
+			'wrapper-long'
+		];
 
 		$status = new Status();
-		$status->warning( new Message( 'fooBar!', array( 'foo', 'bar' ) ) );
-		$testCases['1MessageWarning'] = array(
+		$status->warning( new Message( 'fooBar!', [ 'foo', 'bar' ] ) );
+		$testCases['1MessageWarning'] = [
 			$status,
-			array( 'foo', 'bar' ),
-			'fooBar!'
-		);
+			[ 'foo', 'bar' ],
+			'fooBar!',
+			'wrapper-short'
+		];
 
 		$status = new Status();
-		$status->warning( new Message( 'fooBar!', array( 'foo', 'bar' ) ) );
+		$status->warning( new Message( 'fooBar!', [ 'foo', 'bar' ] ) );
 		$status->warning( new Message( 'fooBar2!' ) );
-		$testCases['2MessageWarnings'] = array(
+		$testCases['2MessageWarnings'] = [
 			$status,
-			array( new Message( 'fooBar!', array( 'foo', 'bar' ) ), new Message( 'fooBar2!' ) ),
-			"* \$1\n* \$2"
-		);
+			[
+				[ 'key' => 'fooBar!', 'params' => [ 'foo', 'bar' ], 'lang' => 'qqx' ],
+				[ 'key' => 'fooBar2!', 'params' => [], 'lang' => 'qqx' ]
+			],
+			"* \$1\n* \$2",
+			'wrapper-long'
+		];
 
 		return $testCases;
 	}
@@ -482,9 +535,9 @@ class StatusTest extends MediaWikiLangTestCase {
 	 */
 	public function testReplaceMessage() {
 		$status = new Status();
-		$message = new Message( 'key1', array( 'foo1', 'bar1' ) );
+		$message = new Message( 'key1', [ 'foo1', 'bar1' ] );
 		$status->error( $message );
-		$newMessage = new Message( 'key2', array( 'foo2', 'bar2' ) );
+		$newMessage = new Message( 'key2', [ 'foo2', 'bar2' ] );
 
 		$status->replaceMessage( $message, $newMessage );
 
@@ -499,10 +552,10 @@ class StatusTest extends MediaWikiLangTestCase {
 		$method->setAccessible( true );
 		$status = new Status();
 		$key = 'foo';
-		$params = array( 'bar' );
+		$params = [ 'bar' ];
 
 		/** @var Message $message */
-		$message = $method->invoke( $status, array_merge( array( $key ), $params ) );
+		$message = $method->invoke( $status, array_merge( [ $key ], $params ) );
 		$this->assertInstanceOf( 'Message', $message );
 		$this->assertEquals( $key, $message->getKey() );
 		$this->assertEquals( $params, $message->getParams() );
@@ -516,15 +569,15 @@ class StatusTest extends MediaWikiLangTestCase {
 		$method->setAccessible( true );
 		$status = new Status();
 		$key = 'foo';
-		$params = array( 'bar' );
+		$params = [ 'bar' ];
 
 		/** @var Message[] $messageArray */
 		$messageArray = $method->invoke(
 			$status,
-			array(
-				array_merge( array( $key ), $params ),
-				array_merge( array( $key ), $params )
-			)
+			[
+				array_merge( [ $key ], $params ),
+				array_merge( [ $key ], $params )
+			]
 		);
 
 		$this->assertInternalType( 'array', $messageArray );
@@ -586,10 +639,10 @@ class StatusTest extends MediaWikiLangTestCase {
 	}
 
 	public static function provideNonObjectMessages() {
-		return array(
-			array( array( 'ImaString', array( 'param1' => 'value1' ) ) ),
-			array( array( 'ImaString' ) ),
-		);
+		return [
+			[ [ 'ImaString', [ 'param1' => 'value1' ] ] ],
+			[ [ 'ImaString' ] ],
+		];
 	}
 
 }