Merge "Bypass login page if no user input is required."

[lhc/web/wiklou.git] / tests / phpunit / includes / api / ApiMessageTest.php

diff --git a/tests/phpunit/includes/api/ApiMessageTest.php b/tests/phpunit/includes/api/ApiMessageTest.php
index 08a984e..8764b41 100644 (file)
--- a/tests/phpunit/includes/api/ApiMessageTest.php
+++ b/tests/phpunit/includes/api/ApiMessageTest.php
@@ -5,17 +5,17 @@
  */
 class ApiMessageTest extends MediaWikiTestCase {
 
-       private function compareMessages( $msg, $msg2 ) {
+       private function compareMessages( Message $msg, Message $msg2 ) {
                $this->assertSame( $msg->getKey(), $msg2->getKey(), 'getKey' );
                $this->assertSame( $msg->getKeysToTry(), $msg2->getKeysToTry(), 'getKeysToTry' );
                $this->assertSame( $msg->getParams(), $msg2->getParams(), 'getParams' );
-               $this->assertSame( $msg->getFormat(), $msg2->getFormat(), 'getFormat' );
                $this->assertSame( $msg->getLanguage(), $msg2->getLanguage(), 'getLanguage' );
 
                $msg = TestingAccessWrapper::newFromObject( $msg );
                $msg2 = TestingAccessWrapper::newFromObject( $msg2 );
                $this->assertSame( $msg->interface, $msg2->interface, 'interface' );
                $this->assertSame( $msg->useDatabase, $msg2->useDatabase, 'useDatabase' );
+               $this->assertSame( $msg->format, $msg2->format, 'format' );
                $this->assertSame(
                        $msg->title ? $msg->title->getFullText() : null,
                        $msg2->title ? $msg2->title->getFullText() : null,
@@ -25,78 +25,80 @@ class ApiMessageTest extends MediaWikiTestCase {
 
        /**
         * @covers ApiMessage
+        * @covers ApiMessageTrait
         */
        public function testApiMessage() {
-               $msg = new Message( array( 'foo', 'bar' ), array( 'baz' ) );
+               $msg = new Message( [ 'foo', 'bar' ], [ 'baz' ] );
                $msg->inLanguage( 'de' )->title( Title::newMainPage() );
-               $msg2 = new ApiMessage( $msg, 'code', array( 'data' ) );
+               $msg2 = new ApiMessage( $msg, 'code', [ 'data' ] );
                $this->compareMessages( $msg, $msg2 );
                $this->assertEquals( 'code', $msg2->getApiCode() );
-               $this->assertEquals( array( 'data' ), $msg2->getApiData() );
+               $this->assertEquals( [ 'data' ], $msg2->getApiData() );
 
                $msg2 = unserialize( serialize( $msg2 ) );
                $this->compareMessages( $msg, $msg2 );
                $this->assertEquals( 'code', $msg2->getApiCode() );
-               $this->assertEquals( array( 'data' ), $msg2->getApiData() );
+               $this->assertEquals( [ 'data' ], $msg2->getApiData() );
 
-               $msg = new Message( array( 'foo', 'bar' ), array( 'baz' ) );
-               $msg2 = new ApiMessage( array( array( 'foo', 'bar' ), 'baz' ), 'code', array( 'data' ) );
+               $msg = new Message( [ 'foo', 'bar' ], [ 'baz' ] );
+               $msg2 = new ApiMessage( [ [ 'foo', 'bar' ], 'baz' ], 'code', [ 'data' ] );
                $this->compareMessages( $msg, $msg2 );
                $this->assertEquals( 'code', $msg2->getApiCode() );
-               $this->assertEquals( array( 'data' ), $msg2->getApiData() );
+               $this->assertEquals( [ 'data' ], $msg2->getApiData() );
 
                $msg = new Message( 'foo' );
                $msg2 = new ApiMessage( 'foo' );
                $this->compareMessages( $msg, $msg2 );
                $this->assertEquals( 'foo', $msg2->getApiCode() );
-               $this->assertEquals( array(), $msg2->getApiData() );
+               $this->assertEquals( [], $msg2->getApiData() );
 
-               $msg2->setApiCode( 'code', array( 'data' ) );
+               $msg2->setApiCode( 'code', [ 'data' ] );
                $this->assertEquals( 'code', $msg2->getApiCode() );
-               $this->assertEquals( array( 'data' ), $msg2->getApiData() );
+               $this->assertEquals( [ 'data' ], $msg2->getApiData() );
                $msg2->setApiCode( null );
                $this->assertEquals( 'foo', $msg2->getApiCode() );
-               $this->assertEquals( array( 'data' ), $msg2->getApiData() );
-               $msg2->setApiData( array( 'data2' ) );
-               $this->assertEquals( array( 'data2' ), $msg2->getApiData() );
+               $this->assertEquals( [ 'data' ], $msg2->getApiData() );
+               $msg2->setApiData( [ 'data2' ] );
+               $this->assertEquals( [ 'data2' ], $msg2->getApiData() );
        }
 
        /**
         * @covers ApiRawMessage
+        * @covers ApiMessageTrait
         */
        public function testApiRawMessage() {
-               $msg = new RawMessage( 'foo', array( 'baz' ) );
+               $msg = new RawMessage( 'foo', [ 'baz' ] );
                $msg->inLanguage( 'de' )->title( Title::newMainPage() );
-               $msg2 = new ApiRawMessage( $msg, 'code', array( 'data' ) );
+               $msg2 = new ApiRawMessage( $msg, 'code', [ 'data' ] );
                $this->compareMessages( $msg, $msg2 );
                $this->assertEquals( 'code', $msg2->getApiCode() );
-               $this->assertEquals( array( 'data' ), $msg2->getApiData() );
+               $this->assertEquals( [ 'data' ], $msg2->getApiData() );
 
                $msg2 = unserialize( serialize( $msg2 ) );
                $this->compareMessages( $msg, $msg2 );
                $this->assertEquals( 'code', $msg2->getApiCode() );
-               $this->assertEquals( array( 'data' ), $msg2->getApiData() );
+               $this->assertEquals( [ 'data' ], $msg2->getApiData() );
 
-               $msg = new RawMessage( 'foo', array( 'baz' ) );
-               $msg2 = new ApiRawMessage( array( 'foo', 'baz' ), 'code', array( 'data' ) );
+               $msg = new RawMessage( 'foo', [ 'baz' ] );
+               $msg2 = new ApiRawMessage( [ 'foo', 'baz' ], 'code', [ 'data' ] );
                $this->compareMessages( $msg, $msg2 );
                $this->assertEquals( 'code', $msg2->getApiCode() );
-               $this->assertEquals( array( 'data' ), $msg2->getApiData() );
+               $this->assertEquals( [ 'data' ], $msg2->getApiData() );
 
                $msg = new RawMessage( 'foo' );
-               $msg2 = new ApiRawMessage( 'foo', 'code', array( 'data' ) );
+               $msg2 = new ApiRawMessage( 'foo', 'code', [ 'data' ] );
                $this->compareMessages( $msg, $msg2 );
                $this->assertEquals( 'code', $msg2->getApiCode() );
-               $this->assertEquals( array( 'data' ), $msg2->getApiData() );
+               $this->assertEquals( [ 'data' ], $msg2->getApiData() );
 
-               $msg2->setApiCode( 'code', array( 'data' ) );
+               $msg2->setApiCode( 'code', [ 'data' ] );
                $this->assertEquals( 'code', $msg2->getApiCode() );
-               $this->assertEquals( array( 'data' ), $msg2->getApiData() );
+               $this->assertEquals( [ 'data' ], $msg2->getApiData() );
                $msg2->setApiCode( null );
                $this->assertEquals( 'foo', $msg2->getApiCode() );
-               $this->assertEquals( array( 'data' ), $msg2->getApiData() );
-               $msg2->setApiData( array( 'data2' ) );
-               $this->assertEquals( array( 'data2' ), $msg2->getApiData() );
+               $this->assertEquals( [ 'data' ], $msg2->getApiData() );
+               $msg2->setApiData( [ 'data2' ] );
+               $this->assertEquals( [ 'data2' ], $msg2->getApiData() );
        }
 
        /**