Fix a few more paths, restore a few files lost in the move
authorChad Horohoe <demon@users.mediawiki.org>
Tue, 14 Dec 2010 16:48:44 +0000 (16:48 +0000)
committerChad Horohoe <demon@users.mediawiki.org>
Tue, 14 Dec 2010 16:48:44 +0000 (16:48 +0000)
includes/AutoLoader.php
includes/DefaultSettings.php
tests/RunSeleniumTests.php [new file with mode: 0644]
tests/parserTests.php [new file with mode: 0644]
tests/testHelpers.inc [new file with mode: 0644]

index d50c006..6e84a54 100644 (file)
@@ -698,45 +698,49 @@ $wgAutoloadLocalClasses = array(
        'LanguageConverter' => 'languages/LanguageConverter.php',
 
        # maintenance
-       'AnsiTermColorer' => 'maintenance/tests/testHelpers.inc',
        'ConvertLinks' => 'maintenance/convertLinks.php',
-       'DbTestPreviewer' => 'maintenance/tests/testHelpers.inc',
-       'DbTestRecorder' => 'maintenance/tests/testHelpers.inc',
        'DeleteArchivedFilesImplementation' => 'maintenance/deleteArchivedFiles.inc',
        'DeleteArchivedRevisionsImplementation' => 'maintenance/deleteArchivedRevisions.inc',
        'DeleteDefaultMessages' => 'maintenance/deleteDefaultMessages.php',
-       'DummyTermColorer' => 'maintenance/tests/testHelpers.inc',
-       'ParserTest' => 'maintenance/tests/parser/parserTest.inc',
-       'ParserTestParserHook' => 'maintenance/tests/parser/parserTestsParserHook.php',
-       'ParserTestStaticParserHook' => 'maintenance/tests/parser/parserTestsStaticParserHook.php',
        'PopulateCategory' => 'maintenance/populateCategory.php',
        'PopulateLogSearch' => 'maintenance/populateLogSearch.php',
        'PopulateParentId' => 'maintenance/populateParentId.php',
        'PopulateRevisionLength' => 'maintenance/populateRevisionLength.php',
-       'RemoteTestRecorder' => 'maintenance/tests/testHelpers.inc',
        'SevenZipStream' => 'maintenance/7zip.inc',
        'Sqlite' => 'maintenance/sqlite.inc',
-       'TestFileIterator' => 'maintenance/tests/testHelpers.inc',
-       'TestRecorder' => 'maintenance/tests/testHelpers.inc',
        'UpdateCollation' => 'maintenance/updateCollation.php',
        'UpdateRestrictions' => 'maintenance/updateRestrictions.php',
        'UserDupes' => 'maintenance/userDupes.inc',
 
-       # maintenance/tests/selenium
-       'Selenium' => 'maintenance/tests/selenium/Selenium.php',
-       'SeleniumLoader' => 'maintenance/tests/selenium/SeleniumLoader.php',
-       'SeleniumTestCase' => 'maintenance/tests/selenium/SeleniumTestCase.php',
-       'SeleniumTestConsoleLogger' => 'maintenance/tests/selenium/SeleniumTestConsoleLogger.php',
-       'SeleniumTestHTMLLogger' => 'maintenance/tests/selenium/SeleniumTestHTMLLogger.php',
-       'SeleniumTestListener' => 'maintenance/tests/selenium/SeleniumTestListener.php',
-       'SeleniumTestSuite' => 'maintenance/tests/selenium/SeleniumTestSuite.php',
-       'SeleniumConfig' => 'maintenance/tests/selenium/SeleniumConfig.php',
-
        # maintenance/language
        'csvStatsOutput' => 'maintenance/language/StatOutputs.php',
        'statsOutput' => 'maintenance/language/StatOutputs.php',
        'textStatsOutput' => 'maintenance/language/StatOutputs.php',
        'wikiStatsOutput' => 'maintenance/language/StatOutputs.php',
+
+       # tests
+       'AnsiTermColorer' => 'tests/testHelpers.inc',
+       'DbTestPreviewer' => 'maintenance/tests/testHelpers.inc',
+       'DbTestRecorder' => 'maintenance/tests/testHelpers.inc',
+       'DummyTermColorer' => 'maintenance/tests/testHelpers.inc',
+       'RemoteTestRecorder' => 'maintenance/tests/testHelpers.inc',
+       'TestFileIterator' => 'maintenance/tests/testHelpers.inc',
+       'TestRecorder' => 'maintenance/tests/testHelpers.inc',
+
+       # tests/parser
+       'ParserTest' => 'tests/parser/parserTest.inc',
+       'ParserTestParserHook' => 'tests/parser/parserTestsParserHook.php',
+       'ParserTestStaticParserHook' => 'tests/parser/parserTestsStaticParserHook.php',
+
+       # tests/selenium
+       'Selenium' => 'tests/selenium/Selenium.php',
+       'SeleniumLoader' => 'tests/selenium/SeleniumLoader.php',
+       'SeleniumTestCase' => 'tests/selenium/SeleniumTestCase.php',
+       'SeleniumTestConsoleLogger' => 'tests/selenium/SeleniumTestConsoleLogger.php',
+       'SeleniumTestHTMLLogger' => 'tests/selenium/SeleniumTestHTMLLogger.php',
+       'SeleniumTestListener' => 'tests/selenium/SeleniumTestListener.php',
+       'SeleniumTestSuite' => 'tests/selenium/SeleniumTestSuite.php',
+       'SeleniumConfig' => 'tests/selenium/SeleniumConfig.php',
 );
 
 class AutoLoader {
index 00f4d4f..e5a7f6f 100644 (file)
@@ -3870,8 +3870,8 @@ $wgUseTrackbacks = false;
  * Use full paths.
  */
 $wgParserTestFiles = array(
-       "$IP/maintenance/tests/parser/parserTests.txt",
-       "$IP/maintenance/tests/parser/extraParserTests.txt"
+       "$IP/tests/parser/parserTests.txt",
+       "$IP/tests/parser/extraParserTests.txt"
 );
 
 /**
diff --git a/tests/RunSeleniumTests.php b/tests/RunSeleniumTests.php
new file mode 100644 (file)
index 0000000..33aab53
--- /dev/null
@@ -0,0 +1,220 @@
+#!/usr/bin/php
+<?php
+/**
+ * @file
+ * @ingroup Maintenance
+ * @copyright Copyright Â© Wikimedia Deuschland, 2009
+ * @author Hallo Welt! Medienwerkstatt GmbH
+ * @author Markus Glaser, Dan Nessett, Priyanka Dhanda
+ * initial idea by Daniel Kinzler
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+define( 'SELENIUMTEST', true );
+
+require_once( dirname( __FILE__ ) . '/../maintenance/commandLine.inc' );
+require_once( 'PHPUnit/Framework.php' );
+require_once( 'PHPUnit/Extensions/SeleniumTestCase.php' );
+include_once( 'PHPUnit/Util/Log/JUnit.php' );
+require_once( dirname( __FILE__ ) . "/selenium/SeleniumServerManager.php" );
+
+class SeleniumTester extends Maintenance {
+       protected $selenium;
+       protected $serverManager;
+       protected $seleniumServerExecPath;
+
+       public function __construct() {
+               parent::__construct();
+               $this->mDescription = "Selenium Test Runner. For documentation, visit http://www.mediawiki.org/wiki/SeleniumFramework";
+               $this->addOption( 'port', 'Port used by selenium server. Default: 4444', false, true );
+               $this->addOption( 'host', 'Host selenium server. Default: $wgServer . $wgScriptPath', false, true );
+               $this->addOption( 'testBrowser', 'The browser used during testing. Default: firefox', false, true );
+               $this->addOption( 'wikiUrl', 'The Mediawiki installation to point to. Default: http://localhost', false, true );
+               $this->addOption( 'username', 'The login username for sunning tests. Default: empty', false, true );
+               $this->addOption( 'userPassword', 'The login password for running tests. Default: empty', false, true );
+               $this->addOption( 'seleniumConfig', 'Location of the selenium config file. Default: empty', false, true );
+               $this->addOption( 'list-browsers', 'List the available browsers.' );
+               $this->addOption( 'verbose', 'Be noisier.' );
+               $this->addOption( 'startserver', 'Start Selenium Server (on localhost) before the run.' );
+               $this->addOption( 'stopserver', 'Stop Selenium Server (on localhost) after the run.' );
+               $this->addOption( 'jUnitLogFile', 'Log results in a specified JUnit log file. Default: empty', false, true );
+               $this->addOption( 'runAgainstGrid', 'The test will be run against a Selenium Grid. Default: false.', false, true );
+               $this->deleteOption( 'dbpass' );
+               $this->deleteOption( 'dbuser' );
+               $this->deleteOption( 'globals' );
+               $this->deleteOption( 'wiki' );
+       }
+
+       public function listBrowsers() {
+               $desc = "Available browsers:\n";
+
+               foreach ($this->selenium->getAvailableBrowsers() as $k => $v) {
+                       $desc .= "  $k => $v\n";
+               }
+
+               echo $desc;
+       }
+
+       protected function startServer() {
+               if ( $this->seleniumServerExecPath == '' ) {
+                       die ( "The selenium server exec path is not set in " .
+                                 "selenium_settings.ini. Cannot start server \n" .
+                                 "as requested - terminating RunSeleniumTests\n" );
+               }
+               $this->serverManager = new SeleniumServerManager( 'true',
+                       $this->selenium->getPort(),
+                       $this->seleniumServerExecPath );
+               switch ( $this->serverManager->start() ) {
+                       case 'started':
+                               break;
+                       case 'failed':
+                               die ( "Unable to start the Selenium Server - " .
+                                       "terminating RunSeleniumTests\n" );
+                       case 'running':
+                               echo ( "Warning: The Selenium Server is " .
+                                       "already running\n" );
+                               break;
+               }
+
+               return;
+       }
+
+       protected function stopServer() {
+               if ( !isset ( $this->serverManager ) ) {
+                       echo ( "Warning: Request to stop Selenium Server, but it was " .
+                               "not stared by RunSeleniumTests\n" .
+                               "RunSeleniumTests cannot stop a Selenium Server it " .
+                               "did not start\n" );
+               } else {
+                       switch ( $this->serverManager->stop() ) {
+                               case 'stopped':
+                                       break;
+                               case 'failed':
+                                       echo ( "unable to stop the Selenium Server\n" );
+                       }
+               }
+               return;
+       }
+
+       protected function runTests( $seleniumTestSuites = array() ) {
+               $result = new PHPUnit_Framework_TestResult;
+               $result->addListener( new SeleniumTestListener( $this->selenium->getLogger() ) );
+               if ( $this->selenium->getJUnitLogFile() ) {
+                       $jUnitListener = new PHPUnit_Util_Log_JUnit( $this->selenium->getJUnitLogFile(), true );
+                       $result->addListener( $jUnitListener );
+               }
+
+               foreach ( $seleniumTestSuites as $testSuiteName => $testSuiteFile ) {
+                       require( $testSuiteFile );
+                       $suite = new $testSuiteName();
+                       $suite->setName( $testSuiteName );
+                       $suite->addTests();
+
+                       try {
+                               $suite->run( $result );
+                       } catch ( Testing_Selenium_Exception $e ) {
+                               $suite->tearDown();
+                               throw new MWException( $e->getMessage() );
+                       }
+               }
+
+               if ( $this->selenium->getJUnitLogFile() ) {
+                       $jUnitListener->flush();
+               }
+       }
+
+       public function execute() {
+               global $wgServer, $wgScriptPath, $wgHooks;
+
+               $seleniumSettings;
+               $seleniumBrowsers;
+               $seleniumTestSuites;
+
+               $configFile = $this->getOption( 'seleniumConfig', '' );
+               if ( strlen( $configFile ) > 0 ) {
+                       $this->output("Using Selenium Configuration file: " . $configFile . "\n");
+                       SeleniumConfig::getSeleniumSettings( $seleniumSettings,
+                               $seleniumBrowsers,
+                               $seleniumTestSuites,
+                               $configFile );
+               } else if ( !isset( $wgHooks['SeleniumSettings'] ) ) {
+                       $this->output("No command line configuration file or configuration hook found.\n");
+                       SeleniumConfig::getSeleniumSettings( $seleniumSettings,
+                               $seleniumBrowsers,
+                               $seleniumTestSuites
+                                                                                                       );
+               } else {
+                       $this->output("Using 'SeleniumSettings' hook for configuration.\n");
+                       wfRunHooks('SeleniumSettings', array( $seleniumSettings,
+                               $seleniumBrowsers,
+                               $seleniumTestSuites ) );
+               }
+
+               // State for starting/stopping the Selenium server has nothing to do with the Selenium
+               // class. Keep this state local to SeleniumTester class. Using getOption() is clumsy, but
+               // the Maintenance class does not have a setOption()
+               if ( isset( $seleniumSettings['startserver'] ) ) $this->getOption( 'startserver', true );
+               if ( isset( $seleniumSettings['stopserver'] ) ) $this->getOption( 'stopserver', true );
+               if ( !isset( $seleniumSettings['seleniumserverexecpath'] ) ) $seleniumSettings['seleniumserverexecpath'] = '';
+               $this->seleniumServerExecPath = $seleniumSettings['seleniumserverexecpath'];
+
+               //set reasonable defaults if we did not find the settings
+               if ( !isset( $seleniumBrowsers ) ) $seleniumBrowsers = array ('firefox' => '*firefox');
+               if ( !isset( $seleniumSettings['host'] ) ) $seleniumSettings['host'] = $wgServer . $wgScriptPath;
+               if ( !isset( $seleniumSettings['port'] ) ) $seleniumSettings['port'] = '4444';
+               if ( !isset( $seleniumSettings['wikiUrl'] ) ) $seleniumSettings['wikiUrl'] = 'http://localhost';
+               if ( !isset( $seleniumSettings['username'] ) ) $seleniumSettings['username'] = '';
+               if ( !isset( $seleniumSettings['userPassword'] ) ) $seleniumSettings['userPassword'] = '';
+               if ( !isset( $seleniumSettings['testBrowser'] ) ) $seleniumSettings['testBrowser'] = 'firefox';
+               if ( !isset( $seleniumSettings['jUnitLogFile'] ) ) $seleniumSettings['jUnitLogFile'] = false;
+               if ( !isset( $seleniumSettings['runAgainstGrid'] ) ) $seleniumSettings['runAgainstGrid'] = false;
+
+               // Setup Selenium class
+               $this->selenium = new Selenium( );
+               $this->selenium->setAvailableBrowsers( $seleniumBrowsers );
+               $this->selenium->setRunAgainstGrid( $this->getOption( 'runAgainstGrid', $seleniumSettings['runAgainstGrid'] ) );
+               $this->selenium->setUrl( $this->getOption( 'wikiUrl', $seleniumSettings['wikiUrl'] ) );
+               $this->selenium->setBrowser( $this->getOption( 'testBrowser', $seleniumSettings['testBrowser'] ) );
+               $this->selenium->setPort( $this->getOption( 'port', $seleniumSettings['port'] ) );
+               $this->selenium->setHost( $this->getOption( 'host', $seleniumSettings['host'] ) );
+               $this->selenium->setUser( $this->getOption( 'username', $seleniumSettings['username'] ) );
+               $this->selenium->setPass( $this->getOption( 'userPassword', $seleniumSettings['userPassword'] ) );
+               $this->selenium->setVerbose( $this->hasOption( 'verbose' ) );
+               $this->selenium->setJUnitLogFile( $this->getOption( 'jUnitLogFile', $seleniumSettings['jUnitLogFile'] ) );
+
+               if( $this->hasOption( 'list-browsers' ) ) {
+                       $this->listBrowsers();
+                       exit(0);
+               }
+               if ( $this->hasOption( 'startserver' ) ) {
+                       $this->startServer();
+               }
+
+               $logger = new SeleniumTestConsoleLogger;
+               $this->selenium->setLogger( $logger );
+
+               $this->runTests( $seleniumTestSuites );
+
+               if ( $this->hasOption( 'stopserver' )  ) {
+                       $this->stopServer();
+               }
+       }
+}
+
+$maintClass = "SeleniumTester";
+
+require_once( DO_MAINTENANCE );
diff --git a/tests/parserTests.php b/tests/parserTests.php
new file mode 100644 (file)
index 0000000..b954790
--- /dev/null
@@ -0,0 +1,92 @@
+<?php
+/**
+ * MediaWiki parser test suite
+ *
+ * Copyright Â© 2004 Brion Vibber <brion@pobox.com>
+ * http://www.mediawiki.org/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup Testing
+ */
+
+$options = array( 'quick', 'color', 'quiet', 'help', 'show-output', 'record', 'run-disabled' );
+$optionsWithArgs = array( 'regex', 'seed', 'setversion' );
+
+require_once( dirname( __FILE__ ) . '/../maintenance/commandLine.inc' );
+
+if ( isset( $options['help'] ) ) {
+       echo <<<ENDS
+MediaWiki $wgVersion parser test suite
+Usage: php parserTests.php [options...]
+
+Options:
+  --quick          Suppress diff output of failed tests
+  --quiet          Suppress notification of passed tests (shows only failed tests)
+  --show-output    Show expected and actual output
+  --color[=yes|no] Override terminal detection and force color output on or off
+                                  use wgCommandLineDarkBg = true; if your term is dark
+  --regex          Only run tests whose descriptions which match given regex
+  --file=<testfile> Run test cases from a custom file instead of parserTests.txt
+  --record         Record tests in database
+  --compare        Compare with recorded results, without updating the database.
+  --setversion     When using --record, set the version string to use (useful
+                                  with git-svn so that you can get the exact revision)
+  --keep-uploads   Re-use the same upload directory for each test, don't delete it
+  --fuzz           Do a fuzz test instead of a normal test
+  --seed <n>       Start the fuzz test from the specified seed
+  --help           Show this help message
+  --run-disabled   run disabled tests
+  --upload         Upload test results to remote wiki (per \$wgParserTestRemote)
+
+ENDS;
+       exit( 0 );
+}
+
+# Cases of weird db corruption were encountered when running tests on earlyish
+# versions of SQLite
+if ( $wgDBtype == 'sqlite' ) {
+       $db = wfGetDB( DB_MASTER );
+       $version = $db->getServerVersion();
+       if ( version_compare( $version, '3.6' ) < 0 ) {
+               die( "Parser tests require SQLite version 3.6 or later, you have $version\n" );
+       }
+}
+
+# There is a convention that the parser should never
+# refer to $wgTitle directly, but instead use the title
+# passed to it.
+$wgTitle = Title::newFromText( 'Parser test script do not use' );
+$tester = new ParserTest($options);
+
+if ( isset( $options['file'] ) ) {
+       $files = array( $options['file'] );
+} else {
+       // Default parser tests and any set from extensions or local config
+       $files = $wgParserTestFiles;
+}
+
+# Print out software version to assist with locating regressions
+$version = SpecialVersion::getVersion();
+echo( "This is MediaWiki version {$version}.\n\n" );
+
+if ( isset( $options['fuzz'] ) ) {
+       $tester->fuzzTest( $files );
+} else {
+       $ok = $tester->runTestsFromFiles( $files );
+       exit ( $ok ? 0 : 1 );
+}
diff --git a/tests/testHelpers.inc b/tests/testHelpers.inc
new file mode 100644 (file)
index 0000000..2545b84
--- /dev/null
@@ -0,0 +1,652 @@
+<?php
+
+/**
+ * @ingroup Testing
+ *
+ * Set of classes to help with test output and such. Right now pretty specific
+ * to the parser tests but could be more useful one day :)
+ *
+ * @todo Fixme: Make this more generic
+ */
+
+class AnsiTermColorer {
+       function __construct() {
+       }
+
+       /**
+        * Return ANSI terminal escape code for changing text attribs/color
+        *
+        * @param $color String: semicolon-separated list of attribute/color codes
+        * @return String
+        */
+       public function color( $color ) {
+               global $wgCommandLineDarkBg;
+
+               $light = $wgCommandLineDarkBg ? "1;" : "0;";
+
+               return "\x1b[{$light}{$color}m";
+       }
+
+       /**
+        * Return ANSI terminal escape code for restoring default text attributes
+        *
+        * @return String
+        */
+       public function reset() {
+               return $this->color( 0 );
+       }
+}
+
+/* A colour-less terminal */
+class DummyTermColorer {
+       public function color( $color ) {
+               return '';
+       }
+
+       public function reset() {
+               return '';
+       }
+}
+
+class TestRecorder {
+       var $parent;
+       var $term;
+
+       function __construct( $parent ) {
+               $this->parent = $parent;
+               $this->term = $parent->term;
+       }
+
+       function start() {
+               $this->total = 0;
+               $this->success = 0;
+       }
+
+       function record( $test, $result ) {
+               $this->total++;
+               $this->success += ( $result ? 1 : 0 );
+       }
+
+       function end() {
+               // dummy
+       }
+
+       function report() {
+               if ( $this->total > 0 ) {
+                       $this->reportPercentage( $this->success, $this->total );
+               } else {
+                       wfDie( "No tests found.\n" );
+               }
+       }
+
+       function reportPercentage( $success, $total ) {
+               $ratio = wfPercent( 100 * $success / $total );
+               print $this->term->color( 1 ) . "Passed $success of $total tests ($ratio)... ";
+
+               if ( $success == $total ) {
+                       print $this->term->color( 32 ) . "ALL TESTS PASSED!";
+               } else {
+                       $failed = $total - $success ;
+                       print $this->term->color( 31 ) . "$failed tests failed!";
+               }
+
+               print $this->term->reset() . "\n";
+
+               return ( $success == $total );
+       }
+}
+
+class DbTestPreviewer extends TestRecorder  {
+       protected $lb;      // /< Database load balancer
+       protected $db;      // /< Database connection to the main DB
+       protected $curRun;  // /< run ID number for the current run
+       protected $prevRun; // /< run ID number for the previous run, if any
+       protected $results; // /< Result array
+
+       /**
+        * This should be called before the table prefix is changed
+        */
+       function __construct( $parent ) {
+               parent::__construct( $parent );
+
+               $this->lb = wfGetLBFactory()->newMainLB();
+               // This connection will have the wiki's table prefix, not parsertest_
+               $this->db = $this->lb->getConnection( DB_MASTER );
+       }
+
+       /**
+        * Set up result recording; insert a record for the run with the date
+        * and all that fun stuff
+        */
+       function start() {
+               parent::start();
+
+               if ( ! $this->db->tableExists( 'testrun' )
+                       or ! $this->db->tableExists( 'testitem' ) )
+               {
+                       print "WARNING> `testrun` table not found in database.\n";
+                       $this->prevRun = false;
+               } else {
+                       // We'll make comparisons against the previous run later...
+                       $this->prevRun = $this->db->selectField( 'testrun', 'MAX(tr_id)' );
+               }
+
+               $this->results = array();
+       }
+
+       function record( $test, $result ) {
+               parent::record( $test, $result );
+               $this->results[$test] = $result;
+       }
+
+       function report() {
+               if ( $this->prevRun ) {
+                       // f = fail, p = pass, n = nonexistent
+                       // codes show before then after
+                       $table = array(
+                               'fp' => 'previously failing test(s) now PASSING! :)',
+                               'pn' => 'previously PASSING test(s) removed o_O',
+                               'np' => 'new PASSING test(s) :)',
+
+                               'pf' => 'previously passing test(s) now FAILING! :(',
+                               'fn' => 'previously FAILING test(s) removed O_o',
+                               'nf' => 'new FAILING test(s) :(',
+                               'ff' => 'still FAILING test(s) :(',
+                       );
+
+                       $prevResults = array();
+
+                       $res = $this->db->select( 'testitem', array( 'ti_name', 'ti_success' ),
+                               array( 'ti_run' => $this->prevRun ), __METHOD__ );
+
+                       foreach ( $res as $row ) {
+                               if ( !$this->parent->regex
+                                       || preg_match( "/{$this->parent->regex}/i", $row->ti_name ) )
+                               {
+                                       $prevResults[$row->ti_name] = $row->ti_success;
+                               }
+                       }
+
+                       $combined = array_keys( $this->results + $prevResults );
+
+                       # Determine breakdown by change type
+                       $breakdown = array();
+                       foreach ( $combined as $test ) {
+                               if ( !isset( $prevResults[$test] ) ) {
+                                       $before = 'n';
+                               } elseif ( $prevResults[$test] == 1 ) {
+                                       $before = 'p';
+                               } else /* if ( $prevResults[$test] == 0 )*/ {
+                                       $before = 'f';
+                               }
+
+                               if ( !isset( $this->results[$test] ) ) {
+                                       $after = 'n';
+                               } elseif ( $this->results[$test] == 1 ) {
+                                       $after = 'p';
+                               } else /*if ( $this->results[$test] == 0 ) */ {
+                                       $after = 'f';
+                               }
+
+                               $code = $before . $after;
+
+                               if ( isset( $table[$code] ) ) {
+                                       $breakdown[$code][$test] = $this->getTestStatusInfo( $test, $after );
+                               }
+                       }
+
+                       # Write out results
+                       foreach ( $table as $code => $label ) {
+                               if ( !empty( $breakdown[$code] ) ) {
+                                       $count = count( $breakdown[$code] );
+                                       printf( "\n%4d %s\n", $count, $label );
+
+                                       foreach ( $breakdown[$code] as $differing_test_name => $statusInfo ) {
+                                               print "      * $differing_test_name  [$statusInfo]\n";
+                                       }
+                               }
+                       }
+               } else {
+                       print "No previous test runs to compare against.\n";
+               }
+
+               print "\n";
+               parent::report();
+       }
+
+       /**
+        * Returns a string giving information about when a test last had a status change.
+        * Could help to track down when regressions were introduced, as distinct from tests
+        * which have never passed (which are more change requests than regressions).
+        */
+       private function getTestStatusInfo( $testname, $after ) {
+               // If we're looking at a test that has just been removed, then say when it first appeared.
+               if ( $after == 'n' ) {
+                       $changedRun = $this->db->selectField ( 'testitem',
+                               'MIN(ti_run)',
+                               array( 'ti_name' => $testname ),
+                               __METHOD__ );
+                       $appear = $this->db->selectRow ( 'testrun',
+                               array( 'tr_date', 'tr_mw_version' ),
+                               array( 'tr_id' => $changedRun ),
+                               __METHOD__ );
+
+                       return "First recorded appearance: "
+                                  . date( "d-M-Y H:i:s",  strtotime ( $appear->tr_date ) )
+                                  .  ", " . $appear->tr_mw_version;
+               }
+
+               // Otherwise, this test has previous recorded results.
+               // See when this test last had a different result to what we're seeing now.
+               $conds = array(
+                       'ti_name'    => $testname,
+                       'ti_success' => ( $after == 'f' ? "1" : "0" ) );
+
+               if ( $this->curRun ) {
+                       $conds[] = "ti_run != " . $this->db->addQuotes ( $this->curRun );
+               }
+
+               $changedRun = $this->db->selectField ( 'testitem', 'MAX(ti_run)', $conds, __METHOD__ );
+
+               // If no record of ever having had a different result.
+               if ( is_null ( $changedRun ) ) {
+                       if ( $after == "f" ) {
+                               return "Has never passed";
+                       } else {
+                               return "Has never failed";
+                       }
+               }
+
+               // Otherwise, we're looking at a test whose status has changed.
+               // (i.e. it used to work, but now doesn't; or used to fail, but is now fixed.)
+               // In this situation, give as much info as we can as to when it changed status.
+               $pre  = $this->db->selectRow ( 'testrun',
+                       array( 'tr_date', 'tr_mw_version' ),
+                       array( 'tr_id' => $changedRun ),
+                       __METHOD__ );
+               $post = $this->db->selectRow ( 'testrun',
+                       array( 'tr_date', 'tr_mw_version' ),
+                       array( "tr_id > " . $this->db->addQuotes ( $changedRun ) ),
+                       __METHOD__,
+                       array( "LIMIT" => 1, "ORDER BY" => 'tr_id' )
+               );
+
+               if ( $post ) {
+                       $postDate = date( "d-M-Y H:i:s",  strtotime ( $post->tr_date  ) ) . ", {$post->tr_mw_version}";
+               } else {
+                       $postDate = 'now';
+               }
+
+               return ( $after == "f" ? "Introduced" : "Fixed" ) . " between "
+                               . date( "d-M-Y H:i:s",  strtotime ( $pre->tr_date ) ) .  ", " . $pre->tr_mw_version
+                               . " and $postDate";
+
+       }
+
+       /**
+        * Commit transaction and clean up for result recording
+        */
+       function end() {
+               $this->lb->commitMasterChanges();
+               $this->lb->closeAll();
+               parent::end();
+       }
+
+}
+
+class DbTestRecorder extends DbTestPreviewer  {
+       var $version;
+
+       /**
+        * Set up result recording; insert a record for the run with the date
+        * and all that fun stuff
+        */
+       function start() {
+               global $wgDBtype;
+               $this->db->begin();
+
+               if ( ! $this->db->tableExists( 'testrun' )
+                       or ! $this->db->tableExists( 'testitem' ) )
+               {
+                       print "WARNING> `testrun` table not found in database. Trying to create table.\n";
+                       $this->db->sourceFile( $this->db->patchPath( 'patch-testrun.sql' ) );
+                       echo "OK, resuming.\n";
+               }
+
+               parent::start();
+
+               $this->db->insert( 'testrun',
+                       array(
+                               'tr_date'        => $this->db->timestamp(),
+                               'tr_mw_version'  => $this->version,
+                               'tr_php_version' => phpversion(),
+                               'tr_db_version'  => $this->db->getServerVersion(),
+                               'tr_uname'       => php_uname()
+                       ),
+                       __METHOD__ );
+                       if ( $wgDBtype === 'postgres' ) {
+                               $this->curRun = $this->db->currentSequenceValue( 'testrun_id_seq' );
+                       } else {
+                               $this->curRun = $this->db->insertId();
+                       }
+       }
+
+       /**
+        * Record an individual test item's success or failure to the db
+        *
+        * @param $test String
+        * @param $result Boolean
+        */
+       function record( $test, $result ) {
+               parent::record( $test, $result );
+
+               $this->db->insert( 'testitem',
+                       array(
+                               'ti_run'     => $this->curRun,
+                               'ti_name'    => $test,
+                               'ti_success' => $result ? 1 : 0,
+                       ),
+                       __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 $status string: "running" - tell it we've started
+        *                        "complete" - provide test results array
+        *                        "abort" - something went horribly awry
+        * @param $results array of test name => true/false
+        */
+       function ping( $status, $results = false ) {
+               global $wgParserTestRemote, $IP;
+
+               $remote = $wgParserTestRemote;
+               $revId = SpecialVersion::getSvnRevision( $IP );
+               $jsonResults = FormatJson::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 = FormatJson::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 ) );
+       }
+}
+
+class TestFileIterator implements Iterator {
+       private $file;
+       private $fh;
+       private $parserTest; /* An instance of ParserTest (parserTests.php) or MediaWikiParserTest (phpunit) */
+       private $index = 0;
+       private $test;
+       private $lineNum;
+       private $eof;
+
+       function __construct( $file, $parserTest = null ) {
+               global $IP;
+
+               $this->file = $file;
+               $this->fh = fopen( $this->file, "rt" );
+
+               if ( !$this->fh ) {
+                       wfDie( "Couldn't open file '$file'\n" );
+               }
+
+               $this->parserTest = $parserTest;
+
+               if ( $this->parserTest ) {
+                       $this->parserTest->showRunFile( wfRelativePath( $this->file, $IP ) );
+               }
+
+               $this->lineNum = $this->index = 0;
+       }
+
+       function rewind() {
+               if ( fseek( $this->fh, 0 ) ) {
+                       wfDie( "Couldn't fseek to the start of '$this->file'\n" );
+               }
+
+               $this->index = -1;
+               $this->lineNum = 0;
+               $this->eof = false;
+               $this->next();
+
+               return true;
+       }
+
+       function current() {
+               return $this->test;
+       }
+
+       function key() {
+               return $this->index;
+       }
+
+       function next() {
+               if ( $this->readNextTest() ) {
+                       $this->index++;
+                       return true;
+               } else {
+                       $this->eof = true;
+               }
+       }
+
+       function valid() {
+               return $this->eof != true;
+       }
+
+       function readNextTest() {
+               $data = array();
+               $section = null;
+
+               while ( false !== ( $line = fgets( $this->fh ) ) ) {
+                       $this->lineNum++;
+                       $matches = array();
+
+                       if ( preg_match( '/^!!\s*(\w+)/', $line, $matches ) ) {
+                               $section = strtolower( $matches[1] );
+
+                               if ( $section == 'endarticle' ) {
+                                       if ( !isset( $data['text'] ) ) {
+                                               wfDie( "'endarticle' without 'text' at line {$this->lineNum} of $this->file\n" );
+                                       }
+
+                                       if ( !isset( $data['article'] ) ) {
+                                               wfDie( "'endarticle' without 'article' at line {$this->lineNum} of $this->file\n" );
+                                       }
+
+                                       if ( $this->parserTest ) {
+                                               $this->parserTest->addArticle( ParserTest::chomp( $data['article'] ), $data['text'], $this->lineNum );
+                                       } else {wfDie("JAJA");
+                                               ParserTest::addArticle( $data['article'], $data['text'], $this->lineNum );
+                                       }
+                                       $data = array();
+                                       $section = null;
+
+                                       continue;
+                               }
+
+                               if ( $section == 'endhooks' ) {
+                                       if ( !isset( $data['hooks'] ) ) {
+                                               wfDie( "'endhooks' without 'hooks' at line {$this->lineNum} of $this->file\n" );
+                                       }
+
+                                       foreach ( explode( "\n", $data['hooks'] ) as $line ) {
+                                               $line = trim( $line );
+
+                                               if ( $line ) {
+                                                       if ( $this->parserTest && !$this->parserTest->requireHook( $line ) ) {
+                                                               return false;
+                                                       }
+                                               }
+                                       }
+
+                                       $data = array();
+                                       $section = null;
+
+                                       continue;
+                               }
+
+                               if ( $section == 'endfunctionhooks' ) {
+                                       if ( !isset( $data['functionhooks'] ) ) {
+                                               wfDie( "'endfunctionhooks' without 'functionhooks' at line {$this->lineNum} of $this->file\n" );
+                                       }
+
+                                       foreach ( explode( "\n", $data['functionhooks'] ) as $line ) {
+                                               $line = trim( $line );
+
+                                               if ( $line ) {
+                                                       if ( $this->parserTest && !$this->parserTest->requireFunctionHook( $line ) ) {
+                                                               return false;
+                                                       }
+                                               }
+                                       }
+
+                                       $data = array();
+                                       $section = null;
+
+                                       continue;
+                               }
+
+                               if ( $section == 'end' ) {
+                                       if ( !isset( $data['test'] ) ) {
+                                               wfDie( "'end' without 'test' at line {$this->lineNum} of $this->file\n" );
+                                       }
+
+                                       if ( !isset( $data['input'] ) ) {
+                                               wfDie( "'end' without 'input' at line {$this->lineNum} of $this->file\n" );
+                                       }
+
+                                       if ( !isset( $data['result'] ) ) {
+                                               wfDie( "'end' without 'result' at line {$this->lineNum} of $this->file\n" );
+                                       }
+
+                                       if ( !isset( $data['options'] ) ) {
+                                               $data['options'] = '';
+                                       }
+
+                                       if ( !isset( $data['config'] ) )
+                                               $data['config'] = '';
+
+                                       if ( $this->parserTest
+                                                && ( ( preg_match( '/\\bdisabled\\b/i', $data['options'] ) && !$this->parserTest->runDisabled )
+                                                        || !preg_match( "/" . $this->parserTest->regex . "/i", $data['test'] ) )  ) {
+                                               # disabled test
+                                               $data = array();
+                                               $section = null;
+
+                                               continue;
+                                       }
+
+                                       global $wgUseTeX;
+
+                                       if ( $this->parserTest &&
+                                                preg_match( '/\\bmath\\b/i', $data['options'] ) && !$wgUseTeX ) {
+                                               # don't run math tests if $wgUseTeX is set to false in LocalSettings
+                                               $data = array();
+                                               $section = null;
+
+                                               continue;
+                                       }
+
+                                       if ( $this->parserTest ) {
+                                               $this->test = array(
+                                                       'test' => ParserTest::chomp( $data['test'] ),
+                                                       'input' => ParserTest::chomp( $data['input'] ),
+                                                       'result' => ParserTest::chomp( $data['result'] ),
+                                                       'options' => ParserTest::chomp( $data['options'] ),
+                                                       'config' => ParserTest::chomp( $data['config'] ) );
+                                       } else {
+                                               $this->test['test'] = $data['test'];
+                                       }
+
+                                       return true;
+                               }
+
+                               if ( isset ( $data[$section] ) ) {
+                                       wfDie( "duplicate section '$section' at line {$this->lineNum} of $this->file\n" );
+                               }
+
+                               $data[$section] = '';
+
+                               continue;
+                       }
+
+                       if ( $section ) {
+                               $data[$section] .= $line;
+                       }
+               }
+
+               return false;
+       }
+}