#
# 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.,
-# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
# http://www.gnu.org/copyleft/gpl.html
/**
require_once( "$IP/languages/LanguageUtf8.php" );
require_once( "$IP/includes/Hooks.php" );
require_once( "$IP/maintenance/parserTestsParserHook.php" );
+require_once( "$IP/maintenance/parserTestsStaticParserHook.php" );
require_once( "$IP/maintenance/parserTestsParserTime.php" );
/**
class ParserTest {
/**
* boolean $color whereas output should be colorized
- * @access private
+ * @private
*/
var $color;
/**
* boolean $lightcolor whereas output should use light colors
- * @access private
+ * @private
*/
var $lightcolor;
* Sets terminal colorization and diff/quick modes depending on OS and
* command-line options (--color and --quick).
*
- * @access public
+ * @public
*/
function ParserTest() {
global $options;
# Matches anything
$this->regex = '';
}
+
+ $this->hooks = array();
}
/**
* Remove last character if it is a newline
- * @access private
+ * @private
*/
function chomp($s) {
if (substr($s, -1) === "\n") {
*
* @param string $filename
* @return bool True if passed all tests, false if any tests failed.
- * @access public
+ * @public
*/
function runTestsFromFile( $filename ) {
$infile = fopen( $filename, 'rt' );
if( !$infile ) {
- wfDie( "Couldn't open parserTests.txt\n" );
+ wfDie( "Couldn't open $filename\n" );
}
$data = array();
$section = null;
continue;
}
+ if( $section == 'endhooks' ) {
+ if( !isset( $data['hooks'] ) ) {
+ wfDie( "'endhooks' without 'hooks' at line $n\n" );
+ }
+ foreach( explode( "\n", $data['hooks'] ) as $line ) {
+ $line = trim( $line );
+ if( $line ) {
+ $this->requireHook( $line );
+ }
+ }
+ $data = array();
+ $section = null;
+ continue;
+ }
if( $section == 'end' ) {
if( !isset( $data['test'] ) ) {
wfDie( "'end' without 'test' at line $n\n" );
if (preg_match('/\\bmath\\b/i', $opts)) {
# XXX this should probably be done by the ParserOptions
- require_once('Math.php');
-
$options->setUseTex(true);
}
$noxml = (bool)preg_match( '~\\b noxml \\b~x', $opts );
$parser =& new Parser();
+ foreach( $this->hooks as $tag => $callback ) {
+ $parser->setHook( $tag, $callback );
+ }
wfRunHooks( 'ParserTestParser', array( &$parser ) );
$title =& Title::makeTitle( NS_MAIN, $titleText );
$out = $parser->preSaveTransform( $input, $title, $user, $options );
} elseif (preg_match('/\\bmsg\\b/i', $opts)) {
$out = $parser->transformMsg( $input, $options );
+ } elseif( preg_match( '/\\bsection=(\d+)\b/i', $opts, $matches ) ) {
+ $section = intval( $matches[1] );
+ $out = $parser->getSection( $input, $section );
+ } elseif( preg_match( '/\\breplace=(\d+),"(.*?)"/i', $opts, $matches ) ) {
+ $section = intval( $matches[1] );
+ $replace = $matches[2];
+ $out = $parser->replaceSection( $input, $section, $replace );
} else {
$output = $parser->parse( $input, $title, $options, true, true, 1337 );
$out = $output->getText();
if (preg_match('/\\bill\\b/i', $opts)) {
$out = $this->tidy( implode( ' ', $output->getLanguageLinks() ) );
} else if (preg_match('/\\bcat\\b/i', $opts)) {
- $out = $this->tidy ( implode( ' ', $output->getCategoryLinks() ) );
+ global $wgOut;
+ $wgOut->addCategoryLinks($output->getCategories());
+ $out = $this->tidy ( implode( ' ', $wgOut->getCategoryLinks() ) );
}
$result = $this->tidy($result);
* Set up the global variables for a consistent environment for each test.
* Ideally this should replace the global configuration entirely.
*
- * @access private
+ * @private
*/
function setupGlobals($opts = '') {
# Save the prefixed / quoted table names for later use when we make the temporaries.
if( !isset( $this->uploadDir ) ) {
$this->uploadDir = $this->setupUploadDir();
}
+
+ if( preg_match( '/language=([a-z]+(?:_[a-z]+)?)/', $opts, $m ) ) {
+ $lang = $m[1];
+ } else {
+ $lang = 'en';
+ }
$settings = array(
'wgServer' => 'http://localhost',
'wgScript' => '/index.php',
'wgScriptPath' => '/',
'wgArticlePath' => '/wiki/$1',
+ 'wgActionPaths' => array(),
'wgUploadPath' => 'http://example.com/images',
'wgUploadDirectory' => $this->uploadDir,
'wgStyleSheetPath' => '/skins',
'wgSitename' => 'MediaWiki',
'wgServerName' => 'Britney Spears',
- 'wgLanguageCode' => 'en',
- 'wgContLanguageCode' => 'en',
- 'wgDBprefix' => 'parsertest',
+ 'wgLanguageCode' => $lang,
+ 'wgContLanguageCode' => $lang,
+ 'wgDBprefix' => 'parsertest_',
'wgDefaultUserOptions' => array(),
- 'wgLang' => new LanguageUtf8(),
- 'wgContLang' => new LanguageUtf8(),
+ 'wgLang' => null,
+ 'wgContLang' => null,
'wgNamespacesWithSubpages' => array( 0 => preg_match('/\\bsubpage\\b/i', $opts)),
'wgMaxTocLevel' => 999,
'wgCapitalLinks' => true,
'wgThumbnailScriptPath' => false,
'wgUseTeX' => false,
'wgLocaltimezone' => 'UTC',
+ 'wgAllowExternalImages' => true,
);
$this->savedGlobals = array();
foreach( $settings as $var => $val ) {
$this->savedGlobals[$var] = $GLOBALS[$var];
$GLOBALS[$var] = $val;
}
+ $langClass = 'Language' . str_replace( '-', '_', ucfirst( $lang ) );
+ $langObj = setupLangObj( $langClass );
+ $GLOBALS['wgLang'] = $langObj;
+ $GLOBALS['wgContLang'] = $langObj;
+
$GLOBALS['wgLoadBalancer']->loadMasterPos();
$GLOBALS['wgMessageCache']->initialise( new BagOStuff(), false, 0, $GLOBALS['wgDBname'] );
$this->setupDatabase();
# List of temporary tables to create, without prefix
# Some of these probably aren't necessary
function listTables() {
- return array('user', 'page', 'revision', 'text',
- 'pagelinks', 'imagelinks', 'categorylinks', 'templatelinks',
+ $tables = array('user', 'page', 'revision', 'text',
+ 'pagelinks', 'imagelinks', 'categorylinks',
+ 'templatelinks', 'externallinks', 'langlinks',
'site_stats', 'hitcounter',
'ipblocks', 'image', 'oldimage',
'recentchanges',
'watchlist', 'math', 'searchindex',
'interwiki', 'querycache',
- 'objectcache'
+ 'objectcache', 'job'
);
+
+ // FIXME manually adding additional table for the tasks extension
+ // we probably need a better software wide system to register new
+ // tables.
+ global $wgExtensionFunctions;
+ if( in_array('wfTasksExtension' , $wgExtensionFunctions ) ) {
+ $tables[] = 'tasks';
+ }
+
+ return $tables;
}
/**
* Currently this will only be done once per run, and any changes to
* the db will be visible to later tests in the run.
*
- * @access private
+ * @private
*/
function setupDatabase() {
static $setupDB = false;
global $wgDBprefix;
# Make sure we don't mess with the live DB
- if (!$setupDB && $wgDBprefix === 'parsertest') {
+ if (!$setupDB && $wgDBprefix === 'parsertest_') {
# oh teh horror
$GLOBALS['wgLoadBalancer'] = LoadBalancer::newFromParams( $GLOBALS['wgDBservers'] );
$db =& wfGetDB( DB_MASTER );
if (!(strcmp($db->getServerVersion(), '4.1') < 0 and stristr($db->getSoftwareLink(), 'MySQL'))) {
# Database that supports CREATE TABLE ... LIKE
global $wgDBtype;
- if( $wgDBtype == 'PostgreSQL' ) {
+ if( $wgDBtype == 'postgres' ) {
$def = 'INCLUDING DEFAULTS';
} else {
$def = '';
'img_major_mime' => "image",
'img_minor_mime' => "jpeg",
) );
+
+ # Update certain things in site_stats
+ $db->insert( 'site_stats', array( 'ss_row_id' => 1, 'ss_images' => 1, 'ss_good_articles' => 1 ) );
$setupDB = true;
}
* Create a dummy uploads directory which will contain a couple
* of files in order to pass existence tests.
* @return string The directory
- * @access private
+ * @private
*/
function setupUploadDir() {
global $IP;
* Restore default values and perform any necessary clean-up
* after each test runs.
*
- * @access private
+ * @private
*/
function teardownGlobals() {
foreach( $this->savedGlobals as $var => $val ) {
/**
* Remove the dummy uploads directory
- * @access private
+ * @private
*/
function teardownUploadDir( $dir ) {
unlink( "$dir/3/3a/Foobar.jpg" );
rmdir( "$dir/3/3a" );
rmdir( "$dir/3" );
+ @rmdir( "$dir/thumb/6/65" );
+ @rmdir( "$dir/thumb/6" );
@unlink( "$dir/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg" );
@rmdir( "$dir/thumb/3/3a/Foobar.jpg" );
@rmdir( "$dir/thumb/3/39" ); # wtf?
@rmdir( "$dir/thumb/3" );
@rmdir( "$dir/thumb" );
- rmdir( "$dir" );
+ @rmdir( "$dir" );
}
/**
* "Running test $desc..."
- * @access private
+ * @private
*/
function showTesting( $desc ) {
print "Running test $desc... ";
*
* @param string $desc The test name
* @return bool
- * @access private
+ * @private
*/
function showSuccess( $desc ) {
if( !$this->quiet ) {
* @param string $result Expected HTML output
* @param string $html Actual HTML output
* @return bool
- * @access private
+ * @private
*/
function showFailure( $desc, $result, $html ) {
if( $this->quiet ) {
print $this->termColor( '1;31' ) . 'FAILED!' . $this->termReset() . "\n";
if( $this->showDiffs ) {
print $this->quickDiff( $result, $html );
- }
- if( !$this->wellFormed( $html ) ) {
- print "XML error: $this->mXmlError\n";
+ if( !$this->wellFormed( $html ) ) {
+ print "XML error: $this->mXmlError\n";
+ }
}
return false;
}
* @param string $inFileTail Tailing for the input file name
* @param string $outFileTail Tailing for the output file name
* @return string
- * @access private
+ * @private
*/
function quickDiff( $input, $output, $inFileTail='expected', $outFileTail='actual' ) {
$prefix = wfTempDir() . "/mwParser-" . mt_rand();
*
* @param string $data
* @param string $filename
- * @access private
+ * @private
*/
function dumpToFile( $data, $filename ) {
$file = fopen( $filename, "wt" );
*
* @param string $color Semicolon-separated list of attribute/color codes
* @return string
- * @access private
+ * @private
*/
function termColor( $color ) {
if($this->lightcolor) {
* or empty string if color output is disabled.
*
* @return string
- * @access private
+ * @private
*/
function termReset() {
return $this->color ? "\x1b[0m" : '';
*
* @param string $text
* @return string
- * @access private
+ * @private
*/
function colorDiff( $text ) {
return preg_replace(
* @param string $name the title, including any prefix
* @param string $text the article text
* @param int $line the input line number, for reporting errors
- * @static
- * @access private
+ * @private
*/
function addArticle($name, $text, $line) {
$this->setupGlobals();
$art->insertNewArticle($text, '', false, false );
$this->teardownGlobals();
}
+
+ /**
+ * 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
+ */
+ private function requireHook( $name ) {
+ global $wgParser;
+ if( isset( $wgParser->mTagHooks[$name] ) ) {
+ $this->hooks[$name] = $wgParser->mTagHooks[$name];
+ } else {
+ wfDie( "This test suite requires the '$name' hook extension.\n" );
+ }
+ }
/*
* Run the "tidy" command on text if the $wgUseTidy
* @param string $text the text to tidy
* @return string
* @static
- * @access private
+ * @private
*/
function tidy( $text ) {
global $wgUseTidy;