Revert r108358. It's a good fellow and we like to keep it.
authorPlatonides <platonides@users.mediawiki.org>
Mon, 9 Jan 2012 22:33:00 +0000 (22:33 +0000)
committerPlatonides <platonides@users.mediawiki.org>
Mon, 9 Jan 2012 22:33:00 +0000 (22:33 +0000)
includes/AutoLoader.php
tests/parser/parserTest.inc [new file with mode: 0644]
tests/parserTests.php [new file with mode: 0644]
tests/phpunit/includes/ParserOptionsTest.php
tests/phpunit/includes/parser/NewParserTest.php
tests/testHelpers.inc

index 5a97972..72e9090 100644 (file)
@@ -928,10 +928,15 @@ $wgAutoloadLocalClasses = array(
        'DummyTermColorer' => 'maintenance/term/MWTerm.php',
 
        # tests
+       'DbTestPreviewer' => 'tests/testHelpers.inc',
+       'DbTestRecorder' => 'tests/testHelpers.inc',
        'TestFileIterator' => 'tests/testHelpers.inc',
+       'TestRecorder' => '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',
diff --git a/tests/parser/parserTest.inc b/tests/parser/parserTest.inc
new file mode 100644 (file)
index 0000000..ac557a3
--- /dev/null
@@ -0,0 +1,1317 @@
+<?php
+# Copyright (C) 2004, 2010 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
+
+/**
+ * @todo Make this more independent of the configuration (and if possible the database)
+ * @todo document
+ * @file
+ * @ingroup Testing
+ */
+
+/**
+ * @ingroup Testing
+ */
+class ParserTest {
+       /**
+        * boolean $color whereas output should be colorized
+        */
+       private $color;
+
+       /**
+        * boolean $showOutput Show test output
+        */
+       private $showOutput;
+
+       /**
+        * boolean $useTemporaryTables Use temporary tables for the temporary database
+        */
+       private $useTemporaryTables = true;
+
+       /**
+        * boolean $databaseSetupDone True if the database has been set up
+        */
+       private $databaseSetupDone = false;
+
+       /**
+        * Our connection to the database
+        * @var DatabaseBase
+        */
+       private $db;
+
+       /**
+        * Database clone helper
+        * @var CloneDatabase
+        */
+       private $dbClone;
+
+       /**
+        * string $oldTablePrefix Original table prefix
+        */
+       private $oldTablePrefix;
+
+       private $maxFuzzTestLength = 300;
+       private $fuzzSeed = 0;
+       private $memoryLimit = 50;
+       private $uploadDir = null;
+
+       public $regex = "";
+       private $savedGlobals = array();
+       /**
+        * Sets terminal colorization and diff/quick modes depending on OS and
+        * command-line options (--color and --quick).
+        */
+       public function __construct( $options = array() ) {
+               # Only colorize output if stdout is a terminal.
+               $this->color = !wfIsWindows() && Maintenance::posix_isatty( 1 );
+
+               if ( isset( $options['color'] ) ) {
+                       switch( $options['color'] ) {
+                       case 'no':
+                               $this->color = false;
+                               break;
+                       case 'yes':
+                       default:
+                               $this->color = true;
+                               break;
+                       }
+               }
+
+               $this->term = $this->color
+                       ? new AnsiTermColorer()
+                       : new DummyTermColorer();
+
+               $this->showDiffs = !isset( $options['quick'] );
+               $this->showProgress = !isset( $options['quiet'] );
+               $this->showFailure = !(
+                       isset( $options['quiet'] )
+                       && ( isset( $options['record'] )
+                               || isset( $options['compare'] ) ) ); // redundant output
+
+               $this->showOutput = isset( $options['show-output'] );
+
+               if ( isset( $options['filter'] ) ) {
+                       $options['regex'] = $options['filter'];
+               }
+
+               if ( isset( $options['regex'] ) ) {
+                       if ( isset( $options['record'] ) ) {
+                               echo "Warning: --record cannot be used with --regex, disabling --record\n";
+                               unset( $options['record'] );
+                       }
+                       $this->regex = $options['regex'];
+               } else {
+                       # Matches anything
+                       $this->regex = '';
+               }
+
+               $this->setupRecorder( $options );
+               $this->keepUploads = isset( $options['keep-uploads'] );
+
+               if ( isset( $options['seed'] ) ) {
+                       $this->fuzzSeed = intval( $options['seed'] ) - 1;
+               }
+
+               $this->runDisabled = isset( $options['run-disabled'] );
+
+               $this->hooks = array();
+               $this->functionHooks = array();
+               self::setUp();
+       }
+
+       static function setUp() {
+               global $wgParser, $wgParserConf, $IP, $messageMemc, $wgMemc,
+                       $wgUser, $wgLang, $wgOut, $wgRequest, $wgStyleDirectory, $wgEnableParserCache,
+                       $wgNamespaceAliases, $wgNamespaceProtection, $wgLocalFileRepo,
+                       $parserMemc, $wgThumbnailScriptPath, $wgScriptPath,
+                       $wgArticlePath, $wgStyleSheetPath, $wgScript, $wgStylePath, $wgExtensionAssetsPath,
+                       $wgMainCacheType, $wgMessageCacheType, $wgParserCacheType;
+
+               $wgScript = '/index.php';
+               $wgScriptPath = '/';
+               $wgArticlePath = '/wiki/$1';
+               $wgStyleSheetPath = '/skins';
+               $wgStylePath = '/skins';
+               $wgExtensionAssetsPath = '/extensions';
+               $wgThumbnailScriptPath = false;
+               $wgLocalFileRepo = array(
+                       'class'           => 'LocalRepo',
+                       'name'            => 'local',
+                       'url'             => 'http://example.com/images',
+                       'hashLevels'      => 2,
+                       'transformVia404' => false,
+                       'backend'         => new FSFileBackend( array(
+                               'name'        => 'local-backend',
+                               'lockManager' => 'fsLockManager',
+                               'containerPaths' => array(
+                                       'local-public'  => wfTempDir() . '/test-repo/public',
+                                       'local-thumb'   => wfTempDir() . '/test-repo/thumb',
+                                       'local-temp'    => wfTempDir() . '/test-repo/temp',
+                                       'local-deleted' => wfTempDir() . '/test-repo/deleted',
+                               )
+                       ) )
+               );
+               $wgNamespaceProtection[NS_MEDIAWIKI] = 'editinterface';
+               $wgNamespaceAliases['Image'] = NS_FILE;
+               $wgNamespaceAliases['Image_talk'] = NS_FILE_TALK;
+
+               // XXX: tests won't run without this (for CACHE_DB)
+               if ( $wgMainCacheType === CACHE_DB ) {
+                       $wgMainCacheType = CACHE_NONE;
+               }
+               if ( $wgMessageCacheType === CACHE_DB ) {
+                       $wgMessageCacheType = CACHE_NONE;
+               }
+               if ( $wgParserCacheType === CACHE_DB ) {
+                       $wgParserCacheType = CACHE_NONE;
+               }
+
+               $wgEnableParserCache = false;
+               DeferredUpdates::clearPendingUpdates();
+               $wgMemc = wfGetMainCache(); // checks $wgMainCacheType
+               $messageMemc = wfGetMessageCacheStorage();
+               $parserMemc = wfGetParserCacheStorage();
+
+               // $wgContLang = new StubContLang;
+               $wgUser = new User;
+               $context = new RequestContext;
+               $wgLang = $context->getLanguage();
+               $wgOut = $context->getOutput();
+               $wgParser = new StubObject( 'wgParser', $wgParserConf['class'], array( $wgParserConf ) );
+               $wgRequest = $context->getRequest();
+
+               if ( $wgStyleDirectory === false ) {
+                       $wgStyleDirectory   = "$IP/skins";
+               }
+
+       }
+
+       public function setupRecorder ( $options ) {
+               if ( isset( $options['record'] ) ) {
+                       $this->recorder = new DbTestRecorder( $this );
+                       $this->recorder->version = isset( $options['setversion'] ) ?
+                                       $options['setversion'] : SpecialVersion::getVersion();
+               } elseif ( isset( $options['compare'] ) ) {
+                       $this->recorder = new DbTestPreviewer( $this );
+               } else {
+                       $this->recorder = new TestRecorder( $this );
+               }
+       }
+
+       /**
+        * Remove last character if it is a newline
+        * @group utility
+        */
+       static public function chomp( $s ) {
+               if ( substr( $s, -1 ) === "\n" ) {
+                       return substr( $s, 0, -1 );
+               }
+               else {
+                       return $s;
+               }
+       }
+
+       /**
+        * Run a fuzz test series
+        * Draw input from a set of test files
+        */
+       function fuzzTest( $filenames ) {
+               $GLOBALS['wgContLang'] = Language::factory( 'en' );
+               $dict = $this->getFuzzInput( $filenames );
+               $dictSize = strlen( $dict );
+               $logMaxLength = log( $this->maxFuzzTestLength );
+               $this->setupDatabase();
+               ini_set( 'memory_limit', $this->memoryLimit * 1048576 );
+
+               $numTotal = 0;
+               $numSuccess = 0;
+               $user = new User;
+               $opts = ParserOptions::newFromUser( $user );
+               $title = Title::makeTitle( NS_MAIN, 'Parser_test' );
+
+               while ( true ) {
+                       // Generate test input
+                       mt_srand( ++$this->fuzzSeed );
+                       $totalLength = mt_rand( 1, $this->maxFuzzTestLength );
+                       $input = '';
+
+                       while ( strlen( $input ) < $totalLength ) {
+                               $logHairLength = mt_rand( 0, 1000000 ) / 1000000 * $logMaxLength;
+                               $hairLength = min( intval( exp( $logHairLength ) ), $dictSize );
+                               $offset = mt_rand( 0, $dictSize - $hairLength );
+                               $input .= substr( $dict, $offset, $hairLength );
+                       }
+
+                       $this->setupGlobals();
+                       $parser = $this->getParser();
+
+                       // Run the test
+                       try {
+                               $parser->parse( $input, $title, $opts );
+                               $fail = false;
+                       } catch ( Exception $exception ) {
+                               $fail = true;
+                       }
+
+                       if ( $fail ) {
+                               echo "Test failed with seed {$this->fuzzSeed}\n";
+                               echo "Input:\n";
+                               printf( "string(%d) \"%s\"\n\n", strlen( $input ), $input );
+                               echo "$exception\n";
+                       } else {
+                               $numSuccess++;
+                       }
+
+                       $numTotal++;
+                       $this->teardownGlobals();
+                       $parser->__destruct();
+
+                       if ( $numTotal % 100 == 0 ) {
+                               $usage = intval( memory_get_usage( true ) / $this->memoryLimit / 1048576 * 100 );
+                               echo "{$this->fuzzSeed}: $numSuccess/$numTotal (mem: $usage%)\n";
+                               if ( $usage > 90 ) {
+                                       echo "Out of memory:\n";
+                                       $memStats = $this->getMemoryBreakdown();
+
+                                       foreach ( $memStats as $name => $usage ) {
+                                               echo "$name: $usage\n";
+                                       }
+                                       $this->abort();
+                               }
+                       }
+               }
+       }
+
+       /**
+        * Get an input dictionary from a set of parser test files
+        */
+       function getFuzzInput( $filenames ) {
+               $dict = '';
+
+               foreach ( $filenames as $filename ) {
+                       $contents = file_get_contents( $filename );
+                       preg_match_all( '/!!\s*input\n(.*?)\n!!\s*result/s', $contents, $matches );
+
+                       foreach ( $matches[1] as $match ) {
+                               $dict .= $match . "\n";
+                       }
+               }
+
+               return $dict;
+       }
+
+       /**
+        * Get a memory usage breakdown
+        */
+       function getMemoryBreakdown() {
+               $memStats = array();
+
+               foreach ( $GLOBALS as $name => $value ) {
+                       $memStats['$' . $name] = strlen( serialize( $value ) );
+               }
+
+               $classes = get_declared_classes();
+
+               foreach ( $classes as $class ) {
+                       $rc = new ReflectionClass( $class );
+                       $props = $rc->getStaticProperties();
+                       $memStats[$class] = strlen( serialize( $props ) );
+                       $methods = $rc->getMethods();
+
+                       foreach ( $methods as $method ) {
+                               $memStats[$class] += strlen( serialize( $method->getStaticVariables() ) );
+                       }
+               }
+
+               $functions = get_defined_functions();
+
+               foreach ( $functions['user'] as $function ) {
+                       $rf = new ReflectionFunction( $function );
+                       $memStats["$function()"] = strlen( serialize( $rf->getStaticVariables() ) );
+               }
+
+               asort( $memStats );
+
+               return $memStats;
+       }
+
+       function abort() {
+               $this->abort();
+       }
+
+       /**
+        * Run a series of tests listed in the given text files.
+        * Each test consists of a brief description, wikitext input,
+        * and the expected HTML output.
+        *
+        * Prints status updates on stdout and counts up the total
+        * number and percentage of passed tests.
+        *
+        * @param $filenames Array of strings
+        * @return Boolean: true if passed all tests, false if any tests failed.
+        */
+       public function runTestsFromFiles( $filenames ) {
+               $ok = false;
+               $GLOBALS['wgContLang'] = Language::factory( 'en' );
+               $this->recorder->start();
+               try {
+                       $this->setupDatabase();
+                       $ok = true;
+
+                       foreach ( $filenames as $filename ) {
+                               $tests = new TestFileIterator( $filename, $this );
+                               $ok = $this->runTests( $tests ) && $ok;
+                       }
+
+                       $this->teardownDatabase();
+                       $this->recorder->report();
+               } catch (DBError $e) {
+                       echo $e->getMessage();
+               }
+               $this->recorder->end();
+
+               return $ok;
+       }
+
+       function runTests( $tests ) {
+               $ok = true;
+
+               foreach ( $tests as $t ) {
+                       $result =
+                               $this->runTest( $t['test'], $t['input'], $t['result'], $t['options'], $t['config'] );
+                       $ok = $ok && $result;
+                       $this->recorder->record( $t['test'], $result );
+               }
+
+               if ( $this->showProgress ) {
+                       print "\n";
+               }
+
+               return $ok;
+       }
+
+       /**
+        * Get a Parser object
+        */
+       function getParser( $preprocessor = null ) {
+               global $wgParserConf;
+
+               $class = $wgParserConf['class'];
+               $parser = new $class( array( 'preprocessorClass' => $preprocessor ) + $wgParserConf );
+
+               foreach ( $this->hooks as $tag => $callback ) {
+                       $parser->setHook( $tag, $callback );
+               }
+
+               foreach ( $this->functionHooks as $tag => $bits ) {
+                       list( $callback, $flags ) = $bits;
+                       $parser->setFunctionHook( $tag, $callback, $flags );
+               }
+
+               wfRunHooks( 'ParserTestParser', array( &$parser ) );
+
+               return $parser;
+       }
+
+       /**
+        * Run a given wikitext input through a freshly-constructed wiki parser,
+        * and compare the output against the expected results.
+        * Prints status and explanatory messages to stdout.
+        *
+        * @param $desc String: test's description
+        * @param $input String: wikitext to try rendering
+        * @param $result String: result to output
+        * @param $opts Array: test's options
+        * @param $config String: overrides for global variables, one per line
+        * @return Boolean
+        */
+       public function runTest( $desc, $input, $result, $opts, $config ) {
+               if ( $this->showProgress ) {
+                       $this->showTesting( $desc );
+               }
+
+               $opts = $this->parseOptions( $opts );
+               $context = $this->setupGlobals( $opts, $config );
+
+               $user = $context->getUser();
+               $options = ParserOptions::newFromContext( $context );
+
+               if ( isset( $opts['title'] ) ) {
+                       $titleText = $opts['title'];
+               }
+               else {
+                       $titleText = 'Parser test';
+               }
+
+               $local = isset( $opts['local'] );
+               $preprocessor = isset( $opts['preprocessor'] ) ? $opts['preprocessor'] : null;
+               $parser = $this->getParser( $preprocessor );
+               $title = Title::newFromText( $titleText );
+
+               if ( isset( $opts['pst'] ) ) {
+                       $out = $parser->preSaveTransform( $input, $title, $user, $options );
+               } elseif ( isset( $opts['msg'] ) ) {
+                       $out = $parser->transformMsg( $input, $options, $title );
+               } elseif ( isset( $opts['section'] ) ) {
+                       $section = $opts['section'];
+                       $out = $parser->getSection( $input, $section );
+               } elseif ( isset( $opts['replace'] ) ) {
+                       $section = $opts['replace'][0];
+                       $replace = $opts['replace'][1];
+                       $out = $parser->replaceSection( $input, $section, $replace );
+               } elseif ( isset( $opts['comment'] ) ) {
+                       $out = Linker::formatComment( $input, $title, $local );
+               } elseif ( isset( $opts['preload'] ) ) {
+                       $out = $parser->getpreloadText( $input, $title, $options );
+               } else {
+                       $output = $parser->parse( $input, $title, $options, true, true, 1337 );
+                       $out = $output->getText();
+
+                       if ( isset( $opts['showtitle'] ) ) {
+                               if ( $output->getTitleText() ) {
+                                       $title = $output->getTitleText();
+                               }
+
+                               $out = "$title\n$out";
+                       }
+
+                       if ( isset( $opts['ill'] ) ) {
+                               $out = $this->tidy( implode( ' ', $output->getLanguageLinks() ) );
+                       } elseif ( isset( $opts['cat'] ) ) {
+                               $outputPage = $context->getOutput();
+                               $outputPage->addCategoryLinks( $output->getCategories() );
+                               $cats = $outputPage->getCategoryLinks();
+
+                               if ( isset( $cats['normal'] ) ) {
+                                       $out = $this->tidy( implode( ' ', $cats['normal'] ) );
+                               } else {
+                                       $out = '';
+                               }
+                       }
+
+                       $result = $this->tidy( $result );
+               }
+
+               $this->teardownGlobals();
+               return $this->showTestResult( $desc, $result, $out );
+       }
+
+       /**
+        *
+        */
+       function showTestResult( $desc, $result, $out ) {
+               if ( $result === $out ) {
+                       $this->showSuccess( $desc );
+                       return true;
+               } else {
+                       $this->showFailure( $desc, $result, $out );
+                       return false;
+               }
+       }
+
+       /**
+        * Use a regex to find out the value of an option
+        * @param $key String: name of option val to retrieve
+        * @param $opts Options array to look in
+        * @param $default Mixed: default value returned if not found
+        */
+       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();
+               // 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 ) {
+                               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 = '', $config = '' ) {
+               # Find out values for some special options.
+               $lang =
+                       self::getOptionValue( 'language', $opts, 'en' );
+               $variant =
+                       self::getOptionValue( 'variant', $opts, false );
+               $maxtoclevel =
+                       self::getOptionValue( 'wgMaxTocLevel', $opts, 999 );
+               $linkHolderBatchSize =
+                       self::getOptionValue( 'wgLinkHolderBatchSize', $opts, 1000 );
+
+               $settings = array(
+                       'wgServer' => 'http://Britney-Spears',
+                       'wgScript' => '/index.php',
+                       'wgScriptPath' => '/',
+                       'wgArticlePath' => '/wiki/$1',
+                       'wgActionPaths' => array(),
+                       'wgLocalFileRepo' => array(
+                               'class' => 'LocalRepo',
+                               'name' => 'local',
+                               'url' => 'http://example.com/images',
+                               'hashLevels' => 2,
+                               'transformVia404' => false,
+                               'backend'         => new FSFileBackend( array(
+                                       'name'        => 'local-backend',
+                                       'lockManager' => 'fsLockManager',
+                                       'containerPaths' => array(
+                                               'local-public'  => $this->uploadDir,
+                                               'local-thumb'   => $this->uploadDir . '/thumb',
+                                               'local-temp'    => $this->uploadDir . '/temp',
+                                               'local-deleted' => $this->uploadDir . '/delete',
+                                       )
+                               ) )
+                       ),
+                       'wgEnableUploads' => self::getOptionValue( 'wgEnableUploads', $opts, true ),
+                       'wgStylePath' => '/skins',
+                       'wgStyleSheetPath' => '/skins',
+                       'wgSitename' => 'MediaWiki',
+                       'wgLanguageCode' => $lang,
+                       'wgDBprefix' => $this->db->getType() != 'oracle' ? 'parsertest_' : 'pt_',
+                       'wgRawHtml' => isset( $opts['rawhtml'] ),
+                       'wgLang' => null,
+                       'wgContLang' => null,
+                       'wgNamespacesWithSubpages' => array( 0 => isset( $opts['subpage'] ) ),
+                       'wgMaxTocLevel' => $maxtoclevel,
+                       'wgCapitalLinks' => true,
+                       'wgNoFollowLinks' => true,
+                       'wgNoFollowDomainExceptions' => array(),
+                       'wgThumbnailScriptPath' => false,
+                       'wgUseImageResize' => false,
+                       'wgLocaltimezone' => 'UTC',
+                       'wgAllowExternalImages' => true,
+                       'wgUseTidy' => false,
+                       'wgDefaultLanguageVariant' => $variant,
+                       'wgVariantArticlePath' => false,
+                       'wgGroupPermissions' => array( '*' => array(
+                               'createaccount' => true,
+                               'read'          => true,
+                               'edit'          => true,
+                               'createpage'    => true,
+                               'createtalk'    => true,
+                       ) ),
+                       'wgNamespaceProtection' => array( NS_MEDIAWIKI => 'editinterface' ),
+                       'wgDefaultExternalStore' => array(),
+                       'wgForeignFileRepos' => array(),
+                       'wgLinkHolderBatchSize' => $linkHolderBatchSize,
+                       'wgExperimentalHtmlIds' => false,
+                       'wgExternalLinkTarget' => false,
+                       'wgAlwaysUseTidy' => false,
+                       'wgHtml5' => true,
+                       'wgCleanupPresentationalAttributes' => true,
+                       'wgWellFormedXml' => true,
+                       'wgAllowMicrodataAttributes' => true,
+                       'wgAdaptiveMessageCache' => true,
+                       'wgDisableLangConversion' => false,
+                       'wgDisableTitleConversion' => false,
+               );
+
+               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 ) {
+                       if ( array_key_exists( $var, $GLOBALS ) ) {
+                               $this->savedGlobals[$var] = $GLOBALS[$var];
+                       }
+
+                       $GLOBALS[$var] = $val;
+               }
+
+               $GLOBALS['wgContLang'] = Language::factory( $lang );
+               $GLOBALS['wgMemc'] = new EmptyBagOStuff;
+
+               $context = new RequestContext();
+               $GLOBALS['wgLang'] = $context->getLanguage();
+               $GLOBALS['wgOut'] = $context->getOutput();
+
+               $GLOBALS['wgUser'] = new User();
+
+               global $wgHooks;
+
+               $wgHooks['ParserTestParser'][] = 'ParserTestParserHook::setup';
+               $wgHooks['ParserGetVariableValueTs'][] = 'ParserTest::getFakeTimestamp';
+
+               MagicWord::clearCache();
+
+               return $context;
+       }
+
+       /**
+        * List of temporary tables to create, without prefix.
+        * Some of these probably aren't necessary.
+        */
+       private function listTables() {
+               $tables = array( 'user', 'user_properties', 'user_former_groups', 'page', 'page_restrictions',
+                       'protected_titles', 'revision', 'text', 'pagelinks', 'imagelinks',
+                       'categorylinks', 'templatelinks', 'externallinks', 'langlinks', 'iwlinks',
+                       'site_stats', 'hitcounter',     'ipblocks', 'image', 'oldimage',
+                       'recentchanges', 'watchlist', 'interwiki', 'logging',
+                       'querycache', 'objectcache', 'job', 'l10n_cache', 'redirect', 'querycachetwo',
+                       'archive', 'user_groups', 'page_props', 'category', 'msg_resource', 'msg_resource_links'
+               );
+
+               if ( in_array( $this->db->getType(), array( 'mysql', 'sqlite', 'oracle' ) ) ) {
+                       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.
+               wfRunHooks( 'ParserTestTables', array( &$tables ) );
+
+               return $tables;
+       }
+
+       /**
+        * Set up a temporary set of wiki tables to work with for the tests.
+        * Currently this will only be done once per run, and any changes to
+        * the db will be visible to later tests in the run.
+        */
+       public function setupDatabase() {
+               global $wgDBprefix;
+
+               if ( $this->databaseSetupDone ) {
+                       return;
+               }
+
+               $this->db = wfGetDB( DB_MASTER );
+               $dbType = $this->db->getType();
+
+               if ( $wgDBprefix === 'parsertest_' || ( $dbType == 'oracle' && $wgDBprefix === 'pt_' ) ) {
+                       throw new MWException( 'setupDatabase should be called before setupGlobals' );
+               }
+
+               $this->databaseSetupDone = true;
+               $this->oldTablePrefix = $wgDBprefix;
+
+               # SqlBagOStuff broke when using temporary tables on r40209 (bug 15892).
+               # It seems to have been fixed since (r55079?), but regressed at some point before r85701.
+               # This works around it for now...
+               ObjectCache::$instances[CACHE_DB] = new HashBagOStuff;
+
+               # CREATE TEMPORARY TABLE breaks if there is more than one server
+               if ( wfGetLB()->getServerCount() != 1 ) {
+                       $this->useTemporaryTables = false;
+               }
+
+               $temporary = $this->useTemporaryTables || $dbType == 'postgres';
+               $prefix = $dbType != 'oracle' ? 'parsertest_' : 'pt_';
+
+               $this->dbClone = new CloneDatabase( $this->db, $this->listTables(), $prefix );
+               $this->dbClone->useTemporaryTables( $temporary );
+               $this->dbClone->cloneTableStructure();
+
+               if ( $dbType == 'oracle' ) {
+                       $this->db->query( 'BEGIN FILL_WIKI_INFO; END;' );
+                       # Insert 0 user to prevent FK violations
+
+                       # Anonymous user
+                       $this->db->insert( 'user', array(
+                               'user_id'         => 0,
+                               'user_name'       => 'Anonymous' ) );
+               }
+
+               # Hack: insert a few Wikipedia in-project interwiki prefixes,
+               # for testing inter-language links
+               $this->db->insert( 'interwiki', array(
+                       array( 'iw_prefix' => 'wikipedia',
+                                  'iw_url'    => 'http://en.wikipedia.org/wiki/$1',
+                                  'iw_api'    => '',
+                                  'iw_wikiid' => '',
+                                  'iw_local'  => 0 ),
+                       array( 'iw_prefix' => 'meatball',
+                                  'iw_url'    => 'http://www.usemod.com/cgi-bin/mb.pl?$1',
+                                  'iw_api'    => '',
+                                  'iw_wikiid' => '',
+                                  'iw_local'  => 0 ),
+                       array( 'iw_prefix' => 'zh',
+                                  'iw_url'    => 'http://zh.wikipedia.org/wiki/$1',
+                                  'iw_api'    => '',
+                                  'iw_wikiid' => '',
+                                  'iw_local'  => 1 ),
+                       array( 'iw_prefix' => 'es',
+                                  'iw_url'    => 'http://es.wikipedia.org/wiki/$1',
+                                  'iw_api'    => '',
+                                  'iw_wikiid' => '',
+                                  'iw_local'  => 1 ),
+                       array( 'iw_prefix' => 'fr',
+                                  'iw_url'    => 'http://fr.wikipedia.org/wiki/$1',
+                                  'iw_api'    => '',
+                                  'iw_wikiid' => '',
+                                  'iw_local'  => 1 ),
+                       array( 'iw_prefix' => 'ru',
+                                  'iw_url'    => 'http://ru.wikipedia.org/wiki/$1',
+                                  'iw_api'    => '',
+                                  'iw_wikiid' => '',
+                                  'iw_local'  => 1 ),
+                       ) );
+
+
+               # Update certain things in site_stats
+               $this->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();
+
+               # Clear the message cache
+               MessageCache::singleton()->clear();
+
+               $this->uploadDir = $this->setupUploadDir();
+               $user = User::createNew( 'WikiSysop' );
+               $image = wfLocalFile( Title::makeTitle( NS_FILE, 'Foobar.jpg' ) );
+               $image->recordUpload2( '', 'Upload of some lame file', 'Some lame file', array(
+                       'size'        => 12345,
+                       'width'       => 1941,
+                       'height'      => 220,
+                       'bits'        => 24,
+                       'media_type'  => MEDIATYPE_BITMAP,
+                       'mime'        => 'image/jpeg',
+                       'metadata'    => serialize( array() ),
+                       'sha1'        => wfBaseConvert( '', 16, 36, 31 ),
+                       'fileExists'  => true
+                       ), $this->db->timestamp( '20010115123500' ), $user );
+
+               # This image will be blacklisted in [[MediaWiki:Bad image list]]
+               $image = wfLocalFile( Title::makeTitle( NS_FILE, 'Bad.jpg' ) );
+               $image->recordUpload2( '', 'zomgnotcensored', 'Borderline image', array(
+                       'size'        => 12345,
+                       'width'       => 320,
+                       'height'      => 240,
+                       'bits'        => 24,
+                       'media_type'  => MEDIATYPE_BITMAP,
+                       'mime'        => 'image/jpeg',
+                       'metadata'    => serialize( array() ),
+                       'sha1'        => wfBaseConvert( '', 16, 36, 31 ),
+                       'fileExists'  => true
+                       ), $this->db->timestamp( '20010115123500' ), $user );
+       }
+
+       public function teardownDatabase() {
+               if ( !$this->databaseSetupDone ) {
+                       $this->teardownGlobals();
+                       return;
+               }
+               $this->teardownUploadDir( $this->uploadDir );
+
+               $this->dbClone->destroy();
+               $this->databaseSetupDone = false;
+
+               if ( $this->useTemporaryTables ) {
+                       if( $this->db->getType() == 'sqlite' ) {
+                               # Under SQLite the searchindex table is virtual and need
+                               # to be explicitly destroyed. See bug 29912
+                               # See also MediaWikiTestCase::destroyDB()
+                               wfDebug( __METHOD__ . " explicitly destroying sqlite virtual table parsertest_searchindex\n" );
+                               $this->db->query( "DROP TABLE `parsertest_searchindex`" );
+                       }
+                       # Don't need to do anything
+                       $this->teardownGlobals();
+                       return;
+               }
+
+               $tables = $this->listTables();
+
+               foreach ( $tables as $table ) {
+                       $sql = $this->db->getType() == 'oracle' ? "DROP TABLE pt_$table DROP CONSTRAINTS" : "DROP TABLE `parsertest_$table`";
+                       $this->db->query( $sql );
+               }
+
+               if ( $this->db->getType() == 'oracle' )
+                       $this->db->query( 'BEGIN FILL_WIKI_INFO; END;' );
+
+               $this->teardownGlobals();
+       }
+
+       /**
+        * Create a dummy uploads directory which will contain a couple
+        * of files in order to pass existence tests.
+        *
+        * @return String: the directory
+        */
+       private function setupUploadDir() {
+               global $IP;
+
+               if ( $this->keepUploads ) {
+                       $dir = wfTempDir() . '/mwParser-images';
+
+                       if ( is_dir( $dir ) ) {
+                               return $dir;
+                       }
+               } else {
+                       $dir = wfTempDir() . "/mwParser-" . mt_rand() . "-images";
+               }
+
+               // wfDebug( "Creating upload directory $dir\n" );
+               if ( file_exists( $dir ) ) {
+                       wfDebug( "Already exists!\n" );
+                       return $dir;
+               }
+
+               wfMkdirParents( $dir . '/3/3a', null, __METHOD__ );
+               copy( "$IP/skins/monobook/headbg.jpg", "$dir/3/3a/Foobar.jpg" );
+               wfMkdirParents( $dir . '/0/09', null, __METHOD__ );
+               copy( "$IP/skins/monobook/headbg.jpg", "$dir/0/09/Bad.jpg" );
+
+               return $dir;
+       }
+
+       /**
+        * Restore default values and perform any necessary clean-up
+        * after each test runs.
+        */
+       private function teardownGlobals() {
+               RepoGroup::destroySingleton();
+               LinkCache::singleton()->clear();
+
+               foreach ( $this->savedGlobals as $var => $val ) {
+                       $GLOBALS[$var] = $val;
+               }
+       }
+
+       /**
+        * Remove the dummy uploads directory
+        */
+       private function teardownUploadDir( $dir ) {
+               if ( $this->keepUploads ) {
+                       return;
+               }
+
+               // delete the files first, then the dirs.
+               self::deleteFiles(
+                       array (
+                               "$dir/3/3a/Foobar.jpg",
+                               "$dir/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg",
+                               "$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",
+                       )
+               );
+
+               self::deleteDirs(
+                       array (
+                               "$dir/3/3a",
+                               "$dir/3",
+                               "$dir/thumb/6/65",
+                               "$dir/thumb/6",
+                               "$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",
+                       )
+               );
+       }
+
+       /**
+        * Delete the specified files, if they exist.
+        * @param $files Array: full paths to files to delete.
+        */
+       private static function deleteFiles( $files ) {
+               foreach ( $files as $file ) {
+                       if ( file_exists( $file ) ) {
+                               unlink( $file );
+                       }
+               }
+       }
+
+       /**
+        * Delete the specified directories, if they exist. Must be empty.
+        * @param $dirs Array: full paths to directories to delete.
+        */
+       private static function deleteDirs( $dirs ) {
+               foreach ( $dirs as $dir ) {
+                       if ( is_dir( $dir ) ) {
+                               rmdir( $dir );
+                       }
+               }
+       }
+
+       /**
+        * "Running test $desc..."
+        */
+       protected function showTesting( $desc ) {
+               print "Running test $desc... ";
+       }
+
+       /**
+        * Print a happy success message.
+        *
+        * @param $desc String: the test name
+        * @return Boolean
+        */
+       protected function showSuccess( $desc ) {
+               if ( $this->showProgress ) {
+                       print $this->term->color( '1;32' ) . 'PASSED' . $this->term->reset() . "\n";
+               }
+
+               return true;
+       }
+
+       /**
+        * Print a failure message and provide some explanatory output
+        * about what went wrong if so configured.
+        *
+        * @param $desc String: the test name
+        * @param $result String: expected HTML output
+        * @param $html String: actual HTML output
+        * @return Boolean
+        */
+       protected function showFailure( $desc, $result, $html ) {
+               if ( $this->showFailure ) {
+                       if ( !$this->showProgress ) {
+                               # In quiet mode we didn't show the 'Testing' message before the
+                               # test, in case it succeeded. Show it now:
+                               $this->showTesting( $desc );
+                       }
+
+                       print $this->term->color( '31' ) . 'FAILED!' . $this->term->reset() . "\n";
+
+                       if ( $this->showOutput ) {
+                               print "--- Expected ---\n$result\n--- Actual ---\n$html\n";
+                       }
+
+                       if ( $this->showDiffs ) {
+                               print $this->quickDiff( $result, $html );
+                               if ( !$this->wellFormed( $html ) ) {
+                                       print "XML error: $this->mXmlError\n";
+                               }
+                       }
+               }
+
+               return false;
+       }
+
+       /**
+        * Run given strings through a diff and return the (colorized) output.
+        * Requires writable /tmp directory and a 'diff' command in the PATH.
+        *
+        * @param $input String
+        * @param $output String
+        * @param $inFileTail String: tailing for the input file name
+        * @param $outFileTail String: tailing for the output file name
+        * @return String
+        */
+       protected function quickDiff( $input, $output, $inFileTail = 'expected', $outFileTail = 'actual' ) {
+               # Windows, or at least the fc utility, is retarded
+               $slash = wfIsWindows() ? '\\' : '/';
+               $prefix = wfTempDir() . "{$slash}mwParser-" . mt_rand();
+
+               $infile = "$prefix-$inFileTail";
+               $this->dumpToFile( $input, $infile );
+
+               $outfile = "$prefix-$outFileTail";
+               $this->dumpToFile( $output, $outfile );
+
+               $shellInfile = wfEscapeShellArg($infile);
+               $shellOutfile = wfEscapeShellArg($outfile);
+
+               global $wgDiff3;
+               // we assume that people with diff3 also have usual diff
+               $diff = ( wfIsWindows() && !$wgDiff3 )
+                       ? `fc $shellInfile $shellOutfile`
+                       : `diff -au $shellInfile $shellOutfile`;
+               unlink( $infile );
+               unlink( $outfile );
+
+               return $this->colorDiff( $diff );
+       }
+
+       /**
+        * Write the given string to a file, adding a final newline.
+        *
+        * @param $data String
+        * @param $filename String
+        */
+       private function dumpToFile( $data, $filename ) {
+               $file = fopen( $filename, "wt" );
+               fwrite( $file, $data . "\n" );
+               fclose( $file );
+       }
+
+       /**
+        * Colorize unified diff output if set for ANSI color output.
+        * Subtractions are colored blue, additions red.
+        *
+        * @param $text String
+        * @return String
+        */
+       protected function colorDiff( $text ) {
+               return preg_replace(
+                       array( '/^(-.*)$/m', '/^(\+.*)$/m' ),
+                       array( $this->term->color( 34 ) . '$1' . $this->term->reset(),
+                                  $this->term->color( 31 ) . '$1' . $this->term->reset() ),
+                       $text );
+       }
+
+       /**
+        * Show "Reading tests from ..."
+        *
+        * @param $path String
+        */
+       public function showRunFile( $path ) {
+               print $this->term->color( 1 ) .
+                       "Reading tests from \"$path\"..." .
+                       $this->term->reset() .
+                       "\n";
+       }
+
+       /**
+        * 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
+        */
+       static public function addArticle( $name, $text, $line = 'unknown', $ignoreDuplicate = '' ) {
+               global $wgCapitalLinks;
+
+               $oldCapitalLinks = $wgCapitalLinks;
+               $wgCapitalLinks = true; // We only need this from SetupGlobals() See r70917#c8637
+
+               $text = self::chomp( $text );
+               $name = self::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
+        * application to our scary parser. If the hook is not installed,
+        * abort processing of this file.
+        *
+        * @param $name String
+        * @return Bool true if tag hook is present
+        */
+       public function requireHook( $name ) {
+               global $wgParser;
+
+               $wgParser->firstCallInit( ); // make sure hooks are loaded.
+
+               if ( isset( $wgParser->mTagHooks[$name] ) ) {
+                       $this->hooks[$name] = $wgParser->mTagHooks[$name];
+               } else {
+                       echo "   This test suite requires the '$name' hook extension, skipping.\n";
+                       return false;
+               }
+
+               return true;
+       }
+
+       /**
+        * Steal a callback function from the primary parser, save it for
+        * application to our scary parser. If the hook is not installed,
+        * abort processing of this file.
+        *
+        * @param $name String
+        * @return Bool true if function hook is present
+        */
+       public function requireFunctionHook( $name ) {
+               global $wgParser;
+
+               $wgParser->firstCallInit( ); // make sure hooks are loaded.
+
+               if ( isset( $wgParser->mFunctionHooks[$name] ) ) {
+                       $this->functionHooks[$name] = $wgParser->mFunctionHooks[$name];
+               } else {
+                       echo "   This test suite requires the '$name' function hook extension, skipping.\n";
+                       return false;
+               }
+
+               return true;
+       }
+
+       /**
+        * Run the "tidy" command on text if the $wgUseTidy
+        * global is true
+        *
+        * @param $text String: the text to tidy
+        * @return String
+        */
+       private function tidy( $text ) {
+               global $wgUseTidy;
+
+               if ( $wgUseTidy ) {
+                       $text = MWTidy::tidy( $text );
+               }
+
+               return $text;
+       }
+
+       private function wellFormed( $text ) {
+               $html =
+                       Sanitizer::hackDocType() .
+                       '<html>' .
+                       $text .
+                       '</html>';
+
+               $parser = xml_parser_create( "UTF-8" );
+
+               # case folding violates XML standard, turn it off
+               xml_parser_set_option( $parser, XML_OPTION_CASE_FOLDING, false );
+
+               if ( !xml_parse( $parser, $html, true ) ) {
+                       $err = xml_error_string( xml_get_error_code( $parser ) );
+                       $position = xml_get_current_byte_index( $parser );
+                       $fragment = $this->extractFragment( $html, $position );
+                       $this->mXmlError = "$err at byte $position:\n$fragment";
+                       xml_parser_free( $parser );
+
+                       return false;
+               }
+
+               xml_parser_free( $parser );
+
+               return true;
+       }
+
+       private function extractFragment( $text, $position ) {
+               $start = max( 0, $position - 10 );
+               $before = $position - $start;
+               $fragment = '...' .
+                       $this->term->color( 34 ) .
+                       substr( $text, $start, $before ) .
+                       $this->term->color( 0 ) .
+                       $this->term->color( 31 ) .
+                       $this->term->color( 1 ) .
+                       substr( $text, $position, 1 ) .
+                       $this->term->color( 0 ) .
+                       $this->term->color( 34 ) .
+                       substr( $text, $position + 1, 9 ) .
+                       $this->term->color( 0 ) .
+                       '...';
+               $display = str_replace( "\n", ' ', $fragment );
+               $caret = '   ' .
+                       str_repeat( ' ', $before ) .
+                       $this->term->color( 31 ) .
+                       '^' .
+                       $this->term->color( 0 );
+
+               return "$display\n$caret";
+       }
+
+       static function getFakeTimestamp( &$parser, &$ts ) {
+               $ts = 123;
+               return true;
+       }
+}
diff --git a/tests/parserTests.php b/tests/parserTests.php
new file mode 100644 (file)
index 0000000..d930ac5
--- /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
+ */
+
+$otions = array( 'quick', 'color', 'quiet', 'help', 'show-output', 'record', 'run-disabled' );
+$optionsWithArgs = array( 'regex', 'filter', '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
+  --filter         Alias for --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
+
+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 );
+}
index 9c50cc4..58c8914 100644 (file)
@@ -6,6 +6,7 @@ class ParserOptionsTest extends MediaWikiTestCase {
        private $pcache;
 
        function setUp() {
+               ParserTest::setUp(); //reuse setup from parser tests
                global $wgContLang, $wgUser, $wgLanguageCode;
                $wgContLang = Language::factory( $wgLanguageCode );
                $this->popts = new ParserOptions( $wgUser );
index 5574c5f..e999796 100644 (file)
@@ -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;
-       }
 }
index 7d9fc6b..7fc60a5 100644 (file)
@@ -1,5 +1,306 @@
 <?php
 
+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 {
+                       throw new MWException( "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', __METHOD__ )
+                       || ! $this->db->tableExists( 'testitem', __METHOD__ ) )
+               {
+                       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() {
+               $this->db->begin();
+
+               if ( ! $this->db->tableExists( 'testrun' )
+                       || ! $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 ( $this->db->getType() === '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 TestFileIterator implements Iterator {
        private $file;
        private $fh;
@@ -76,7 +377,7 @@ class TestFileIterator implements Iterator {
                                        $this->checkSection( 'text'    );
                                        $this->checkSection( 'article' );
 
-                                       $this->parserTest->addArticle( self::chomp( $this->sectionData['article'] ), $this->sectionData['text'], $this->lineNum );
+                                       $this->parserTest->addArticle( ParserTest::chomp( $this->sectionData['article'] ), $this->sectionData['text'], $this->lineNum );
 
                                        $this->clearSection();
 
@@ -148,11 +449,11 @@ class TestFileIterator implements Iterator {
                                        }
 
                                        $this->test = array(
-                                               'test'    => self::chomp( $this->sectionData['test']    ),
-                                               'input'   => self::chomp( $this->sectionData['input']   ),
-                                               'result'  => self::chomp( $this->sectionData['result']  ),
-                                               'options' => self::chomp( $this->sectionData['options'] ),
-                                               'config'  => self::chomp( $this->sectionData['config']  ),
+                                               'test'    => ParserTest::chomp( $this->sectionData['test']    ),
+                                               'input'   => ParserTest::chomp( $this->sectionData['input']   ),
+                                               'result'  => ParserTest::chomp( $this->sectionData['result']  ),
+                                               'options' => ParserTest::chomp( $this->sectionData['options'] ),
+                                               'config'  => ParserTest::chomp( $this->sectionData['config']  ),
                                        );
 
                                        return true;
@@ -185,19 +486,6 @@ class TestFileIterator implements Iterator {
                
        }
 
-       /**
-        * Remove last character if it is a newline
-        * @group utility
-        */
-       public static function chomp( $s ) {
-               if ( substr( $s, -1 ) === "\n" ) {
-                       return substr( $s, 0, -1 );
-               }
-               else {
-                       return $s;
-               }
-       }
-
        /**
         * Verify the current section data has some value for the given token
         * name (first parameter).
@@ -225,7 +513,7 @@ class TestFileIterator implements Iterator {
 }
 
 /**
- * A class to delay execution of a parser test hooks. 
+ * A class to delay execution of a parser test hooks.
  */
 class DelayedParserTest {