X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=blobdiff_plain;f=maintenance%2FparserTests.inc;h=05327c10653dac1954bd4fee8723f3d47ffe63a2;hb=5dbbca7331f618bd359fd14c1684f1990d6d02f1;hp=eab4ea972a4d55d389bdcbd2ea3f7e54c4d3d90d;hpb=e32ed6eaf03c52067752a67834632496a02dcd43;p=lhc%2Fweb%2Fwiklou.git diff --git a/maintenance/parserTests.inc b/maintenance/parserTests.inc index eab4ea972a..05327c1065 100644 --- a/maintenance/parserTests.inc +++ b/maintenance/parserTests.inc @@ -24,17 +24,6 @@ * @ingroup Maintenance */ -/** */ -$options = array( 'quick', 'color', 'quiet', 'help', 'show-output', 'record'. 'run-disabled' ); -$optionsWithArgs = array( 'regex', 'seed', 'setversion' ); - -if ( !defined( "NO_COMMAND_LINE" ) ) { - require_once( dirname(__FILE__) . '/commandLine.inc' ); -} -require_once( "$IP/maintenance/parserTestsParserHook.php" ); -require_once( "$IP/maintenance/parserTestsStaticParserHook.php" ); -require_once( "$IP/maintenance/parserTestsParserTime.php" ); - /** * @ingroup Maintenance */ @@ -72,13 +61,11 @@ class ParserTest { * Sets terminal colorization and diff/quick modes depending on OS and * command-line options (--color and --quick). */ - public function ParserTest() { - global $options; - + public function ParserTest( $options = array() ) { # Only colorize output if stdout is a terminal. - $this->color = !wfIsWindows() && posix_isatty(1); + $this->color = !wfIsWindows() && posix_isatty( 1 ); - if( isset( $options['color'] ) ) { + if ( isset( $options['color'] ) ) { switch( $options['color'] ) { case 'no': $this->color = false; @@ -103,7 +90,7 @@ class ParserTest { $this->showOutput = isset( $options['show-output'] ); - if (isset($options['regex'])) { + if ( isset( $options['regex'] ) ) { if ( isset( $options['record'] ) ) { echo "Warning: --record cannot be used with --regex, disabling --record\n"; unset( $options['record'] ); @@ -114,17 +101,7 @@ class ParserTest { $this->regex = ''; } - if( isset( $options['record'] ) ) { - $this->recorder = new DbTestRecorder( $this ); - } elseif( isset( $options['compare'] ) ) { - $this->recorder = new DbTestPreviewer( $this ); - } elseif( isset( $options['upload'] ) ) { - $this->recorder = new RemoteTestRecorder( $this ); - } elseif( class_exists( 'PHPUnitTestRecorder' ) ) { - $this->recorder = new PHPUnitTestRecorder( $this ); - } else { - $this->recorder = new TestRecorder( $this ); - } + $this->setupRecorder( $options ); $this->keepUploads = isset( $options['keep-uploads'] ); if ( isset( $options['seed'] ) ) { @@ -137,12 +114,26 @@ class ParserTest { $this->functionHooks = array(); } + 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 ); + } elseif ( isset( $options['upload'] ) ) { + $this->recorder = new RemoteTestRecorder( $this ); + } else { + $this->recorder = new TestRecorder( $this ); + } + } + /** * Remove last character if it is a newline */ - public function chomp($s) { - if (substr($s, -1) === "\n") { - return substr($s, 0, -1); + public function chomp( $s ) { + if ( substr( $s, -1 ) === "\n" ) { + return substr( $s, 0, -1 ); } else { return $s; @@ -154,6 +145,7 @@ class ParserTest { * 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 ); @@ -221,7 +213,7 @@ class ParserTest { */ function getFuzzInput( $filenames ) { $dict = ''; - foreach( $filenames as $filename ) { + 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 ) { @@ -237,7 +229,7 @@ class ParserTest { function getMemoryBreakdown() { $memStats = array(); foreach ( $GLOBALS as $name => $value ) { - $memStats['$'.$name] = strlen( serialize( $value ) ); + $memStats['$' . $name] = strlen( serialize( $value ) ); } $classes = get_declared_classes(); foreach ( $classes as $class ) { @@ -270,14 +262,15 @@ class ParserTest { * Prints status updates on stdout and counts up the total * number and percentage of passed tests. * - * @param array of strings $filenames - * @return bool True if passed all tests, false if any tests failed. + * @param $filenames Array of strings + * @return Boolean: true if passed all tests, false if any tests failed. */ public function runTestsFromFiles( $filenames ) { + $GLOBALS['wgContLang'] = Language::factory( 'en' ); $this->recorder->start(); $this->setupDatabase(); $ok = true; - foreach( $filenames as $filename ) { + foreach ( $filenames as $filename ) { $tests = new TestFileIterator( $filename, $this ); $ok = $this->runTests( $tests ) && $ok; } @@ -287,30 +280,31 @@ class ParserTest { return $ok; } - function runTests($tests) { + function runTests( $tests ) { $ok = true; - foreach($tests as $i => $t) { + foreach ( $tests as $i => $t ) { $result = - $this->runTest($t['test'], $t['input'], $t['result'], $t['options'], $t['config']); + $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() { + function getParser( $preprocessor = null ) { global $wgParserConf; $class = $wgParserConf['class']; - $parser = new $class( $wgParserConf ); - foreach( $this->hooks as $tag => $callback ) { + $parser = new $class( array( 'preprocessorClass' => $preprocessor ) + $wgParserConf ); + foreach ( $this->hooks as $tag => $callback ) { $parser->setHook( $tag, $callback ); } - foreach( $this->functionHooks as $tag => $bits ) { + foreach ( $this->functionHooks as $tag => $bits ) { list( $callback, $flags ) = $bits; $parser->setFunctionHook( $tag, $callback, $flags ); } @@ -323,23 +317,25 @@ class ParserTest { * and compare the output against the expected results. * Prints status and explanatory messages to stdout. * - * @param string $input Wikitext to try rendering - * @param string $result Result to output - * @return bool + * @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 ) { + if ( $this->showProgress ) { $this->showTesting( $desc ); } $opts = $this->parseOptions( $opts ); - $this->setupGlobals($opts, $config); + $this->setupGlobals( $opts, $config ); $user = new User(); $options = ParserOptions::newFromUser( $user ); - $m = array(); - if (isset( $opts['title'] ) ) { + if ( isset( $opts['title'] ) ) { $titleText = $opts['title']; } else { @@ -348,36 +344,39 @@ class ParserTest { $noxml = isset( $opts['noxml'] ); $local = isset( $opts['local'] ); - $parser = $this->getParser(); + $preprocessor = isset( $opts['preprocessor'] ) ? $opts['preprocessor'] : null; + $parser = $this->getParser( $preprocessor ); $title = Title::newFromText( $titleText ); - $matches = array(); - if( isset( $opts['pst'] ) ) { + if ( isset( $opts['pst'] ) ) { $out = $parser->preSaveTransform( $input, $title, $user, $options ); - } elseif( isset( $opts['msg'] ) ) { + } elseif ( isset( $opts['msg'] ) ) { $out = $parser->transformMsg( $input, $options ); - } elseif( isset( $opts['section'] ) ) { + } elseif ( isset( $opts['section'] ) ) { $section = $opts['section']; $out = $parser->getSection( $input, $section ); - } elseif( isset( $opts['replace'] ) ) { + } elseif ( isset( $opts['replace'] ) ) { $section = $opts['replace'][0]; $replace = $opts['replace'][1]; $out = $parser->replaceSection( $input, $section, $replace ); - } elseif( isset( $opts['comment'] ) ) { + } elseif ( isset( $opts['comment'] ) ) { $linker = $user->getSkin(); $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'] ) ) { - $out = $output->getTitleText() . "\n$out"; + if ( $output->getTitleText() ) $title = $output->getTitleText(); + $out = "$title\n$out"; } - if (isset( $opts['ill'] ) ) { + if ( isset( $opts['ill'] ) ) { $out = $this->tidy( implode( ' ', $output->getLanguageLinks() ) ); - } elseif( isset( $opts['cat'] ) ) { + } elseif ( isset( $opts['cat'] ) ) { global $wgOut; - $wgOut->addCategoryLinks($output->getCategories()); + $wgOut->addCategoryLinks( $output->getCategories() ); $cats = $wgOut->getCategoryLinks(); if ( isset( $cats['normal'] ) ) { $out = $this->tidy( implode( ' ', $cats['normal'] ) ); @@ -386,13 +385,13 @@ class ParserTest { } } - $result = $this->tidy($result); + $result = $this->tidy( $result ); } $this->teardownGlobals(); - if( $result === $out && ( $noxml === true || $this->wellFormed( $out ) ) ) { + if ( $result === $out && ( $noxml === true || $this->wellFormed( $out ) ) ) { return $this->showSuccess( $desc ); } else { return $this->showFailure( $desc, $result, $out ); @@ -402,13 +401,13 @@ class ParserTest { /** * Use a regex to find out the value of an option - * @param $key name of option val to retrieve + * @param $key String: name of option val to retrieve * @param $opts Options array to look in - * @param $defaults Default value returned if not found + * @param $default Mixed: default value returned if not found */ private static function getOptionValue( $key, $opts, $default ) { $key = strtolower( $key ); - if( isset( $opts[$key] ) ) { + if ( isset( $opts[$key] ) ) { return $opts[$key]; } else { return $default; @@ -454,13 +453,13 @@ class ParserTest { )? /x'; - if( preg_match_all( $regex, $instring, $matches, PREG_SET_ORDER ) ) { - foreach( $matches as $bits ) { + if ( preg_match_all( $regex, $instring, $matches, PREG_SET_ORDER ) ) { + foreach ( $matches as $bits ) { $match = array_shift( $bits ); $key = strtolower( array_shift( $bits ) ); - if( count( $bits ) == 0 ) { + if ( count( $bits ) == 0 ) { $opts[$key] = true; - } elseif( count( $bits ) == 1 ) { + } elseif ( count( $bits ) == 1 ) { $opts[$key] = $this->cleanupOption( array_shift( $bits ) ); } else { // Array! @@ -472,10 +471,10 @@ class ParserTest { } private function cleanupOption( $opt ) { - if( substr( $opt, 0, 1 ) == '"' ) { + if ( substr( $opt, 0, 1 ) == '"' ) { return substr( $opt, 1, -1 ); } - if( substr( $opt, 0, 2 ) == '[[' ) { + if ( substr( $opt, 0, 2 ) == '[[' ) { return substr( $opt, 2, -2 ); } return $opt; @@ -485,11 +484,8 @@ class ParserTest { * 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 = '') { + private function setupGlobals( $opts = '', $config = '' ) { global $wgDBtype; - if( !isset( $this->uploadDir ) ) { - $this->uploadDir = $this->setupUploadDir(); - } # Find out values for some special options. $lang = @@ -558,19 +554,19 @@ class ParserTest { 'wgAllowMicrodataAttributes' => true, ); - if ($config) { + if ( $config ) { $configLines = explode( "\n", $config ); - foreach( $configLines as $line ) { + foreach ( $configLines as $line ) { list( $var, $value ) = explode( '=', $line, 2 ); - $settings[$var] = eval("return $value;" ); + $settings[$var] = eval( "return $value;" ); } } $this->savedGlobals = array(); - foreach( $settings as $var => $val ) { - if( array_key_exists( $var, $GLOBALS ) ) { + foreach ( $settings as $var => $val ) { + if ( array_key_exists( $var, $GLOBALS ) ) { $this->savedGlobals[$var] = $GLOBALS[$var]; } $GLOBALS[$var] = $val; @@ -581,6 +577,11 @@ class ParserTest { $GLOBALS['wgMemc'] = new FakeMemCachedClient; $GLOBALS['wgOut'] = new OutputPage; + global $wgHooks; + $wgHooks['ParserTestParser'][] = 'ParserTestParserHook::setup'; + $wgHooks['ParserTestParser'][] = 'ParserTestStaticParserHook::setup'; + $wgHooks['ParserGetVariableValueTs'][] = 'ParserTest::getFakeTimestamp'; + MagicWord::clearCache(); global $wgUser; @@ -593,16 +594,16 @@ class ParserTest { */ private function listTables() { global $wgDBtype; - $tables = array('user', 'page', 'page_restrictions', + $tables = array( 'user', 'user_properties', 'page', 'page_restrictions', 'protected_titles', 'revision', 'text', 'pagelinks', 'imagelinks', - 'categorylinks', 'templatelinks', 'externallinks', 'langlinks', + 'categorylinks', 'templatelinks', 'externallinks', 'langlinks', 'iwlinks', 'site_stats', 'hitcounter', 'ipblocks', 'image', 'oldimage', - 'recentchanges', 'watchlist', 'math', 'interwiki', + 'recentchanges', 'watchlist', 'math', 'interwiki', 'logging', 'querycache', 'objectcache', 'job', 'l10n_cache', 'redirect', 'querycachetwo', - 'archive', 'user_groups', 'page_props', 'category' + 'archive', 'user_groups', 'page_props', 'category', ); - if ($wgDBtype === 'mysql') + if ( in_array( $wgDBtype, array( 'mysql', 'sqlite' ) ) ) array_push( $tables, 'searchindex' ); // Allow extensions to add to the list of tables to duplicate; @@ -618,21 +619,23 @@ class ParserTest { * Currently this will only be done once per run, and any changes to * the db will be visible to later tests in the run. */ - function setupDatabase() { + public function setupDatabase() { global $wgDBprefix, $wgDBtype; if ( $this->databaseSetupDone ) { return; } - if ( $wgDBprefix === 'parsertest_' || ($wgDBtype == 'oracle' && $wgDBprefix === 'pt_')) { + if ( $wgDBprefix === 'parsertest_' || ( $wgDBtype == '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?). + # If it fails, $wgCaches[CACHE_DB] = new HashBagOStuff(); should work around it. + # CREATE TEMPORARY TABLE breaks if there is more than one server - # FIXME: r40209 makes temporary tables break even with just one server - # FIXME: (bug 15892); disabling the feature entirely as a temporary fix - if ( true || wfGetLB()->getServerCount() != 1 ) { + if ( wfGetLB()->getServerCount() != 1 ) { $this->useTemporaryTables = false; } @@ -650,14 +653,21 @@ class ParserTest { $this->changePrefix( $wgDBtype != 'oracle' ? 'parsertest_' : 'pt_' ); $newTableName = $db->tableName( $tbl ); - if ( $db->tableExists( $tbl ) && $wgDBtype != 'postgres' && $wgDBtype != 'oracle' ) { + if ( $wgDBtype == 'mysql' ) { + $db->query( "DROP TABLE IF EXISTS $newTableName" ); + } elseif ( in_array( $wgDBtype, array( 'postgres', 'oracle' ) ) ) { + /* DROPs wouldn't work due to Foreign Key Constraints (bug 14990, r58669) + * Use "DROP TABLE IF EXISTS $newTableName CASCADE" for postgres? That + * syntax would also work for mysql. + */ + } elseif ( $db->tableExists( $tbl ) ) { $db->query( "DROP TABLE $newTableName" ); } # Create new table $db->duplicateTableStructure( $oldTableName, $newTableName, $temporary ); } - if ($wgDBtype == 'oracle') - $db->query('BEGIN FILL_WIKI_INFO; END;'); + if ( $wgDBtype == 'oracle' ) + $db->query( 'BEGIN FILL_WIKI_INFO; END;' ); $this->changePrefix( $wgDBtype != 'oracle' ? 'parsertest_' : 'pt_' ); @@ -666,72 +676,45 @@ class ParserTest { $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 ), ) ); - if ($wgDBtype == 'oracle') { - # Insert 0 and 1 user_ids to prevent FK violations + if ( $wgDBtype == 'oracle' ) { + # Insert 0 user to prevent FK violations - #Anonymous user + # Anonymous user $db->insert( 'user', array( 'user_id' => 0, - 'user_name' => 'Anonymous') ); - - # Hack-on-Hack: Insert a test user to be able to insert an image - $db->insert( 'user', array( - 'user_id' => 1, - 'user_name' => 'Tester') ); - } - - # Hack: Insert an image to work with - $db->insert( 'image', array( - 'img_name' => 'Foobar.jpg', - 'img_size' => 12345, - 'img_description' => 'Some lame file', - 'img_user' => 1, - 'img_user_text' => 'WikiSysop', - 'img_timestamp' => $db->timestamp( '20010115123500' ), - 'img_width' => 1941, - 'img_height' => 220, - 'img_bits' => 24, - 'img_media_type' => MEDIATYPE_BITMAP, - 'img_major_mime' => "image", - 'img_minor_mime' => "jpeg", - 'img_metadata' => serialize( array() ), - ) ); - - # This image will be blacklisted in [[MediaWiki:Bad image list]] - $db->insert( 'image', array( - 'img_name' => 'Bad.jpg', - 'img_size' => 12345, - 'img_description' => 'zomgnotcensored', - 'img_user' => 1, - 'img_user_text' => 'WikiSysop', - 'img_timestamp' => $db->timestamp( '20010115123500' ), - 'img_width' => 320, - 'img_height' => 240, - 'img_bits' => 24, - 'img_media_type' => MEDIATYPE_BITMAP, - 'img_major_mime' => "image", - 'img_minor_mime' => "jpeg", - 'img_metadata' => serialize( array() ), - ) ); + 'user_name' => 'Anonymous' ) ); + } # Update certain things in site_stats $db->insert( 'site_stats', array( 'ss_row_id' => 1, 'ss_images' => 2, 'ss_good_articles' => 1 ) ); @@ -741,7 +724,36 @@ class ParserTest { # Make a new message cache global $wgMessageCache, $wgMemc; - $wgMessageCache = new MessageCache( $wgMemc, true, 3600, '' ); + $wgMessageCache = new MessageCache( $wgMemc, true, 3600 ); + + $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' => sha1(''), + 'fileExists' => true + ), $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' => sha1(''), + 'fileExists' => true + ), $db->timestamp( '20010115123500' ), $user ); } /** @@ -761,11 +773,13 @@ class ParserTest { $db->tablePrefix( $prefix ); } - private function teardownDatabase() { - global $wgDBprefix, $wgDBtype; + public function teardownDatabase() { + global $wgDBtype; if ( !$this->databaseSetupDone ) { return; } + $this->teardownUploadDir( $this->uploadDir ); + $this->changePrefix( $this->oldTablePrefix ); $this->databaseSetupDone = false; if ( $this->useTemporaryTables ) { @@ -773,7 +787,6 @@ class ParserTest { return; } - /* $tables = $this->listTables(); $db = wfGetDB( DB_MASTER ); foreach ( $tables as $table ) { @@ -782,13 +795,13 @@ class ParserTest { } if ($wgDBtype == 'oracle') $db->query('BEGIN FILL_WIKI_INFO; END;'); - */ } /** * Create a dummy uploads directory which will contain a couple * of files in order to pass existence tests. - * @return string The directory + * + * @return String: the directory */ private function setupUploadDir() { global $IP; @@ -801,14 +814,13 @@ class ParserTest { $dir = wfTempDir() . "/mwParser-" . mt_rand() . "-images"; } - wfDebug( "Creating upload directory $dir\n" ); + //wfDebug( "Creating upload directory $dir\n" ); if ( file_exists( $dir ) ) { wfDebug( "Already exists!\n" ); return $dir; } wfMkdirParents( $dir . '/3/3a' ); copy( "$IP/skins/monobook/headbg.jpg", "$dir/3/3a/Foobar.jpg" ); - wfMkdirParents( $dir . '/0/09' ); copy( "$IP/skins/monobook/headbg.jpg", "$dir/0/09/Bad.jpg" ); return $dir; @@ -821,13 +833,9 @@ class ParserTest { private function teardownGlobals() { RepoGroup::destroySingleton(); LinkCache::singleton()->clear(); - foreach( $this->savedGlobals as $var => $val ) { + foreach ( $this->savedGlobals as $var => $val ) { $GLOBALS[$var] = $val; } - if( isset( $this->uploadDir ) ) { - $this->teardownUploadDir( $this->uploadDir ); - unset( $this->uploadDir ); - } } /** @@ -877,11 +885,11 @@ class ParserTest { /** * Delete the specified files, if they exist. - * @param array $files full paths to files to delete. + * @param $files Array: full paths to files to delete. */ private static function deleteFiles( $files ) { - foreach( $files as $file ) { - if( file_exists( $file ) ) { + foreach ( $files as $file ) { + if ( file_exists( $file ) ) { unlink( $file ); } } @@ -889,11 +897,11 @@ class ParserTest { /** * Delete the specified directories, if they exist. Must be empty. - * @param array $dirs full paths to directories to delete. + * @param $dirs Array: full paths to directories to delete. */ private static function deleteDirs( $dirs ) { - foreach( $dirs as $dir ) { - if( is_dir( $dir ) ) { + foreach ( $dirs as $dir ) { + if ( is_dir( $dir ) ) { rmdir( $dir ); } } @@ -909,11 +917,11 @@ class ParserTest { /** * Print a happy success message. * - * @param string $desc The test name - * @return bool + * @param $desc String: the test name + * @return Boolean */ protected function showSuccess( $desc ) { - if( $this->showProgress ) { + if ( $this->showProgress ) { print $this->term->color( '1;32' ) . 'PASSED' . $this->term->reset() . "\n"; } return true; @@ -923,14 +931,14 @@ class ParserTest { * Print a failure message and provide some explanatory output * about what went wrong if so configured. * - * @param string $desc The test name - * @param string $result Expected HTML output - * @param string $html Actual HTML output - * @return bool + * @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 ) { + 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 ); @@ -939,9 +947,9 @@ class ParserTest { if ( $this->showOutput ) { print "--- Expected ---\n$result\n--- Actual ---\n$html\n"; } - if( $this->showDiffs ) { + if ( $this->showDiffs ) { print $this->quickDiff( $result, $html ); - if( !$this->wellFormed( $html ) ) { + if ( !$this->wellFormed( $html ) ) { print "XML error: $this->mXmlError\n"; } } @@ -953,13 +961,13 @@ class ParserTest { * Run given strings through a diff and return the (colorized) output. * Requires writable /tmp directory and a 'diff' command in the PATH. * - * @param string $input - * @param string $output - * @param string $inFileTail Tailing for the input file name - * @param string $outFileTail Tailing for the output file name - * @return string + * @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' ) { + protected function quickDiff( $input, $output, $inFileTail = 'expected', $outFileTail = 'actual' ) { $prefix = wfTempDir() . "/mwParser-" . mt_rand(); $infile = "$prefix-$inFileTail"; @@ -978,8 +986,8 @@ class ParserTest { /** * Write the given string to a file, adding a final newline. * - * @param string $data - * @param string $filename + * @param $data String + * @param $filename String */ private function dumpToFile( $data, $filename ) { $file = fopen( $filename, "wt" ); @@ -991,23 +999,23 @@ class ParserTest { * Colorize unified diff output if set for ANSI color output. * Subtractions are colored blue, additions red. * - * @param string $text - * @return string + * @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() ), + $this->term->color( 31 ) . '$1' . $this->term->reset() ), $text ); } /** * Show "Reading tests from ..." * - * @param String $path + * @param $path String */ - public function showRunFile( $path ){ + public function showRunFile( $path ) { print $this->term->color( 1 ) . "Reading tests from \"$path\"..." . $this->term->reset() . @@ -1016,72 +1024,83 @@ class ParserTest { /** * Insert a temporary test article - * @param string $name the title, including any prefix - * @param string $text the article text - * @param int $line the input line number, for reporting errors + * @param $name String: the title, including any prefix + * @param $text String: the article text + * @param $line Integer: the input line number, for reporting errors */ - public function addArticle($name, $text, $line) { - $this->setupGlobals(); + public function addArticle( $name, $text, $line ) { + global $wgCapitalLinks; + $oldCapitalLinks = $wgCapitalLinks; + $wgCapitalLinks = true; // We only need this from SetupGlobals() See r70917#c8637 + $title = Title::newFromText( $name ); - if ( is_null($title) ) { + if ( is_null( $title ) ) { wfDie( "invalid title at line $line\n" ); } $aid = $title->getArticleID( GAID_FOR_UPDATE ); - if ($aid != 0) { + if ( $aid != 0 ) { wfDie( "duplicate article '$name' at line $line\n" ); } - $art = new Article($title); - $art->insertNewArticle($text, '', false, false ); + $art = new Article( $title ); + $art->insertNewArticle( $text, '', false, false ); - $this->teardownGlobals(); + $wgCapitalLinks = $oldCapitalLinks; } /** * Steal a callback function from the primary parser, save it for * application to our scary parser. If the hook is not installed, - * die a painful dead to warn the others. - * @param string $name + * 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] ) ) { + $wgParser->firstCallInit( ); // make sure hooks are loaded. + if ( isset( $wgParser->mTagHooks[$name] ) ) { $this->hooks[$name] = $wgParser->mTagHooks[$name]; } else { - wfDie( "This test suite requires the '$name' hook extension.\n" ); + 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, - * die a painful dead to warn the others. - * @param string $name + * abort processing of this file. + * + * @param $name String + * @return Bool true if function hook is present */ - private function requireFunctionHook( $name ) { + public function requireFunctionHook( $name ) { global $wgParser; - $wgParser->firstCallInit( ); //make sure hooks are loaded. - if( isset( $wgParser->mFunctionHooks[$name] ) ) { + $wgParser->firstCallInit( ); // make sure hooks are loaded. + if ( isset( $wgParser->mFunctionHooks[$name] ) ) { $this->functionHooks[$name] = $wgParser->mFunctionHooks[$name]; } else { - wfDie( "This test suite requires the '$name' function hook extension.\n" ); + 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 string $text the text to tidy - * @return string + * @param $text String: the text to tidy + * @return String * @static */ private function tidy( $text ) { global $wgUseTidy; - if ($wgUseTidy) { - $text = Parser::tidy($text); + if ( $wgUseTidy ) { + $text = MWTidy::tidy( $text ); } return $text; } @@ -1098,7 +1117,7 @@ class ParserTest { # case folding violates XML standard, turn it off xml_parser_set_option( $parser, XML_OPTION_CASE_FOLDING, false ); - if( !xml_parse( $parser, $html, true ) ) { + 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 ); @@ -1133,6 +1152,11 @@ class ParserTest { $this->term->color( 0 ); return "$display\n$caret"; } + + static function getFakeTimestamp( &$parser, &$ts ) { + $ts = 123; + return true; + } } class AnsiTermColorer { @@ -1142,8 +1166,8 @@ class AnsiTermColorer { /** * Return ANSI terminal escape code for changing text attribs/color * - * @param string $color Semicolon-separated list of attribute/color codes - * @return string + * @param $color String: semicolon-separated list of attribute/color codes + * @return String */ public function color( $color ) { global $wgCommandLineDarkBg; @@ -1154,7 +1178,7 @@ class AnsiTermColorer { /** * Return ANSI terminal escape code for restoring default text attributes * - * @return string + * @return String */ public function reset() { return $this->color( 0 ); @@ -1188,7 +1212,7 @@ class TestRecorder { function record( $test, $result ) { $this->total++; - $this->success += ($result ? 1 : 0); + $this->success += ( $result ? 1 : 0 ); } function end() { @@ -1196,7 +1220,7 @@ class TestRecorder { } function report() { - if( $this->total > 0 ) { + if ( $this->total > 0 ) { $this->reportPercentage( $this->success, $this->total ); } else { wfDie( "No tests found.\n" ); @@ -1206,23 +1230,23 @@ class TestRecorder { function reportPercentage( $success, $total ) { $ratio = wfPercent( 100 * $success / $total ); print $this->term->color( 1 ) . "Passed $success of $total tests ($ratio)... "; - if( $success == $total ) { + 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); + 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 + 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 @@ -1239,10 +1263,9 @@ class DbTestPreviewer extends TestRecorder { * and all that fun stuff */ function start() { - global $wgDBtype, $wgDBprefix; parent::start(); - if( ! $this->db->tableExists( 'testrun' ) + if ( ! $this->db->tableExists( 'testrun' ) or ! $this->db->tableExists( 'testitem' ) ) { print "WARNING> `testrun` table not found in database.\n"; @@ -1260,7 +1283,7 @@ class DbTestPreviewer extends TestRecorder { } function report() { - if( $this->prevRun ) { + if ( $this->prevRun ) { // f = fail, p = pass, n = nonexistent // codes show before then after $table = array( @@ -1313,10 +1336,10 @@ class DbTestPreviewer extends TestRecorder { # Write out results foreach ( $table as $code => $label ) { - if( !empty( $breakdown[$code] ) ) { - $count = count($breakdown[$code]); + if ( !empty( $breakdown[$code] ) ) { + $count = count( $breakdown[$code] ); printf( "\n%4d %s\n", $count, $label ); - foreach ($breakdown[$code] as $differing_test_name => $statusInfo) { + foreach ( $breakdown[$code] as $differing_test_name => $statusInfo ) { print " * $differing_test_name [$statusInfo]\n"; } } @@ -1329,32 +1352,32 @@ class DbTestPreviewer extends TestRecorder { } /** - ** 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). + * 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) { + 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__ ); + 'MIN(ti_run)', + array( 'ti_name' => $testname ), + __METHOD__ ); $appear = $this->db->selectRow ( 'testrun', - array( 'tr_date', 'tr_mw_version' ), - array( 'tr_id' => $changedRun ), - __METHOD__ ); + 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; + . 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") ); + 'ti_success' => ( $after == 'f' ? "1" : "0" ) ); if ( $this->curRun ) { $conds[] = "ti_run != " . $this->db->addQuotes ( $this->curRun ); } @@ -1363,7 +1386,7 @@ class DbTestPreviewer extends TestRecorder { // If no record of ever having had a different result. if ( is_null ( $changedRun ) ) { - if ($after == "f") { + if ( $after == "f" ) { return "Has never passed"; } else { return "Has never failed"; @@ -1374,15 +1397,15 @@ class DbTestPreviewer extends TestRecorder { // (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__ ); + 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' ) - ); + 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}"; @@ -1407,24 +1430,26 @@ class DbTestPreviewer extends TestRecorder { } 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, $wgDBprefix, $options; + global $wgDBtype; $this->db->begin(); - if( ! $this->db->tableExists( 'testrun' ) + if ( ! $this->db->tableExists( 'testrun' ) or ! $this->db->tableExists( 'testitem' ) ) { print "WARNING> `testrun` table not found in database. Trying to create table.\n"; - if ($wgDBtype === 'postgres') - $this->db->sourceFile( dirname(__FILE__) . '/testRunner.postgres.sql' ); - elseif ($wgDBtype === 'oracle') - $this->db->sourceFile( dirname(__FILE__) . '/testRunner.ora.sql' ); + if ( $wgDBtype === 'postgres' ) + $this->db->sourceFile( dirname( __FILE__ ) . '/testRunner.postgres.sql' ); + elseif ( $wgDBtype === 'oracle' ) + $this->db->sourceFile( dirname( __FILE__ ) . '/testRunner.ora.sql' ); else - $this->db->sourceFile( dirname(__FILE__) . '/testRunner.sql' ); + $this->db->sourceFile( dirname( __FILE__ ) . '/testRunner.sql' ); echo "OK, resuming.\n"; } @@ -1433,23 +1458,23 @@ class DbTestRecorder extends DbTestPreviewer { $this->db->insert( 'testrun', array( 'tr_date' => $this->db->timestamp(), - 'tr_mw_version' => isset( $options['setversion'] ) ? - $options['setversion'] : SpecialVersion::getVersion(), + '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'); + 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 string $test - * @param bool $result + * + * @param $test String + * @param $result Boolean */ function record( $test, $result ) { parent::record( $test, $result ); @@ -1482,20 +1507,20 @@ class RemoteTestRecorder extends TestRecorder { /** * Inform a CodeReview instance that we've started or completed a test run... - * @param $remote array: info on remote target + * * @param $status string: "running" - tell it we've started * "complete" - provide test results array * "abort" - something went horribly awry - * @param $data array of test name => true/false + * @param $results array of test name => true/false */ - function ping( $status, $results=false ) { + function ping( $status, $results = false ) { global $wgParserTestRemote, $IP; $remote = $wgParserTestRemote; $revId = SpecialVersion::getSvnRevision( $IP ); - $jsonResults = json_encode( $results ); + $jsonResults = FormatJson::encode( $results ); - if( !$remote ) { + if ( !$remote ) { print "Can't do remote upload without configuring \$wgParserTestRemote!\n"; exit( 1 ); } @@ -1507,7 +1532,7 @@ class RemoteTestRecorder extends TestRecorder { $revId, $status, ); - if( $status == "complete" ) { + if ( $status == "complete" ) { $message[] = $jsonResults; } $hmac = hash_hmac( "sha1", implode( "|", $message ), $remote['secret'] ); @@ -1521,22 +1546,22 @@ class RemoteTestRecorder extends TestRecorder { 'status' => $status, 'hmac' => $hmac, ); - if( $status == "complete" ) { + if ( $status == "complete" ) { $postData['results'] = $jsonResults; } $response = $this->post( $remote['api-url'], $postData ); - if( $response === false ) { + if ( $response === false ) { print "CodeReview info upload failed to reach server.\n"; exit( 1 ); } - $responseData = json_decode( $response, true ); - if( !is_array( $responseData ) ) { + $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'] ) ) { + if ( isset( $responseData['error'] ) ) { $code = $responseData['error']['code']; $info = $responseData['error']['info']; print "CodeReview info upload failed: $code $info\n"; @@ -1545,16 +1570,16 @@ class RemoteTestRecorder extends TestRecorder { } function post( $url, $data ) { - return Http::post( $url, array( 'postData' => $data) ); + return Http::post( $url, array( 'postData' => $data ) ); } } class TestFileIterator implements Iterator { - private $file; - private $fh; - private $parser; - private $index = 0; - private $test; + private $file; + private $fh; + private $parser; + private $index = 0; + private $test; private $lineNum; private $eof; @@ -1562,14 +1587,14 @@ class TestFileIterator implements Iterator { global $IP; $this->file = $file; - $this->fh = fopen($this->file, "rt"); - if( !$this->fh ) { + $this->fh = fopen( $this->file, "rt" ); + if ( !$this->fh ) { wfDie( "Couldn't open file '$file'\n" ); } $this->parser = $parser; - if( $this->parser ) $this->parser->showRunFile( wfRelativePath( $this->file, $IP ) ); + if ( $this->parser ) $this->parser->showRunFile( wfRelativePath( $this->file, $IP ) ); $this->lineNum = $this->index = 0; } @@ -1578,120 +1603,128 @@ class TestFileIterator implements Iterator { } function rewind() { - if(fseek($this->fh, 0)) { - wfDie( "Couldn't fseek to the start of '$filename'\n" ); + if ( fseek( $this->fh, 0 ) ) { + wfDie( "Couldn't fseek to the start of '$this->file'\n" ); } - $this->index = 0; + $this->index = -1; $this->lineNum = 0; $this->eof = false; - $this->readNextTest(); + $this->next(); return true; - } + } - function current() { + function current() { return $this->test; - } + } - function key() { + function key() { return $this->index; - } + } - function next() { - if($this->readNextTest()) { + function next() { + if ( $this->readNextTest() ) { $this->index++; return true; } else { $this->eof = true; } - } + } - function valid() { + function valid() { return $this->eof != true; - } + } function readNextTest() { $data = array(); $section = null; - while( false !== ($line = fgets( $this->fh ) ) ) { + while ( false !== ( $line = fgets( $this->fh ) ) ) { $this->lineNum++; $matches = array(); - if( preg_match( '/^!!\s*(\w+)/', $line, $matches ) ) { + 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 $filename\n" ); + 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( !isset( $data['article'] ) ) { - wfDie( "'endarticle' without 'article' at line {$this->lineNum} of $filename\n" ); + if ( $this->parser ) { + $this->parser->addArticle( $this->parser->chomp( $data['article'] ), $this->parser->chomp( $data['text'] ), + $this->lineNum ); } - if( $this->parser ) $this->parser->addArticle($this->parser->chomp($data['article']), $this->parser->chomp($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 $filename\n" ); + 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 ) { + foreach ( explode( "\n", $data['hooks'] ) as $line ) { $line = trim( $line ); - if( $line ) { - if( $this->parser ) $this->parser->requireHook( $line ); + if ( $line ) { + if ( $this->parser && !$this->parser->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 $filename\n" ); + 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 ) { + foreach ( explode( "\n", $data['functionhooks'] ) as $line ) { $line = trim( $line ); - if( $line ) { - if( $this->parser ) $this->parser->requireFunctionHook( $line ); + if ( $line ) { + if ( $this->parser && !$this->parser->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 $filename\n" ); + 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 $filename\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 $filename\n" ); + if ( !isset( $data['result'] ) ) { + wfDie( "'end' without 'result' at line {$this->lineNum} of $this->file\n" ); } - if( !isset( $data['options'] ) ) { + if ( !isset( $data['options'] ) ) { $data['options'] = ''; } - if (!isset( $data['config'] ) ) + if ( !isset( $data['config'] ) ) $data['config'] = ''; - if ( $this->parser && (preg_match('/\\bdisabled\\b/i', $data['options']) - || !preg_match("/{$this->parser->regex}/i", $data['test'])) && !$this->parser->runDisabled ) { + if ( $this->parser + && ( ( preg_match( '/\\bdisabled\\b/i', $data['options'] ) && !$this->parser->runDisabled ) + || !preg_match( "/" . $this->parser->regex . "/i", $data['test'] ) ) ) { # disabled test $data = array(); $section = null; continue; } + global $wgUseTeX; if ( $this->parser && - preg_match('/\\bmath\\b/i', $data['options']) && !$this->parser->savedGlobals['wgUseTeX'] ) { + 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->parser ) { + if ( $this->parser ) { $this->test = array( 'test' => $this->parser->chomp( $data['test'] ), 'input' => $this->parser->chomp( $data['input'] ), @@ -1703,16 +1736,17 @@ class TestFileIterator implements Iterator { } return true; } - if ( isset ($data[$section] ) ) { - wfDie( "duplicate section '$section' at line {$this->lineNum} of $filename\n" ); + if ( isset ( $data[$section] ) ) { + wfDie( "duplicate section '$section' at line {$this->lineNum} of $this->file\n" ); } $data[$section] = ''; continue; } - if( $section ) { + if ( $section ) { $data[$section] .= $line; } } return false; } -} \ No newline at end of file +} +