1 files changed, 51 insertions, 38 deletions

diff --git a/tests/phpunit/includes/search/SearchEngineTest.php b/tests/phpunit/includes/search/SearchEngineTest.php
index 957907c7..87067038 100644
--- a/tests/phpunit/includes/search/SearchEngineTest.php
+++ b/tests/phpunit/includes/search/SearchEngineTest.php
@@ -1,31 +1,27 @@
 <?php
 
 /**
- * This class is not directly tested. Instead it is extended by SearchDbTest.
  * @group Search
  * @group Database
  */
-class SearchEngineTest extends MediaWikiTestCase {
+class SearchEngineTest extends MediaWikiLangTestCase {
 	protected $search, $pageList;
 
-	function tearDown() {
-		unset( $this->search );
-	}
-
 	/**
 	 * Checks for database type & version.
 	 * Will skip current test if DB does not support search.
 	 */
-	function setUp() {
+	protected function setUp() {
 		parent::setUp();
+
 		// Search tests require MySQL or SQLite with FTS
 		# Get database type and version
 		$dbType = $this->db->getType();
 		$dbSupported =
-			($dbType === 'mysql')
-			|| ( $dbType === 'sqlite' && $this->db->getFulltextSearchModule() == 'FTS3' );
+			( $dbType === 'mysql' )
+				|| ( $dbType === 'sqlite' && $this->db->getFulltextSearchModule() == 'FTS3' );
 
-		if( !$dbSupported ) {
+		if ( !$dbSupported ) {
 			$this->markTestSkipped( "MySQL or SQLite with FTS3 only" );
 		}
 
@@ -33,6 +29,12 @@ class SearchEngineTest extends MediaWikiTestCase {
 		$this->search = new $searchType( $this->db );
 	}
 
+	protected function tearDown() {
+		unset( $this->search );
+
+		parent::tearDown();
+	}
+
 	function pageExists( $title ) {
 		return false;
 	}
@@ -41,26 +43,37 @@ class SearchEngineTest extends MediaWikiTestCase {
 		if ( $this->pageExists( 'Not_Main_Page' ) ) {
 			return;
 		}
-		$this->insertPage( "Not_Main_Page",	"This is not a main page", 0 );
-		$this->insertPage( 'Talk:Not_Main_Page',	'This is not a talk page to the main page, see [[smithee]]', 1 );
-		$this->insertPage( 'Smithee',	'A smithee is one who smiths. See also [[Alan Smithee]]', 0 );
-		$this->insertPage( 'Talk:Smithee',	'This article sucks.', 1 );
-		$this->insertPage( 'Unrelated_page',	'Nothing in this page is about the S word.', 0 );
-		$this->insertPage( 'Another_page',	'This page also is unrelated.', 0 );
-		$this->insertPage( 'Help:Help',		'Help me!', 4 );
-		$this->insertPage( 'Thppt',		'Blah blah', 0 );
-		$this->insertPage( 'Alan_Smithee',	'yum', 0 );
-		$this->insertPage( 'Pages',		'are\'food', 0 );
-		$this->insertPage( 'HalfOneUp',	'AZ', 0 );
-		$this->insertPage( 'FullOneUp',	'ＡＺ', 0 );
-		$this->insertPage( 'HalfTwoLow',	'az', 0 );
-		$this->insertPage( 'FullTwoLow',	'ａｚ', 0 );
-		$this->insertPage( 'HalfNumbers',	'1234567890', 0 );
-		$this->insertPage( 'FullNumbers',	'１２３４５６７８９０', 0 );
-		$this->insertPage( 'DomainName',	'example.com', 0 );
+
+		if ( !$this->isWikitextNS( NS_MAIN ) ) {
+			// @todo cover the case of non-wikitext content in the main namespace
+			return;
+		}
+
+		$this->insertPage( "Not_Main_Page", "This is not a main page", 0 );
+		$this->insertPage( 'Talk:Not_Main_Page', 'This is not a talk page to the main page, see [[smithee]]', 1 );
+		$this->insertPage( 'Smithee', 'A smithee is one who smiths. See also [[Alan Smithee]]', 0 );
+		$this->insertPage( 'Talk:Smithee', 'This article sucks.', 1 );
+		$this->insertPage( 'Unrelated_page', 'Nothing in this page is about the S word.', 0 );
+		$this->insertPage( 'Another_page', 'This page also is unrelated.', 0 );
+		$this->insertPage( 'Help:Help', 'Help me!', 4 );
+		$this->insertPage( 'Thppt', 'Blah blah', 0 );
+		$this->insertPage( 'Alan_Smithee', 'yum', 0 );
+		$this->insertPage( 'Pages', 'are\'food', 0 );
+		$this->insertPage( 'HalfOneUp', 'AZ', 0 );
+		$this->insertPage( 'FullOneUp', 'ＡＺ', 0 );
+		$this->insertPage( 'HalfTwoLow', 'az', 0 );
+		$this->insertPage( 'FullTwoLow', 'ａｚ', 0 );
+		$this->insertPage( 'HalfNumbers', '1234567890', 0 );
+		$this->insertPage( 'FullNumbers', '１２３４５６７８９０', 0 );
+		$this->insertPage( 'DomainName', 'example.com', 0 );
 	}
 
 	function fetchIds( $results ) {
+		if ( !$this->isWikitextNS( NS_MAIN ) ) {
+			$this->markTestIncomplete( __CLASS__ . " does no yet support non-wikitext content "
+				. "in the main namespace" );
+		}
+
 		$this->assertTrue( is_object( $results ) );
 
 		$matches = array();
@@ -74,6 +87,7 @@ class SearchEngineTest extends MediaWikiTestCase {
 		# sort them numerically so we will compare simply that we received
 		# the expected matches.
 		sort( $matches );
+
 		return $matches;
 	}
 
@@ -85,7 +99,7 @@ class SearchEngineTest extends MediaWikiTestCase {
 	 * @param $n Integer: unused
 	 */
 	function insertPage( $pageName, $text, $ns ) {
-		$title = Title::newFromText( $pageName );
+		$title = Title::newFromText( $pageName, $ns );
 
 		$user = User::newFromName( 'WikiSysop' );
 		$comment = 'Search Test';
@@ -94,14 +108,14 @@ class SearchEngineTest extends MediaWikiTestCase {
 		LinkCache::singleton()->clear();
 
 		$page = WikiPage::factory( $title );
-		$page->doEdit( $text, $comment, 0, false, $user );
+		$page->doEditContent( ContentHandler::makeContent( $text, $title ), $comment, 0, false, $user );
 
 		$this->pageList[] = array( $title, $page->getId() );
 
 		return true;
 	}
 
-	function testFullWidth() {
+	public function testFullWidth() {
 		$this->assertEquals(
 			array( 'FullOneUp', 'FullTwoLow', 'HalfOneUp', 'HalfTwoLow' ),
 			$this->fetchIds( $this->search->searchText( 'AZ' ) ),
@@ -120,14 +134,14 @@ class SearchEngineTest extends MediaWikiTestCase {
 			"Search for normalized from Full-width Lower" );
 	}
 
-	function testTextSearch() {
+	public function testTextSearch() {
 		$this->assertEquals(
-				array( 'Smithee' ),
-				$this->fetchIds( $this->search->searchText( 'smithee' ) ),
-				"Plain search failed" );
+			array( 'Smithee' ),
+			$this->fetchIds( $this->search->searchText( 'smithee' ) ),
+			"Plain search failed" );
 	}
 
-	function testTextPowerSearch() {
+	public function testTextPowerSearch() {
 		$this->search->setNamespaces( array( 0, 1, 4 ) );
 		$this->assertEquals(
 			array(
@@ -138,7 +152,7 @@ class SearchEngineTest extends MediaWikiTestCase {
 			"Power search failed" );
 	}
 
-	function testTitleSearch() {
+	public function testTitleSearch() {
 		$this->assertEquals(
 			array(
 				'Alan Smithee',
@@ -148,7 +162,7 @@ class SearchEngineTest extends MediaWikiTestCase {
 			"Title search failed" );
 	}
 
-	function testTextTitlePowerSearch() {
+	public function testTextTitlePowerSearch() {
 		$this->search->setNamespaces( array( 0, 1, 4 ) );
 		$this->assertEquals(
 			array(
@@ -159,5 +173,4 @@ class SearchEngineTest extends MediaWikiTestCase {
 			$this->fetchIds( $this->search->searchTitle( 'smithee' ) ),
 			"Title power search failed" );
 	}
-
 }