From cd987b8db604cd5a7fb825b8d57286b3ed7fc512 Mon Sep 17 00:00:00 2001 From: daniel Date: Tue, 24 Jul 2012 17:58:02 +0200 Subject: [PATCH] fix some tests to work with =false Change-Id: I520565ac119ea87d7ecca0af93c5fe77a32896ec --- .../phpunit/includes/RevisionStorageTest.php | 25 +++++++++++++++++-- tests/phpunit/includes/WikiPageTest.php | 12 +++++++++ 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/tests/phpunit/includes/RevisionStorageTest.php b/tests/phpunit/includes/RevisionStorageTest.php index 8b77746183..15cf9eceae 100644 --- a/tests/phpunit/includes/RevisionStorageTest.php +++ b/tests/phpunit/includes/RevisionStorageTest.php @@ -9,6 +9,9 @@ */ class RevisionStorageTest extends MediaWikiTestCase { + /** + * @var WikiPage $the_page + */ var $the_page; function __construct( $name = null, array $data = array(), $dataName = '' ) { @@ -204,6 +207,8 @@ class RevisionStorageTest extends MediaWikiTestCase { */ public function testSelectFields() { + global $wgContentHandlerUseDB; + $fields = Revision::selectFields(); $this->assertTrue( in_array( 'rev_id', $fields ), 'missing rev_id in list of fields'); @@ -211,8 +216,12 @@ class RevisionStorageTest extends MediaWikiTestCase { $this->assertTrue( in_array( 'rev_timestamp', $fields ), 'missing rev_timestamp in list of fields'); $this->assertTrue( in_array( 'rev_user', $fields ), 'missing rev_user in list of fields'); - $this->assertTrue( in_array( 'rev_content_model', $fields ), 'missing rev_content_model in list of fields'); - $this->assertTrue( in_array( 'rev_content_format', $fields ), 'missing rev_content_format in list of fields'); + if ( $wgContentHandlerUseDB ) { + $this->assertTrue( in_array( 'rev_content_model', $fields ), 'missing rev_content_model in list of fields'); + $this->assertTrue( in_array( 'rev_content_format', $fields ), 'missing rev_content_format in list of fields'); + } else { + $this->markTestSkipped( '$wgContentHandlerUseDB is disabled' ); + } } /** @@ -277,6 +286,12 @@ class RevisionStorageTest extends MediaWikiTestCase { */ public function testGetContentModel() { + global $wgContentHandlerUseDB; + + if ( !$wgContentHandlerUseDB ) { + $this->markTestSkipped( '$wgContentHandlerUseDB is disabled' ); + } + $orig = $this->makeRevision( array( 'text' => 'hello hello.', 'content_model' => CONTENT_MODEL_JAVASCRIPT ) ); $rev = Revision::newFromId( $orig->getId() ); @@ -288,6 +303,12 @@ class RevisionStorageTest extends MediaWikiTestCase { */ public function testGetContentFormat() { + global $wgContentHandlerUseDB; + + if ( !$wgContentHandlerUseDB ) { + $this->markTestSkipped( '$wgContentHandlerUseDB is disabled' ); + } + $orig = $this->makeRevision( array( 'text' => 'hello hello.', 'content_model' => CONTENT_MODEL_JAVASCRIPT, 'content_format' => CONTENT_FORMAT_JAVASCRIPT ) ); $rev = Revision::newFromId( $orig->getId() ); diff --git a/tests/phpunit/includes/WikiPageTest.php b/tests/phpunit/includes/WikiPageTest.php index 1e44371b14..98406495e8 100644 --- a/tests/phpunit/includes/WikiPageTest.php +++ b/tests/phpunit/includes/WikiPageTest.php @@ -316,6 +316,12 @@ class WikiPageTest extends MediaWikiLangTestCase { } public function testGetContentModel() { + global $wgContentHandlerUseDB; + + if ( !$wgContentHandlerUseDB ) { + $this->markTestSkipped( '$wgContentHandlerUseDB is disabled' ); + } + $page = $this->createPage( "WikiPageTest_testGetContentModel", "some text", CONTENT_MODEL_JAVASCRIPT ); $page = new WikiPage( $page->getTitle() ); @@ -323,6 +329,12 @@ class WikiPageTest extends MediaWikiLangTestCase { } public function testGetContentHandler() { + global $wgContentHandlerUseDB; + + if ( !$wgContentHandlerUseDB ) { + $this->markTestSkipped( '$wgContentHandlerUseDB is disabled' ); + } + $page = $this->createPage( "WikiPageTest_testGetContentHandler", "some text", CONTENT_MODEL_JAVASCRIPT ); $page = new WikiPage( $page->getTitle() ); -- 2.20.1