From 2e44b49a2db3026050b136de9b00f749dd3ff939 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Fri, 25 Apr 2014 06:26:49 +0200 Subject: Update to MediaWiki 1.22.6 --- .../phpunit/includes/parser/MagicVariableTest.php | 242 ----- .../includes/parser/MediaWikiParserTest.php | 120 --- tests/phpunit/includes/parser/NewParserTest.php | 969 --------------------- .../phpunit/includes/parser/ParserMethodsTest.php | 95 -- tests/phpunit/includes/parser/ParserOutputTest.php | 59 -- .../phpunit/includes/parser/ParserPreloadTest.php | 80 -- tests/phpunit/includes/parser/PreprocessorTest.php | 239 ----- tests/phpunit/includes/parser/TagHooksTest.php | 82 -- tests/phpunit/includes/parser/TidyTest.php | 44 - 9 files changed, 1930 deletions(-) delete mode 100644 tests/phpunit/includes/parser/MagicVariableTest.php delete mode 100644 tests/phpunit/includes/parser/MediaWikiParserTest.php delete mode 100644 tests/phpunit/includes/parser/NewParserTest.php delete mode 100644 tests/phpunit/includes/parser/ParserMethodsTest.php delete mode 100644 tests/phpunit/includes/parser/ParserOutputTest.php delete mode 100644 tests/phpunit/includes/parser/ParserPreloadTest.php delete mode 100644 tests/phpunit/includes/parser/PreprocessorTest.php delete mode 100644 tests/phpunit/includes/parser/TagHooksTest.php delete mode 100644 tests/phpunit/includes/parser/TidyTest.php (limited to 'tests/phpunit/includes/parser') diff --git a/tests/phpunit/includes/parser/MagicVariableTest.php b/tests/phpunit/includes/parser/MagicVariableTest.php deleted file mode 100644 index c2c97c01..00000000 --- a/tests/phpunit/includes/parser/MagicVariableTest.php +++ /dev/null @@ -1,242 +0,0 @@ -setMwGlobals( array( - 'wgLanguageCode' => 'en', - 'wgContLang' => $contLang, - ) ); - - $this->testParser = new Parser(); - $this->testParser->Options( ParserOptions::newFromUserAndLang( new User, $contLang ) ); - - # initialize parser output - $this->testParser->clearState(); - - # Needs a title to do magic word stuff - $title = Title::newFromText( 'Tests' ); - $title->mRedirect = false; # Else it needs a db connection just to check if it's a redirect (when deciding the page language) - - $this->testParser->setTitle( $title ); - } - - /** - * @param int $num upper limit for numbers - * @return array of numbers from 1 up to $num - */ - private static function createProviderUpTo( $num ) { - $ret = array(); - for ( $i = 1; $i <= $num; $i++ ) { - $ret[] = array( $i ); - } - - return $ret; - } - - /** - * @return array of months numbers (as an integer) - */ - public static function provideMonths() { - return self::createProviderUpTo( 12 ); - } - - /** - * @return array of days numbers (as an integer) - */ - public static function provideDays() { - return self::createProviderUpTo( 31 ); - } - - ############### TESTS ############################################# - # @todo FIXME: - # - those got copy pasted, we can probably make them cleaner - # - tests are lacking useful messages - - # day - - /** @dataProvider provideDays */ - public function testCurrentdayIsUnPadded( $day ) { - $this->assertUnPadded( 'currentday', $day ); - } - - /** @dataProvider provideDays */ - public function testCurrentdaytwoIsZeroPadded( $day ) { - $this->assertZeroPadded( 'currentday2', $day ); - } - - /** @dataProvider provideDays */ - public function testLocaldayIsUnPadded( $day ) { - $this->assertUnPadded( 'localday', $day ); - } - - /** @dataProvider provideDays */ - public function testLocaldaytwoIsZeroPadded( $day ) { - $this->assertZeroPadded( 'localday2', $day ); - } - - # month - - /** @dataProvider provideMonths */ - public function testCurrentmonthIsZeroPadded( $month ) { - $this->assertZeroPadded( 'currentmonth', $month ); - } - - /** @dataProvider provideMonths */ - public function testCurrentmonthoneIsUnPadded( $month ) { - $this->assertUnPadded( 'currentmonth1', $month ); - } - - /** @dataProvider provideMonths */ - public function testLocalmonthIsZeroPadded( $month ) { - $this->assertZeroPadded( 'localmonth', $month ); - } - - /** @dataProvider provideMonths */ - public function testLocalmonthoneIsUnPadded( $month ) { - $this->assertUnPadded( 'localmonth1', $month ); - } - - # revision day - - /** @dataProvider provideDays */ - public function testRevisiondayIsUnPadded( $day ) { - $this->assertUnPadded( 'revisionday', $day ); - } - - /** @dataProvider provideDays */ - public function testRevisiondaytwoIsZeroPadded( $day ) { - $this->assertZeroPadded( 'revisionday2', $day ); - } - - # revision month - - /** @dataProvider provideMonths */ - public function testRevisionmonthIsZeroPadded( $month ) { - $this->assertZeroPadded( 'revisionmonth', $month ); - } - - /** @dataProvider provideMonths */ - public function testRevisionmonthoneIsUnPadded( $month ) { - $this->assertUnPadded( 'revisionmonth1', $month ); - } - - /** - * Rough tests for {{SERVERNAME}} magic word - * Bug 31176 - * @group Database - * @dataProvider provideDataServernameFromDifferentProtocols - */ - public function testServernameFromDifferentProtocols( $server ) { - $this->setMwGlobals( 'wgServer', $server ); - - $this->assertMagic( 'localhost', 'servername' ); - } - - public static function provideDataServernameFromDifferentProtocols() { - return array( - array( 'http://localhost/' ), - array( 'https://localhost/' ), - array( '//localhost/' ), # bug 31176 - ); - } - - ############### HELPERS ############################################ - - /** assertion helper expecting a magic output which is zero padded */ - public function assertZeroPadded( $magic, $value ) { - $this->assertMagicPadding( $magic, $value, '%02d' ); - } - - /** assertion helper expecting a magic output which is unpadded */ - public function assertUnPadded( $magic, $value ) { - $this->assertMagicPadding( $magic, $value, '%d' ); - } - - /** - * Main assertion helper for magic variables padding - * @param $magic string Magic variable name - * @param $value mixed Month or day - * @param $format string sprintf format for $value - */ - private function assertMagicPadding( $magic, $value, $format ) { - # Initialize parser timestamp as year 2010 at 12h34 56s. - # month and day are given by the caller ($value). Month < 12! - if ( $value > 12 ) { - $month = $value % 12; - } else { - $month = $value; - } - - $this->setParserTS( - sprintf( '2010%02d%02d123456', $month, $value ) - ); - - # please keep the following commented line of code. It helps debugging. - //print "\nDEBUG (value $value):" . sprintf( '2010%02d%02d123456', $value, $value ) . "\n"; - - # format expectation and test it - $expected = sprintf( $format, $value ); - $this->assertMagic( $expected, $magic ); - } - - /** helper to set the parser timestamp and revision timestamp */ - private function setParserTS( $ts ) { - $this->testParser->Options()->setTimestamp( $ts ); - $this->testParser->mRevisionTimestamp = $ts; - } - - /** - * Assertion helper to test a magic variable output - */ - private function assertMagic( $expected, $magic ) { - if ( in_array( $magic, $this->expectedAsInteger ) ) { - $expected = (int)$expected; - } - - # Generate a message for the assertion - $msg = sprintf( "Magic %s should be <%s:%s>", - $magic, - $expected, - gettype( $expected ) - ); - - $this->assertSame( - $expected, - $this->testParser->getVariableValue( $magic ), - $msg - ); - } -} diff --git a/tests/phpunit/includes/parser/MediaWikiParserTest.php b/tests/phpunit/includes/parser/MediaWikiParserTest.php deleted file mode 100644 index c120ca34..00000000 --- a/tests/phpunit/includes/parser/MediaWikiParserTest.php +++ /dev/null @@ -1,120 +0,0 @@ - "\\'", '\\' => '\\\\' ) ); - /* This used to be ucfirst( basename( dirname( $filename ) ) ) - * and then was ucfirst( basename( $filename, '.txt' ) - * but that didn't work with names like foo.tests.txt - */ - $parserTestClassName = str_replace( '.', '_', ucfirst( $testsName ) ); - $parserTestClassDefinition = <<addTestSuite( $parserTestClassName ); - } - return $suite; - } - - /** - * Write $msg under log group 'tests-parser' - * @param string $msg Message to log - */ - protected static function debug( $msg ) { - return wfDebugLog( 'tests-parser', wfGetCaller() . ' ' . $msg ); - } -} diff --git a/tests/phpunit/includes/parser/NewParserTest.php b/tests/phpunit/includes/parser/NewParserTest.php deleted file mode 100644 index eac4de5c..00000000 --- a/tests/phpunit/includes/parser/NewParserTest.php +++ /dev/null @@ -1,969 +0,0 @@ -getCliArg( 'regex=' ) ) { - $this->regex = $this->getCliArg( 'regex=' ); - } else { - # Matches anything - $this->regex = ''; - } - - $this->keepUploads = $this->getCliArg( 'keep-uploads' ); - - $tmpGlobals = array(); - - $tmpGlobals['wgLanguageCode'] = 'en'; - $tmpGlobals['wgContLang'] = Language::factory( 'en' ); - $tmpGlobals['wgSitename'] = 'MediaWiki'; - $tmpGlobals['wgServer'] = 'http://example.org'; - $tmpGlobals['wgScript'] = '/index.php'; - $tmpGlobals['wgScriptPath'] = '/'; - $tmpGlobals['wgArticlePath'] = '/wiki/$1'; - $tmpGlobals['wgActionPaths'] = array(); - $tmpGlobals['wgVariantArticlePath'] = false; - $tmpGlobals['wgExtensionAssetsPath'] = '/extensions'; - $tmpGlobals['wgStylePath'] = '/skins'; - $tmpGlobals['wgEnableUploads'] = true; - $tmpGlobals['wgThumbnailScriptPath'] = false; - $tmpGlobals['wgLocalFileRepo'] = array( - 'class' => 'LocalRepo', - 'name' => 'local', - 'url' => 'http://example.com/images', - 'hashLevels' => 2, - 'transformVia404' => false, - 'backend' => 'local-backend' - ); - $tmpGlobals['wgForeignFileRepos'] = array(); - $tmpGlobals['wgDefaultExternalStore'] = array(); - $tmpGlobals['wgEnableParserCache'] = false; - $tmpGlobals['wgCapitalLinks'] = true; - $tmpGlobals['wgNoFollowLinks'] = true; - $tmpGlobals['wgNoFollowDomainExceptions'] = array(); - $tmpGlobals['wgExternalLinkTarget'] = false; - $tmpGlobals['wgThumbnailScriptPath'] = false; - $tmpGlobals['wgUseImageResize'] = true; - $tmpGlobals['wgAllowExternalImages'] = true; - $tmpGlobals['wgRawHtml'] = false; - $tmpGlobals['wgUseTidy'] = false; - $tmpGlobals['wgAlwaysUseTidy'] = false; - $tmpGlobals['wgWellFormedXml'] = true; - $tmpGlobals['wgAllowMicrodataAttributes'] = true; - $tmpGlobals['wgExperimentalHtmlIds'] = false; - $tmpGlobals['wgAdaptiveMessageCache'] = true; - $tmpGlobals['wgUseDatabaseMessages'] = true; - $tmpGlobals['wgLocaltimezone'] = 'UTC'; - $tmpGlobals['wgDeferredUpdateList'] = array(); - $tmpGlobals['wgGroupPermissions'] = array( - '*' => array( - 'createaccount' => true, - 'read' => true, - 'edit' => true, - 'createpage' => true, - 'createtalk' => true, - ) ); - $tmpGlobals['wgNamespaceProtection'] = array( NS_MEDIAWIKI => 'editinterface' ); - - $tmpGlobals['wgParser'] = new StubObject( - 'wgParser', $GLOBALS['wgParserConf']['class'], - array( $GLOBALS['wgParserConf'] ) ); - - $tmpGlobals['wgFileExtensions'][] = 'svg'; - $tmpGlobals['wgSVGConverter'] = 'rsvg'; - $tmpGlobals['wgSVGConverters']['rsvg'] = - '$path/rsvg-convert -w $width -h $height $input -o $output'; - - if ( $GLOBALS['wgStyleDirectory'] === false ) { - $tmpGlobals['wgStyleDirectory'] = "$IP/skins"; - } - - # Replace all media handlers with a mock. We do not need to generate - # actual thumbnails to do parser testing, we only care about receiving - # a ThumbnailImage properly initialized. - global $wgMediaHandlers; - foreach ( $wgMediaHandlers as $type => $handler ) { - $tmpGlobals['wgMediaHandlers'][$type] = 'MockBitmapHandler'; - } - // Vector images have to be handled slightly differently - $tmpGlobals['wgMediaHandlers']['image/svg+xml'] = 'MockSvgHandler'; - - $tmpHooks = $wgHooks; - $tmpHooks['ParserTestParser'][] = 'ParserTestParserHook::setup'; - $tmpHooks['ParserGetVariableValueTs'][] = 'ParserTest::getFakeTimestamp'; - $tmpGlobals['wgHooks'] = $tmpHooks; - # add a namespace shadowing a interwiki link, to test - # proper precedence when resolving links. (bug 51680) - $tmpGlobals['wgExtraNamespaces'] = array( 100 => 'MemoryAlpha' ); - - $this->setMwGlobals( $tmpGlobals ); - - $this->savedWeirdGlobals['image_alias'] = $wgNamespaceAliases['Image']; - $this->savedWeirdGlobals['image_talk_alias'] = $wgNamespaceAliases['Image_talk']; - - $wgNamespaceAliases['Image'] = NS_FILE; - $wgNamespaceAliases['Image_talk'] = NS_FILE_TALK; - - MWNamespace::getCanonicalNamespaces( true ); # reset namespace cache - $wgContLang->resetNamespaces(); # reset namespace cache - } - - protected function tearDown() { - global $wgNamespaceAliases, $wgContLang; - - $wgNamespaceAliases['Image'] = $this->savedWeirdGlobals['image_alias']; - $wgNamespaceAliases['Image_talk'] = $this->savedWeirdGlobals['image_talk_alias']; - - // Restore backends - RepoGroup::destroySingleton(); - FileBackendGroup::destroySingleton(); - - // Remove temporary pages from the link cache - LinkCache::singleton()->clear(); - - // Restore message cache (temporary pages and $wgUseDatabaseMessages) - MessageCache::destroyInstance(); - - parent::tearDown(); - - MWNamespace::getCanonicalNamespaces( true ); # reset namespace cache - $wgContLang->resetNamespaces(); # reset namespace cache - } - - public static function tearDownAfterClass() { - ParserTest::tearDownInterwikis(); - parent::tearDownAfterClass(); - } - - function addDBData() { - $this->tablesUsed[] = 'site_stats'; - # disabled for performance - #$this->tablesUsed[] = 'image'; - - # Update certain things in site_stats - $this->db->insert( 'site_stats', - array( 'ss_row_id' => 1, 'ss_images' => 2, 'ss_good_articles' => 1 ), - __METHOD__ - ); - - $user = User::newFromId( 0 ); - LinkCache::singleton()->clear(); # Avoids the odd failure at creating the nullRevision - - # Upload DB table entries for files. - # We will upload the actual files later. Note that if anything causes LocalFile::load() - # to be triggered before then, it will break via maybeUpgrade() setting the fileExists - # member to false and storing it in cache. - # note that the size/width/height/bits/etc of the file - # are actually set by inspecting the file itself; the arguments - # to recordUpload2 have no effect. That said, we try to make things - # match up so it is less confusing to readers of the code & tests. - $image = wfLocalFile( Title::makeTitle( NS_FILE, 'Foobar.jpg' ) ); - if ( !$this->db->selectField( 'image', '1', array( 'img_name' => $image->getName() ) ) ) { - $image->recordUpload2( - '', // archive name - 'Upload of some lame file', - 'Some lame file', - array( - 'size' => 7881, - 'width' => 1941, - 'height' => 220, - 'bits' => 8, - 'media_type' => MEDIATYPE_BITMAP, - 'mime' => 'image/jpeg', - 'metadata' => serialize( array() ), - 'sha1' => wfBaseConvert( '1', 16, 36, 31 ), - 'fileExists' => true ), - $this->db->timestamp( '20010115123500' ), $user - ); - } - - $image = wfLocalFile( Title::makeTitle( NS_FILE, 'Thumb.png' ) ); - if ( !$this->db->selectField( 'image', '1', array( 'img_name' => $image->getName() ) ) ) { - $image->recordUpload2( - '', // archive name - 'Upload of some lame thumbnail', - 'Some lame thumbnail', - array( - 'size' => 22589, - 'width' => 135, - 'height' => 135, - 'bits' => 8, - 'media_type' => MEDIATYPE_BITMAP, - 'mime' => 'image/png', - 'metadata' => serialize( array() ), - 'sha1' => wfBaseConvert( '2', 16, 36, 31 ), - 'fileExists' => true ), - $this->db->timestamp( '20130225203040' ), $user - ); - } - - # This image will be blacklisted in [[MediaWiki:Bad image list]] - $image = wfLocalFile( Title::makeTitle( NS_FILE, 'Bad.jpg' ) ); - if ( !$this->db->selectField( 'image', '1', array( 'img_name' => $image->getName() ) ) ) { - $image->recordUpload2( - '', // archive name - 'zomgnotcensored', - 'Borderline image', - array( - 'size' => 12345, - 'width' => 320, - 'height' => 240, - 'bits' => 24, - 'media_type' => MEDIATYPE_BITMAP, - 'mime' => 'image/jpeg', - 'metadata' => serialize( array() ), - 'sha1' => wfBaseConvert( '3', 16, 36, 31 ), - 'fileExists' => true ), - $this->db->timestamp( '20010115123500' ), $user - ); - } - $image = wfLocalFile( Title::makeTitle( NS_FILE, 'Foobar.svg' ) ); - if ( !$this->db->selectField( 'image', '1', array( 'img_name' => $image->getName() ) ) ) { - $image->recordUpload2( '', 'Upload of some lame SVG', 'Some lame SVG', array( - 'size' => 12345, - 'width' => 200, - 'height' => 200, - 'bits' => 24, - 'media_type' => MEDIATYPE_DRAWING, - 'mime' => 'image/svg+xml', - 'metadata' => serialize( array() ), - 'sha1' => wfBaseConvert( '', 16, 36, 31 ), - 'fileExists' => true - ), $this->db->timestamp( '20010115123500' ), $user ); - } - } - - //ParserTest setup/teardown functions - - /** - * Set up the global variables for a consistent environment for each test. - * Ideally this should replace the global configuration entirely. - */ - protected function setupGlobals( $opts = array(), $config = '' ) { - global $wgFileBackends; - # 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 ); - - $uploadDir = $this->getUploadDir(); - if ( $this->getCliArg( 'use-filebackend=' ) ) { - if ( self::$backendToUse ) { - $backend = self::$backendToUse; - } else { - $name = $this->getCliArg( 'use-filebackend=' ); - $useConfig = array(); - foreach ( $wgFileBackends as $conf ) { - if ( $conf['name'] == $name ) { - $useConfig = $conf; - } - } - $useConfig['name'] = 'local-backend'; // swap name - $class = $conf['class']; - self::$backendToUse = new $class( $useConfig ); - $backend = self::$backendToUse; - } - } else { - # Replace with a mock. We do not care about generating real - # files on the filesystem, just need to expose the file - # informations. - $backend = new MockFileBackend( array( - 'name' => 'local-backend', - 'lockManager' => 'nullLockManager', - 'containerPaths' => array( - 'local-public' => "$uploadDir", - 'local-thumb' => "$uploadDir/thumb", - ) - ) ); - } - - $settings = array( - 'wgLocalFileRepo' => array( - 'class' => 'LocalRepo', - 'name' => 'local', - 'url' => 'http://example.com/images', - 'hashLevels' => 2, - 'transformVia404' => false, - 'backend' => $backend - ), - 'wgEnableUploads' => self::getOptionValue( 'wgEnableUploads', $opts, true ), - 'wgLanguageCode' => $lang, - 'wgDBprefix' => $this->db->getType() != 'oracle' ? 'unittest_' : 'ut_', - 'wgRawHtml' => self::getOptionValue( 'wgRawHtml', $opts, false ), - 'wgNamespacesWithSubpages' => array( NS_MAIN => isset( $opts['subpage'] ) ), - 'wgAllowExternalImages' => self::getOptionValue( 'wgAllowExternalImages', $opts, true ), - 'wgMaxTocLevel' => $maxtoclevel, - 'wgUseTeX' => isset( $opts['math'] ) || isset( $opts['texvc'] ), - 'wgMathDirectory' => $uploadDir . '/math', - 'wgDefaultLanguageVariant' => $variant, - 'wgLinkHolderBatchSize' => $linkHolderBatchSize, - ); - - if ( $config ) { - $configLines = explode( "\n", $config ); - - foreach ( $configLines as $line ) { - list( $var, $value ) = explode( '=', $line, 2 ); - - $settings[$var] = eval( "return $value;" ); //??? - } - } - - $this->savedGlobals = array(); - - /** @since 1.20 */ - wfRunHooks( 'ParserTestGlobals', array( &$settings ) ); - - $langObj = Language::factory( $lang ); - $settings['wgContLang'] = $langObj; - $settings['wgLang'] = $langObj; - - $context = new RequestContext(); - $settings['wgOut'] = $context->getOutput(); - $settings['wgUser'] = $context->getUser(); - $settings['wgRequest'] = $context->getRequest(); - - foreach ( $settings as $var => $val ) { - if ( array_key_exists( $var, $GLOBALS ) ) { - $this->savedGlobals[$var] = $GLOBALS[$var]; - } - - $GLOBALS[$var] = $val; - } - - MagicWord::clearCache(); - - # The entries saved into RepoGroup cache with previous globals will be wrong. - RepoGroup::destroySingleton(); - FileBackendGroup::destroySingleton(); - - # Create dummy files in storage - $this->setupUploads(); - - # Publish the articles after we have the final language set - $this->publishTestArticles(); - - MessageCache::destroyInstance(); - - return $context; - } - - /** - * Get an FS upload directory (only applies to FSFileBackend) - * - * @return String: the directory - */ - protected function getUploadDir() { - 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; - } - - return $dir; - } - - /** - * Create a dummy uploads directory which will contain a couple - * of files in order to pass existence tests. - * - * @return String: the directory - */ - protected function setupUploads() { - global $IP; - - $base = $this->getBaseDir(); - $backend = RepoGroup::singleton()->getLocalRepo()->getBackend(); - $backend->prepare( array( 'dir' => "$base/local-public/3/3a" ) ); - $backend->store( array( - 'src' => "$IP/skins/monobook/headbg.jpg", 'dst' => "$base/local-public/3/3a/Foobar.jpg" - ) ); - $backend->prepare( array( 'dir' => "$base/local-public/e/ea" ) ); - $backend->store( array( - 'src' => "$IP/skins/monobook/wiki.png", 'dst' => "$base/local-public/e/ea/Thumb.png" - ) ); - $backend->prepare( array( 'dir' => "$base/local-public/0/09" ) ); - $backend->store( array( - 'src' => "$IP/skins/monobook/headbg.jpg", 'dst' => "$base/local-public/0/09/Bad.jpg" - ) ); - - // No helpful SVG file to copy, so make one ourselves - $tmpDir = wfTempDir(); - $tempFsFile = new TempFSFile( "$tmpDir/Foobar.svg" ); - $tempFsFile->autocollect(); // destroy file when $tempFsFile leaves scope - file_put_contents( "$tmpDir/Foobar.svg", - '' . - 'Foo' ); - - $backend->prepare( array( 'dir' => "$base/local-public/f/ff" ) ); - $backend->quickStore( array( - 'src' => "$tmpDir/Foobar.svg", 'dst' => "$base/local-public/f/ff/Foobar.svg" - ) ); - } - - /** - * Restore default values and perform any necessary clean-up - * after each test runs. - */ - protected function teardownGlobals() { - $this->teardownUploads(); - - foreach ( $this->savedGlobals as $var => $val ) { - $GLOBALS[$var] = $val; - } - } - - /** - * Remove the dummy uploads directory - */ - private function teardownUploads() { - if ( $this->keepUploads ) { - return; - } - - $backend = RepoGroup::singleton()->getLocalRepo()->getBackend(); - if ( $backend instanceof MockFileBackend ) { - # In memory backend, so dont bother cleaning them up. - return; - } - - $base = $this->getBaseDir(); - // delete the files first, then the dirs. - self::deleteFiles( - array( - "$base/local-public/3/3a/Foobar.jpg", - "$base/local-thumb/3/3a/Foobar.jpg/180px-Foobar.jpg", - "$base/local-thumb/3/3a/Foobar.jpg/200px-Foobar.jpg", - "$base/local-thumb/3/3a/Foobar.jpg/640px-Foobar.jpg", - "$base/local-thumb/3/3a/Foobar.jpg/120px-Foobar.jpg", - "$base/local-thumb/3/3a/Foobar.jpg/1280px-Foobar.jpg", - "$base/local-thumb/3/3a/Foobar.jpg/20px-Foobar.jpg", - "$base/local-thumb/3/3a/Foobar.jpg/270px-Foobar.jpg", - "$base/local-thumb/3/3a/Foobar.jpg/300px-Foobar.jpg", - "$base/local-thumb/3/3a/Foobar.jpg/30px-Foobar.jpg", - "$base/local-thumb/3/3a/Foobar.jpg/360px-Foobar.jpg", - "$base/local-thumb/3/3a/Foobar.jpg/400px-Foobar.jpg", - "$base/local-thumb/3/3a/Foobar.jpg/40px-Foobar.jpg", - "$base/local-thumb/3/3a/Foobar.jpg/70px-Foobar.jpg", - "$base/local-thumb/3/3a/Foobar.jpg/960px-Foobar.jpg", - - "$base/local-public/e/ea/Thumb.png", - - "$base/local-public/0/09/Bad.jpg", - - "$base/local-public/f/ff/Foobar.svg", - "$base/local-thumb/f/ff/Foobar.svg/180px-Foobar.svg.jpg", - "$base/local-thumb/f/ff/Foobar.svg/270px-Foobar.svg.jpg", - "$base/local-thumb/f/ff/Foobar.svg/360px-Foobar.svg.jpg", - "$base/local-thumb/f/ff/Foobar.svg/langde-180px-Foobar.svg.jpg", - "$base/local-thumb/f/ff/Foobar.svg/langde-270px-Foobar.svg.jpg", - "$base/local-thumb/f/ff/Foobar.svg/langde-360px-Foobar.svg.jpg", - - "$base/local-public/math/f/a/5/fa50b8b616463173474302ca3e63586b.png", - ) - ); - } - - /** - * Delete the specified files, if they exist. - * @param $files Array: full paths to files to delete. - */ - private static function deleteFiles( $files ) { - $backend = RepoGroup::singleton()->getLocalRepo()->getBackend(); - foreach ( $files as $file ) { - $backend->delete( array( 'src' => $file ), array( 'force' => 1 ) ); - } - foreach ( $files as $file ) { - $tmp = $file; - while ( $tmp = FileBackend::parentStoragePath( $tmp ) ) { - if ( !$backend->clean( array( 'dir' => $tmp ) )->isOK() ) { - break; - } - } - } - } - - protected function getBaseDir() { - return 'mwstore://local-backend'; - } - - public function parserTestProvider() { - if ( $this->file === false ) { - global $wgParserTestFiles; - $this->file = $wgParserTestFiles[0]; - } - - return new TestFileIterator( $this->file, $this ); - } - - /** - * Set the file from whose tests will be run by this instance - */ - public function setParserTestFile( $filename ) { - $this->file = $filename; - } - - /** - * @group medium - * @dataProvider parserTestProvider - */ - public function testParserTest( $desc, $input, $result, $opts, $config ) { - if ( $this->regex != '' && !preg_match( '/' . $this->regex . '/', $desc ) ) { - $this->assertTrue( true ); // XXX: don't flood output with "test made no assertions" - //$this->markTestSkipped( 'Filtered out by the user' ); - return; - } - - if ( !$this->isWikitextNS( NS_MAIN ) ) { - // parser tests frequently assume that the main namespace contains wikitext. - // @todo When setting up pages, force the content model. Only skip if - // $wgtContentModelUseDB is false. - $this->markTestSkipped( "Main namespace does not support wikitext," - . "skipping parser test: $desc" ); - } - - wfDebug( "Running parser test: $desc\n" ); - - $opts = $this->parseOptions( $opts ); - $context = $this->setupGlobals( $opts, $config ); - - $user = $context->getUser(); - $options = ParserOptions::newFromContext( $context ); - - if ( isset( $opts['title'] ) ) { - $titleText = $opts['title']; - } else { - $titleText = 'Parser test'; - } - - $local = isset( $opts['local'] ); - $preprocessor = isset( $opts['preprocessor'] ) ? $opts['preprocessor'] : null; - $parser = $this->getParser( $preprocessor ); - - $title = Title::newFromText( $titleText ); - - # Parser test requiring math. Make sure texvc is executable - # or just skip such tests. - if ( isset( $opts['math'] ) || isset( $opts['texvc'] ) ) { - global $wgTexvc; - - if ( !isset( $wgTexvc ) ) { - $this->markTestSkipped( "SKIPPED: \$wgTexvc is not set" ); - } elseif ( !is_executable( $wgTexvc ) ) { - $this->markTestSkipped( "SKIPPED: texvc binary does not exist" - . " or is not executable.\n" - . "Current configuration is:\n\$wgTexvc = '$wgTexvc'" ); - } - } - - if ( isset( $opts['pst'] ) ) { - $out = $parser->preSaveTransform( $input, $title, $user, $options ); - } elseif ( isset( $opts['msg'] ) ) { - $out = $parser->transformMsg( $input, $options, $title ); - } elseif ( isset( $opts['section'] ) ) { - $section = $opts['section']; - $out = $parser->getSection( $input, $section ); - } elseif ( isset( $opts['replace'] ) ) { - $section = $opts['replace'][0]; - $replace = $opts['replace'][1]; - $out = $parser->replaceSection( $input, $section, $replace ); - } elseif ( isset( $opts['comment'] ) ) { - $out = Linker::formatComment( $input, $title, $local ); - } elseif ( isset( $opts['preload'] ) ) { - $out = $parser->getPreloadText( $input, $title, $options ); - } else { - $output = $parser->parse( $input, $title, $options, true, true, 1337 ); - $output->setTOCEnabled( !isset( $opts['notoc'] ) ); - $out = $output->getText(); - - if ( isset( $opts['showtitle'] ) ) { - if ( $output->getTitleText() ) { - $title = $output->getTitleText(); - } - - $out = "$title\n$out"; - } - - if ( isset( $opts['ill'] ) ) { - $out = $this->tidy( implode( ' ', $output->getLanguageLinks() ) ); - } elseif ( isset( $opts['cat'] ) ) { - $outputPage = $context->getOutput(); - $outputPage->addCategoryLinks( $output->getCategories() ); - $cats = $outputPage->getCategoryLinks(); - - if ( isset( $cats['normal'] ) ) { - $out = $this->tidy( implode( ' ', $cats['normal'] ) ); - } else { - $out = ''; - } - } - $parser->mPreprocessor = null; - - $result = $this->tidy( $result ); - } - - $this->teardownGlobals(); - - $this->assertEquals( $result, $out, $desc ); - } - - /** - * Run a fuzz test series - * Draw input from a set of test files - * - * @todo fixme Needs some work to not eat memory until the world explodes - * - * @group ParserFuzz - */ - public function testFuzzTests() { - global $wgParserTestFiles; - - $files = $wgParserTestFiles; - - if ( $this->getCliArg( 'file=' ) ) { - $files = array( $this->getCliArg( 'file=' ) ); - } - - $dict = $this->getFuzzInput( $files ); - $dictSize = strlen( $dict ); - $logMaxLength = log( $this->maxFuzzTestLength ); - - ini_set( 'memory_limit', $this->memoryLimit * 1048576 ); - - $user = new User; - $opts = ParserOptions::newFromUser( $user ); - $title = Title::makeTitle( NS_MAIN, 'Parser_test' ); - - $id = 1; - - while ( true ) { - - // Generate test input - mt_srand( ++$this->fuzzSeed ); - $totalLength = mt_rand( 1, $this->maxFuzzTestLength ); - $input = ''; - - while ( strlen( $input ) < $totalLength ) { - $logHairLength = mt_rand( 0, 1000000 ) / 1000000 * $logMaxLength; - $hairLength = min( intval( exp( $logHairLength ) ), $dictSize ); - $offset = mt_rand( 0, $dictSize - $hairLength ); - $input .= substr( $dict, $offset, $hairLength ); - } - - $this->setupGlobals(); - $parser = $this->getParser(); - - // Run the test - try { - $parser->parse( $input, $title, $opts ); - $this->assertTrue( true, "Test $id, fuzz seed {$this->fuzzSeed}" ); - } catch ( Exception $exception ) { - $input_dump = sprintf( "string(%d) \"%s\"\n", strlen( $input ), $input ); - - $this->assertTrue( false, "Test $id, fuzz seed {$this->fuzzSeed}. \n\n" . - "Input: $input_dump\n\nError: {$exception->getMessage()}\n\n" . - "Backtrace: {$exception->getTraceAsString()}" ); - } - - $this->teardownGlobals(); - $parser->__destruct(); - - if ( $id % 100 == 0 ) { - $usage = intval( memory_get_usage( true ) / $this->memoryLimit / 1048576 * 100 ); - //echo "{$this->fuzzSeed}: $numSuccess/$numTotal (mem: $usage%)\n"; - if ( $usage > 90 ) { - $ret = "Out of memory:\n"; - $memStats = $this->getMemoryBreakdown(); - - foreach ( $memStats as $name => $usage ) { - $ret .= "$name: $usage\n"; - } - - throw new MWException( $ret ); - } - } - - $id++; - } - } - - //Various getter functions - - /** - * Get an input dictionary from a set of parser test files - */ - function getFuzzInput( $filenames ) { - $dict = ''; - - foreach ( $filenames as $filename ) { - $contents = file_get_contents( $filename ); - preg_match_all( '/!!\s*input\n(.*?)\n!!\s*result/s', $contents, $matches ); - - foreach ( $matches[1] as $match ) { - $dict .= $match . "\n"; - } - } - - return $dict; - } - - /** - * Get a memory usage breakdown - */ - function getMemoryBreakdown() { - $memStats = array(); - - foreach ( $GLOBALS as $name => $value ) { - $memStats['$' . $name] = strlen( serialize( $value ) ); - } - - $classes = get_declared_classes(); - - foreach ( $classes as $class ) { - $rc = new ReflectionClass( $class ); - $props = $rc->getStaticProperties(); - $memStats[$class] = strlen( serialize( $props ) ); - $methods = $rc->getMethods(); - - foreach ( $methods as $method ) { - $memStats[$class] += strlen( serialize( $method->getStaticVariables() ) ); - } - } - - $functions = get_defined_functions(); - - foreach ( $functions['user'] as $function ) { - $rf = new ReflectionFunction( $function ); - $memStats["$function()"] = strlen( serialize( $rf->getStaticVariables() ) ); - } - - asort( $memStats ); - - return $memStats; - } - - /** - * Get a Parser object - */ - function getParser( $preprocessor = null ) { - global $wgParserConf; - - $class = $wgParserConf['class']; - $parser = new $class( array( 'preprocessorClass' => $preprocessor ) + $wgParserConf ); - - wfRunHooks( 'ParserTestParser', array( &$parser ) ); - - return $parser; - } - - //Various action functions - - public function addArticle( $name, $text, $line ) { - self::$articles[$name] = array( $text, $line ); - } - - public function publishTestArticles() { - if ( empty( self::$articles ) ) { - return; - } - - foreach ( self::$articles as $name => $info ) { - list( $text, $line ) = $info; - ParserTest::addArticle( $name, $text, $line, 'ignoreduplicate' ); - } - } - - /** - * 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. - return isset( $wgParser->mTagHooks[$name] ); - } - - public function requireFunctionHook( $name ) { - global $wgParser; - $wgParser->firstCallInit(); // make sure hooks are loaded. - return isset( $wgParser->mFunctionHooks[$name] ); - } - - //Various "cleanup" functions - - /** - * Run the "tidy" command on text if the $wgUseTidy - * global is true - * - * @param $text String: the text to tidy - * @return String - */ - protected function tidy( $text ) { - global $wgUseTidy; - - if ( $wgUseTidy ) { - $text = MWTidy::tidy( $text ); - } - - return $text; - } - - /** - * 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; - } - } - - //Test options parser functions - - 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; - } - } -} diff --git a/tests/phpunit/includes/parser/ParserMethodsTest.php b/tests/phpunit/includes/parser/ParserMethodsTest.php deleted file mode 100644 index e5c5cb21..00000000 --- a/tests/phpunit/includes/parser/ParserMethodsTest.php +++ /dev/null @@ -1,95 +0,0 @@ -~~~', - 'hello \'\'this\'\' is ~~~', - ), - ); - } - - /** - * @dataProvider providePreSaveTransform - * @covers Parser::preSaveTransform - */ - public function testPreSaveTransform( $text, $expected ) { - global $wgParser; - - $title = Title::newFromText( str_replace( '::', '__', __METHOD__ ) ); - $user = new User(); - $user->setName( "127.0.0.1" ); - $popts = ParserOptions::newFromUser( $user ); - $text = $wgParser->preSaveTransform( $text, $title, $user, $popts ); - - $this->assertEquals( $expected, $text ); - } - - /** - * @covers Parser::callParserFunction - */ - public function testCallParserFunction() { - global $wgParser; - - // Normal parses test passing PPNodes. Test passing an array. - $title = Title::newFromText( str_replace( '::', '__', __METHOD__ ) ); - $wgParser->startExternalParse( $title, new ParserOptions(), Parser::OT_HTML ); - $frame = $wgParser->getPreprocessor()->newFrame(); - $ret = $wgParser->callParserFunction( $frame, '#tag', - array( 'pre', 'foo', 'style' => 'margin-left: 1.6em' ) - ); - $ret['text'] = $wgParser->mStripState->unstripBoth( $ret['text'] ); - $this->assertSame( array( - 'found' => true, - 'text' => '
foo
', - ), $ret, 'callParserFunction works for {{#tag:pre|foo|style=margin-left: 1.6em}}' ); - } - - /** - * @covers Parser::parse - * @covers ParserOutput::getSections - */ - public function testGetSections() { - global $wgParser; - - $title = Title::newFromText( str_replace( '::', '__', __METHOD__ ) ); - $out = $wgParser->parse( "==foo==\n

bar

\n==baz==\n", $title, new ParserOptions() ); - $this->assertSame( array( - array( - 'toclevel' => 1, - 'level' => '2', - 'line' => 'foo', - 'number' => '1', - 'index' => '1', - 'fromtitle' => $title->getPrefixedDBkey(), - 'byteoffset' => 0, - 'anchor' => 'foo', - ), - array( - 'toclevel' => 1, - 'level' => '2', - 'line' => 'bar', - 'number' => '2', - 'index' => '', - 'fromtitle' => false, - 'byteoffset' => null, - 'anchor' => 'bar', - ), - array( - 'toclevel' => 1, - 'level' => '2', - 'line' => 'baz', - 'number' => '3', - 'index' => '2', - 'fromtitle' => $title->getPrefixedDBkey(), - 'byteoffset' => 21, - 'anchor' => 'baz', - ), - ), $out->getSections(), 'getSections() with proper value when

is used' ); - } - //@Todo Add tests for cleanSig() / cleanSigInSig(), getSection(), replaceSection(), getPreloadText() -} diff --git a/tests/phpunit/includes/parser/ParserOutputTest.php b/tests/phpunit/includes/parser/ParserOutputTest.php deleted file mode 100644 index c73666da..00000000 --- a/tests/phpunit/includes/parser/ParserOutputTest.php +++ /dev/null @@ -1,59 +0,0 @@ -assertEquals( $shouldMatch, ParserOutput::isLinkInternal( $server, $url ) ); - } - - /** - * @covers ParserOutput::setExtensionData - * @covers ParserOutput::getExtensionData - */ - public function testExtensionData() { - $po = new ParserOutput(); - - $po->setExtensionData( "one", "Foo" ); - - $this->assertEquals( "Foo", $po->getExtensionData( "one" ) ); - $this->assertNull( $po->getExtensionData( "spam" ) ); - - $po->setExtensionData( "two", "Bar" ); - $this->assertEquals( "Foo", $po->getExtensionData( "one" ) ); - $this->assertEquals( "Bar", $po->getExtensionData( "two" ) ); - - $po->setExtensionData( "one", null ); - $this->assertNull( $po->getExtensionData( "one" ) ); - $this->assertEquals( "Bar", $po->getExtensionData( "two" ) ); - } -} diff --git a/tests/phpunit/includes/parser/ParserPreloadTest.php b/tests/phpunit/includes/parser/ParserPreloadTest.php deleted file mode 100644 index d12fee36..00000000 --- a/tests/phpunit/includes/parser/ParserPreloadTest.php +++ /dev/null @@ -1,80 +0,0 @@ -testParserOptions = ParserOptions::newFromUserAndLang( new User, $wgContLang ); - - $this->testParser = new Parser(); - $this->testParser->Options( $this->testParserOptions ); - $this->testParser->clearState(); - - $this->title = Title::newFromText( 'Preload Test' ); - } - - protected function tearDown() { - parent::tearDown(); - - unset( $this->testParser ); - unset( $this->title ); - } - - /** - * @covers Parser::getPreloadText - */ - public function testPreloadSimpleText() { - $this->assertPreloaded( 'simple', 'simple' ); - } - - /** - * @covers Parser::getPreloadText - */ - public function testPreloadedPreIsUnstripped() { - $this->assertPreloaded( - '
monospaced
', - '
monospaced
', - '
 in preloaded text must be unstripped (bug 27467)'
-		);
-	}
-
-	/**
-	 * @covers Parser::getPreloadText
-	 */
-	public function testPreloadedNowikiIsUnstripped() {
-		$this->assertPreloaded(
-			'[[Dummy title]]',
-			'[[Dummy title]]',
-			' in preloaded text must be unstripped (bug 27467)'
-		);
-	}
-
-	protected function assertPreloaded( $expected, $text, $msg = '' ) {
-		$this->assertEquals(
-			$expected,
-			$this->testParser->getPreloadText(
-				$text,
-				$this->title,
-				$this->testParserOptions
-			),
-			$msg
-		);
-	}
-}
diff --git a/tests/phpunit/includes/parser/PreprocessorTest.php b/tests/phpunit/includes/parser/PreprocessorTest.php
deleted file mode 100644
index 8aee937c..00000000
--- a/tests/phpunit/includes/parser/PreprocessorTest.php
+++ /dev/null
@@ -1,239 +0,0 @@
-mOptions = ParserOptions::newFromUserAndLang( new User, $wgContLang );
-		$name = isset( $wgParserConf['preprocessorClass'] ) ? $wgParserConf['preprocessorClass'] : 'Preprocessor_DOM';
-
-		$this->mPreprocessor = new $name( $this );
-	}
-
-	function getStripList() {
-		return array( 'gallery', 'display map' /* Used by Maps, see r80025 CR */, '/foo' );
-	}
-
-	public static function provideCases() {
-		return array(
-			array( "Foo", "Foo" ),
-			array( "", "<!-- Foo -->" ),
-			array( "", "<!-- Foo --><!-- Bar -->" ),
-			array( "  ", "<!-- Foo -->  <!-- Bar -->" ),
-			array( " \n ", "<!-- Foo --> \n <!-- Bar -->" ),
-			array( " \n \n", "<!-- Foo --> \n <!-- Bar -->\n" ),
-			array( "  \n", "<!-- Foo -->  <!-- Bar -->\n" ),
-			array( "Bar", "<!-->Bar" ),
-			array( "\n== Baz ==\n", "== Foo ==\n  <!-- Bar -->\n== Baz ==\n" ),
-			array( "", "gallery" ),
-			array( "Foo  Bar", "Foo gallery Bar" ),
-			array( "", "gallery</gallery>" ),
-			array( " ", "<foo> gallery</gallery>" ),
-			array( " ", "<foo> gallery<gallery></gallery>" ),
-			array( " Foo bar ", "<noinclude> Foo bar </noinclude>" ),
-			array( "\n{{Foo}}\n", "<noinclude>\n\n</noinclude>" ),
-			array( "\n{{Foo}}\n\n", "<noinclude>\n\n</noinclude>\n" ),
-			array( "foo bar", "galleryfoo bar" ),
-			array( "<{{foo}}>", "<>" ),
-			array( "<{{{foo}}}>", "<foo>" ),
-			array( "", "gallery</gallery</gallery>" ),
-			array( "=== Foo === ", "=== Foo === " ),
-			array( "=== Foo === ", "==<!-- -->= Foo === " ),
-			array( "=== Foo === ", "=== Foo ==<!-- -->= " ),
-			array( "=== Foo ===\n", "=== Foo ===<!-- -->\n" ),
-			array( "=== Foo === \n", "=== Foo ===<!-- --> <!-- -->\n" ),
-			array( "== Foo ==\n== Bar == \n", "== Foo ==\n== Bar == \n" ),
-			array( "===========", "===========" ),
-			array( "Foo\n=\n==\n=\n", "Foo\n=\n==\n=\n" ),
-			array( "{{Foo}}", "" ),
-			array( "\n{{Foo}}", "\n" ),
-			array( "{{Foo|bar}}", "" ),
-			array( "{{Foo|bar}}a", "a" ),
-			array( "{{Foo|bar|baz}}", "" ),
-			array( "{{Foo|1=bar}}", "" ),
-			array( "{{Foo|=bar}}", "" ),
-			array( "{{Foo|bar=baz}}", "" ),
-			array( "{{Foo|{{bar}}=baz}}", "" ),
-			array( "{{Foo|1=bar|baz}}", "" ),
-			array( "{{Foo|1=bar|2=baz}}", "" ),
-			array( "{{Foo|bar|foo=baz}}", "" ),
-			array( "{{{1}}}", "1" ),
-			array( "{{{1|}}}", "1" ),
-			array( "{{{Foo}}}", "Foo" ),
-			array( "{{{Foo|}}}", "Foo" ),
-			array( "{{{Foo|bar|baz}}}", "Foobarbaz" ),
-			array( "{{Foo}}", "{<!-- -->{Foo}}" ),
-			array( "{{{{Foobar}}}}", "{Foobar}" ),
-			array( "{{{ {{Foo}} }}}", " <template><title>Foo " ),
-			array( "{{ {{{Foo}}} }}", "" ),
-			array( "{{{{{Foo}}}}}", "" ),
-			array( "{{{{{Foo}} }}}", "<template><title>Foo " ),
-			array( "{{{{{{Foo}}}}}}", "<tplarg><title>Foo" ),
-			array( "{{{{{{Foo}}}}}", "{" ),
-			array( "[[[Foo]]", "[[[Foo]]" ),
-			array( "{{Foo|[[[[bar]]|baz]]}}", "" ), // This test is important, since it means the difference between having the [[ rule stacked or not
-			array( "{{Foo|[[[[bar]|baz]]}}", "{{Foo|[[[[bar]|baz]]}}" ),
-			array( "{{Foo|Foo [[[[bar]|baz]]}}", "{{Foo|Foo [[[[bar]|baz]]}}" ),
-			array( "Foo BarBaz", "Foo display mapBar</display map             >Baz" ),
-			array( "Foo BarBaz", "Foo display map fooBar</display map             >Baz" ),
-			array( "Foo ", "Foo gallery bar="baz" " ),
-			array( "Foo ", "Foo gallery bar="1" baz=2 " ),
-			array( "Foo", "/fooFoo<//foo>" ), # Worth blacklisting IMHO
-			array( "{{#ifexpr: ({{{1|1}}} = 2) | Foo | Bar }}", "" ),
-			array( "{{#if: {{{1|}}} | Foo | {{Bar}} }}", "" ),
-			array( "{{#if: {{{1|}}} | Foo | [[Bar]] }}", "" ),
-			array( "{{#if: {{{1|}}} | [[Foo]] | Bar }}", "" ),
-			array( "{{#if: {{{1|}}} | 1 | {{#if: {{{1|}}} | 2 | 3 }} }}", "" ),
-			array( "{{ {{Foo}}", "{{ " ),
-			array( "{{Foobar {{Foo}} {{Bar}} {{Baz}} ", "{{Foobar    " ),
-			array( "[[Foo]] |", "[[Foo]] |" ),
-			array( "{{Foo|Bar|", "{{Foo|Bar|" ),
-			array( "[[Foo]", "[[Foo]" ),
-			array( "[[Foo|Bar]", "[[Foo|Bar]" ),
-			array( "{{Foo| [[Bar] }}", "{{Foo| [[Bar] }}" ),
-			array( "{{Foo| [[Bar|Baz] }}", "{{Foo| [[Bar|Baz] }}" ),
-			array( "{{Foo|bar=[[baz]}}", "{{Foo|bar=[[baz]}}" ),
-			array( "{{foo|", "{{foo|" ),
-			array( "{{foo|}", "{{foo|}" ),
-			array( "{{foo|} }}", "" ),
-			array( "{{foo|bar=|}", "{{foo|bar=|}" ),
-			array( "{{Foo|} Bar=", "{{Foo|} Bar=" ),
-			array( "{{Foo|} Bar=}}", "" ),
-			/* array( file_get_contents( __DIR__ . '/QuoteQuran.txt' ), file_get_contents( __DIR__ . '/QuoteQuranExpanded.txt' ) ), */
-		);
-	}
-
-	/**
-	 * Get XML preprocessor tree from the preprocessor (which may not be the
-	 * native XML-based one).
-	 *
-	 * @param string $wikiText
-	 * @return string
-	 */
-	protected function preprocessToXml( $wikiText ) {
-		if ( method_exists( $this->mPreprocessor, 'preprocessToXml' ) ) {
-			return $this->normalizeXml( $this->mPreprocessor->preprocessToXml( $wikiText ) );
-		}
-
-		$dom = $this->mPreprocessor->preprocessToObj( $wikiText );
-		if ( is_callable( array( $dom, 'saveXML' ) ) ) {
-			return $dom->saveXML();
-		} else {
-			return $this->normalizeXml( $dom->__toString() );
-		}
-	}
-
-	/**
-	 * Normalize XML string to the form that a DOMDocument saves out.
-	 *
-	 * @param string $xml
-	 * @return string
-	 */
-	protected function normalizeXml( $xml ) {
-		return preg_replace( '!<([a-z]+)/>!', '<$1>', str_replace( ' />', '/>', $xml ) );
-	}
-
-	/**
-	 * @dataProvider provideCases
-	 * @covers Preprocessor_DOM::preprocessToXml
-	 */
-	public function testPreprocessorOutput( $wikiText, $expectedXml ) {
-		$this->assertEquals( $this->normalizeXml( $expectedXml ), $this->preprocessToXml( $wikiText ) );
-	}
-
-	/**
-	 * These are more complex test cases taken out of wiki articles.
-	 */
-	public static function provideFiles() {
-		return array(
-			array( "QuoteQuran" ), # http://en.wikipedia.org/w/index.php?title=Template:QuoteQuran/sandbox&oldid=237348988 GFDL + CC-BY-SA by Striver
-			array( "Factorial" ), # http://en.wikipedia.org/w/index.php?title=Template:Factorial&oldid=98548758 GFDL + CC-BY-SA by Polonium
-			array( "All_system_messages" ), # http://tl.wiktionary.org/w/index.php?title=Suleras:All_system_messages&oldid=2765 GPL text generated by MediaWiki
-			array( "Fundraising" ), # http://tl.wiktionary.org/w/index.php?title=MediaWiki:Sitenotice&oldid=5716 GFDL + CC-BY-SA, copied there by Sky Harbor.
-			array( "NestedTemplates" ), # bug 27936
-		);
-	}
-
-	/**
-	 * @dataProvider provideFiles
-	 * @covers Preprocessor_DOM::preprocessToXml
-	 */
-	public function testPreprocessorOutputFiles( $filename ) {
-		$folder = __DIR__ . "/../../../parser/preprocess";
-		$wikiText = file_get_contents( "$folder/$filename.txt" );
-		$output = $this->preprocessToXml( $wikiText );
-
-		$expectedFilename = "$folder/$filename.expected";
-		if ( file_exists( $expectedFilename ) ) {
-			$expectedXml = $this->normalizeXml( file_get_contents( $expectedFilename ) );
-			$this->assertEquals( $expectedXml, $output );
-		} else {
-			$tempFilename = tempnam( $folder, "$filename." );
-			file_put_contents( $tempFilename, $output );
-			$this->markTestIncomplete( "File $expectedFilename missing. Output stored as $tempFilename" );
-		}
-	}
-
-	/**
-	 * Tests from Bug 28642 · https://bugzilla.wikimedia.org/28642
-	 */
-	public static function provideHeadings() {
-		return array( /* These should become headings: */
-			array( "== h ==", "== h ==<!--c1-->" ),
-			array( "== h == 	", "== h == 	<!--c1-->" ),
-			array( "== h == 	", "== h ==<!--c1--> 	" ),
-			array( "== h == 	 	", "== h == 	<!--c1--> 	" ),
-			array( "== h ==", "== h ==<!--c1--><!--c2-->" ),
-			array( "== h == 	", "== h == 	<!--c1--><!--c2-->" ),
-			array( "== h == 	", "== h ==<!--c1--><!--c2--> 	" ),
-			array( "== h == 	 	", "== h == 	<!--c1--><!--c2--> 	" ),
-			array( "== h == 	  ", "== h == 	<!--c1-->  <!--c2-->" ),
-			array( "== h ==   	", "== h ==<!--c1-->  <!--c2--> 	" ),
-			array( "== h == 	   	", "== h == 	<!--c1-->  <!--c2--> 	" ),
-			array( "== h ==", "== h ==<!--c1--><!--c2--><!--c3-->" ),
-			array( "== h ==  ", "== h ==<!--c1-->  <!--c2--><!--c3-->" ),
-			array( "== h ==  ", "== h ==<!--c1--><!--c2-->  <!--c3-->" ),
-			array( "== h ==    ", "== h ==<!--c1-->  <!--c2-->  <!--c3-->" ),
-			array( "== h ==  ", "== h ==  <!--c1--><!--c2--><!--c3-->" ),
-			array( "== h ==    ", "== h ==  <!--c1-->  <!--c2--><!--c3-->" ),
-			array( "== h ==    ", "== h ==  <!--c1--><!--c2-->  <!--c3-->" ),
-			array( "== h ==      ", "== h ==  <!--c1-->  <!--c2-->  <!--c3-->" ),
-			array( "== h ==  ", "== h ==<!--c1--><!--c2--><!--c3-->  " ),
-			array( "== h ==    ", "== h ==<!--c1-->  <!--c2--><!--c3-->  " ),
-			array( "== h ==    ", "== h ==<!--c1--><!--c2-->  <!--c3-->  " ),
-			array( "== h ==      ", "== h ==<!--c1-->  <!--c2-->  <!--c3-->  " ),
-			array( "== h ==    ", "== h ==  <!--c1--><!--c2--><!--c3-->  " ),
-			array( "== h ==      ", "== h ==  <!--c1-->  <!--c2--><!--c3-->  " ),
-			array( "== h ==      ", "== h ==  <!--c1--><!--c2-->  <!--c3-->  " ),
-			array( "== h ==        ", "== h ==  <!--c1-->  <!--c2-->  <!--c3-->  " ),
-			array( "== h == 	", "== h ==<!--c1--> 	<!--c2-->" ),
-			array( "== h == 	 	", "== h == 	<!--c1--> 	<!--c2-->" ),
-			array( "== h == 	 	", "== h ==<!--c1--> 	<!--c2--> 	" ),
-
-			/* These are not working: */
-			array( "== h == x   ", "== h == x <!--c1--><!--c2--><!--c3-->  " ),
-			array( "== h == x   ", "== h ==<!--c1--> x <!--c2--><!--c3-->  " ),
-			array( "== h == x ", "== h ==<!--c1--><!--c2--><!--c3--> x " ),
-		);
-	}
-
-	/**
-	 * @dataProvider provideHeadings
-	 * @covers Preprocessor_DOM::preprocessToXml
-	 */
-	public function testHeadings( $wikiText, $expectedXml ) {
-		$this->assertEquals( $this->normalizeXml( $expectedXml ), $this->preprocessToXml( $wikiText ) );
-	}
-}
diff --git a/tests/phpunit/includes/parser/TagHooksTest.php b/tests/phpunit/includes/parser/TagHooksTest.php
deleted file mode 100644
index 61cbe45d..00000000
--- a/tests/phpunit/includes/parser/TagHooksTest.php
+++ /dev/null
@@ -1,82 +0,0 @@
-bar" ), array( "foo\nbar" ), array( "foo\rbar" ) );
-	}
-
-	protected function setUp() {
-		parent::setUp();
-
-		$this->setMwGlobals( 'wgAlwaysUseTidy', false );
-	}
-
-	/**
-	 * @dataProvider provideValidNames
-	 */
-	public function testTagHooks( $tag ) {
-		global $wgParserConf, $wgContLang;
-		$parser = new Parser( $wgParserConf );
-
-		$parser->setHook( $tag, array( $this, 'tagCallback' ) );
-		$parserOutput = $parser->parse( "Foo<$tag>BarBaz", Title::newFromText( 'Test' ), ParserOptions::newFromUserAndLang( new User, $wgContLang ) );
-		$this->assertEquals( "
FooOneBaz\n
", $parserOutput->getText() );
-
-		$parser->mPreprocessor = null; # Break the Parser <-> Preprocessor cycle
-	}
-
-	/**
-	 * @dataProvider provideBadNames
-	 * @expectedException MWException
-	 */
-	public function testBadTagHooks( $tag ) {
-		global $wgParserConf, $wgContLang;
-		$parser = new Parser( $wgParserConf );
-
-		$parser->setHook( $tag, array( $this, 'tagCallback' ) );
-		$parser->parse( "Foo<$tag>BarBaz", Title::newFromText( 'Test' ), ParserOptions::newFromUserAndLang( new User, $wgContLang ) );
-		$this->fail( 'Exception not thrown.' );
-	}
-
-	/**
-	 * @dataProvider provideValidNames
-	 */
-	public function testFunctionTagHooks( $tag ) {
-		global $wgParserConf, $wgContLang;
-		$parser = new Parser( $wgParserConf );
-
-		$parser->setFunctionTagHook( $tag, array( $this, 'functionTagCallback' ), 0 );
-		$parserOutput = $parser->parse( "Foo<$tag>BarBaz", Title::newFromText( 'Test' ), ParserOptions::newFromUserAndLang( new User, $wgContLang ) );
-		$this->assertEquals( "
FooOneBaz\n
", $parserOutput->getText() );
-
-		$parser->mPreprocessor = null; # Break the Parser <-> Preprocessor cycle
-	}
-
-	/**
-	 * @dataProvider provideBadNames
-	 * @expectedException MWException
-	 */
-	public function testBadFunctionTagHooks( $tag ) {
-		global $wgParserConf, $wgContLang;
-		$parser = new Parser( $wgParserConf );
-
-		$parser->setFunctionTagHook( $tag, array( $this, 'functionTagCallback' ), SFH_OBJECT_ARGS );
-		$parser->parse( "Foo<$tag>BarBaz", Title::newFromText( 'Test' ), ParserOptions::newFromUserAndLang( new User, $wgContLang ) );
-		$this->fail( 'Exception not thrown.' );
-	}
-
-	function tagCallback( $text, $params, $parser ) {
-		return str_rot13( $text );
-	}
-
-	function functionTagCallback( &$parser, $frame, $code, $attribs ) {
-		return str_rot13( $code );
-	}
-}
diff --git a/tests/phpunit/includes/parser/TidyTest.php b/tests/phpunit/includes/parser/TidyTest.php
deleted file mode 100644
index 57a88b9d..00000000
--- a/tests/phpunit/includes/parser/TidyTest.php
+++ /dev/null
@@ -1,44 +0,0 @@
-markTestSkipped( 'Tidy not found' );
-		}
-	}
-
-	/**
-	 * @dataProvider provideTestWrapping
-	 */
-	public function testTidyWrapping( $expected, $text, $msg = '' ) {
-		$text = MWTidy::tidy( $text );
-		// We don't care about where Tidy wants to stick is 
s
-		$text = trim( preg_replace( '##', '', $text ) );
-		// Windows, we love you!
-		$text = str_replace( "\r", '', $text );
-		$this->assertEquals( $expected, $text, $msg );
-	}
-
-	public function provideTestWrapping() {
-		return array(
-			array(
-				'foo',
-				'foo',
-				' should survive tidy'
-			),
-			array(
-				'foo',
-				'foo',
-				' should survive tidy'
-			),
-			array( 'foo', 'foo', ' should survive tidy' ),
-			array( "\nfoo", 'foo', ' should survive tidy' ),
-			array( "\nfoo", 'foo', ' should survive tidy' ),
-		);
-	}
-}
\ No newline at end of file
-- 
cgit v1.2.2