* Fix for r57997 and bug 21222: move math, gallery, pre and nowiki to a new module...
[lhc/web/wiklou.git] / maintenance / parserTests.inc
index 06c1c8a..26eee24 100644 (file)
  */
 
 /** */
-$options = array( 'quick', 'color', 'quiet', 'help', 'show-output', 'record' );
-$optionsWithArgs = array( 'regex', 'seed' );
+$options = array( 'quick', 'color', 'quiet', 'help', 'show-output', 'record'. 'run-disabled' );
+$optionsWithArgs = array( 'regex', 'seed', 'setversion' );
 
-require_once( 'commandLine.inc' );
+if ( !defined( "NO_COMMAND_LINE" ) ) {
+       require_once( dirname(__FILE__) . '/commandLine.inc' );
+}
 require_once( "$IP/maintenance/parserTestsParserHook.php" );
 require_once( "$IP/maintenance/parserTestsStaticParserHook.php" );
 require_once( "$IP/maintenance/parserTestsParserTime.php" );
@@ -97,7 +99,7 @@ class ParserTest {
                        isset( $options['quiet'] )
                        && ( isset( $options['record'] )
                                || isset( $options['compare'] ) ) ); // redundant output
-               
+
                $this->showOutput = isset( $options['show-output'] );
 
 
@@ -116,6 +118,8 @@ class ParserTest {
                        $this->recorder = new DbTestRecorder( $this );
                } elseif( isset( $options['compare'] ) ) {
                        $this->recorder = new DbTestPreviewer( $this );
+               } elseif( isset( $options['upload'] ) ) {
+                       $this->recorder = new RemoteTestRecorder( $this );
                } else {
                        $this->recorder = new TestRecorder( $this );
                }
@@ -125,6 +129,8 @@ class ParserTest {
                        $this->fuzzSeed = intval( $options['seed'] ) - 1;
                }
 
+               $this->runDisabled = isset( $options['run-disabled'] );
+
                $this->hooks = array();
                $this->functionHooks = array();
        }
@@ -281,7 +287,7 @@ class ParserTest {
        private function runFile( $filename ) {
                $infile = fopen( $filename, 'rt' );
                if( !$infile ) {
-                       wfDie( "Couldn't open $filename\n" );
+                       wfDie( "Couldn't open file '$filename'\n" );
                } else {
                        global $IP;
                        $relative = wfRelativePath( $filename, $IP );
@@ -353,18 +359,29 @@ class ParserTest {
                                        else {
                                                $data['options'] = $this->chomp( $data['options'] );
                                        }
-                                       if (preg_match('/\\bdisabled\\b/i', $data['options'])
-                                               || !preg_match("/{$this->regex}/i", $data['test'])) {
+                                       if (!isset( $data['config'] ) )
+                                               $data['config'] = '';
+
+                                       if ( (preg_match('/\\bdisabled\\b/i', $data['options'])
+                                               || !preg_match("/{$this->regex}/i", $data['test'])) && !$this->runDisabled ) {
                                                # disabled test
                                                $data = array();
                                                $section = null;
                                                continue;
                                        }
+                                       if ( preg_match('/\\bmath\\b/i', $data['options']) && !$this->savedGlobals['wgUseTeX'] ) {
+                                               # don't run math tests if $wgUseTeX is set to false in LocalSettings
+                                               $data = array();
+                                               $section = null;
+                                               continue;
+                                       }
                                        $result = $this->runTest(
                                                $this->chomp( $data['test'] ),
                                                $this->chomp( $data['input'] ),
                                                $this->chomp( $data['result'] ),
-                                               $this->chomp( $data['options'] ) );
+                                               $this->chomp( $data['options'] ),
+                                               $this->chomp( $data['config']   )
+                                               );
                                        $ok = $ok && $result;
                                        $this->recorder->record( $this->chomp( $data['test'] ), $result );
                                        $data = array();
@@ -414,52 +431,55 @@ class ParserTest {
         * @param string $result Result to output
         * @return bool
         */
-       private function runTest( $desc, $input, $result, $opts ) {
+       private function runTest( $desc, $input, $result, $opts, $config ) {
                if( $this->showProgress ) {
                        $this->showTesting( $desc );
                }
 
-               $this->setupGlobals($opts);
+               $opts = $this->parseOptions( $opts );
+               $this->setupGlobals($opts, $config);
 
                $user = new User();
                $options = ParserOptions::newFromUser( $user );
 
-               if (preg_match('/\\bmath\\b/i', $opts)) {
-                       # XXX this should probably be done by the ParserOptions
-                       $options->setUseTex(true);
-               }
-
                $m = array();
-               if (preg_match('/title=\[\[(.*)\]\]/', $opts, $m)) {
-                       $titleText = $m[1];
+               if (isset( $opts['title'] ) ) {
+                       $titleText = $opts['title'];
                }
                else {
                        $titleText = 'Parser test';
                }
 
-               $noxml = (bool)preg_match( '~\\b noxml \\b~x', $opts );
+               $noxml = isset( $opts['noxml'] );
+               $local = isset( $opts['local'] );
                $parser = $this->getParser();
-               $title =& Title::makeTitle( NS_MAIN, $titleText );
+               $title = Title::newFromText( $titleText );
 
                $matches = array();
-               if (preg_match('/\\bpst\\b/i', $opts)) {
+               if( isset( $opts['pst'] ) ) {
                        $out = $parser->preSaveTransform( $input, $title, $user, $options );
-               } elseif (preg_match('/\\bmsg\\b/i', $opts)) {
+               } elseif( isset( $opts['msg'] ) ) {
                        $out = $parser->transformMsg( $input, $options );
-               } elseif( preg_match( '/\\bsection=([\w-]+)\b/i', $opts, $matches ) ) {
-                       $section = $matches[1];
+               } elseif( isset( $opts['section'] ) ) {
+                       $section = $opts['section'];
                        $out = $parser->getSection( $input, $section );
-               } elseif( preg_match( '/\\breplace=([\w-]+),"(.*?)"/i', $opts, $matches ) ) {
-                       $section = $matches[1];
-                       $replace = $matches[2];
+               } elseif( isset( $opts['replace'] ) ) {
+                       $section = $opts['replace'][0];
+                       $replace = $opts['replace'][1];
                        $out = $parser->replaceSection( $input, $section, $replace );
+               } elseif( isset( $opts['comment'] ) ) {
+                       $linker = $user->getSkin();
+                       $out = $linker->formatComment( $input, $title, $local );
                } else {
                        $output = $parser->parse( $input, $title, $options, true, true, 1337 );
                        $out = $output->getText();
 
-                       if (preg_match('/\\bill\\b/i', $opts)) {
+                       if ( isset( $opts['showtitle'] ) ) {
+                               $out = $output->getTitleText() . "\n$out";
+                       }
+                       if (isset( $opts['ill'] ) ) {
                                $out = $this->tidy( implode( ' ', $output->getLanguageLinks() ) );
-                       } else if (preg_match('/\\bcat\\b/i', $opts)) {
+                       } elseif( isset( $opts['cat'] ) ) {
                                global $wgOut;
                                $wgOut->addCategoryLinks($output->getCategories());
                                $cats = $wgOut->getCategoryLinks();
@@ -473,6 +493,7 @@ class ParserTest {
                        $result = $this->tidy($result);
                }
 
+
                $this->teardownGlobals();
 
                if( $result === $out && ( $noxml === true || $this->wellFormed( $out ) ) ) {
@@ -485,37 +506,104 @@ class ParserTest {
 
        /**
         * Use a regex to find out the value of an option
-        * @param $regex A regex, the first group will be the value returned
-        * @param $opts Options line to look in
-        * @param $defaults Default value returned if the regex does not match
+        * @param $key name of option val to retrieve
+        * @param $opts Options array to look in
+        * @param $defaults Default value returned if not found
         */
-       private static function getOptionValue( $regex, $opts, $default ) {
-               $m = array();
-               if( preg_match( $regex, $opts, $m ) ) {
-                       return $m[1];
+       private static function getOptionValue( $key, $opts, $default ) {
+               $key = strtolower( $key );
+               if( isset( $opts[$key] ) ) {
+                       return $opts[$key];
                } else {
                        return $default;
                }
        }
 
+       private function parseOptions( $instring ) {
+               $opts = array();
+               $lines = explode( "\n", $instring );
+               // foo
+               // foo=bar
+               // foo="bar baz"
+               // foo=[[bar baz]]
+               // foo=bar,"baz quux"
+               $regex = '/\b
+                       ([\w-]+)                                                # Key
+                       \b
+                       (?:\s*
+                               =                                               # First sub-value
+                               \s*
+                               (
+                                       "
+                                               [^"]*                   # Quoted val
+                                       "
+                               |
+                                       \[\[
+                                               [^]]*                   # Link target
+                                       \]\]
+                               |
+                                       [\w-]+                          # Plain word
+                               )
+                               (?:\s*
+                                       ,                                       # Sub-vals 1..N
+                                       \s*
+                                       (
+                                               "[^"]*"                 # Quoted val
+                                       |
+                                               \[\[[^]]*\]\]   # Link target
+                                       |
+                                               [\w-]+                  # Plain word
+                                       )
+                               )*
+                       )?
+                       /x';
+
+               if( preg_match_all( $regex, $instring, $matches, PREG_SET_ORDER ) ) {
+                       foreach( $matches as $bits ) {
+                               $match = array_shift( $bits );
+                               $key = strtolower( array_shift( $bits ) );
+                               if( count( $bits ) == 0 ) {
+                                       $opts[$key] = true;
+                               } elseif( count( $bits ) == 1 ) {
+                                       $opts[$key] = $this->cleanupOption( array_shift( $bits ) );
+                               } else {
+                                       // Array!
+                                       $opts[$key] = array_map( array( $this, 'cleanupOption' ), $bits );
+                               }
+                       }
+               }
+               return $opts;
+       }
+
+       private function cleanupOption( $opt ) {
+               if( substr( $opt, 0, 1 ) == '"' ) {
+                       return substr( $opt, 1, -1 );
+               }
+               if( substr( $opt, 0, 2 ) == '[[' ) {
+                       return substr( $opt, 2, -2 );
+               }
+               return $opt;
+       }
+
        /**
         * Set up the global variables for a consistent environment for each test.
         * Ideally this should replace the global configuration entirely.
         */
-       private function setupGlobals($opts = '') {
+       private function setupGlobals($opts = '', $config = '') {
+               global $wgDBtype;
                if( !isset( $this->uploadDir ) ) {
                        $this->uploadDir = $this->setupUploadDir();
                }
 
                # Find out values for some special options.
                $lang =
-                       self::getOptionValue( '/language=([a-z]+(?:_[a-z]+)?)/', $opts, 'en' );
+                       self::getOptionValue( 'language', $opts, 'en' );
                $variant =
-                       self::getOptionValue( '/variant=([a-z]+(?:-[a-z]+)?)/', $opts, false );
+                       self::getOptionValue( 'variant', $opts, false );
                $maxtoclevel =
-                       self::getOptionValue( '/wgMaxTocLevel=(\d+)/', $opts, 999 );
-               $linkHolderBatchSize = 
-                       self::getOptionValue( '/wgLinkHolderBatchSize=(\d+)/', $opts, 1000 );
+                       self::getOptionValue( 'wgMaxTocLevel', $opts, 999 );
+               $linkHolderBatchSize =
+                       self::getOptionValue( 'wgLinkHolderBatchSize', $opts, 1000 );
 
                $settings = array(
                        'wgServer' => 'http://localhost',
@@ -534,19 +622,22 @@ class ParserTest {
                        'wgEnableUploads' => true,
                        'wgStyleSheetPath' => '/skins',
                        'wgSitename' => 'MediaWiki',
-                       'wgServerName' => 'Britney Spears',
+                       'wgServerName' => 'Britney-Spears',
                        'wgLanguageCode' => $lang,
                        'wgContLanguageCode' => $lang,
-                       'wgDBprefix' => 'parsertest_',
-                       'wgRawHtml' => preg_match('/\\brawhtml\\b/i', $opts),
+                       'wgDBprefix' => $wgDBtype != 'oracle' ? 'parsertest_' : 'pt_',
+                       'wgRawHtml' => isset( $opts['rawhtml'] ),
                        'wgLang' => null,
                        'wgContLang' => null,
-                       'wgNamespacesWithSubpages' => array( 0 => preg_match('/\\bsubpage\\b/i', $opts)),
+                       'wgNamespacesWithSubpages' => array( 0 => isset( $opts['subpage'] ) ),
                        'wgMaxTocLevel' => $maxtoclevel,
                        'wgCapitalLinks' => true,
                        'wgNoFollowLinks' => true,
+                       'wgNoFollowDomainExceptions' => array(),
                        'wgThumbnailScriptPath' => false,
-                       'wgUseTeX' => false,
+                       'wgUseImageResize' => false,
+                       'wgUseTeX' => isset( $opts['math'] ),
+                       'wgMathDirectory' => $this->uploadDir . '/math',
                        'wgLocaltimezone' => 'UTC',
                        'wgAllowExternalImages' => true,
                        'wgUseTidy' => false,
@@ -563,19 +654,38 @@ class ParserTest {
                        'wgDefaultExternalStore' => array(),
                        'wgForeignFileRepos' => array(),
                        'wgLinkHolderBatchSize' => $linkHolderBatchSize,
-                       'wgEnforceHtmlIds' => true,
-                       );
+                       'wgExperimentalHtmlIds' => false,
+                       'wgExternalLinkTarget' => false,
+                       'wgAlwaysUseTidy' => false,
+                       'wgHtml5' => true,
+                       'wgWellFormedXml' => true,
+                       'wgAllowMicrodataAttributes' => true,
+               );
+
+               if ($config) {
+                       $configLines = explode( "\n", $config );
+
+                       foreach( $configLines as $line ) {
+                               list( $var, $value ) = explode( '=', $line, 2 );
+
+                               $settings[$var] = eval("return $value;" );
+                       }
+               }
+
                $this->savedGlobals = array();
                foreach( $settings as $var => $val ) {
-                       $this->savedGlobals[$var] = $GLOBALS[$var];
+                       if( array_key_exists( $var, $GLOBALS ) ) {
+                               $this->savedGlobals[$var] = $GLOBALS[$var];
+                       }
                        $GLOBALS[$var] = $val;
                }
                $langObj = Language::factory( $lang );
                $GLOBALS['wgLang'] = $langObj;
                $GLOBALS['wgContLang'] = $langObj;
                $GLOBALS['wgMemc'] = new FakeMemCachedClient;
+               $GLOBALS['wgOut'] = new OutputPage;
 
-               //$GLOBALS['wgMessageCache'] = new MessageCache( new BagOStuff(), false, 0, $GLOBALS['wgDBname'] );
+               MagicWord::clearCache();
 
                global $wgUser;
                $wgUser = new User();
@@ -592,13 +702,13 @@ class ParserTest {
                        'categorylinks', 'templatelinks', 'externallinks', 'langlinks',
                        'site_stats', 'hitcounter',     'ipblocks', 'image', 'oldimage',
                        'recentchanges', 'watchlist', 'math', 'interwiki',
-                       'querycache', 'objectcache', 'job', 'redirect', 'querycachetwo',
-                       'archive', 'user_groups', 'page_props', 'category', 'user_restrictions',
+                       'querycache', 'objectcache', 'job', 'l10n_cache', 'redirect', 'querycachetwo',
+                       'archive', 'user_groups', 'page_props', 'category'
                );
 
-               if ($wgDBtype === 'mysql') 
+               if ($wgDBtype === 'mysql')
                        array_push( $tables, 'searchindex' );
-               
+
                // Allow extensions to add to the list of tables to duplicate;
                // may be necessary if they hook into page save or other code
                // which will require them while running tests.
@@ -613,11 +723,11 @@ class ParserTest {
         * the db will be visible to later tests in the run.
         */
        private function setupDatabase() {
-               global $wgDBprefix;
+               global $wgDBprefix, $wgDBtype;
                if ( $this->databaseSetupDone ) {
                        return;
                }
-               if ( $wgDBprefix === 'parsertest_' ) {
+               if ( $wgDBprefix === 'parsertest_' || ($wgDBtype == 'oracle' && $wgDBprefix === 'pt_')) {
                        throw new MWException( 'setupDatabase should be called before setupGlobals' );
                }
                $this->databaseSetupDone = true;
@@ -630,58 +740,30 @@ class ParserTest {
                        $this->useTemporaryTables = false;
                }
 
-               $temporary = $this->useTemporaryTables ? 'TEMPORARY' : '';
+               $temporary = $this->useTemporaryTables || $wgDBtype == 'postgres';
 
                $db = wfGetDB( DB_MASTER );
                $tables = $this->listTables();
 
-               if (!(strcmp($db->getServerVersion(), '4.1') < 0 and stristr($db->getSoftwareLink(), 'MySQL'))) {
-                       # Database that supports CREATE TABLE ... LIKE
-                       global $wgDBtype;
-                       if( $wgDBtype == 'postgres' ) {
-                               $def = 'INCLUDING DEFAULTS';
-                       } else {
-                               $def = '';
-                       }
-                       foreach ($tables as $tbl) {
-                               # Clean up from previous aborted run.  So that table escaping
-                               # works correctly across DB engines, we need to change the pre-
-                               # fix back and forth so tableName() works right.
-                               $this->changePrefix( $this->oldTablePrefix );
-                               $oldTableName = $db->tableName( $tbl );
-                               $this->changePrefix( 'parsertest_' );
-                               $newTableName = $db->tableName( $tbl );
-
-                               if ( $db->tableExists( $tbl ) ) {
-                                       $db->query("DROP TABLE $newTableName");
-                               }
-                               # Create new table
-                               $db->query("CREATE $temporary TABLE $newTableName (LIKE $oldTableName $def)");
-                       }
-               } else {
-                       # Hack for MySQL versions < 4.1, which don't support
-                       # "CREATE TABLE ... LIKE". Note that
-                       # "CREATE TEMPORARY TABLE ... SELECT * FROM ... LIMIT 0"
-                       # would not create the indexes we need....
-                       #
-                       # Note that we don't bother changing around the prefixes here be-
-                       # cause we know we're using MySQL anyway.
-                       foreach ($tables as $tbl) {
-                               $oldTableName = $db->tableName( $tbl );
-                               $res = $db->query("SHOW CREATE TABLE $oldTableName");
-                               $row = $db->fetchRow($res);
-                               $create = $row[1];
-                               $create_tmp = preg_replace('/CREATE TABLE `(.*?)`/', 
-                                       "CREATE $temporary TABLE `parsertest_$tbl`", $create);
-                               if ($create === $create_tmp) {
-                                       # Couldn't do replacement
-                                       wfDie("could not create temporary table $tbl");
-                               }
-                               $db->query($create_tmp);
+               foreach ( $tables as $tbl ) {
+                       # Clean up from previous aborted run.  So that table escaping
+                       # works correctly across DB engines, we need to change the pre-
+                       # fix back and forth so tableName() works right.
+                       $this->changePrefix( $this->oldTablePrefix );
+                       $oldTableName = $db->tableName( $tbl );
+                       $this->changePrefix( $wgDBtype != 'oracle' ? 'parsertest_' : 'pt_' );
+                       $newTableName = $db->tableName( $tbl );
+
+                       if ( $db->tableExists( $tbl ) && $wgDBtype != 'postgres' && $wgDBtype != 'oracle' ) {
+                               $db->query( "DROP TABLE $newTableName" );
                        }
+                       # Create new table
+                       $db->duplicateTableStructure( $oldTableName, $newTableName, $temporary );
                }
+               if ($wgDBtype == 'oracle')
+                       $db->query('BEGIN FILL_WIKI_INFO; END;');
 
-               $this->changePrefix( 'parsertest_' );
+               $this->changePrefix( $wgDBtype != 'oracle' ? 'parsertest_' : 'pt_' );
 
                # Hack: insert a few Wikipedia in-project interwiki prefixes,
                # for testing inter-language links
@@ -706,6 +788,21 @@ class ParserTest {
                                   'iw_local'  => 1 ),
                        ) );
 
+
+               if ($wgDBtype == 'oracle') {
+                       # Insert 0 and 1 user_ids to prevent FK violations
+
+                       #Anonymous user
+                       $db->insert( 'user', array(
+                               'user_id'         => 0,
+                               'user_name'       => 'Anonymous') );
+
+                       # Hack-on-Hack: Insert a test user to be able to insert an image
+                       $db->insert( 'user', array(
+                               'user_id'         => 1,
+                               'user_name'       => 'Tester') );
+               }
+
                # Hack: Insert an image to work with
                $db->insert( 'image', array(
                        'img_name'        => 'Foobar.jpg',
@@ -723,8 +820,32 @@ class ParserTest {
                        'img_metadata'    => serialize( array() ),
                        ) );
 
+               # This image will be blacklisted in [[MediaWiki:Bad image list]]
+               $db->insert( 'image', array(
+                       'img_name'        => 'Bad.jpg',
+                       'img_size'        => 12345,
+                       'img_description' => 'zomgnotcensored',
+                       'img_user'        => 1,
+                       'img_user_text'   => 'WikiSysop',
+                       'img_timestamp'   => $db->timestamp( '20010115123500' ),
+                       'img_width'       => 320,
+                       'img_height'      => 240,
+                       'img_bits'        => 24,
+                       'img_media_type'  => MEDIATYPE_BITMAP,
+                       'img_major_mime'  => "image",
+                       'img_minor_mime'  => "jpeg",
+                       'img_metadata'    => serialize( array() ),
+                       ) );
+
                # Update certain things in site_stats
-               $db->insert( 'site_stats', array( 'ss_row_id' => 1, 'ss_images' => 1, 'ss_good_articles' => 1 ) );
+               $db->insert( 'site_stats', array( 'ss_row_id' => 1, 'ss_images' => 2, 'ss_good_articles' => 1 ) );
+
+               # Reinitialise the LocalisationCache to match the database state
+               Language::getLocalisationCache()->unloadAll();
+
+               # Make a new message cache
+               global $wgMessageCache, $wgMemc;
+               $wgMessageCache = new MessageCache( $wgMemc, true, 3600, '' );
        }
 
        /**
@@ -745,7 +866,7 @@ class ParserTest {
        }
 
        private function teardownDatabase() {
-               global $wgDBprefix;
+               global $wgDBprefix, $wgDBtype;
                if ( !$this->databaseSetupDone ) {
                        return;
                }
@@ -760,10 +881,14 @@ class ParserTest {
                $tables = $this->listTables();
                $db = wfGetDB( DB_MASTER );
                foreach ( $tables as $table ) {
-                       $db->query( "DROP TABLE `parsertest_$table`" );
-               }*/
+                       $sql = $wgDBtype == 'oracle' ? "DROP TABLE pt_$table DROP CONSTRAINTS" : "DROP TABLE `parsertest_$table`";
+                       $db->query( $sql );
+               }
+               if ($wgDBtype == 'oracle')
+                       $db->query('BEGIN FILL_WIKI_INFO; END;');
+               */
        }
-       
+
        /**
         * Create a dummy uploads directory which will contain a couple
         * of files in order to pass existence tests.
@@ -787,6 +912,9 @@ class ParserTest {
                }
                wfMkdirParents( $dir . '/3/3a' );
                copy( "$IP/skins/monobook/headbg.jpg", "$dir/3/3a/Foobar.jpg" );
+
+               wfMkdirParents( $dir . '/0/09' );
+               copy( "$IP/skins/monobook/headbg.jpg", "$dir/0/09/Bad.jpg" );
                return $dir;
        }
 
@@ -796,7 +924,6 @@ class ParserTest {
         */
        private function teardownGlobals() {
                RepoGroup::destroySingleton();
-               FileCache::destroySingleton();
                LinkCache::singleton()->clear();
                foreach( $this->savedGlobals as $var => $val ) {
                        $GLOBALS[$var] = $val;
@@ -823,6 +950,10 @@ class ParserTest {
                                "$dir/thumb/3/3a/Foobar.jpg/200px-Foobar.jpg",
                                "$dir/thumb/3/3a/Foobar.jpg/640px-Foobar.jpg",
                                "$dir/thumb/3/3a/Foobar.jpg/120px-Foobar.jpg",
+
+                               "$dir/0/09/Bad.jpg",
+
+                               "$dir/math/f/a/5/fa50b8b616463173474302ca3e63586b.png",
                        )
                );
 
@@ -835,7 +966,14 @@ class ParserTest {
                                "$dir/thumb/3/3a/Foobar.jpg",
                                "$dir/thumb/3/3a",
                                "$dir/thumb/3",
+
+                               "$dir/0/09/",
+                               "$dir/0/",
                                "$dir/thumb",
+                               "$dir/math/f/a/5",
+                               "$dir/math/f/a",
+                               "$dir/math/f",
+                               "$dir/math",
                                "$dir",
                        )
                );
@@ -1000,6 +1138,7 @@ class ParserTest {
 
                $art = new Article($title);
                $art->insertNewArticle($text, '', false, false );
+
                $this->teardownGlobals();
        }
 
@@ -1011,6 +1150,7 @@ class ParserTest {
         */
        private function requireHook( $name ) {
                global $wgParser;
+               $wgParser->firstCallInit( ); //make sure hooks are loaded.
                if( isset( $wgParser->mTagHooks[$name] ) ) {
                        $this->hooks[$name] = $wgParser->mTagHooks[$name];
                } else {
@@ -1026,6 +1166,7 @@ class ParserTest {
         */
        private function requireFunctionHook( $name ) {
                global $wgParser;
+               $wgParser->firstCallInit( ); //make sure hooks are loaded.
                if( isset( $wgParser->mFunctionHooks[$name] ) ) {
                        $this->functionHooks[$name] = $wgParser->mFunctionHooks[$name];
                } else {
@@ -1205,8 +1346,8 @@ class DbTestPreviewer extends TestRecorder  {
                global $wgDBtype, $wgDBprefix;
                parent::start();
 
-               if( ! $this->db->tableExists( 'testrun' ) 
-                       or ! $this->db->tableExists( 'testitem' ) ) 
+               if( ! $this->db->tableExists( 'testrun' )
+                       or ! $this->db->tableExists( 'testitem' ) )
                {
                        print "WARNING> `testrun` table not found in database.\n";
                        $this->prevRun = false;
@@ -1242,7 +1383,7 @@ class DbTestPreviewer extends TestRecorder  {
                        $res = $this->db->select( 'testitem', array( 'ti_name', 'ti_success' ),
                                array( 'ti_run' => $this->prevRun ), __METHOD__ );
                        foreach ( $res as $row ) {
-                               if ( !$this->parent->regex 
+                               if ( !$this->parent->regex
                                        || preg_match( "/{$this->parent->regex}/i", $row->ti_name ) )
                                {
                                        $prevResults[$row->ti_name] = $row->ti_success;
@@ -1315,7 +1456,7 @@ class DbTestPreviewer extends TestRecorder  {
 
                // Otherwise, this test has previous recorded results.
                // See when this test last had a different result to what we're seeing now.
-               $conds = array( 
+               $conds = array(
                        'ti_name'    => $testname,
                        'ti_success' => ($after == 'f' ? "1" : "0") );
                if ( $this->curRun ) {
@@ -1375,26 +1516,29 @@ class DbTestRecorder extends DbTestPreviewer  {
         * and all that fun stuff
         */
        function start() {
-               global $wgDBtype, $wgDBprefix;
+               global $wgDBtype, $wgDBprefix, $options;
                $this->db->begin();
 
-               if( ! $this->db->tableExists( 'testrun' ) 
-                       or ! $this->db->tableExists( 'testitem' ) ) 
+               if( ! $this->db->tableExists( 'testrun' )
+                       or ! $this->db->tableExists( 'testitem' ) )
                {
                        print "WARNING> `testrun` table not found in database. Trying to create table.\n";
                        if ($wgDBtype === 'postgres')
                                $this->db->sourceFile( dirname(__FILE__) . '/testRunner.postgres.sql' );
+                       elseif ($wgDBtype === 'oracle')
+                               $this->db->sourceFile( dirname(__FILE__) . '/testRunner.ora.sql' );
                        else
                                $this->db->sourceFile( dirname(__FILE__) . '/testRunner.sql' );
                        echo "OK, resuming.\n";
                }
-               
+
                parent::start();
 
                $this->db->insert( 'testrun',
                        array(
                                'tr_date'        => $this->db->timestamp(),
-                               'tr_mw_version'  => SpecialVersion::getVersion(),
+                               'tr_mw_version'  => isset( $options['setversion'] ) ?
+                                       $options['setversion'] : SpecialVersion::getVersion(),
                                'tr_php_version' => phpversion(),
                                'tr_db_version'  => $this->db->getServerVersion(),
                                'tr_uname'       => php_uname()
@@ -1422,3 +1566,89 @@ class DbTestRecorder extends DbTestPreviewer  {
                        __METHOD__ );
        }
 }
+
+class RemoteTestRecorder extends TestRecorder {
+       function start() {
+               parent::start();
+               $this->results = array();
+               $this->ping( 'running' );
+       }
+
+       function record( $test, $result ) {
+               parent::record( $test, $result );
+               $this->results[$test] = (bool)$result;
+       }
+
+       function end() {
+               $this->ping( 'complete', $this->results );
+               parent::end();
+       }
+
+       /**
+        * Inform a CodeReview instance that we've started or completed a test run...
+        * @param $remote array: info on remote target
+        * @param $status string: "running" - tell it we've started
+        *                        "complete" - provide test results array
+        *                        "abort" - something went horribly awry
+        * @param $data array of test name => true/false
+        */
+       function ping( $status, $results=false ) {
+               global $wgParserTestRemote, $IP;
+
+               $remote = $wgParserTestRemote;
+               $revId = SpecialVersion::getSvnRevision( $IP );
+               $jsonResults = json_encode( $results );
+
+               if( !$remote ) {
+                       print "Can't do remote upload without configuring \$wgParserTestRemote!\n";
+                       exit( 1 );
+               }
+
+               // Generate a hash MAC to validate our credentials
+               $message = array(
+                       $remote['repo'],
+                       $remote['suite'],
+                       $revId,
+                       $status,
+               );
+               if( $status == "complete" ) {
+                       $message[] = $jsonResults;
+               }
+               $hmac = hash_hmac( "sha1", implode( "|", $message ), $remote['secret'] );
+
+               $postData = array(
+                       'action' => 'codetestupload',
+                       'format' => 'json',
+                       'repo'   => $remote['repo'],
+                       'suite'  => $remote['suite'],
+                       'rev'    => $revId,
+                       'status' => $status,
+                       'hmac'   => $hmac,
+               );
+               if( $status == "complete" ) {
+                       $postData['results'] = $jsonResults;
+               }
+               $response = $this->post( $remote['api-url'], $postData );
+
+               if( $response === false ) {
+                       print "CodeReview info upload failed to reach server.\n";
+                       exit( 1 );
+               }
+               $responseData = json_decode( $response, true );
+               if( !is_array( $responseData ) ) {
+                       print "CodeReview API response not recognized...\n";
+                       wfDebug( "Unrecognized CodeReview API response: $response\n" );
+                       exit( 1 );
+               }
+               if( isset( $responseData['error'] ) ) {
+                       $code = $responseData['error']['code'];
+                       $info = $responseData['error']['info'];
+                       print "CodeReview info upload failed: $code $info\n";
+                       exit( 1 );
+               }
+       }
+
+       function post( $url, $data ) {
+               return Http::post( $url, array( 'postData' => $data) );
+       }
+}