Addshore has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/393111 )
Change subject: Remove unused WikiPageTestContentHandlerUseDB (test) ...................................................................... Remove unused WikiPageTestContentHandlerUseDB (test) This class had the wrong name so has not been run since it was written in 2012. In If5b1fa39610dbe366649f79beda58f4ea6d58c8f I fixed the name but the tests fail, so lets just remove it and rewrite the tests. Change-Id: Iccdcd4a4f72c8b1329d36ff2e8699ba6b23c9ae7 --- D tests/phpunit/includes/page/WikiPageTestContentHandlerUseDB.php 1 file changed, 0 insertions(+), 61 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/11/393111/1 diff --git a/tests/phpunit/includes/page/WikiPageTestContentHandlerUseDB.php b/tests/phpunit/includes/page/WikiPageTestContentHandlerUseDB.php deleted file mode 100644 index 3db7628..0000000 --- a/tests/phpunit/includes/page/WikiPageTestContentHandlerUseDB.php +++ /dev/null @@ -1,61 +0,0 @@ -<?php - -/** - * @group ContentHandler - * @group Database - * ^--- important, causes temporary tables to be used instead of the real database - */ -class WikiPageTestContentHandlerUseDB extends WikiPageTest { - - protected function setUp() { - parent::setUp(); - $this->setMwGlobals( 'wgContentHandlerUseDB', false ); - - $dbw = wfGetDB( DB_MASTER ); - - $page_table = $dbw->tableName( 'page' ); - $revision_table = $dbw->tableName( 'revision' ); - $archive_table = $dbw->tableName( 'archive' ); - - if ( $dbw->fieldExists( $page_table, 'page_content_model' ) ) { - $dbw->query( "alter table $page_table drop column page_content_model" ); - $dbw->query( "alter table $revision_table drop column rev_content_model" ); - $dbw->query( "alter table $revision_table drop column rev_content_format" ); - $dbw->query( "alter table $archive_table drop column ar_content_model" ); - $dbw->query( "alter table $archive_table drop column ar_content_format" ); - } - } - - /** - * @covers WikiPage::getContentModel - */ - public function testGetContentModel() { - $page = $this->createPage( - "WikiPageTest_testGetContentModel", - "some text", - CONTENT_MODEL_JAVASCRIPT - ); - - $page = new WikiPage( $page->getTitle() ); - - // NOTE: since the content model is not recorded in the database, - // we expect to get the default, namely CONTENT_MODEL_WIKITEXT - $this->assertEquals( CONTENT_MODEL_WIKITEXT, $page->getContentModel() ); - } - - /** - * @covers WikiPage::getContentHandler - */ - public function testGetContentHandler() { - $page = $this->createPage( - "WikiPageTest_testGetContentHandler", - "some text", - CONTENT_MODEL_JAVASCRIPT - ); - - // NOTE: since the content model is not recorded in the database, - // we expect to get the default, namely CONTENT_MODEL_WIKITEXT - $page = new WikiPage( $page->getTitle() ); - $this->assertEquals( 'WikitextContentHandler', get_class( $page->getContentHandler() ) ); - } -} -- To view, visit https://gerrit.wikimedia.org/r/393111 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iccdcd4a4f72c8b1329d36ff2e8699ba6b23c9ae7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Addshore <addshorew...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits