Move tests that have likely never been executed. Now they will be executed.

It might be a good idea to have a commit hook or similar to catch these.

You can find candidates for renaming with this command:
$ find tests/phpunit/includes/ -name '*.php' | grep -Ev 'Test.php$' | xargs grep -l MediaWikiTestCase

diff --git a/tests/phpunit/includes/GlobalFunctions/wfShorthandToInteger.php b/tests/phpunit/includes/GlobalFunctions/wfShorthandToInteger.php
deleted file mode 100644 (file)
index 1df26d2..0000000
--- a/tests/phpunit/includes/GlobalFunctions/wfShorthandToInteger.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-class wfShorthandToIntegerTest extends MediaWikiTestCase {
-       /**
-        * @dataProvider provideABunchOfShorthands
-        */
-       function testWfShorthandToInteger( $input, $output, $description ) {
-               $this->assertEquals(
-                       wfShorthandToInteger( $input ),
-                       $output,
-                       $description
-               );
-       }
-
-       function provideABunchOfShorthands() {
-               return array(
-                       array( '', -1, 'Empty string' ),
-                       array( '     ', -1, 'String of spaces' ),
-                       array( '1G', 1024 * 1024 * 1024, 'One gig uppercased' ),
-                       array( '1g', 1024 * 1024 * 1024, 'One gig lowercased' ),
-                       array( '1M', 1024 * 1024, 'One meg uppercased' ),
-                       array( '1m', 1024 * 1024, 'One meg lowercased' ),
-                       array( '1K', 1024, 'One kb uppercased' ),
-                       array( '1k', 1024, 'One kb lowercased' ),
-               );
-       }
-       
-}

diff --git a/tests/phpunit/includes/GlobalFunctions/wfShorthandToIntegerTest.php b/tests/phpunit/includes/GlobalFunctions/wfShorthandToIntegerTest.php
new file mode 100644 (file)
index 0000000..1df26d2
--- /dev/null
+++ b/tests/phpunit/includes/GlobalFunctions/wfShorthandToIntegerTest.php
@@ -0,0 +1,28 @@
+<?php
+
+class wfShorthandToIntegerTest extends MediaWikiTestCase {
+       /**
+        * @dataProvider provideABunchOfShorthands
+        */
+       function testWfShorthandToInteger( $input, $output, $description ) {
+               $this->assertEquals(
+                       wfShorthandToInteger( $input ),
+                       $output,
+                       $description
+               );
+       }
+
+       function provideABunchOfShorthands() {
+               return array(
+                       array( '', -1, 'Empty string' ),
+                       array( '     ', -1, 'String of spaces' ),
+                       array( '1G', 1024 * 1024 * 1024, 'One gig uppercased' ),
+                       array( '1g', 1024 * 1024 * 1024, 'One gig lowercased' ),
+                       array( '1M', 1024 * 1024, 'One meg uppercased' ),
+                       array( '1m', 1024 * 1024, 'One meg lowercased' ),
+                       array( '1K', 1024, 'One kb uppercased' ),
+                       array( '1k', 1024, 'One kb lowercased' ),
+               );
+       }
+       
+}

diff --git a/tests/phpunit/includes/parser/TagHooks.php b/tests/phpunit/includes/parser/TagHooks.php
deleted file mode 100644 (file)
index 713ce84..0000000
--- a/tests/phpunit/includes/parser/TagHooks.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-
-/**
- * @group Parser
- */
-class TagHookTest extends MediaWikiTestCase {
-       
-       public static function provideValidNames() {
-               return array( array( 'foo' ), array( 'foo-bar' ), array( 'foo_bar' ), array( 'FOO-BAR' ), array( 'foo bar' ) );
-       }
-
-       public static function provideBadNames() {
-               return array( array( "foo<bar" ), array( "foo>bar" ), array( "foo\nbar" ),  array( "foo\rbar" ) );
-       }
-               
-       /**
-        * @dataProvider provideValidNames
-        */
-       function testTagHooks( $tag ) {
-               global $wgParserConf;
-               $parser = new Parser( $wgParserConf );
-               
-               $parser->setHook( $tag, array( $this, 'tagCallback' ) );
-               $parserOutput = $parser->parse( "Foo<$tag>Bar</$tag>Baz", Title::newFromText( 'Test' ), new ParserOptions );
-               $this->assertEquals( "<p>FooOneBaz\n</p>", $parserOutput->getText() );
-               
-               $parser->mPreprocessor = null; # Break the Parser <-> Preprocessor cycle
-       }
-       
-       /**
-        * @dataProvider provideBadNames
-        * @expectedException MWException
-        */
-       function testBadTagHooks( $tag ) {
-               global $wgParserConf;
-               $parser = new Parser( $wgParserConf );
-               
-               $parser->setHook( $tag, array( $this, 'tagCallback' ) );
-               $parser->parse( "Foo<$tag>Bar</$tag>Baz", Title::newFromText( 'Test' ), new ParserOptions );
-               $this->fail('Exception not thrown.');
-       }
-       
-       /**
-        * @dataProvider provideValidNames
-        */
-       function testFunctionTagHooks( $tag ) {
-               global $wgParserConf;
-               $parser = new Parser( $wgParserConf );
-               
-               $parser->setFunctionTagHook( $tag, array( $this, 'functionTagCallback' ), 0 );
-               $parserOutput = $parser->parse( "Foo<$tag>Bar</$tag>Baz", Title::newFromText( 'Test' ), new ParserOptions );
-               $this->assertEquals( "<p>FooOneBaz\n</p>", $parserOutput->getText() );
-               
-               $parser->mPreprocessor = null; # Break the Parser <-> Preprocessor cycle
-       }
-       
-       /**
-        * @dataProvider provideBadNames
-        * @expectedException MWException
-        */
-       function testBadFunctionTagHooks( $tag ) {
-               global $wgParserConf;
-               $parser = new Parser( $wgParserConf );
-               
-               $parser->setFunctionTagHook( $tag, array( $this, 'functionTagCallback' ), SFH_OBJECT_ARGS );
-               $parser->parse( "Foo<$tag>Bar</$tag>Baz", Title::newFromText( 'Test' ), new ParserOptions );
-               $this->fail('Exception not thrown.');
-       }
-       
-       function tagCallback( $text, $params, $parser ) {
-               return str_rot13( $text );
-       }
-       
-       function functionTagCallback( &$parser, $frame, $code, $attribs ) {
-               return str_rot13( $code );
-       }
-}

diff --git a/tests/phpunit/includes/parser/TagHooksTest.php b/tests/phpunit/includes/parser/TagHooksTest.php
new file mode 100644 (file)
index 0000000..713ce84
--- /dev/null
+++ b/tests/phpunit/includes/parser/TagHooksTest.php
@@ -0,0 +1,77 @@
+<?php
+
+/**
+ * @group Parser
+ */
+class TagHookTest extends MediaWikiTestCase {
+       
+       public static function provideValidNames() {
+               return array( array( 'foo' ), array( 'foo-bar' ), array( 'foo_bar' ), array( 'FOO-BAR' ), array( 'foo bar' ) );
+       }
+
+       public static function provideBadNames() {
+               return array( array( "foo<bar" ), array( "foo>bar" ), array( "foo\nbar" ),  array( "foo\rbar" ) );
+       }
+               
+       /**
+        * @dataProvider provideValidNames
+        */
+       function testTagHooks( $tag ) {
+               global $wgParserConf;
+               $parser = new Parser( $wgParserConf );
+               
+               $parser->setHook( $tag, array( $this, 'tagCallback' ) );
+               $parserOutput = $parser->parse( "Foo<$tag>Bar</$tag>Baz", Title::newFromText( 'Test' ), new ParserOptions );
+               $this->assertEquals( "<p>FooOneBaz\n</p>", $parserOutput->getText() );
+               
+               $parser->mPreprocessor = null; # Break the Parser <-> Preprocessor cycle
+       }
+       
+       /**
+        * @dataProvider provideBadNames
+        * @expectedException MWException
+        */
+       function testBadTagHooks( $tag ) {
+               global $wgParserConf;
+               $parser = new Parser( $wgParserConf );
+               
+               $parser->setHook( $tag, array( $this, 'tagCallback' ) );
+               $parser->parse( "Foo<$tag>Bar</$tag>Baz", Title::newFromText( 'Test' ), new ParserOptions );
+               $this->fail('Exception not thrown.');
+       }
+       
+       /**
+        * @dataProvider provideValidNames
+        */
+       function testFunctionTagHooks( $tag ) {
+               global $wgParserConf;
+               $parser = new Parser( $wgParserConf );
+               
+               $parser->setFunctionTagHook( $tag, array( $this, 'functionTagCallback' ), 0 );
+               $parserOutput = $parser->parse( "Foo<$tag>Bar</$tag>Baz", Title::newFromText( 'Test' ), new ParserOptions );
+               $this->assertEquals( "<p>FooOneBaz\n</p>", $parserOutput->getText() );
+               
+               $parser->mPreprocessor = null; # Break the Parser <-> Preprocessor cycle
+       }
+       
+       /**
+        * @dataProvider provideBadNames
+        * @expectedException MWException
+        */
+       function testBadFunctionTagHooks( $tag ) {
+               global $wgParserConf;
+               $parser = new Parser( $wgParserConf );
+               
+               $parser->setFunctionTagHook( $tag, array( $this, 'functionTagCallback' ), SFH_OBJECT_ARGS );
+               $parser->parse( "Foo<$tag>Bar</$tag>Baz", Title::newFromText( 'Test' ), new ParserOptions );
+               $this->fail('Exception not thrown.');
+       }
+       
+       function tagCallback( $text, $params, $parser ) {
+               return str_rot13( $text );
+       }
+       
+       function functionTagCallback( &$parser, $frame, $code, $attribs ) {
+               return str_rot13( $code );
+       }
+}