From d9022f63880ce039446fba8364f68e656b7bf4cb Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Thu, 3 May 2012 13:01:35 +0200
Subject: Update to MediaWiki 1.19.0

---
 .../includes/specials/QueryAllSpecialPagesTest.php |  79 ++++++++++++
 .../includes/specials/SpecialRecentchanges.php     | 134 ---------------------
 .../includes/specials/SpecialRecentchangesTest.php | 132 ++++++++++++++++++++
 .../includes/specials/SpecialSearchTest.php        | 108 +++++++++++++++++
 4 files changed, 319 insertions(+), 134 deletions(-)
 create mode 100644 tests/phpunit/includes/specials/QueryAllSpecialPagesTest.php
 delete mode 100644 tests/phpunit/includes/specials/SpecialRecentchanges.php
 create mode 100644 tests/phpunit/includes/specials/SpecialRecentchangesTest.php
 create mode 100644 tests/phpunit/includes/specials/SpecialSearchTest.php

(limited to 'tests/phpunit/includes/specials')

diff --git a/tests/phpunit/includes/specials/QueryAllSpecialPagesTest.php b/tests/phpunit/includes/specials/QueryAllSpecialPagesTest.php
new file mode 100644
index 00000000..a33c7b68
--- /dev/null
+++ b/tests/phpunit/includes/specials/QueryAllSpecialPagesTest.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * Test class to run the query of most of all our special pages
+ *
+ * Copyright © 2011, Antoine Musso
+ *
+ * @author Antoine Musso
+ * @group Database
+ */
+
+if ( !defined( 'MEDIAWIKI' ) ) {
+	die( 1 );
+}
+
+global $IP;
+require_once "$IP/includes/QueryPage.php"; // Needed to populate $wgQueryPages
+
+class QueryAllSpecialPagesTest extends MediaWikiTestCase {
+
+	/** List query pages that can not be tested automatically */
+	protected $manualTest = array(
+		'LinkSearchPage'
+	);
+
+	/**
+	 * Pages whose query use the same DB table more than once.
+	 * This is used to skip testing those pages when run against a MySQL backend
+	 * which does not support reopening a temporary table. See upstream bug:
+	 * http://bugs.mysql.com/bug.php?id=10327
+	 */
+	protected $reopensTempTable = array(
+		'BrokenRedirects',
+	);
+
+	/**
+	 * Initialize all query page objects
+	 */
+	function __construct() {
+		parent::__construct();
+
+		global $wgQueryPages;
+		foreach( $wgQueryPages as $page ) {
+			$class = $page[0];
+			if( ! in_array( $class, $this->manualTest ) ) {
+				$this->queryPages[$class] = new $class;
+			}
+		}
+	}
+
+	/**
+	 * Test SQL for each of our QueryPages objects
+	 * @group Database
+	 */
+	function testQuerypageSqlQuery() {
+		global $wgDBtype;
+
+		foreach( $this->queryPages as $page ) {
+
+			// With MySQL, skips special pages reopening a temporary table
+			// See http://bugs.mysql.com/bug.php?id=10327
+			if(
+				$wgDBtype === 'mysql'
+				&& in_array( $page->getName(), $this->reopensTempTable )
+			) {
+					$this->markTestSkipped( "SQL query for page {$page->getName()} can not be tested on MySQL backend (it reopens a temporary table)" );
+					continue;
+				}
+
+			$msg = "SQL query for page {$page->getName()} should give a result wrapper object" ;
+
+			$result = $page->reallyDoQuery( 50 );
+			if( $result instanceof ResultWrapper ) {
+				$this->assertTrue( true, $msg );
+			} else {
+				$this->assertFalse( false, $msg );
+			}
+		}
+	}
+}
diff --git a/tests/phpunit/includes/specials/SpecialRecentchanges.php b/tests/phpunit/includes/specials/SpecialRecentchanges.php
deleted file mode 100644
index a98e7c1a..00000000
--- a/tests/phpunit/includes/specials/SpecialRecentchanges.php
+++ /dev/null
@@ -1,134 +0,0 @@
-<?php
-/**
- * Test class for SpecialRecentchanges class
- *
- * Copyright © 2011, Ashar Voultoiz
- *
- * @author Ashar Voultoiz
- */
-class SpecialRecentchangesTest extends MediaWikiTestCase {
-
-	/**
-	 * @var SpecialRecentChanges
-	 */
-	protected $rc;
-
-	function setUp() {
-	}
-
-	/** helper to test SpecialRecentchanges::buildMainQueryConds() */
-	private function assertConditions( $expected, $requestOptions = null, $message = '' ) {
-		global $wgRequest;
-		$savedGlobal = $wgRequest;
-
-		# Initialize a WebRequest object ...
-		$wgRequest = new FauxRequest( $requestOptions );
-		# ... then setup the rc object (which use wgRequest internally)
-		$this->rc = new SpecialRecentChanges();
-		$formOptions = $this->rc->setup( null );
-
-		# Filter out rc_timestamp conditions which depends on the test runtime
-		# This condition is not needed as of march 2, 2011 -- hashar
-		# @todo FIXME: Find a way to generate the correct rc_timestamp
-		$queryConditions = array_filter(
-			$this->rc->buildMainQueryConds( $formOptions ),
-			'SpecialRecentchangesTest::filterOutRcTimestampCondition'
-		);
-
-		$this->assertEquals(
-			$expected,
-			$queryConditions,
-			$message
-		);
-
-		$wgRequest = $savedGlobal;
-	}
-
-	/** return false if condition begin with 'rc_timestamp ' */
-	private static function filterOutRcTimestampCondition( $var ) {
-		return (false === strpos( $var, 'rc_timestamp ' ));
-
-	}
-
-	public function testRcNsFilter() {
-		$this->assertConditions(
-			array( # expected
-				'rc_bot' => 0,
-				#0 => "rc_timestamp >= '20110223000000'",
-				1 => "rc_namespace = '0'",
-			),
-			array(
-				'namespace' => NS_MAIN,
-			),
-			"rc conditions with no options (aka default setting)"
-		);
-	}
-
-	public function testRcNsFilterInversion() {
-		$this->assertConditions(
-			array( # expected
-				#0 => "rc_timestamp >= '20110223000000'",
-				'rc_bot' => 0,
-				1 => sprintf( "rc_namespace != '%s'", NS_MAIN ),
-			),
-			array(
-				'namespace' => NS_MAIN,
-				'invert' => 1,
-			),
-		  "rc conditions with namespace inverted"
-		);
-	}
-
-	/**
-	 * @bug 2429
-	 * @dataProvider provideNamespacesAssociations
-	 */
-	public function testRcNsFilterAssociation( $ns1, $ns2 ) {
-		$this->assertConditions(
-			array( # expected
-				#0 => "rc_timestamp >= '20110223000000'",
-				'rc_bot' => 0,
-				1 => sprintf( "(rc_namespace = '%s' OR rc_namespace = '%s')", $ns1, $ns2 ),
-			),
-			array(
-				'namespace' => $ns1,
-				'associated' => 1,
-			),
-		  "rc conditions with namespace inverted"
-		);
-	}
-
-	/**
-	 * @bug 2429
-	 * @dataProvider provideNamespacesAssociations
-	 */
-	public function testRcNsFilterAssociationWithInversion( $ns1, $ns2 ) {
-		$this->assertConditions(
-			array( # expected
-				#0 => "rc_timestamp >= '20110223000000'",
-				'rc_bot' => 0,
-				1 => sprintf( "(rc_namespace != '%s' AND rc_namespace != '%s')", $ns1, $ns2 ),
-			),
-			array(
-				'namespace'  => $ns1,
-				'associated' => 1,
-				'invert'     => 1,
-			),
-		  "rc conditions with namespace inverted"
-		);
-	}
-
-	/**
-	 * Provides associated namespaces to test recent changes
-	 * namespaces association filtering.
-	 */
-	public function provideNamespacesAssociations() {
-		return array( # (NS => Associated_NS)
-			array( NS_MAIN, NS_TALK),
-			array( NS_TALK, NS_MAIN),
-		);
-	}
-
-}
-
-
diff --git a/tests/phpunit/includes/specials/SpecialRecentchangesTest.php b/tests/phpunit/includes/specials/SpecialRecentchangesTest.php
new file mode 100644
index 00000000..2e4f4b09
--- /dev/null
+++ b/tests/phpunit/includes/specials/SpecialRecentchangesTest.php
@@ -0,0 +1,132 @@
+<?php
+/**
+ * Test class for SpecialRecentchanges class
+ *
+ * Copyright © 2011, Antoine Musso
+ *
+ * @author Antoine Musso
+ * @group Database
+ */
+class SpecialRecentchangesTest extends MediaWikiTestCase {
+
+	/**
+	 * @var SpecialRecentChanges
+	 */
+	protected $rc;
+
+	function setUp() {
+	}
+
+	/** helper to test SpecialRecentchanges::buildMainQueryConds() */
+	private function assertConditions( $expected, $requestOptions = null, $message = '' ) {
+		$context = new RequestContext;
+		$context->setRequest( new FauxRequest( $requestOptions ) );
+
+		# setup the rc object
+		$this->rc = new SpecialRecentChanges();
+		$this->rc->setContext( $context );
+		$formOptions = $this->rc->setup( null );
+
+		# Filter out rc_timestamp conditions which depends on the test runtime
+		# This condition is not needed as of march 2, 2011 -- hashar
+		# @todo FIXME: Find a way to generate the correct rc_timestamp
+		$queryConditions = array_filter(
+			$this->rc->buildMainQueryConds( $formOptions ),
+			'SpecialRecentchangesTest::filterOutRcTimestampCondition'
+		);
+
+		$this->assertEquals(
+			$expected,
+			$queryConditions,
+			$message
+		);
+	}
+
+	/** return false if condition begin with 'rc_timestamp ' */
+	private static function filterOutRcTimestampCondition( $var ) {
+		return (false === strpos( $var, 'rc_timestamp ' ));
+
+	}
+
+	public function testRcNsFilter() {
+		$this->assertConditions(
+			array( # expected
+				'rc_bot' => 0,
+				#0 => "rc_timestamp >= '20110223000000'",
+				1 => "rc_namespace = '0'",
+			),
+			array(
+				'namespace' => NS_MAIN,
+			),
+			"rc conditions with no options (aka default setting)"
+		);
+	}
+
+	public function testRcNsFilterInversion() {
+		$this->assertConditions(
+			array( # expected
+				#0 => "rc_timestamp >= '20110223000000'",
+				'rc_bot' => 0,
+				1 => sprintf( "rc_namespace != '%s'", NS_MAIN ),
+			),
+			array(
+				'namespace' => NS_MAIN,
+				'invert' => 1,
+			),
+		  "rc conditions with namespace inverted"
+		);
+	}
+
+	/**
+	 * @bug 2429
+	 * @dataProvider provideNamespacesAssociations
+	 */
+	public function testRcNsFilterAssociation( $ns1, $ns2 ) {
+		$this->assertConditions(
+			array( # expected
+				#0 => "rc_timestamp >= '20110223000000'",
+				'rc_bot' => 0,
+				1 => sprintf( "(rc_namespace = '%s' OR rc_namespace = '%s')", $ns1, $ns2 ),
+			),
+			array(
+				'namespace' => $ns1,
+				'associated' => 1,
+			),
+		  "rc conditions with namespace inverted"
+		);
+	}
+
+	/**
+	 * @bug 2429
+	 * @dataProvider provideNamespacesAssociations
+	 */
+	public function testRcNsFilterAssociationWithInversion( $ns1, $ns2 ) {
+		$this->assertConditions(
+			array( # expected
+				#0 => "rc_timestamp >= '20110223000000'",
+				'rc_bot' => 0,
+				1 => sprintf( "(rc_namespace != '%s' AND rc_namespace != '%s')", $ns1, $ns2 ),
+			),
+			array(
+				'namespace'  => $ns1,
+				'associated' => 1,
+				'invert'     => 1,
+			),
+		  "rc conditions with namespace inverted"
+		);
+	}
+
+	/**
+	 * Provides associated namespaces to test recent changes
+	 * namespaces association filtering.
+	 */
+	public function provideNamespacesAssociations() {
+		return array( # (NS => Associated_NS)
+			array( NS_MAIN, NS_TALK),
+			array( NS_TALK, NS_MAIN),
+		);
+	}
+
+}
+
+
diff --git a/tests/phpunit/includes/specials/SpecialSearchTest.php b/tests/phpunit/includes/specials/SpecialSearchTest.php
new file mode 100644
index 00000000..ea9d5533
--- /dev/null
+++ b/tests/phpunit/includes/specials/SpecialSearchTest.php
@@ -0,0 +1,108 @@
+<?php
+/**
+ * Test class for SpecialSearch class
+ * Copyright © 2012, Antoine Musso
+ *
+ * @author Antoine Musso
+ * @group Database
+ */
+
+class SpecialSearchTest extends MediaWikiTestCase {
+	private $search;
+
+	function setUp() { }
+	function tearDown() { }
+
+	/**
+	 * @covers SpecialSearch::load
+	 * @dataProvider provideSearchOptionsTests
+	 * @param $requested Array Request parameters. For example array( 'ns5' => true, 'ns6' => true). NULL to use default options.
+	 * @param $userOptions Array User options to test with. For example array('searchNs5' => 1 );. NULL to use default options.
+	 * @param $expectedProfile An expected search profile name
+	 * @param $expectedNs Array Expected namespaces
+	 */
+	function testProfileAndNamespaceLoading(
+		$requested, $userOptions, $expectedProfile, $expectedNS,
+		$message = 'Profile name and namespaces mismatches!'
+	) {
+		$context = new RequestContext;
+		$context->setUser(
+			$this->newUserWithSearchNS( $userOptions )
+		);
+		/*
+		$context->setRequest( new FauxRequest( array(
+			'ns5'=>true,
+			'ns6'=>true,
+		) ));
+		 */
+		$context->setRequest( new FauxRequest( $requested ));
+		$search = new SpecialSearch();
+		$search->setContext( $context );
+		$search->load();
+
+		/**
+		 * Verify profile name and namespace in the same assertion to make
+		 * sure we will be able to fully compare the above code. PHPUnit stop
+		 * after an assertion fail.
+		 */
+		$this->assertEquals(
+			array( /** Expected: */
+				'ProfileName' => $expectedProfile,
+				'Namespaces'  => $expectedNS,
+			)
+			, array( /** Actual: */
+				'ProfileName' => $search->getProfile(),
+				'Namespaces'  => $search->getNamespaces(),
+			)
+			, $message
+		);
+
+	}
+
+	function provideSearchOptionsTests() {
+		$defaultNS = SearchEngine::defaultNamespaces();
+		$EMPTY_REQUEST = array();
+		$NO_USER_PREF  = null;
+
+		return array(
+			/**
+			 * Parameters:
+			 * 	<Web Request>, <User options>
+			 * Followed by expected values:
+			 * 	<ProfileName>, <NSList>
+			 * Then an optional message.
+			 */
+			array(
+				$EMPTY_REQUEST, $NO_USER_PREF,
+				'default', $defaultNS,
+				'Bug 33270: No request nor user preferences should give default profile'
+			),
+			array(
+				array( 'ns5' => 1 ), $NO_USER_PREF,
+				'advanced', array(  5),
+				'Web request with specific NS should override user preference'
+			),
+			array(
+				$EMPTY_REQUEST, array( 'searchNs2' => 1, 'searchNs14' => 1 ),
+				'advanced', array( 2, 14 ),
+				'Bug 33583: search with no option should honor User search preferences'
+			),
+		);
+	}
+
+	/**
+	 * Helper to create a new User object with given options
+	 * User remains anonymous though
+	 */
+	function newUserWithSearchNS( $opt = null ) {
+		$u = User::newFromId(0);
+		if( $opt === null ) {
+			return $u;
+		}
+		foreach($opt as $name => $value) {
+			$u->setOption( $name, $value );
+		}
+		return $u;
+	}
+}
+
-- 
cgit v1.2.2