Merge "Convert -{}- markups in title="" and alt=""."

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

diff --git a/tests/phpunit/includes/WikitextContentTest.php b/tests/phpunit/includes/WikitextContentTest.php
index 449423b..dac8041 100644 (file)
--- a/tests/phpunit/includes/WikitextContentTest.php
+++ b/tests/phpunit/includes/WikitextContentTest.php
@@ -2,12 +2,22 @@
 
 /**
  * @group ContentHandler
+ *
+ * @group Database
+ *        ^--- needed, because we do need the database to test link updates
  */
 class WikitextContentTest extends MediaWikiTestCase {
 
        public function setup() {
+               global $wgUser;
+
+               // anon user
+               $wgUser = new User();
+               $wgUser->setName( '127.0.0.1' );
+
                $this->context = new RequestContext( new FauxRequest() );
                $this->context->setTitle( Title::newFromText( "Test" ) );
+               $this->context->setUser( $wgUser );
        }
 
        public function newContent( $text ) {
@@ -17,7 +27,7 @@ class WikitextContentTest extends MediaWikiTestCase {
 
        public function dataGetParserOutput() {
                return array(
-                       array("WikitextContentTest_testGetParserOutput", "hello ''world''\n", "<p>hello <i>world</i>\n</p>"),
+                       array("WikitextContentTest_testGetParserOutput", CONTENT_MODEL_WIKITEXT, "hello ''world''\n", "<p>hello <i>world</i>\n</p>"),
                        // @todo: more...?
                );
        }
@@ -25,9 +35,9 @@ class WikitextContentTest extends MediaWikiTestCase {
        /**
         * @dataProvider dataGetParserOutput
         */
-       public function testGetParserOutput( $title, $text, $expectedHtml ) {
+       public function testGetParserOutput( $title, $model, $text, $expectedHtml ) {
                $title = Title::newFromText( $title );
-               $content = ContentHandler::makeContent( $text, $title );
+               $content = ContentHandler::makeContent( $text, $title, $model );
 
                $po = $content->getParserOutput( $title );
 
@@ -37,11 +47,13 @@ class WikitextContentTest extends MediaWikiTestCase {
 
        public function dataGetSecondaryDataUpdates() {
                return array(
-                       array("WikitextContentTest_testGetSecondaryDataUpdates_1", "hello ''world''\n",
+                       array("WikitextContentTest_testGetSecondaryDataUpdates_1",
+                               CONTENT_MODEL_WIKITEXT, "hello ''world''\n",
                                array( 'LinksUpdate' => array(  'mRecursive' => true,
                                                                'mLinks' => array() ) )
                        ),
-                       array("WikitextContentTest_testGetSecondaryDataUpdates_2", "hello [[world test 21344]]\n",
+                       array("WikitextContentTest_testGetSecondaryDataUpdates_2",
+                               CONTENT_MODEL_WIKITEXT, "hello [[world test 21344]]\n",
                                array( 'LinksUpdate' => array(  'mRecursive' => true,
                                                                'mLinks' => array( array( 'World_test_21344' => 0 ) ) ) )
                        ),
@@ -53,25 +65,24 @@ class WikitextContentTest extends MediaWikiTestCase {
         * @dataProvider dataGetSecondaryDataUpdates
         * @group Database
         */
-       public function testGetSecondaryDataUpdates( $title, $text, $expectedStuff ) {
+       public function testGetSecondaryDataUpdates( $title, $model, $text, $expectedStuff ) {
                $title = Title::newFromText( $title );
                $title->resetArticleID( 2342 ); //dummy id. fine as long as we don't try to execute the updates!
 
-               $handler = ContentHandler::getForModelID( $title->getContentModel() );
-               $content = ContentHandler::makeContent( $text, $title );
+               $content = ContentHandler::makeContent( $text, $title, $model );
 
                $updates = $content->getSecondaryDataUpdates( $title );
 
                // make updates accessible by class name
                foreach ( $updates as $update ) {
                        $class = get_class( $update );
-                       $updates[ $class ] = $update;
+                       $updates[$class] = $update;
                }
 
                foreach ( $expectedStuff as $class => $fieldValues ) {
                        $this->assertArrayHasKey( $class, $updates, "missing an update of type $class" );
 
-                       $update = $updates[ $class ];
+                       $update = $updates[$class];
 
                        foreach ( $fieldValues as $field => $value ) {
                                $v = $update->$field; #if the field doesn't exist, just crash and burn
@@ -191,8 +202,9 @@ just a test"
         * @dataProvider dataPreSaveTransform
         */
        public function testPreSaveTransform( $text, $expected ) {
-               global $wgUser, $wgContLang;
-               $options = ParserOptions::newFromUserAndLang( $wgUser, $wgContLang );
+               global $wgContLang;
+
+               $options = ParserOptions::newFromUserAndLang( $this->context->getUser(), $wgContLang );
 
                $content = $this->newContent( $text );
                $content = $content->preSaveTransform( $this->context->getTitle(), $this->context->getUser(), $options );
@@ -215,8 +227,8 @@ just a test"
         * @dataProvider dataPreloadTransform
         */
        public function testPreloadTransform( $text, $expected ) {
-               global $wgUser, $wgContLang;
-               $options = ParserOptions::newFromUserAndLang( $wgUser, $wgContLang );
+               global $wgContLang;
+               $options = ParserOptions::newFromUserAndLang( $this->context->getUser(), $wgContLang );
 
                $content = $this->newContent( $text );
                $content = $content->preloadTransform( $this->context->getTitle(), $options );
@@ -245,8 +257,11 @@ just a test"
                $content = $this->newContent( $text );
                $t = $content->getRedirectTarget( );
 
-               if ( is_null( $expected ) ) $this->assertNull( $t, "text should not have generated a redirect target: $text" );
-               else $this->assertEquals( $expected, $t->getPrefixedText() );
+               if ( is_null( $expected ) ) {
+                       $this->assertNull( $t, "text should not have generated a redirect target: $text" );
+               } else {
+                       $this->assertEquals( $expected, $t->getPrefixedText() );
+               }
        }
 
        /**
@@ -260,7 +275,7 @@ just a test"
 
 
        /**
-        * @todo: test needs database!
+        * @todo: test needs database! Should be done by a test class in the Database group.
         */
        /*
        public function getRedirectChain() {
@@ -270,7 +285,7 @@ just a test"
        */
 
        /**
-        * @todo: test needs database!
+        * @todo: test needs database! Should be done by a test class in the Database group.
         */
        /*
        public function getUltimateRedirectTarget() {
@@ -498,10 +513,12 @@ just a test"
 
        public function dataGetDeletionUpdates() {
                return array(
-                       array("WikitextContentTest_testGetSecondaryDataUpdates_1", "hello ''world''\n",
+                       array("WikitextContentTest_testGetSecondaryDataUpdates_1",
+                               CONTENT_MODEL_WIKITEXT, "hello ''world''\n",
                                array( 'LinksDeletionUpdate' => array( ) )
                        ),
-                       array("WikitextContentTest_testGetSecondaryDataUpdates_2", "hello [[world test 21344]]\n",
+                       array("WikitextContentTest_testGetSecondaryDataUpdates_2",
+                               CONTENT_MODEL_WIKITEXT, "hello [[world test 21344]]\n",
                                array( 'LinksDeletionUpdate' => array( ) )
                        ),
                        // @todo: more...?
@@ -511,14 +528,13 @@ just a test"
        /**
         * @dataProvider dataGetDeletionUpdates
         */
-       public function testDeletionUpdates( $title, $text, $expectedStuff ) {
+       public function testDeletionUpdates( $title, $model, $text, $expectedStuff ) {
                $title = Title::newFromText( $title );
                $title->resetArticleID( 2342 ); //dummy id. fine as long as we don't try to execute the updates!
 
-               $handler = ContentHandler::getForModelID( $title->getContentModel() );
-               $content = ContentHandler::makeContent( $text, $title );
+               $content = ContentHandler::makeContent( $text, $title, $model );
 
-               $updates = $content->getDeletionUpdates( $title );
+               $updates = $content->getDeletionUpdates( WikiPage::factory( $title ) );
 
                // make updates accessible by class name
                foreach ( $updates as $update ) {