Update formatting

[lhc/web/wiklou.git] / tests / phpunit / includes / specials / SpecialSearchTest.php

diff --git a/tests/phpunit/includes/specials/SpecialSearchTest.php b/tests/phpunit/includes/specials/SpecialSearchTest.php
index fed97ad..f5ef0fb 100644 (file)
--- a/tests/phpunit/includes/specials/SpecialSearchTest.php
+++ b/tests/phpunit/includes/specials/SpecialSearchTest.php
@@ -32,7 +32,7 @@ class SpecialSearchTest extends MediaWikiTestCase {
                        'ns6'=>true,
                ) ));
                 */
-               $context->setRequest( new FauxRequest( $requested ));
+               $context->setRequest( new FauxRequest( $requested ) );
                $search = new SpecialSearch();
                $search->setContext( $context );
                $search->load();
@@ -45,11 +45,11 @@ class SpecialSearchTest extends MediaWikiTestCase {
                $this->assertEquals(
                        array( /** Expected: */
                                'ProfileName' => $expectedProfile,
-                               'Namespaces'  => $expectedNS,
+                               'Namespaces' => $expectedNS,
                        )
                        , array( /** Actual: */
                                'ProfileName' => $search->getProfile(),
-                               'Namespaces'  => $search->getNamespaces(),
+                               'Namespaces' => $search->getNamespaces(),
                        )
                        , $message
                );
@@ -59,14 +59,14 @@ class SpecialSearchTest extends MediaWikiTestCase {
        function provideSearchOptionsTests() {
                $defaultNS = SearchEngine::defaultNamespaces();
                $EMPTY_REQUEST = array();
-               $NO_USER_PREF  = null;
+               $NO_USER_PREF = null;
 
                return array(
                        /**
                         * Parameters:
-                        *      <Web Request>, <User options>
+                        *     <Web Request>, <User options>
                         * Followed by expected values:
-                        *      <ProfileName>, <NSList>
+                        *     <ProfileName>, <NSList>
                         * Then an optional message.
                         */
                        array(
@@ -76,19 +76,19 @@ class SpecialSearchTest extends MediaWikiTestCase {
                        ),
                        array(
                                array( 'ns5' => 1 ), $NO_USER_PREF,
-                               'advanced', array(  5),
+                               'advanced', array( 5 ),
                                'Web request with specific NS should override user preference'
                        ),
                        array(
                                $EMPTY_REQUEST, array(
-                                       'searchNs2' => 1,
-                                       'searchNs14' => 1,
-                               ) + array_fill_keys( array_map( function( $ns ) {
-                                       return "searchNs$ns";
-                               }, $defaultNS ), 0 ),
+                               'searchNs2' => 1,
+                               'searchNs14' => 1,
+                       ) + array_fill_keys( array_map( function ( $ns ) {
+                               return "searchNs$ns";
+                       }, $defaultNS ), 0 ),
                                'advanced', array( 2, 14 ),
                                'Bug 33583: search with no option should honor User search preferences'
-                               . ' and have all other namespace disabled'
+                                       . ' and have all other namespace disabled'
                        ),
                );
        }
@@ -98,11 +98,11 @@ class SpecialSearchTest extends MediaWikiTestCase {
         * User remains anonymous though
         */
        function newUserWithSearchNS( $opt = null ) {
-               $u = User::newFromId(0);
-               if( $opt === null ) {
+               $u = User::newFromId( 0 );
+               if ( $opt === null ) {
                        return $u;
                }
-               foreach($opt as $name => $value) {
+               foreach ( $opt as $name => $value ) {
                        $u->setOption( $name, $value );
                }
                return $u;
@@ -116,7 +116,7 @@ class SpecialSearchTest extends MediaWikiTestCase {
 
                # Initialize [[Special::Search]]
                $search = new SpecialSearch();
-               $search->getContext()->setTitle( Title::newFromText('Special:Search' ) );
+               $search->getContext()->setTitle( Title::newFromText( 'Special:Search' ) );
                $search->load();
 
                # Simulate a user searching for a given term
@@ -129,16 +129,12 @@ class SpecialSearchTest extends MediaWikiTestCase {
                        ->getOutput()
                        ->getHTMLTitle();
 
-               # Craft the expected, plain, text:
-               $aPlainSearchTerm =
-                       wfMessage( 'searchresults-title', $term )
-                       ->plain();
-
                # Compare :-]
-               $this->assertStringStartsWith( $aPlainSearchTerm,
+               $this->assertRegExp(
+                       '/' . preg_quote( $term ) . '/',
                        $pageTitle,
-                       "Search term should not be expanded in Special:Search <title>"
+                       "Search term '{$term}' should not be expanded in Special:Search <title>"
                );
+
        }
 }
-