Start work on porting ParserTests completely into PHPunit.
authorX! <soxred93@users.mediawiki.org>
Sat, 1 Jan 2011 03:39:37 +0000 (03:39 +0000)
committerX! <soxred93@users.mediawiki.org>
Sat, 1 Jan 2011 03:39:37 +0000 (03:39 +0000)
Disable temporary tables, a few reports of them not working. The tables get deleted anyway, so why risk it?

tests/phpunit/MediaWikiTestCase.php
tests/phpunit/includes/parser/NewParserHelpers.php [new file with mode: 0644]
tests/phpunit/includes/parser/NewParserTest.php [new file with mode: 0644]
tests/testHelpers.inc

index 8e30fff..c64f6d2 100644 (file)
@@ -107,6 +107,7 @@ abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase {
                $prefix = $dbType != 'oracle' ? 'unittest_' : 'ut_';
                
                $this->dbClone = new CloneDatabase( $this->db, $tables, $prefix );
+               $this->dbClone->useTemporaryTables( false ); //reported problems with temp tables, disabling until fixed
                $this->dbClone->cloneTableStructure();
                
                if ( $dbType == 'oracle' )
diff --git a/tests/phpunit/includes/parser/NewParserHelpers.php b/tests/phpunit/includes/parser/NewParserHelpers.php
new file mode 100644 (file)
index 0000000..982d686
--- /dev/null
@@ -0,0 +1,199 @@
+<?php
+
+class ParserTestFileIterator implements Iterator {
+
+       protected $file;
+       protected $fh;
+       protected $parserTest; /* An instance of ParserTest (parserTests.php) or MediaWikiParserTest (phpunit) */
+       protected $index = 0;
+       protected $test;
+       protected $lineNum;
+       protected $eof;
+
+       function __construct( $file, $parserTest ) {
+               global $IP;
+
+               $this->file = $file;
+               $this->fh = fopen( $this->file, "rt" );
+
+               if ( !$this->fh ) {
+                       wfDie( "Couldn't open file '$file'\n" );
+               }
+
+               $this->parserTest = $parserTest;
+               //$this->parserTest->showRunFile( wfRelativePath( $this->file, $IP ) );
+
+               $this->lineNum = $this->index = 0;
+       }
+
+       function rewind() {
+               if ( fseek( $this->fh, 0 ) ) {
+                       wfDie( "Couldn't fseek to the start of '$this->file'\n" );
+               }
+
+               $this->index = -1;
+               $this->lineNum = 0;
+               $this->eof = false;
+               $this->next();
+
+               return true;
+       }
+
+       function current() {
+               return $this->test;
+       }
+
+       function key() {
+               return $this->index;
+       }
+
+       function next() {
+               if ( $this->readNextTest() ) {
+                       $this->index++;
+                       return true;
+               } else {
+                       $this->eof = true;
+               }
+       }
+
+       function valid() {
+               return $this->eof != true;
+       }
+
+       function readNextTest() {
+               $data = array();
+               $section = null;
+
+               while ( false !== ( $line = fgets( $this->fh ) ) ) {
+                       $this->lineNum++;
+                       $matches = array();
+
+                       if ( preg_match( '/^!!\s*(\w+)/', $line, $matches ) ) {
+                               $section = strtolower( $matches[1] );
+
+                               if ( $section == 'endarticle' ) {
+                                       if ( !isset( $data['text'] ) ) {
+                                               wfDie( "'endarticle' without 'text' at line {$this->lineNum} of $this->file\n" );
+                                       }
+
+                                       if ( !isset( $data['article'] ) ) {
+                                               wfDie( "'endarticle' without 'article' at line {$this->lineNum} of $this->file\n" );
+                                       }
+
+                                       $this->parserTest->addArticle( $this->parserTest->removeEndingNewline( $data['article'] ), $data['text'], $this->lineNum );
+                                       
+                                       
+                                       $data = array();
+                                       $section = null;
+
+                                       continue;
+                               }
+
+                               if ( $section == 'endhooks' ) {
+                                       if ( !isset( $data['hooks'] ) ) {
+                                               wfDie( "'endhooks' without 'hooks' at line {$this->lineNum} of $this->file\n" );
+                                       }
+
+                                       foreach ( explode( "\n", $data['hooks'] ) as $line ) {
+                                               $line = trim( $line );
+
+                                               if ( $line ) {
+                                                       if ( !$this->parserTest->requireHook( $line ) ) {
+                                                               return false;
+                                                       }
+                                               }
+                                       }
+
+                                       $data = array();
+                                       $section = null;
+
+                                       continue;
+                               }
+
+                               if ( $section == 'endfunctionhooks' ) {
+                                       if ( !isset( $data['functionhooks'] ) ) {
+                                               wfDie( "'endfunctionhooks' without 'functionhooks' at line {$this->lineNum} of $this->file\n" );
+                                       }
+
+                                       foreach ( explode( "\n", $data['functionhooks'] ) as $line ) {
+                                               $line = trim( $line );
+
+                                               if ( $line ) {
+                                                       if ( !$this->parserTest->requireFunctionHook( $line ) ) {
+                                                               return false;
+                                                       }
+                                               }
+                                       }
+
+                                       $data = array();
+                                       $section = null;
+
+                                       continue;
+                               }
+
+                               if ( $section == 'end' ) {
+                                       if ( !isset( $data['test'] ) ) {
+                                               wfDie( "'end' without 'test' at line {$this->lineNum} of $this->file\n" );
+                                       }
+
+                                       if ( !isset( $data['input'] ) ) {
+                                               wfDie( "'end' without 'input' at line {$this->lineNum} of $this->file\n" );
+                                       }
+
+                                       if ( !isset( $data['result'] ) ) {
+                                               wfDie( "'end' without 'result' at line {$this->lineNum} of $this->file\n" );
+                                       }
+
+                                       if ( !isset( $data['options'] ) ) {
+                                               $data['options'] = '';
+                                       }
+
+                                       if ( !isset( $data['config'] ) )
+                                               $data['config'] = '';
+
+                                       if ( ( preg_match( '/\\bdisabled\\b/i', $data['options'] ) && !$this->parserTest->runDisabled )
+                                                        || !preg_match( "/" . $this->parserTest->regex . "/i", $data['test'] ) ) {
+                                               # disabled test
+                                               $data = array();
+                                               $section = null;
+
+                                               continue;
+                                       }
+
+                                       global $wgUseTeX;
+
+                                       if ( 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;
+                                       }
+
+                                       $this->test = array(
+                                               'test' => $this->parserTest->removeEndingNewline( $data['test'] ),
+                                               'input' => $this->parserTest->removeEndingNewline( $data['input'] ),
+                                               'result' => $this->parserTest->removeEndingNewline( $data['result'] ),
+                                               'options' => $this->parserTest->removeEndingNewline( $data['options'] ),
+                                               'config' => $this->parserTest->removeEndingNewline( $data['config'] ) );
+
+                                       return true;
+                               }
+
+                               if ( isset ( $data[$section] ) ) {
+                                       wfDie( "duplicate section '$section' at line {$this->lineNum} of $this->file\n" );
+                               }
+
+                               $data[$section] = '';
+
+                               continue;
+                       }
+
+                       if ( $section ) {
+                               $data[$section] .= $line;
+                       }
+               }
+
+               return false;
+       }
+}
\ No newline at end of file
diff --git a/tests/phpunit/includes/parser/NewParserTest.php b/tests/phpunit/includes/parser/NewParserTest.php
new file mode 100644 (file)
index 0000000..1a939d8
--- /dev/null
@@ -0,0 +1,607 @@
+<?php
+
+require_once( dirname( __FILE__ ) . '/NewParserHelpers.php' );
+
+/**
+ * @group Database
+ */
+class NewParserTest extends MediaWikiTestCase {
+       
+       public $uploadDir;
+       public $keepUploads = false;
+       public $runDisabled = false;
+       public $regex = '';
+       public $showProgress = true;
+       public $savedGlobals = array();
+       public $hooks = array();
+       public $functionHooks = array();
+       
+       function setUp() {
+               global $wgContLang;
+               $wgContLang = Language::factory( 'en' );
+                               
+               global $wgParser, $wgParserConf, $IP, $messageMemc, $wgMemc, $wgDeferredUpdateList,
+                       $wgUser, $wgLang, $wgOut, $wgRequest, $wgStyleDirectory, $wgEnableParserCache,
+                       $wgMessageCache, $wgUseDatabaseMessages, $wgMsgCacheExpiry, $parserMemc,
+                       $wgNamespaceAliases, $wgNamespaceProtection, $wgLocalFileRepo,
+                       $wgThumbnailScriptPath, $wgScriptPath,
+                       $wgArticlePath, $wgStyleSheetPath, $wgScript, $wgStylePath;
+
+               $wgScript = '/index.php';
+               $wgScriptPath = '/';
+               $wgArticlePath = '/wiki/$1';
+               $wgStyleSheetPath = '/skins';
+               $wgStylePath = '/skins';
+               $wgThumbnailScriptPath = false;
+               $wgLocalFileRepo = array(
+                       'class' => 'LocalRepo',
+                       'name' => 'local',
+                       'directory' => wfTempDir() . '/test-repo',
+                       'url' => 'http://example.com/images',
+                       'deletedDir' => wfTempDir() . '/test-repo/delete',
+                       'hashLevels' => 2,
+                       'transformVia404' => false,
+               );
+               $wgNamespaceProtection[NS_MEDIAWIKI] = 'editinterface';
+               $wgNamespaceAliases['Image'] = NS_FILE;
+               $wgNamespaceAliases['Image_talk'] = NS_FILE_TALK;
+
+
+               $wgEnableParserCache = false;
+               $wgDeferredUpdateList = array();
+               $wgMemc = &wfGetMainCache();
+               $messageMemc = &wfGetMessageCacheStorage();
+               $parserMemc = &wfGetParserCacheStorage();
+
+               // $wgContLang = new StubContLang;
+               $wgUser = new User;
+               $wgLang = new StubUserLang;
+               $wgOut = new StubObject( 'wgOut', 'OutputPage' );
+               $wgParser = new StubObject( 'wgParser', $wgParserConf['class'], array( $wgParserConf ) );
+               $wgRequest = new WebRequest;
+
+               $wgMessageCache = new StubObject( 'wgMessageCache', 'MessageCache',
+                                                                                 array( $messageMemc, $wgUseDatabaseMessages,
+                                                                                                $wgMsgCacheExpiry ) );
+               if ( $wgStyleDirectory === false ) {
+                       $wgStyleDirectory   = "$IP/skins";
+               }
+       }
+       
+       /**
+        * Set up the global variables for a consistent environment for each test.
+        * Ideally this should replace the global configuration entirely.
+        */
+       protected 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',
+                               'directory' => $this->uploadDir,
+                               'url' => 'http://example.com/images',
+                               'hashLevels' => 2,
+                               'transformVia404' => false,
+                       ),
+                       'wgEnableUploads' => self::getOptionValue( 'wgEnableUploads', $opts, true ),
+                       'wgStylePath' => '/skins',
+                       'wgStyleSheetPath' => '/skins',
+                       'wgSitename' => 'MediaWiki',
+                       'wgLanguageCode' => $lang,
+                       'wgDBprefix' => $this->db->getType() != 'oracle' ? 'unittest_' : 'ut_',
+                       '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,
+                       'wgUseTeX' => isset( $opts['math'] ),
+                       'wgMathDirectory' => $this->uploadDir . '/math',
+                       '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,
+                       'wgWellFormedXml' => true,
+                       'wgAllowMicrodataAttributes' => true,
+                       'wgAdaptiveMessageCache' => true
+               );
+
+               if ( $config ) {
+                       $configLines = explode( "\n", $config );
+
+                       foreach ( $configLines as $line ) {
+                               list( $var, $value ) = explode( '=', $line, 2 );
+
+                               $settings[$var] = eval( "return $value;" ); //???
+                       }
+               }
+
+               $this->savedGlobals = array();
+
+               foreach ( $settings as $var => $val ) {
+                       if ( array_key_exists( $var, $GLOBALS ) ) {
+                               $this->savedGlobals[$var] = $GLOBALS[$var];
+                       }
+
+                       $GLOBALS[$var] = $val;
+               }
+
+               $langObj = Language::factory( $lang );
+               $GLOBALS['wgLang'] = $langObj;
+               $GLOBALS['wgContLang'] = $langObj;
+               $GLOBALS['wgMemc'] = new FakeMemCachedClient;
+               $GLOBALS['wgOut'] = new OutputPage;
+
+               global $wgHooks;
+
+               $wgHooks['ParserTestParser'][] = 'ParserTestParserHook::setup';
+               $wgHooks['ParserTestParser'][] = 'ParserTestStaticParserHook::setup';
+               $wgHooks['ParserGetVariableValueTs'][] = 'ParserTest::getFakeTimestamp';
+
+               MagicWord::clearCache();
+
+               global $wgUser;
+               $wgUser = new User();
+       }
+       
+       /**
+        * Restore default values and perform any necessary clean-up
+        * after each test runs.
+        */
+       protected function teardownGlobals() {
+               RepoGroup::destroySingleton();
+               LinkCache::singleton()->clear();
+
+               foreach ( $this->savedGlobals as $var => $val ) {
+                       $GLOBALS[$var] = $val;
+               }
+       }
+       
+       function addDBData() {
+               # 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();
+
+               # Make a new message cache
+               global $wgMessageCache, $wgMemc;
+               $wgMessageCache = new MessageCache( $wgMemc, true, 3600 );
+
+               $this->uploadDir = $this->setupUploadDir();
+               
+               $user = User::newFromId( 0 );
+               
+               $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 testParserTests() {
+               
+               //global $IP;
+               //$wgParserTestFiles = array( "$IP/tests/parser/testparserTests.txt" );
+               
+               global $wgParserTestFiles;
+               
+               foreach( $wgParserTestFiles as $file ) {
+                       
+                       $iter = new ParserTestFileIterator( $file, $this );
+                       
+                       foreach ( $iter as $t ) {
+                               
+                               $result = $this->doRunTest( $t['test'], $t['input'], $t['result'], $t['options'], $t['config'] );
+                       
+                               //$this->recorder->record( $t['test'], $result );
+                       }
+               
+               }
+               
+                       
+       }
+       
+       
+       /**
+        * 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
+        */
+       protected function doRunTest( $desc, $input, $result, $opts, $config ) {
+               
+               $opts = $this->parseOptions( $opts );
+               $this->setupGlobals( $opts, $config );
+
+               $user = new User();
+               $options = ParserOptions::newFromUser( $user );
+
+               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 );
+               } 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'] ) ) {
+                       $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'] ) ) {
+                               if ( $output->getTitleText() ) {
+                                       $title = $output->getTitleText();
+                               }
+
+                               $out = "$title\n$out";
+                       }
+
+                       if ( isset( $opts['ill'] ) ) {
+                               $out = $this->tidy( implode( ' ', $output->getLanguageLinks() ) );
+                       } elseif ( isset( $opts['cat'] ) ) {
+                               global $wgOut;
+
+                               $wgOut->addCategoryLinks( $output->getCategories() );
+                               $cats = $wgOut->getCategoryLinks();
+
+                               if ( isset( $cats['normal'] ) ) {
+                                       $out = $this->tidy( implode( ' ', $cats['normal'] ) );
+                               } else {
+                                       $out = '';
+                               }
+                       }
+
+                       $result = $this->tidy( $result );
+               }
+
+               $this->teardownGlobals();
+               
+               $this->assertEquals( $result, $out, $desc );
+       }
+       
+       /**
+        * 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 the "tidy" command on text if the $wgUseTidy
+        * global is true
+        *
+        * @param $text String: the text to tidy
+        * @return String
+        * @static
+        */
+       protected function tidy( $text ) {
+               global $wgUseTidy;
+
+               if ( $wgUseTidy ) {
+                       $text = MWTidy::tidy( $text );
+               }
+
+               return $text;
+       }
+       
+       
+       /**
+        * Create a dummy uploads directory which will contain a couple
+        * of files in order to pass existence tests.
+        *
+        * @return String: the directory
+        */
+       protected 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' );
+               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;
+       }
+       
+       /**
+        * 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
+        */
+       public function addArticle( $name, $text, $line = 'unknown' ) {
+               global $wgCapitalLinks;
+
+               $text = $this->removeEndingNewline($text);
+
+               $oldCapitalLinks = $wgCapitalLinks;
+               $wgCapitalLinks = true; // We only need this from SetupGlobals() See r70917#c8637
+
+               $name = $this->removeEndingNewline( $name );
+               $title = Title::newFromText( $name );
+
+               if ( is_null( $title ) ) {
+                       wfDie( "invalid title ('$name' => '$title') at line $line\n" );
+               }
+
+               $aid = $title->getArticleID( Title::GAID_FOR_UPDATE );
+
+               if ( $aid != 0 ) {
+                       debug_print_backtrace();
+                       wfDie( "duplicate article '$name' at line $line\n" );
+               }
+
+               $art = new Article( $title );
+               $art->doEdit( $text, '', EDIT_NEW );
+
+               $wgCapitalLinks = $oldCapitalLinks;
+       }
+       
+       /**
+        * Remove last character if it is a newline
+        */
+       public function removeEndingNewline( $s ) {
+               if ( substr( $s, -1 ) === "\n" ) {
+                       return substr( $s, 0, -1 );
+               }
+               else {
+                       return $s;
+               }
+       }
+       
+       /**
+        * 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;
+       }
+       
+       protected 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;
+       }
+       
+       protected 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;
+       }
+       
+       /**
+        * 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
+        */
+       protected static function getOptionValue( $key, $opts, $default ) {
+               $key = strtolower( $key );
+
+               if ( isset( $opts[$key] ) ) {
+                       return $opts[$key];
+               } else {
+                       return $default;
+               }
+       }
+}
+
index 2545b84..eec7fb2 100644 (file)
@@ -527,7 +527,8 @@ class TestFileIterator implements Iterator {
 
                                        if ( $this->parserTest ) {
                                                $this->parserTest->addArticle( ParserTest::chomp( $data['article'] ), $data['text'], $this->lineNum );
-                                       } else {wfDie("JAJA");
+                                       } else {
+                                               wfDie("Cannot add an article without a parserTest instance");
                                                ParserTest::addArticle( $data['article'], $data['text'], $this->lineNum );
                                        }
                                        $data = array();