Merge "Better error message for invalid user name in cleanupSpam.php"

[lhc/web/wiklou.git] / tests / phpunit / includes / search / SearchEngineTest.php

diff --git a/tests/phpunit/includes/search/SearchEngineTest.php b/tests/phpunit/includes/search/SearchEngineTest.php
index 395e1a0..6abca6d 100644 (file)
--- a/tests/phpunit/includes/search/SearchEngineTest.php
+++ b/tests/phpunit/includes/search/SearchEngineTest.php
@@ -4,7 +4,7 @@
  * @group Search
  * @group Database
  */
-class SearchEngineTest extends MediaWikiTestCase {
+class SearchEngineTest extends MediaWikiLangTestCase {
        protected $search, $pageList;
 
        /**
@@ -13,14 +13,15 @@ class SearchEngineTest extends MediaWikiTestCase {
         */
        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" );
                }
 
@@ -30,6 +31,8 @@ class SearchEngineTest extends MediaWikiTestCase {
 
        protected function tearDown() {
                unset( $this->search );
+
+               parent::tearDown();
        }
 
        function pageExists( $title ) {
@@ -46,29 +49,29 @@ class SearchEngineTest extends MediaWikiTestCase {
                        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 );
+               $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");
+                               . "in the main namespace" );
                }
 
                $this->assertTrue( is_object( $results ) );
@@ -132,9 +135,9 @@ class SearchEngineTest extends MediaWikiTestCase {
 
        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() {