Merge "jquery.accessKeyLabel: make modifier info public"

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

diff --git a/tests/phpunit/includes/api/ApiResultTest.php b/tests/phpunit/includes/api/ApiResultTest.php
index 2f31677..9dbde3d 100644 (file)
--- a/tests/phpunit/includes/api/ApiResultTest.php
+++ b/tests/phpunit/includes/api/ApiResultTest.php
@@ -458,6 +458,13 @@ class ApiResultTest extends MediaWikiTestCase {
                        );
                }
 
+               // Add two values and some metadata, but ensure metadata is not counted
+               $result = new ApiResult( 100 );
+               $obj = array( 'attr' => '12345' );
+               ApiResult::setContentValue( $obj, 'content', '1234567890' );
+               $this->assertTrue( $result->addValue( null, 'foo', $obj ) );
+               $this->assertSame( 15, $result->getSize() );
+
                $result = new ApiResult( 10 );
                $formatter = new ApiErrorFormatter( $result, Language::factory( 'en' ), 'none', false );
                $result->setErrorFormatter( $formatter );
@@ -973,7 +980,12 @@ class ApiResultTest extends MediaWikiTestCase {
                                        'kvpmerge' => array(
                                                $kvp( 'name', 'x', 'value', 'a' ),
                                                $kvp( 'name', 'y', 'value', array( 'b', ApiResult::META_TYPE => 'array' ) ),
-                                               array( 'name' => 'z', 'c' => 'd', ApiResult::META_TYPE => 'assoc', ApiResult::META_PRESERVE_KEYS => array( 'name' ) ),
+                                               array(
+                                                       'name' => 'z',
+                                                       'c' => 'd',
+                                                       ApiResult::META_TYPE => 'assoc',
+                                                       ApiResult::META_PRESERVE_KEYS => array( 'name' )
+                                               ),
                                                ApiResult::META_TYPE => 'array',
                                                ApiResult::META_KVP_MERGE => true,
                                        ),
@@ -1011,7 +1023,11 @@ class ApiResultTest extends MediaWikiTestCase {
                                        'kvpmerge' => array(
                                                $kvp( 'name', 'x', '*', 'a' ),
                                                $kvp( 'name', 'y', '*', array( 'b', ApiResult::META_TYPE => 'array' ) ),
-                                               array( 'name' => 'z', 'c' => 'd', ApiResult::META_TYPE => 'assoc', ApiResult::META_PRESERVE_KEYS => array( 'name' ) ),
+                                               array(
+                                                       'name' => 'z',
+                                                       'c' => 'd',
+                                                       ApiResult::META_TYPE => 'assoc',
+                                                       ApiResult::META_PRESERVE_KEYS => array( 'name' ) ),
                                                ApiResult::META_TYPE => 'array',
                                                ApiResult::META_KVP_MERGE => true,
                                        ),
@@ -1053,7 +1069,12 @@ class ApiResultTest extends MediaWikiTestCase {
                                        'kvpmerge' => array(
                                                (object)$kvp( 'name', 'x', 'value', 'a' ),
                                                (object)$kvp( 'name', 'y', 'value', array( 'b', ApiResult::META_TYPE => 'array' ) ),
-                                               (object)array( 'name' => 'z', 'c' => 'd', ApiResult::META_TYPE => 'assoc', ApiResult::META_PRESERVE_KEYS => array( 'name' ) ),
+                                               (object)array(
+                                                       'name' => 'z',
+                                                       'c' => 'd',
+                                                       ApiResult::META_TYPE => 'assoc',
+                                                       ApiResult::META_PRESERVE_KEYS => array( 'name' )
+                                               ),
                                                ApiResult::META_TYPE => 'array',
                                                ApiResult::META_KVP_MERGE => true,
                                        ),