Merge commit 'fa89acd'

# Conflicts:
#	.gitignore
#	extensions/ArchInterWiki.sql

1 files changed, 65 insertions, 0 deletions

diff --git a/tests/phpunit/includes/logging/LogFormatterTestCase.php b/tests/phpunit/includes/logging/LogFormatterTestCase.php
new file mode 100644
index 00000000..e88452b7
--- /dev/null
+++ b/tests/phpunit/includes/logging/LogFormatterTestCase.php
@@ -0,0 +1,65 @@
+<?php
+
+/**
+ * @since 1.26
+ */
+abstract class LogFormatterTestCase extends MediaWikiLangTestCase {
+
+	public function doTestLogFormatter( $row, $extra ) {
+		RequestContext::resetMain();
+		$row = $this->expandDatabaseRow( $row, $this->isLegacy( $extra ) );
+
+		$formatter = LogFormatter::newFromRow( $row );
+
+		$this->assertEquals(
+			$extra['text'],
+			self::removeSomeHtml( $formatter->getActionText() ),
+			'Action text is equal to expected text'
+		);
+
+		$this->assertSame( // ensure types and array key order
+			$extra['api'],
+			self::removeApiMetaData( $formatter->formatParametersForApi() ),
+			'Api log params is equal to expected array'
+		);
+	}
+
+	protected function isLegacy( $extra ) {
+		return isset( $extra['legacy'] ) && $extra['legacy'];
+	}
+
+	protected function expandDatabaseRow( $data, $legacy ) {
+		return array(
+			// no log_id because no insert in database
+			'log_type' => $data['type'],
+			'log_action' => $data['action'],
+			'log_timestamp' => isset( $data['timestamp'] ) ? $data['timestamp'] : wfTimestampNow(),
+			'log_user' => isset( $data['user'] ) ? $data['user'] : 0,
+			'log_user_text' => isset( $data['user_text'] ) ? $data['user_text'] : 'User',
+			'log_namespace' => isset( $data['namespace'] ) ? $data['namespace'] : NS_MAIN,
+			'log_title' => isset( $data['title'] ) ? $data['title'] : 'Main_Page',
+			'log_page' => isset( $data['page'] ) ? $data['page'] : 0,
+			'log_comment' => isset( $data['comment'] ) ? $data['comment'] : '',
+			'log_params' => $legacy
+				? LogPage::makeParamBlob( $data['params'] )
+				: LogEntryBase::makeParamBlob( $data['params'] ),
+			'log_deleted' => isset( $data['deleted'] ) ? $data['deleted'] : 0,
+		);
+	}
+
+	private static function removeSomeHtml( $html ) {
+		$html = str_replace( '&quot;', '"', $html );
+		return trim( preg_replace( '/<(a|span)[^>]*>([^<]*)<\/\1>/', '$2', $html ) );
+	}
+
+	private static function removeApiMetaData( $val ) {
+		if ( is_array( $val ) ) {
+			unset( $val['_element'] );
+			unset( $val['_type'] );
+			foreach ( $val as $key => $value ) {
+				$val[$key] = self::removeApiMetaData( $value );
+			}
+		}
+		return $val;
+	}
+}