Revert r108358. It's a good fellow and we like to keep it.

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

diff --git a/tests/phpunit/includes/parser/NewParserTest.php b/tests/phpunit/includes/parser/NewParserTest.php
index 5574c5f..e999796 100644 (file)
--- a/tests/phpunit/includes/parser/NewParserTest.php
+++ b/tests/phpunit/includes/parser/NewParserTest.php
@@ -323,7 +323,7 @@ class NewParserTest extends MediaWikiTestCase {
                global $wgHooks;
 
                $wgHooks['ParserTestParser'][] = 'ParserTestParserHook::setup';
-               $wgHooks['ParserGetVariableValueTs'][] = 'NewParserTest::getFakeTimestamp';
+               $wgHooks['ParserGetVariableValueTs'][] = 'ParserTest::getFakeTimestamp';
 
                MagicWord::clearCache();
                RepoGroup::destroySingleton();
@@ -708,48 +708,9 @@ class NewParserTest extends MediaWikiTestCase {
 
                foreach ( self::$articles as $name => $info ) {
                        list( $text, $line ) = $info;
-                       self::injectArticle( $name, $text, $line, 'ignoreduplicate' );
+                       ParserTest::addArticle( $name, $text, $line, 'ignoreduplicate' );
                }
        }
-       
-       /**
-        * Insert a temporary test article
-        * @param $name String: the title, including any prefix
-        * @param $text String: the article text
-        * @param $line Integer: the input line number, for reporting errors
-        * @param $ignoreDuplicate Boolean: whether to silently ignore duplicate pages
-        */
-       private static function injectArticle( $name, $text, $line = 'unknown', $ignoreDuplicate = '' ) {
-               global $wgCapitalLinks;
-
-               $oldCapitalLinks = $wgCapitalLinks;
-               $wgCapitalLinks = true; // We only need this from SetupGlobals() See r70917#c8637
-
-               $text = TestFileIterator::chomp( $text );
-               $name = TestFileIterator::chomp( $name );
-
-               $title = Title::newFromText( $name );
-
-               if ( is_null( $title ) ) {
-                       throw new MWException( "invalid title '$name' at line $line\n" );
-               }
-
-               $page = WikiPage::factory( $title );
-               $page->loadPageData( 'fromdbmaster' );
-
-               if ( $page->exists() ) {
-                       if ( $ignoreDuplicate == 'ignoreduplicate' ) {
-                               return;
-                       } else {
-                               throw new MWException( "duplicate article '$name' at line $line\n" );
-                       }
-               }
-
-               $page->doEdit( $text, '', EDIT_NEW );
-
-               $wgCapitalLinks = $oldCapitalLinks;
-       }
-
 
        /**
         * Steal a callback function from the primary parser, save it for
@@ -884,9 +845,4 @@ class NewParserTest extends MediaWikiTestCase {
                        return $default;
                }
        }
-
-       public static function getFakeTimestamp( &$parser, &$ts ) {
-               $ts = 123;
-               return true;
-       }
 }