Merge commit 'f6d65'

# Conflicts:
#	skins/ArchLinux/ArchLinux.php

1 files changed, 53 insertions, 0 deletions

diff --git a/tests/phpunit/includes/logging/LogFormatterTest.php b/tests/phpunit/includes/logging/LogFormatterTest.php
index 6210d098..515990e6 100644
--- a/tests/phpunit/includes/logging/LogFormatterTest.php
+++ b/tests/phpunit/includes/logging/LogFormatterTest.php
@@ -239,4 +239,57 @@ class LogFormatterTest extends MediaWikiLangTestCase {
 
 		$this->assertEquals( $comment, $formatter->getComment() );
 	}
+
+	/**
+	 * @dataProvider provideApiParamFormatting
+	 * @covers LogFormatter::formatParametersForApi
+	 * @covers LogFormatter::formatParameterValueForApi
+	 */
+	public function testApiParamFormatting( $key, $value, $expected ) {
+		$entry = $this->newLogEntry( 'param', array( $key => $value ) );
+		$formatter = LogFormatter::newFromEntry( $entry );
+		$formatter->setContext( $this->context );
+
+		ApiResult::setIndexedTagName( $expected, 'param' );
+		ApiResult::setArrayType( $expected, 'assoc' );
+
+		$this->assertEquals( $expected, $formatter->formatParametersForApi() );
+	}
+
+	public static function provideApiParamFormatting() {
+		return array(
+			array( 0, 'value', array( 'value' ) ),
+			array( 'named', 'value', array( 'named' => 'value' ) ),
+			array( '::key', 'value', array( 'key' => 'value' ) ),
+			array( '4::key', 'value', array( 'key' => 'value' ) ),
+			array( '4:raw:key', 'value', array( 'key' => 'value' ) ),
+			array( '4:plain:key', 'value', array( 'key' => 'value' ) ),
+			array( '4:bool:key', '1', array( 'key' => true ) ),
+			array( '4:bool:key', '0', array( 'key' => false ) ),
+			array( '4:number:key', '123', array( 'key' => 123 ) ),
+			array( '4:number:key', '123.5', array( 'key' => 123.5 ) ),
+			array( '4:array:key', array(), array( 'key' => array( ApiResult::META_TYPE => 'array' ) ) ),
+			array( '4:assoc:key', array(), array( 'key' => array( ApiResult::META_TYPE => 'assoc' ) ) ),
+			array( '4:kvp:key', array(), array( 'key' => array( ApiResult::META_TYPE => 'kvp' ) ) ),
+			array( '4:timestamp:key', '20150102030405', array( 'key' => '2015-01-02T03:04:05Z' ) ),
+			array( '4:msg:key', 'parentheses', array(
+				'key_key' => 'parentheses',
+				'key_text' => wfMessage( 'parentheses' )->text(),
+			) ),
+			array( '4:msg-content:key', 'parentheses', array(
+				'key_key' => 'parentheses',
+				'key_text' => wfMessage( 'parentheses' )->inContentLanguage()->text(),
+			) ),
+			array( '4:title:key', 'project:foo', array(
+				'key_ns' => NS_PROJECT,
+				'key_title' => Title::newFromText( 'project:foo' )->getFullText(),
+			) ),
+			array( '4:title-link:key', 'project:foo', array(
+				'key_ns' => NS_PROJECT,
+				'key_title' => Title::newFromText( 'project:foo' )->getFullText(),
+			) ),
+			array( '4:user:key', 'foo', array( 'key' => 'Foo' ) ),
+			array( '4:user-link:key', 'foo', array( 'key' => 'Foo' ) ),
+		);
+	}
 }