Use integers for content_model and content_format.

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

diff --git a/tests/phpunit/includes/TitleMethodsTest.php b/tests/phpunit/includes/TitleMethodsTest.php
index fcf1976..4edff72 100644 (file)
--- a/tests/phpunit/includes/TitleMethodsTest.php
+++ b/tests/phpunit/includes/TitleMethodsTest.php
@@ -1,5 +1,8 @@
 <?php
 
+/**
+ * @group ContentHandler
+ */
 class TitleMethodsTest extends MediaWikiTestCase {
 
        public function setup() {
@@ -100,7 +103,7 @@ class TitleMethodsTest extends MediaWikiTestCase {
        }
 
 
-       public function dataGetContentModelName() {
+       public function dataGetContentModel() {
                return array(
                        array( 'Foo', CONTENT_MODEL_WIKITEXT ),
                        array( 'Foo.js', CONTENT_MODEL_WIKITEXT ),
@@ -126,19 +129,19 @@ class TitleMethodsTest extends MediaWikiTestCase {
        }
 
        /**
-        * @dataProvider dataGetContentModelName
+        * @dataProvider dataGetContentModel
         */
-       public function testGetContentModelName( $title, $expectedModelName ) {
+       public function testGetContentModel( $title, $expectedModelId ) {
                $title = Title::newFromText( $title );
-               $this->assertEquals( $expectedModelName, $title->getContentModelName() );
+               $this->assertEquals( $expectedModelId, $title->getContentModel() );
        }
 
        /**
-        * @dataProvider dataGetContentModelName
+        * @dataProvider dataGetContentModel
         */
-       public function testHasContentModel( $title, $expectedModelName ) {
+       public function testHasContentModel( $title, $expectedModelId ) {
                $title = Title::newFromText( $title );
-               $this->assertTrue( $title->hasContentModel( $expectedModelName ) );
+               $this->assertTrue( $title->hasContentModel( $expectedModelId ) );
        }
 
        public function dataIsCssOrJsPage() {