From f6d65e533c62f6deb21342d4901ece24497b433e Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Thu, 4 Jun 2015 07:31:04 +0200
Subject: Update to MediaWiki 1.25.1

---
 .../includes/api/format/ApiFormatJsonTest.php      | 106 +++++++++++++++++++--
 1 file changed, 97 insertions(+), 9 deletions(-)

(limited to 'tests/phpunit/includes/api/format/ApiFormatJsonTest.php')

diff --git a/tests/phpunit/includes/api/format/ApiFormatJsonTest.php b/tests/phpunit/includes/api/format/ApiFormatJsonTest.php
index fc1f9021..3dfcaf0f 100644
--- a/tests/phpunit/includes/api/format/ApiFormatJsonTest.php
+++ b/tests/phpunit/includes/api/format/ApiFormatJsonTest.php
@@ -2,21 +2,109 @@
 
 /**
  * @group API
- * @group Database
- * @group medium
  * @covers ApiFormatJson
  */
 class ApiFormatJsonTest extends ApiFormatTestBase {
 
-	public function testValidSyntax( ) {
-		$data = $this->apiRequest( 'json', array( 'action' => 'query', 'meta' => 'siteinfo' ) );
+	protected $printerName = 'json';
 
-		$this->assertInternalType( 'array', json_decode( $data, true ) );
-		$this->assertGreaterThan( 0, count( (array)$data ) );
+	private static function addFormatVersion( $format, $arr ) {
+		foreach ( $arr as &$p ) {
+			if ( !isset( $p[2] ) ) {
+				$p[2] = array( 'formatversion' => $format );
+			} else {
+				$p[2]['formatversion'] = $format;
+			}
+		}
+		return $arr;
 	}
 
-	public function testJsonpInjection( ) {
-		$data = $this->apiRequest( 'json', array( 'action' => 'query', 'meta' => 'siteinfo', 'callback' => 'myCallback' ) );
-		$this->assertEquals( '/**/myCallback(', substr( $data, 0, 15 ) );
+	public static function provideGeneralEncoding() {
+		return array_merge(
+			self::addFormatVersion( 1, array(
+				// Basic types
+				array( array( null ), '[null]' ),
+				array( array( true ), '[""]' ),
+				array( array( false ), '[]' ),
+				array( array( true, ApiResult::META_BC_BOOLS => array( 0 ) ), '[true]' ),
+				array( array( false, ApiResult::META_BC_BOOLS => array( 0 ) ), '[false]' ),
+				array( array( 42 ), '[42]' ),
+				array( array( 42.5 ), '[42.5]' ),
+				array( array( 1e42 ), '[1.0e+42]' ),
+				array( array( 'foo' ), '["foo"]' ),
+				array( array( 'fóo' ), '["f\u00f3o"]' ),
+				array( array( 'fóo' ), '["fóo"]', array( 'utf8' => 1 ) ),
+
+				// Arrays and objects
+				array( array( array() ), '[[]]' ),
+				array( array( array( 1 ) ), '[[1]]' ),
+				array( array( array( 'x' => 1 ) ), '[{"x":1}]' ),
+				array( array( array( 2 => 1 ) ), '[{"2":1}]' ),
+				array( array( (object)array() ), '[{}]' ),
+				array( array( array( 1, ApiResult::META_TYPE => 'assoc' ) ), '[{"0":1}]' ),
+				array( array( array( 'x' => 1, ApiResult::META_TYPE => 'array' ) ), '[[1]]' ),
+				array( array( array( 'x' => 1, ApiResult::META_TYPE => 'kvp' ) ), '[{"x":1}]' ),
+				array( array( array( 'x' => 1, ApiResult::META_TYPE => 'BCkvp', ApiResult::META_KVP_KEY_NAME => 'key' ) ),
+					'[[{"key":"x","*":1}]]' ),
+				array( array( array( 'x' => 1, ApiResult::META_TYPE => 'BCarray' ) ), '[{"x":1}]' ),
+				array( array( array( 'a', 'b', ApiResult::META_TYPE => 'BCassoc' ) ), '[["a","b"]]' ),
+
+				// Content
+				array( array( 'content' => 'foo', ApiResult::META_CONTENT => 'content' ),
+					'{"*":"foo"}' ),
+
+				// BC Subelements
+				array( array( 'foo' => 'foo', ApiResult::META_BC_SUBELEMENTS => array( 'foo' ) ),
+					'{"foo":{"*":"foo"}}' ),
+
+				// Callbacks
+				array( array( 1 ), '/**/myCallback([1])', array( 'callback' => 'myCallback' ) ),
+
+				// Cross-domain mangling
+				array( array( '< Cross-Domain-Policy >' ), '["\u003C Cross-Domain-Policy \u003E"]' ),
+			) ),
+			self::addFormatVersion( 2, array(
+				// Basic types
+				array( array( null ), '[null]' ),
+				array( array( true ), '[true]' ),
+				array( array( false ), '[false]' ),
+				array( array( true, ApiResult::META_BC_BOOLS => array( 0 ) ), '[true]' ),
+				array( array( false, ApiResult::META_BC_BOOLS => array( 0 ) ), '[false]' ),
+				array( array( 42 ), '[42]' ),
+				array( array( 42.5 ), '[42.5]' ),
+				array( array( 1e42 ), '[1.0e+42]' ),
+				array( array( 'foo' ), '["foo"]' ),
+				array( array( 'fóo' ), '["fóo"]' ),
+				array( array( 'fóo' ), '["f\u00f3o"]', array( 'ascii' => 1 ) ),
+
+				// Arrays and objects
+				array( array( array() ), '[[]]' ),
+				array( array( array( 'x' => 1 ) ), '[{"x":1}]' ),
+				array( array( array( 2 => 1 ) ), '[{"2":1}]' ),
+				array( array( (object)array() ), '[{}]' ),
+				array( array( array( 1, ApiResult::META_TYPE => 'assoc' ) ), '[{"0":1}]' ),
+				array( array( array( 'x' => 1, ApiResult::META_TYPE => 'array' ) ), '[[1]]' ),
+				array( array( array( 'x' => 1, ApiResult::META_TYPE => 'kvp' ) ), '[{"x":1}]' ),
+				array( array( array( 'x' => 1, ApiResult::META_TYPE => 'BCkvp', ApiResult::META_KVP_KEY_NAME => 'key' ) ),
+					'[{"x":1}]' ),
+				array( array( array( 'x' => 1, ApiResult::META_TYPE => 'BCarray' ) ), '[[1]]' ),
+				array( array( array( 'a', 'b', ApiResult::META_TYPE => 'BCassoc' ) ), '[{"0":"a","1":"b"}]' ),
+
+				// Content
+				array( array( 'content' => 'foo', ApiResult::META_CONTENT => 'content' ),
+					'{"content":"foo"}' ),
+
+				// BC Subelements
+				array( array( 'foo' => 'foo', ApiResult::META_BC_SUBELEMENTS => array( 'foo' ) ),
+					'{"foo":"foo"}' ),
+
+				// Callbacks
+				array( array( 1 ), '/**/myCallback([1])', array( 'callback' => 'myCallback' ) ),
+
+				// Cross-domain mangling
+				array( array( '< Cross-Domain-Policy >' ), '["\u003C Cross-Domain-Policy \u003E"]' ),
+			) )
+		);
 	}
+
 }
-- 
cgit v1.2.2