Update to MediaWiki 1.25.1

1 files changed, 18 insertions, 49 deletions

diff --git a/tests/phpunit/includes/search/SearchEngineTest.php b/tests/phpunit/includes/search/SearchEngineTest.php
index 3da13615..d0cbfa0a 100644
--- a/tests/phpunit/includes/search/SearchEngineTest.php
+++ b/tests/phpunit/includes/search/SearchEngineTest.php
@@ -14,8 +14,6 @@ class SearchEngineTest extends MediaWikiLangTestCase {
 	 */
 	protected $search;
 
-	protected $pageList;
-
 	/**
 	 * Checks for database type & version.
 	 * Will skip current test if DB does not support search.
@@ -37,10 +35,6 @@ class SearchEngineTest extends MediaWikiLangTestCase {
 			'wgSearchType' => $searchType
 		) );
 
-		if ( !isset( self::$pageList ) ) {
-			$this->addPages();
-		}
-
 		$this->search = new $searchType( $this->db );
 	}
 
@@ -50,33 +44,32 @@ class SearchEngineTest extends MediaWikiLangTestCase {
 		parent::tearDown();
 	}
 
-	protected function addPages() {
+	public function addDBData() {
 		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( 'Not_Main_Page', 'This is not a main page' );
 		$this->insertPage(
 			'Talk:Not_Main_Page',
-			'This is not a talk page to the main page, see [[smithee]]',
-			1
+			'This is not a talk page to the main page, see [[smithee]]'
 		);
-		$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 );
+		$this->insertPage( 'Smithee', 'A smithee is one who smiths. See also [[Alan Smithee]]' );
+		$this->insertPage( 'Talk:Smithee', 'This article sucks.' );
+		$this->insertPage( 'Unrelated_page', 'Nothing in this page is about the S word.' );
+		$this->insertPage( 'Another_page', 'This page also is unrelated.' );
+		$this->insertPage( 'Help:Help', 'Help me!' );
+		$this->insertPage( 'Thppt', 'Blah blah' );
+		$this->insertPage( 'Alan_Smithee', 'yum' );
+		$this->insertPage( 'Pages', 'are\'food' );
+		$this->insertPage( 'HalfOneUp', 'AZ' );
+		$this->insertPage( 'FullOneUp', 'ＡＺ' );
+		$this->insertPage( 'HalfTwoLow', 'az' );
+		$this->insertPage( 'FullTwoLow', 'ａｚ' );
+		$this->insertPage( 'HalfNumbers', '1234567890' );
+		$this->insertPage( 'FullNumbers', '１２３４５６７８９０' );
+		$this->insertPage( 'DomainName', 'example.com' );
 	}
 
 	protected function fetchIds( $results ) {
@@ -101,30 +94,6 @@ class SearchEngineTest extends MediaWikiLangTestCase {
 		return $matches;
 	}
 
-	/**
-	 * Insert a new page
-	 *
-	 * @param string $pageName Page name
-	 * @param string $text Page's content
-	 * @param int $ns Unused
-	 */
-	protected function insertPage( $pageName, $text, $ns ) {
-		$title = Title::newFromText( $pageName, $ns );
-
-		$user = User::newFromName( 'WikiSysop' );
-		$comment = 'Search Test';
-
-		// avoid memory leak...?
-		LinkCache::singleton()->clear();
-
-		$page = WikiPage::factory( $title );
-		$page->doEditContent( ContentHandler::makeContent( $text, $title ), $comment, 0, false, $user );
-
-		$this->pageList[] = array( $title, $page->getId() );
-
-		return true;
-	}
-
 	public function testFullWidth() {
 		$this->assertEquals(
 			array( 'FullOneUp', 'FullTwoLow', 'HalfOneUp', 'HalfTwoLow' ),