Merge "Installer: properly override default $wgLogo value"

[lhc/web/wiklou.git] / tests / phpunit / includes / parser / TagHooksTest.php

diff --git a/tests/phpunit/includes/parser/TagHooksTest.php b/tests/phpunit/includes/parser/TagHooksTest.php
index d643264..e3c4cc8 100644 (file)
--- a/tests/phpunit/includes/parser/TagHooksTest.php
+++ b/tests/phpunit/includes/parser/TagHooksTest.php
@@ -5,7 +5,13 @@
  */
 class TagHookTest extends MediaWikiTestCase {
        public static function provideValidNames() {
-               return array( array( 'foo' ), array( 'foo-bar' ), array( 'foo_bar' ), array( 'FOO-BAR' ), array( 'foo bar' ) );
+               return array(
+                       array( 'foo' ),
+                       array( 'foo-bar' ),
+                       array( 'foo_bar' ),
+                       array( 'FOO-BAR' ),
+                       array( 'foo bar' )
+               );
        }
 
        public static function provideBadNames() {
@@ -20,14 +26,18 @@ class TagHookTest extends MediaWikiTestCase {
 
        /**
         * @dataProvider provideValidNames
-        * @group Database
+        * @covers Parser::setHook
         */
-       function testTagHooks( $tag ) {
+       public function testTagHooks( $tag ) {
                global $wgParserConf, $wgContLang;
                $parser = new Parser( $wgParserConf );
 
                $parser->setHook( $tag, array( $this, 'tagCallback' ) );
-               $parserOutput = $parser->parse( "Foo<$tag>Bar</$tag>Baz", Title::newFromText( 'Test' ), ParserOptions::newFromUserAndLang( new User, $wgContLang ) );
+               $parserOutput = $parser->parse(
+                       "Foo<$tag>Bar</$tag>Baz",
+                       Title::newFromText( 'Test' ),
+                       ParserOptions::newFromUserAndLang( new User, $wgContLang )
+               );
                $this->assertEquals( "<p>FooOneBaz\n</p>", $parserOutput->getText() );
 
                $parser->mPreprocessor = null; # Break the Parser <-> Preprocessor cycle
@@ -36,26 +46,35 @@ class TagHookTest extends MediaWikiTestCase {
        /**
         * @dataProvider provideBadNames
         * @expectedException MWException
+        * @covers Parser::setHook
         */
-       function testBadTagHooks( $tag ) {
+       public function testBadTagHooks( $tag ) {
                global $wgParserConf, $wgContLang;
                $parser = new Parser( $wgParserConf );
 
                $parser->setHook( $tag, array( $this, 'tagCallback' ) );
-               $parser->parse( "Foo<$tag>Bar</$tag>Baz", Title::newFromText( 'Test' ), ParserOptions::newFromUserAndLang( new User, $wgContLang ) );
+               $parser->parse(
+                       "Foo<$tag>Bar</$tag>Baz",
+                       Title::newFromText( 'Test' ),
+                       ParserOptions::newFromUserAndLang( new User, $wgContLang )
+               );
                $this->fail( 'Exception not thrown.' );
        }
 
        /**
         * @dataProvider provideValidNames
-        * @group Database
+        * @covers Parser::setFunctionTagHook
         */
-       function testFunctionTagHooks( $tag ) {
+       public function testFunctionTagHooks( $tag ) {
                global $wgParserConf, $wgContLang;
                $parser = new Parser( $wgParserConf );
 
                $parser->setFunctionTagHook( $tag, array( $this, 'functionTagCallback' ), 0 );
-               $parserOutput = $parser->parse( "Foo<$tag>Bar</$tag>Baz", Title::newFromText( 'Test' ), ParserOptions::newFromUserAndLang( new User, $wgContLang ) );
+               $parserOutput = $parser->parse(
+                       "Foo<$tag>Bar</$tag>Baz",
+                       Title::newFromText( 'Test' ),
+                       ParserOptions::newFromUserAndLang( new User, $wgContLang )
+               );
                $this->assertEquals( "<p>FooOneBaz\n</p>", $parserOutput->getText() );
 
                $parser->mPreprocessor = null; # Break the Parser <-> Preprocessor cycle
@@ -64,13 +83,18 @@ class TagHookTest extends MediaWikiTestCase {
        /**
         * @dataProvider provideBadNames
         * @expectedException MWException
+        * @covers Parser::setFunctionTagHook
         */
-       function testBadFunctionTagHooks( $tag ) {
+       public function testBadFunctionTagHooks( $tag ) {
                global $wgParserConf, $wgContLang;
                $parser = new Parser( $wgParserConf );
 
                $parser->setFunctionTagHook( $tag, array( $this, 'functionTagCallback' ), SFH_OBJECT_ARGS );
-               $parser->parse( "Foo<$tag>Bar</$tag>Baz", Title::newFromText( 'Test' ), ParserOptions::newFromUserAndLang( new User, $wgContLang ) );
+               $parser->parse(
+                       "Foo<$tag>Bar</$tag>Baz",
+                       Title::newFromText( 'Test' ),
+                       ParserOptions::newFromUserAndLang( new User, $wgContLang )
+               );
                $this->fail( 'Exception not thrown.' );
        }