Merge "Implement static public Parser::getExternalLinkRel"

[lhc/web/wiklou.git] / tests / phpunit / includes / content / WikitextContentHandlerTest.php

diff --git a/tests/phpunit/includes/content/WikitextContentHandlerTest.php b/tests/phpunit/includes/content/WikitextContentHandlerTest.php
index 1ba85a9..8121099 100644 (file)
--- a/tests/phpunit/includes/content/WikitextContentHandlerTest.php
+++ b/tests/phpunit/includes/content/WikitextContentHandlerTest.php
@@ -3,7 +3,7 @@
 /**
  * @group ContentHandler
  */
-class WikitextContentHandlerTest extends MediaWikiTestCase {
+class WikitextContentHandlerTest extends MediaWikiLangTestCase {
 
        /**
         * @var ContentHandler
@@ -103,16 +103,7 @@ class WikitextContentHandlerTest extends MediaWikiTestCase {
         * @dataProvider dataMerge3
         */
        public function testMerge3( $old, $mine, $yours, $expected ) {
-               global $wgDiff3;
-
-               if ( !$wgDiff3 ) {
-                       $this->markTestSkipped( "Can't test merge3(), since \$wgDiff3 is not configured" );
-               }
-
-               if ( !file_exists( $wgDiff3 ) ) {
-                       #XXX: this sucks, since it uses arcane internal knowledge about TextContentHandler::merge3 and wfMerge.
-                       $this->markTestSkipped( "Can't test merge3(), since \$wgDiff3 is misconfigured: can't find $wgDiff3" );
-               }
+               $this->checkHasDiff3();
 
                // test merge
                $oldContent = new WikitextContent( $old );
@@ -169,8 +160,6 @@ class WikitextContentHandlerTest extends MediaWikiTestCase {
         * @dataProvider dataGetAutosummary
         */
        public function testGetAutosummary( $old, $new, $flags, $expected ) {
-               global $wgLanguageCode, $wgContLang;
-
                $oldContent = is_null( $old ) ? null : new WikitextContent( $old );
                $newContent = is_null( $new ) ? null : new WikitextContent( $new );