Merge commit 'fa89acd'

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

1 files changed, 118 insertions, 0 deletions

diff --git a/tests/phpunit/includes/logging/PatrolLogFormatterTest.php b/tests/phpunit/includes/logging/PatrolLogFormatterTest.php
new file mode 100644
index 00000000..6e1c5efc
--- /dev/null
+++ b/tests/phpunit/includes/logging/PatrolLogFormatterTest.php
@@ -0,0 +1,118 @@
+<?php
+
+class PatrolLogFormatterTest extends LogFormatterTestCase {
+
+	/**
+	 * Provide different rows from the logging table to test
+	 * for backward compatibility.
+	 * Do not change the existing data, just add a new database row
+	 */
+	public static function providePatrolLogDatabaseRows() {
+		return array(
+			// Current format
+			array(
+				array(
+					'type' => 'patrol',
+					'action' => 'patrol',
+					'comment' => 'patrol comment',
+					'namespace' => NS_MAIN,
+					'title' => 'Page',
+					'params' => array(
+						'4::curid' => 2,
+						'5::previd' => 1,
+						'6::auto' => 0,
+					),
+				),
+				array(
+					'text' => 'User marked revision 2 of page Page patrolled',
+					'api' => array(
+						'curid' => 2,
+						'previd' => 1,
+						'auto' => false,
+					),
+				),
+			),
+
+			// Current format - autopatrol
+			array(
+				array(
+					'type' => 'patrol',
+					'action' => 'patrol',
+					'comment' => 'patrol comment',
+					'namespace' => NS_MAIN,
+					'title' => 'Page',
+					'params' => array(
+						'4::curid' => 2,
+						'5::previd' => 1,
+						'6::auto' => 1,
+					),
+				),
+				array(
+					'text' => 'User automatically marked revision 2 of page Page patrolled',
+					'api' => array(
+						'curid' => 2,
+						'previd' => 1,
+						'auto' => true,
+					),
+				),
+			),
+
+			// Legacy format
+			array(
+				array(
+					'type' => 'patrol',
+					'action' => 'patrol',
+					'comment' => 'patrol comment',
+					'namespace' => NS_MAIN,
+					'title' => 'Page',
+					'params' => array(
+						'2',
+						'1',
+						'0',
+					),
+				),
+				array(
+					'legacy' => true,
+					'text' => 'User marked revision 2 of page Page patrolled',
+					'api' => array(
+						'curid' => 2,
+						'previd' => 1,
+						'auto' => false,
+					),
+				),
+			),
+
+			// Legacy format - autopatrol
+			array(
+				array(
+					'type' => 'patrol',
+					'action' => 'patrol',
+					'comment' => 'patrol comment',
+					'namespace' => NS_MAIN,
+					'title' => 'Page',
+					'params' => array(
+						'2',
+						'1',
+						'1',
+					),
+				),
+				array(
+					'legacy' => true,
+					'text' => 'User automatically marked revision 2 of page Page patrolled',
+					'api' => array(
+						'curid' => 2,
+						'previd' => 1,
+						'auto' => true,
+					),
+				),
+			),
+		);
+	}
+
+	/**
+	 * @dataProvider providePatrolLogDatabaseRows
+	 */
+	public function testPatrolLogDatabaseRows( $row, $extra ) {
+		$this->doTestLogFormatter( $row, $extra );
+	}
+}