# tests/phpunit/includes
'RevisionTestModifyableContent' => "$testDir/phpunit/includes/RevisionTestModifyableContent.php",
'RevisionTestModifyableContentHandler' => "$testDir/phpunit/includes/RevisionTestModifyableContentHandler.php",
- 'RevisionStorageTest' => "$testDir/phpunit/includes/RevisionStorageTest.php",
'TestLogger' => "$testDir/phpunit/includes/TestLogger.php",
# tests/phpunit/includes/api
--- /dev/null
+<?php
+
+/**
+ * @group ContentHandler
+ * @group Database
+ *
+ * @group medium
+ */
+class RevisionIntegrationTest extends MediaWikiTestCase {
+
+ /**
+ * @var WikiPage $the_page
+ */
+ private $the_page;
+
+ public function __construct( $name = null, array $data = [], $dataName = '' ) {
+ parent::__construct( $name, $data, $dataName );
+
+ $this->tablesUsed = array_merge( $this->tablesUsed,
+ [
+ 'page',
+ 'revision',
+ 'ip_changes',
+ 'text',
+ 'archive',
+
+ 'recentchanges',
+ 'logging',
+
+ 'page_props',
+ 'pagelinks',
+ 'categorylinks',
+ 'langlinks',
+ 'externallinks',
+ 'imagelinks',
+ 'templatelinks',
+ 'iwlinks'
+ ]
+ );
+ }
+
+ protected function setUp() {
+ global $wgContLang;
+
+ parent::setUp();
+
+ $this->mergeMwGlobalArrayValue(
+ 'wgExtraNamespaces',
+ [
+ 12312 => 'Dummy',
+ 12313 => 'Dummy_talk',
+ ]
+ );
+
+ $this->mergeMwGlobalArrayValue(
+ 'wgNamespaceContentModels',
+ [
+ 12312 => DummyContentForTesting::MODEL_ID,
+ ]
+ );
+
+ $this->mergeMwGlobalArrayValue(
+ 'wgContentHandlers',
+ [
+ DummyContentForTesting::MODEL_ID => 'DummyContentHandlerForTesting',
+ RevisionTestModifyableContent::MODEL_ID => 'RevisionTestModifyableContentHandler',
+ ]
+ );
+
+ MWNamespace::clearCaches();
+ // Reset namespace cache
+ $wgContLang->resetNamespaces();
+ if ( !$this->the_page ) {
+ $this->the_page = $this->createPage(
+ 'RevisionStorageTest_the_page',
+ "just a dummy page",
+ CONTENT_MODEL_WIKITEXT
+ );
+ }
+ }
+
+ protected function tearDown() {
+ global $wgContLang;
+
+ parent::tearDown();
+
+ MWNamespace::clearCaches();
+ // Reset namespace cache
+ $wgContLang->resetNamespaces();
+ }
+
+ protected function makeRevision( $props = null ) {
+ if ( $props === null ) {
+ $props = [];
+ }
+
+ if ( !isset( $props['content'] ) && !isset( $props['text'] ) ) {
+ $props['text'] = 'Lorem Ipsum';
+ }
+
+ if ( !isset( $props['comment'] ) ) {
+ $props['comment'] = 'just a test';
+ }
+
+ if ( !isset( $props['page'] ) ) {
+ $props['page'] = $this->the_page->getId();
+ }
+
+ $rev = new Revision( $props );
+
+ $dbw = wfGetDB( DB_MASTER );
+ $rev->insertOn( $dbw );
+
+ return $rev;
+ }
+
+ /**
+ * @param string $titleString
+ * @param string $text
+ * @param string|null $model
+ *
+ * @return WikiPage
+ */
+ protected function createPage( $titleString, $text, $model = null ) {
+ if ( !preg_match( '/:/', $titleString ) &&
+ ( $model === null || $model === CONTENT_MODEL_WIKITEXT )
+ ) {
+ $ns = $this->getDefaultWikitextNS();
+ $titleString = MWNamespace::getCanonicalName( $ns ) . ':' . $titleString;
+ }
+
+ $title = Title::newFromText( $titleString );
+ $wikipage = new WikiPage( $title );
+
+ // Delete the article if it already exists
+ if ( $wikipage->exists() ) {
+ $wikipage->doDeleteArticle( "done" );
+ }
+
+ $content = ContentHandler::makeContent( $text, $title, $model );
+ $wikipage->doEditContent( $content, __METHOD__, EDIT_NEW );
+
+ return $wikipage;
+ }
+
+ protected function assertRevEquals( Revision $orig, Revision $rev = null ) {
+ $this->assertNotNull( $rev, 'missing revision' );
+
+ $this->assertEquals( $orig->getId(), $rev->getId() );
+ $this->assertEquals( $orig->getPage(), $rev->getPage() );
+ $this->assertEquals( $orig->getTimestamp(), $rev->getTimestamp() );
+ $this->assertEquals( $orig->getUser(), $rev->getUser() );
+ $this->assertEquals( $orig->getContentModel(), $rev->getContentModel() );
+ $this->assertEquals( $orig->getContentFormat(), $rev->getContentFormat() );
+ $this->assertEquals( $orig->getSha1(), $rev->getSha1() );
+ }
+
+ /**
+ * @covers Revision::__construct
+ */
+ public function testConstructFromRow() {
+ $orig = $this->makeRevision();
+
+ $dbr = wfGetDB( DB_REPLICA );
+ $res = $dbr->select( 'revision', Revision::selectFields(), [ 'rev_id' => $orig->getId() ] );
+ $this->assertTrue( is_object( $res ), 'query failed' );
+
+ $row = $res->fetchObject();
+ $res->free();
+
+ $rev = new Revision( $row );
+
+ $this->assertRevEquals( $orig, $rev );
+ }
+
+ /**
+ * @covers Revision::newFromTitle
+ */
+ public function testNewFromTitle_withoutId() {
+ $page = $this->createPage(
+ __METHOD__,
+ 'GOAT',
+ CONTENT_MODEL_WIKITEXT
+ );
+ $latestRevId = $page->getLatest();
+
+ $rev = Revision::newFromTitle( $page->getTitle() );
+
+ $this->assertTrue( $page->getTitle()->equals( $rev->getTitle() ) );
+ $this->assertEquals( $latestRevId, $rev->getId() );
+ }
+
+ /**
+ * @covers Revision::newFromTitle
+ */
+ public function testNewFromTitle_withId() {
+ $page = $this->createPage(
+ __METHOD__,
+ 'GOAT',
+ CONTENT_MODEL_WIKITEXT
+ );
+ $latestRevId = $page->getLatest();
+
+ $rev = Revision::newFromTitle( $page->getTitle(), $latestRevId );
+
+ $this->assertTrue( $page->getTitle()->equals( $rev->getTitle() ) );
+ $this->assertEquals( $latestRevId, $rev->getId() );
+ }
+
+ /**
+ * @covers Revision::newFromTitle
+ */
+ public function testNewFromTitle_withBadId() {
+ $page = $this->createPage(
+ __METHOD__,
+ 'GOAT',
+ CONTENT_MODEL_WIKITEXT
+ );
+ $latestRevId = $page->getLatest();
+
+ $rev = Revision::newFromTitle( $page->getTitle(), $latestRevId + 1 );
+
+ $this->assertNull( $rev );
+ }
+
+ /**
+ * @covers Revision::newFromRow
+ */
+ public function testNewFromRow() {
+ $orig = $this->makeRevision();
+
+ $dbr = wfGetDB( DB_REPLICA );
+ $res = $dbr->select( 'revision', Revision::selectFields(), [ 'rev_id' => $orig->getId() ] );
+ $this->assertTrue( is_object( $res ), 'query failed' );
+
+ $row = $res->fetchObject();
+ $res->free();
+
+ $rev = Revision::newFromRow( $row );
+
+ $this->assertRevEquals( $orig, $rev );
+ }
+
+ /**
+ * @covers Revision::newFromArchiveRow
+ */
+ public function testNewFromArchiveRow() {
+ $page = $this->createPage(
+ 'RevisionStorageTest_testNewFromArchiveRow',
+ 'Lorem Ipsum',
+ CONTENT_MODEL_WIKITEXT
+ );
+ $orig = $page->getRevision();
+ $page->doDeleteArticle( 'test Revision::newFromArchiveRow' );
+
+ $dbr = wfGetDB( DB_REPLICA );
+ $res = $dbr->select(
+ 'archive', Revision::selectArchiveFields(), [ 'ar_rev_id' => $orig->getId() ]
+ );
+ $this->assertTrue( is_object( $res ), 'query failed' );
+
+ $row = $res->fetchObject();
+ $res->free();
+
+ $rev = Revision::newFromArchiveRow( $row );
+
+ $this->assertRevEquals( $orig, $rev );
+ }
+
+ /**
+ * @covers Revision::newFromId
+ */
+ public function testNewFromId() {
+ $orig = $this->makeRevision();
+
+ $rev = Revision::newFromId( $orig->getId() );
+
+ $this->assertRevEquals( $orig, $rev );
+ }
+
+ /**
+ * @covers Revision::fetchRevision
+ */
+ public function testFetchRevision() {
+ $page = $this->createPage(
+ 'RevisionStorageTest_testFetchRevision',
+ 'one',
+ CONTENT_MODEL_WIKITEXT
+ );
+
+ // Hidden process cache assertion below
+ $page->getRevision()->getId();
+
+ $page->doEditContent( new WikitextContent( 'two' ), 'second rev' );
+ $id = $page->getRevision()->getId();
+
+ $res = Revision::fetchRevision( $page->getTitle() );
+
+ # note: order is unspecified
+ $rows = [];
+ while ( ( $row = $res->fetchObject() ) ) {
+ $rows[$row->rev_id] = $row;
+ }
+
+ $this->assertEquals( 1, count( $rows ), 'expected exactly one revision' );
+ $this->assertArrayHasKey( $id, $rows, 'missing revision with id ' . $id );
+ }
+
+ /**
+ * @covers Revision::selectFields
+ */
+ public function testSelectFields() {
+ global $wgContentHandlerUseDB;
+
+ $fields = Revision::selectFields();
+
+ $this->assertTrue( in_array( 'rev_id', $fields ), 'missing rev_id in list of fields' );
+ $this->assertTrue( in_array( 'rev_page', $fields ), 'missing rev_page in list of fields' );
+ $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' );
+
+ 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' );
+ }
+ }
+
+ /**
+ * @covers Revision::getPage
+ */
+ public function testGetPage() {
+ $page = $this->the_page;
+
+ $orig = $this->makeRevision( [ 'page' => $page->getId() ] );
+ $rev = Revision::newFromId( $orig->getId() );
+
+ $this->assertEquals( $page->getId(), $rev->getPage() );
+ }
+
+ /**
+ * @covers Revision::isCurrent
+ */
+ public function testIsCurrent() {
+ $page = $this->createPage(
+ 'RevisionStorageTest_testIsCurrent',
+ 'Lorem Ipsum',
+ CONTENT_MODEL_WIKITEXT
+ );
+ $rev1 = $page->getRevision();
+
+ # @todo find out if this should be true
+ # $this->assertTrue( $rev1->isCurrent() );
+
+ $rev1x = Revision::newFromId( $rev1->getId() );
+ $this->assertTrue( $rev1x->isCurrent() );
+
+ $page->doEditContent(
+ ContentHandler::makeContent( 'Bla bla', $page->getTitle(), CONTENT_MODEL_WIKITEXT ),
+ 'second rev'
+ );
+ $rev2 = $page->getRevision();
+
+ # @todo find out if this should be true
+ # $this->assertTrue( $rev2->isCurrent() );
+
+ $rev1x = Revision::newFromId( $rev1->getId() );
+ $this->assertFalse( $rev1x->isCurrent() );
+
+ $rev2x = Revision::newFromId( $rev2->getId() );
+ $this->assertTrue( $rev2x->isCurrent() );
+ }
+
+ /**
+ * @covers Revision::getPrevious
+ */
+ public function testGetPrevious() {
+ $page = $this->createPage(
+ 'RevisionStorageTest_testGetPrevious',
+ 'Lorem Ipsum testGetPrevious',
+ CONTENT_MODEL_WIKITEXT
+ );
+ $rev1 = $page->getRevision();
+
+ $this->assertNull( $rev1->getPrevious() );
+
+ $page->doEditContent(
+ ContentHandler::makeContent( 'Bla bla', $page->getTitle(), CONTENT_MODEL_WIKITEXT ),
+ 'second rev testGetPrevious' );
+ $rev2 = $page->getRevision();
+
+ $this->assertNotNull( $rev2->getPrevious() );
+ $this->assertEquals( $rev1->getId(), $rev2->getPrevious()->getId() );
+ }
+
+ /**
+ * @covers Revision::getNext
+ */
+ public function testGetNext() {
+ $page = $this->createPage(
+ 'RevisionStorageTest_testGetNext',
+ 'Lorem Ipsum testGetNext',
+ CONTENT_MODEL_WIKITEXT
+ );
+ $rev1 = $page->getRevision();
+
+ $this->assertNull( $rev1->getNext() );
+
+ $page->doEditContent(
+ ContentHandler::makeContent( 'Bla bla', $page->getTitle(), CONTENT_MODEL_WIKITEXT ),
+ 'second rev testGetNext'
+ );
+ $rev2 = $page->getRevision();
+
+ $this->assertNotNull( $rev1->getNext() );
+ $this->assertEquals( $rev2->getId(), $rev1->getNext()->getId() );
+ }
+
+ /**
+ * @covers Revision::newNullRevision
+ */
+ public function testNewNullRevision() {
+ $page = $this->createPage(
+ 'RevisionStorageTest_testNewNullRevision',
+ 'some testing text',
+ CONTENT_MODEL_WIKITEXT
+ );
+ $orig = $page->getRevision();
+
+ $dbw = wfGetDB( DB_MASTER );
+ $rev = Revision::newNullRevision( $dbw, $page->getId(), 'a null revision', false );
+
+ $this->assertNotEquals( $orig->getId(), $rev->getId(),
+ 'new null revision shold have a different id from the original revision' );
+ $this->assertEquals( $orig->getTextId(), $rev->getTextId(),
+ 'new null revision shold have the same text id as the original revision' );
+ $this->assertEquals( 'some testing text', $rev->getContent()->getNativeData() );
+ }
+
+ /**
+ * @covers Revision::insertOn
+ */
+ public function testInsertOn() {
+ $ip = '2600:387:ed7:947e:8c16:a1ad:dd34:1dd7';
+
+ $orig = $this->makeRevision( [
+ 'user_text' => $ip
+ ] );
+
+ // Make sure the revision was copied to ip_changes
+ $dbr = wfGetDB( DB_REPLICA );
+ $res = $dbr->select( 'ip_changes', '*', [ 'ipc_rev_id' => $orig->getId() ] );
+ $row = $res->fetchObject();
+
+ $this->assertEquals( IP::toHex( $ip ), $row->ipc_hex );
+ $this->assertEquals( $orig->getTimestamp(), $row->ipc_rev_timestamp );
+ }
+
+ public static function provideUserWasLastToEdit() {
+ yield 'actually the last edit' => [ 3, true ];
+ yield 'not the current edit, but still by this user' => [ 2, true ];
+ yield 'edit by another user' => [ 1, false ];
+ yield 'first edit, by this user, but another user edited in the mean time' => [ 0, false ];
+ }
+
+ /**
+ * @dataProvider provideUserWasLastToEdit
+ */
+ public function testUserWasLastToEdit( $sinceIdx, $expectedLast ) {
+ $userA = User::newFromName( "RevisionStorageTest_userA" );
+ $userB = User::newFromName( "RevisionStorageTest_userB" );
+
+ if ( $userA->getId() === 0 ) {
+ $userA = User::createNew( $userA->getName() );
+ }
+
+ if ( $userB->getId() === 0 ) {
+ $userB = User::createNew( $userB->getName() );
+ }
+
+ $ns = $this->getDefaultWikitextNS();
+
+ $dbw = wfGetDB( DB_MASTER );
+ $revisions = [];
+
+ // create revisions -----------------------------
+ $page = WikiPage::factory( Title::newFromText(
+ 'RevisionStorageTest_testUserWasLastToEdit', $ns ) );
+ $page->insertOn( $dbw );
+
+ $revisions[0] = new Revision( [
+ 'page' => $page->getId(),
+ // we need the title to determine the page's default content model
+ 'title' => $page->getTitle(),
+ 'timestamp' => '20120101000000',
+ 'user' => $userA->getId(),
+ 'text' => 'zero',
+ 'content_model' => CONTENT_MODEL_WIKITEXT,
+ 'summary' => 'edit zero'
+ ] );
+ $revisions[0]->insertOn( $dbw );
+
+ $revisions[1] = new Revision( [
+ 'page' => $page->getId(),
+ // still need the title, because $page->getId() is 0 (there's no entry in the page table)
+ 'title' => $page->getTitle(),
+ 'timestamp' => '20120101000100',
+ 'user' => $userA->getId(),
+ 'text' => 'one',
+ 'content_model' => CONTENT_MODEL_WIKITEXT,
+ 'summary' => 'edit one'
+ ] );
+ $revisions[1]->insertOn( $dbw );
+
+ $revisions[2] = new Revision( [
+ 'page' => $page->getId(),
+ 'title' => $page->getTitle(),
+ 'timestamp' => '20120101000200',
+ 'user' => $userB->getId(),
+ 'text' => 'two',
+ 'content_model' => CONTENT_MODEL_WIKITEXT,
+ 'summary' => 'edit two'
+ ] );
+ $revisions[2]->insertOn( $dbw );
+
+ $revisions[3] = new Revision( [
+ 'page' => $page->getId(),
+ 'title' => $page->getTitle(),
+ 'timestamp' => '20120101000300',
+ 'user' => $userA->getId(),
+ 'text' => 'three',
+ 'content_model' => CONTENT_MODEL_WIKITEXT,
+ 'summary' => 'edit three'
+ ] );
+ $revisions[3]->insertOn( $dbw );
+
+ $revisions[4] = new Revision( [
+ 'page' => $page->getId(),
+ 'title' => $page->getTitle(),
+ 'timestamp' => '20120101000200',
+ 'user' => $userA->getId(),
+ 'text' => 'zero',
+ 'content_model' => CONTENT_MODEL_WIKITEXT,
+ 'summary' => 'edit four'
+ ] );
+ $revisions[4]->insertOn( $dbw );
+
+ // test it ---------------------------------
+ $since = $revisions[$sinceIdx]->getTimestamp();
+
+ $wasLast = Revision::userWasLastToEdit( $dbw, $page->getId(), $userA->getId(), $since );
+
+ $this->assertEquals( $expectedLast, $wasLast );
+ }
+
+ /**
+ * @param string $text
+ * @param string $title
+ * @param string $model
+ * @param string $format
+ *
+ * @return Revision
+ */
+ private function newTestRevision( $text, $title = "Test",
+ $model = CONTENT_MODEL_WIKITEXT, $format = null
+ ) {
+ if ( is_string( $title ) ) {
+ $title = Title::newFromText( $title );
+ }
+
+ $content = ContentHandler::makeContent( $text, $title, $model, $format );
+
+ $rev = new Revision(
+ [
+ 'id' => 42,
+ 'page' => 23,
+ 'title' => $title,
+
+ 'content' => $content,
+ 'length' => $content->getSize(),
+ 'comment' => "testing",
+ 'minor_edit' => false,
+
+ 'content_format' => $format,
+ ]
+ );
+
+ return $rev;
+ }
+
+ public function provideGetContentModel() {
+ // NOTE: we expect the help namespace to always contain wikitext
+ return [
+ [ 'hello world', 'Help:Hello', null, null, CONTENT_MODEL_WIKITEXT ],
+ [ 'hello world', 'User:hello/there.css', null, null, CONTENT_MODEL_CSS ],
+ [ serialize( 'hello world' ), 'Dummy:Hello', null, null, DummyContentForTesting::MODEL_ID ],
+ ];
+ }
+
+ /**
+ * @dataProvider provideGetContentModel
+ * @covers Revision::getContentModel
+ */
+ public function testGetContentModel( $text, $title, $model, $format, $expectedModel ) {
+ $rev = $this->newTestRevision( $text, $title, $model, $format );
+
+ $this->assertEquals( $expectedModel, $rev->getContentModel() );
+ }
+
+ public function provideGetContentFormat() {
+ // NOTE: we expect the help namespace to always contain wikitext
+ return [
+ [ 'hello world', 'Help:Hello', null, null, CONTENT_FORMAT_WIKITEXT ],
+ [ 'hello world', 'Help:Hello', CONTENT_MODEL_CSS, null, CONTENT_FORMAT_CSS ],
+ [ 'hello world', 'User:hello/there.css', null, null, CONTENT_FORMAT_CSS ],
+ [ serialize( 'hello world' ), 'Dummy:Hello', null, null, DummyContentForTesting::MODEL_ID ],
+ ];
+ }
+
+ /**
+ * @dataProvider provideGetContentFormat
+ * @covers Revision::getContentFormat
+ */
+ public function testGetContentFormat( $text, $title, $model, $format, $expectedFormat ) {
+ $rev = $this->newTestRevision( $text, $title, $model, $format );
+
+ $this->assertEquals( $expectedFormat, $rev->getContentFormat() );
+ }
+
+ public function provideGetContentHandler() {
+ // NOTE: we expect the help namespace to always contain wikitext
+ return [
+ [ 'hello world', 'Help:Hello', null, null, 'WikitextContentHandler' ],
+ [ 'hello world', 'User:hello/there.css', null, null, 'CssContentHandler' ],
+ [ serialize( 'hello world' ), 'Dummy:Hello', null, null, 'DummyContentHandlerForTesting' ],
+ ];
+ }
+
+ /**
+ * @dataProvider provideGetContentHandler
+ * @covers Revision::getContentHandler
+ */
+ public function testGetContentHandler( $text, $title, $model, $format, $expectedClass ) {
+ $rev = $this->newTestRevision( $text, $title, $model, $format );
+
+ $this->assertEquals( $expectedClass, get_class( $rev->getContentHandler() ) );
+ }
+
+ public function provideGetContent() {
+ // NOTE: we expect the help namespace to always contain wikitext
+ return [
+ [ 'hello world', 'Help:Hello', null, null, Revision::FOR_PUBLIC, 'hello world' ],
+ [
+ serialize( 'hello world' ),
+ 'Hello',
+ DummyContentForTesting::MODEL_ID,
+ null,
+ Revision::FOR_PUBLIC,
+ serialize( 'hello world' )
+ ],
+ [
+ serialize( 'hello world' ),
+ 'Dummy:Hello',
+ null,
+ null,
+ Revision::FOR_PUBLIC,
+ serialize( 'hello world' )
+ ],
+ ];
+ }
+
+ /**
+ * @dataProvider provideGetContent
+ * @covers Revision::getContent
+ */
+ public function testGetContent( $text, $title, $model, $format,
+ $audience, $expectedSerialization
+ ) {
+ $rev = $this->newTestRevision( $text, $title, $model, $format );
+ $content = $rev->getContent( $audience );
+
+ $this->assertEquals(
+ $expectedSerialization,
+ is_null( $content ) ? null : $content->serialize( $format )
+ );
+ }
+
+ /**
+ * @covers Revision::getContent
+ */
+ public function testGetContent_failure() {
+ $rev = new Revision( [
+ 'page' => $this->the_page->getId(),
+ 'content_model' => $this->the_page->getContentModel(),
+ 'text_id' => 123456789, // not in the test DB
+ ] );
+
+ $this->assertNull( $rev->getContent(),
+ "getContent() should return null if the revision's text blob could not be loaded." );
+
+ // NOTE: check this twice, once for lazy initialization, and once with the cached value.
+ $this->assertNull( $rev->getContent(),
+ "getContent() should return null if the revision's text blob could not be loaded." );
+ }
+
+ public function provideGetSize() {
+ return [
+ [ "hello world.", CONTENT_MODEL_WIKITEXT, 12 ],
+ [ serialize( "hello world." ), DummyContentForTesting::MODEL_ID, 12 ],
+ ];
+ }
+
+ /**
+ * @covers Revision::getSize
+ * @dataProvider provideGetSize
+ */
+ public function testGetSize( $text, $model, $expected_size ) {
+ $rev = $this->newTestRevision( $text, 'RevisionTest_testGetSize', $model );
+ $this->assertEquals( $expected_size, $rev->getSize() );
+ }
+
+ public function provideGetSha1() {
+ return [
+ [ "hello world.", CONTENT_MODEL_WIKITEXT, Revision::base36Sha1( "hello world." ) ],
+ [
+ serialize( "hello world." ),
+ DummyContentForTesting::MODEL_ID,
+ Revision::base36Sha1( serialize( "hello world." ) )
+ ],
+ ];
+ }
+
+ /**
+ * @covers Revision::getSha1
+ * @dataProvider provideGetSha1
+ */
+ public function testGetSha1( $text, $model, $expected_hash ) {
+ $rev = $this->newTestRevision( $text, 'RevisionTest_testGetSha1', $model );
+ $this->assertEquals( $expected_hash, $rev->getSha1() );
+ }
+
+ /**
+ * Tests whether $rev->getContent() returns a clone when needed.
+ *
+ * @covers Revision::getContent
+ */
+ public function testGetContentClone() {
+ $content = new RevisionTestModifyableContent( "foo" );
+
+ $rev = new Revision(
+ [
+ 'id' => 42,
+ 'page' => 23,
+ 'title' => Title::newFromText( "testGetContentClone_dummy" ),
+
+ 'content' => $content,
+ 'length' => $content->getSize(),
+ 'comment' => "testing",
+ 'minor_edit' => false,
+ ]
+ );
+
+ /** @var RevisionTestModifyableContent $content */
+ $content = $rev->getContent( Revision::RAW );
+ $content->setText( "bar" );
+
+ /** @var RevisionTestModifyableContent $content2 */
+ $content2 = $rev->getContent( Revision::RAW );
+ // content is mutable, expect clone
+ $this->assertNotSame( $content, $content2, "expected a clone" );
+ // clone should contain the original text
+ $this->assertEquals( "foo", $content2->getText() );
+
+ $content2->setText( "bla bla" );
+ // clones should be independent
+ $this->assertEquals( "bar", $content->getText() );
+ }
+
+ /**
+ * Tests whether $rev->getContent() returns the same object repeatedly if appropriate.
+ * @covers Revision::getContent
+ */
+ public function testGetContentUncloned() {
+ $rev = $this->newTestRevision( "hello", "testGetContentUncloned_dummy", CONTENT_MODEL_WIKITEXT );
+ $content = $rev->getContent( Revision::RAW );
+ $content2 = $rev->getContent( Revision::RAW );
+
+ // for immutable content like wikitext, this should be the same object
+ $this->assertSame( $content, $content2 );
+ }
+
+}
+++ /dev/null
-<?php
-
-/**
- * Test class for Revision storage.
- *
- * @group ContentHandler
- * @group Database
- * ^--- important, causes temporary tables to be used instead of the real database
- *
- * @group medium
- * ^--- important, causes tests not to fail with timeout
- */
-class RevisionStorageTest extends MediaWikiTestCase {
- /**
- * @var WikiPage $the_page
- */
- private $the_page;
-
- public function __construct( $name = null, array $data = [], $dataName = '' ) {
- parent::__construct( $name, $data, $dataName );
-
- $this->tablesUsed = array_merge( $this->tablesUsed,
- [ 'page',
- 'revision',
- 'ip_changes',
- 'text',
-
- 'recentchanges',
- 'logging',
-
- 'page_props',
- 'pagelinks',
- 'categorylinks',
- 'langlinks',
- 'externallinks',
- 'imagelinks',
- 'templatelinks',
- 'iwlinks' ] );
- }
-
- protected function setUp() {
- global $wgContLang;
-
- parent::setUp();
-
- $this->mergeMwGlobalArrayValue(
- 'wgExtraNamespaces',
- [
- 12312 => 'Dummy',
- 12313 => 'Dummy_talk',
- ]
- );
-
- $this->mergeMwGlobalArrayValue(
- 'wgNamespaceContentModels',
- [
- 12312 => 'DUMMY',
- ]
- );
-
- $this->mergeMwGlobalArrayValue(
- 'wgContentHandlers',
- [
- 'DUMMY' => 'DummyContentHandlerForTesting',
- ]
- );
-
- MWNamespace::clearCaches();
- // Reset namespace cache
- $wgContLang->resetNamespaces();
- if ( !$this->the_page ) {
- $this->the_page = $this->createPage(
- 'RevisionStorageTest_the_page',
- "just a dummy page",
- CONTENT_MODEL_WIKITEXT
- );
- }
-
- $this->tablesUsed[] = 'archive';
- }
-
- protected function tearDown() {
- global $wgContLang;
-
- parent::tearDown();
-
- MWNamespace::clearCaches();
- // Reset namespace cache
- $wgContLang->resetNamespaces();
- }
-
- protected function makeRevision( $props = null ) {
- if ( $props === null ) {
- $props = [];
- }
-
- if ( !isset( $props['content'] ) && !isset( $props['text'] ) ) {
- $props['text'] = 'Lorem Ipsum';
- }
-
- if ( !isset( $props['comment'] ) ) {
- $props['comment'] = 'just a test';
- }
-
- if ( !isset( $props['page'] ) ) {
- $props['page'] = $this->the_page->getId();
- }
-
- $rev = new Revision( $props );
-
- $dbw = wfGetDB( DB_MASTER );
- $rev->insertOn( $dbw );
-
- return $rev;
- }
-
- /**
- * @param string $titleString
- * @param string $text
- * @param string|null $model
- *
- * @return WikiPage
- */
- protected function createPage( $titleString, $text, $model = null ) {
- if ( !preg_match( '/:/', $titleString ) &&
- ( $model === null || $model === CONTENT_MODEL_WIKITEXT )
- ) {
- $ns = $this->getDefaultWikitextNS();
- $titleString = MWNamespace::getCanonicalName( $ns ) . ':' . $titleString;
- }
-
- $title = Title::newFromText( $titleString );
- $wikipage = new WikiPage( $title );
-
- // Delete the article if it already exists
- if ( $wikipage->exists() ) {
- $wikipage->doDeleteArticle( "done" );
- }
-
- $content = ContentHandler::makeContent( $text, $title, $model );
- $wikipage->doEditContent( $content, __METHOD__, EDIT_NEW );
-
- return $wikipage;
- }
-
- protected function assertRevEquals( Revision $orig, Revision $rev = null ) {
- $this->assertNotNull( $rev, 'missing revision' );
-
- $this->assertEquals( $orig->getId(), $rev->getId() );
- $this->assertEquals( $orig->getPage(), $rev->getPage() );
- $this->assertEquals( $orig->getTimestamp(), $rev->getTimestamp() );
- $this->assertEquals( $orig->getUser(), $rev->getUser() );
- $this->assertEquals( $orig->getContentModel(), $rev->getContentModel() );
- $this->assertEquals( $orig->getContentFormat(), $rev->getContentFormat() );
- $this->assertEquals( $orig->getSha1(), $rev->getSha1() );
- }
-
- /**
- * @covers Revision::__construct
- */
- public function testConstructFromRow() {
- $orig = $this->makeRevision();
-
- $dbr = wfGetDB( DB_REPLICA );
- $res = $dbr->select( 'revision', Revision::selectFields(), [ 'rev_id' => $orig->getId() ] );
- $this->assertTrue( is_object( $res ), 'query failed' );
-
- $row = $res->fetchObject();
- $res->free();
-
- $rev = new Revision( $row );
-
- $this->assertRevEquals( $orig, $rev );
- }
-
- /**
- * @covers Revision::newFromTitle
- */
- public function testNewFromTitle_withoutId() {
- $page = $this->createPage(
- __METHOD__,
- 'GOAT',
- CONTENT_MODEL_WIKITEXT
- );
- $latestRevId = $page->getLatest();
-
- $rev = Revision::newFromTitle( $page->getTitle() );
-
- $this->assertTrue( $page->getTitle()->equals( $rev->getTitle() ) );
- $this->assertEquals( $latestRevId, $rev->getId() );
- }
-
- /**
- * @covers Revision::newFromTitle
- */
- public function testNewFromTitle_withId() {
- $page = $this->createPage(
- __METHOD__,
- 'GOAT',
- CONTENT_MODEL_WIKITEXT
- );
- $latestRevId = $page->getLatest();
-
- $rev = Revision::newFromTitle( $page->getTitle(), $latestRevId );
-
- $this->assertTrue( $page->getTitle()->equals( $rev->getTitle() ) );
- $this->assertEquals( $latestRevId, $rev->getId() );
- }
-
- /**
- * @covers Revision::newFromTitle
- */
- public function testNewFromTitle_withBadId() {
- $page = $this->createPage(
- __METHOD__,
- 'GOAT',
- CONTENT_MODEL_WIKITEXT
- );
- $latestRevId = $page->getLatest();
-
- $rev = Revision::newFromTitle( $page->getTitle(), $latestRevId + 1 );
-
- $this->assertNull( $rev );
- }
-
- /**
- * @covers Revision::newFromRow
- */
- public function testNewFromRow() {
- $orig = $this->makeRevision();
-
- $dbr = wfGetDB( DB_REPLICA );
- $res = $dbr->select( 'revision', Revision::selectFields(), [ 'rev_id' => $orig->getId() ] );
- $this->assertTrue( is_object( $res ), 'query failed' );
-
- $row = $res->fetchObject();
- $res->free();
-
- $rev = Revision::newFromRow( $row );
-
- $this->assertRevEquals( $orig, $rev );
- }
-
- /**
- * @covers Revision::newFromArchiveRow
- */
- public function testNewFromArchiveRow() {
- $page = $this->createPage(
- 'RevisionStorageTest_testNewFromArchiveRow',
- 'Lorem Ipsum',
- CONTENT_MODEL_WIKITEXT
- );
- $orig = $page->getRevision();
- $page->doDeleteArticle( 'test Revision::newFromArchiveRow' );
-
- $dbr = wfGetDB( DB_REPLICA );
- $res = $dbr->select(
- 'archive', Revision::selectArchiveFields(), [ 'ar_rev_id' => $orig->getId() ]
- );
- $this->assertTrue( is_object( $res ), 'query failed' );
-
- $row = $res->fetchObject();
- $res->free();
-
- $rev = Revision::newFromArchiveRow( $row );
-
- $this->assertRevEquals( $orig, $rev );
- }
-
- /**
- * @covers Revision::newFromId
- */
- public function testNewFromId() {
- $orig = $this->makeRevision();
-
- $rev = Revision::newFromId( $orig->getId() );
-
- $this->assertRevEquals( $orig, $rev );
- }
-
- /**
- * @covers Revision::fetchRevision
- */
- public function testFetchRevision() {
- $page = $this->createPage(
- 'RevisionStorageTest_testFetchRevision',
- 'one',
- CONTENT_MODEL_WIKITEXT
- );
-
- // Hidden process cache assertion below
- $page->getRevision()->getId();
-
- $page->doEditContent( new WikitextContent( 'two' ), 'second rev' );
- $id = $page->getRevision()->getId();
-
- $res = Revision::fetchRevision( $page->getTitle() );
-
- # note: order is unspecified
- $rows = [];
- while ( ( $row = $res->fetchObject() ) ) {
- $rows[$row->rev_id] = $row;
- }
-
- $this->assertEquals( 1, count( $rows ), 'expected exactly one revision' );
- $this->assertArrayHasKey( $id, $rows, 'missing revision with id ' . $id );
- }
-
- /**
- * @covers Revision::selectFields
- */
- public function testSelectFields() {
- global $wgContentHandlerUseDB;
-
- $fields = Revision::selectFields();
-
- $this->assertTrue( in_array( 'rev_id', $fields ), 'missing rev_id in list of fields' );
- $this->assertTrue( in_array( 'rev_page', $fields ), 'missing rev_page in list of fields' );
- $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' );
-
- 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' );
- }
- }
-
- /**
- * @covers Revision::getPage
- */
- public function testGetPage() {
- $page = $this->the_page;
-
- $orig = $this->makeRevision( [ 'page' => $page->getId() ] );
- $rev = Revision::newFromId( $orig->getId() );
-
- $this->assertEquals( $page->getId(), $rev->getPage() );
- }
-
- /**
- * @covers Revision::getContent
- */
- public function testGetContent_failure() {
- $rev = new Revision( [
- 'page' => $this->the_page->getId(),
- 'content_model' => $this->the_page->getContentModel(),
- 'text_id' => 123456789, // not in the test DB
- ] );
-
- $this->assertNull( $rev->getContent(),
- "getContent() should return null if the revision's text blob could not be loaded." );
-
- // NOTE: check this twice, once for lazy initialization, and once with the cached value.
- $this->assertNull( $rev->getContent(),
- "getContent() should return null if the revision's text blob could not be loaded." );
- }
-
- /**
- * @covers Revision::getContent
- */
- public function testGetContent() {
- $orig = $this->makeRevision( [ 'text' => 'hello hello.' ] );
- $rev = Revision::newFromId( $orig->getId() );
-
- $this->assertEquals( 'hello hello.', $rev->getContent()->getNativeData() );
- }
-
- /**
- * @covers Revision::getContentModel
- */
- public function testGetContentModel() {
- global $wgContentHandlerUseDB;
-
- if ( !$wgContentHandlerUseDB ) {
- $this->markTestSkipped( '$wgContentHandlerUseDB is disabled' );
- }
-
- $orig = $this->makeRevision( [ 'text' => 'hello hello.',
- 'content_model' => CONTENT_MODEL_JAVASCRIPT ] );
- $rev = Revision::newFromId( $orig->getId() );
-
- $this->assertEquals( CONTENT_MODEL_JAVASCRIPT, $rev->getContentModel() );
- }
-
- /**
- * @covers Revision::getContentFormat
- */
- public function testGetContentFormat() {
- global $wgContentHandlerUseDB;
-
- if ( !$wgContentHandlerUseDB ) {
- $this->markTestSkipped( '$wgContentHandlerUseDB is disabled' );
- }
-
- $orig = $this->makeRevision( [
- 'text' => 'hello hello.',
- 'content_model' => CONTENT_MODEL_JAVASCRIPT,
- 'content_format' => CONTENT_FORMAT_JAVASCRIPT
- ] );
- $rev = Revision::newFromId( $orig->getId() );
-
- $this->assertEquals( CONTENT_FORMAT_JAVASCRIPT, $rev->getContentFormat() );
- }
-
- /**
- * @covers Revision::isCurrent
- */
- public function testIsCurrent() {
- $page = $this->createPage(
- 'RevisionStorageTest_testIsCurrent',
- 'Lorem Ipsum',
- CONTENT_MODEL_WIKITEXT
- );
- $rev1 = $page->getRevision();
-
- # @todo find out if this should be true
- # $this->assertTrue( $rev1->isCurrent() );
-
- $rev1x = Revision::newFromId( $rev1->getId() );
- $this->assertTrue( $rev1x->isCurrent() );
-
- $page->doEditContent(
- ContentHandler::makeContent( 'Bla bla', $page->getTitle(), CONTENT_MODEL_WIKITEXT ),
- 'second rev'
- );
- $rev2 = $page->getRevision();
-
- # @todo find out if this should be true
- # $this->assertTrue( $rev2->isCurrent() );
-
- $rev1x = Revision::newFromId( $rev1->getId() );
- $this->assertFalse( $rev1x->isCurrent() );
-
- $rev2x = Revision::newFromId( $rev2->getId() );
- $this->assertTrue( $rev2x->isCurrent() );
- }
-
- /**
- * @covers Revision::getPrevious
- */
- public function testGetPrevious() {
- $page = $this->createPage(
- 'RevisionStorageTest_testGetPrevious',
- 'Lorem Ipsum testGetPrevious',
- CONTENT_MODEL_WIKITEXT
- );
- $rev1 = $page->getRevision();
-
- $this->assertNull( $rev1->getPrevious() );
-
- $page->doEditContent(
- ContentHandler::makeContent( 'Bla bla', $page->getTitle(), CONTENT_MODEL_WIKITEXT ),
- 'second rev testGetPrevious' );
- $rev2 = $page->getRevision();
-
- $this->assertNotNull( $rev2->getPrevious() );
- $this->assertEquals( $rev1->getId(), $rev2->getPrevious()->getId() );
- }
-
- /**
- * @covers Revision::getNext
- */
- public function testGetNext() {
- $page = $this->createPage(
- 'RevisionStorageTest_testGetNext',
- 'Lorem Ipsum testGetNext',
- CONTENT_MODEL_WIKITEXT
- );
- $rev1 = $page->getRevision();
-
- $this->assertNull( $rev1->getNext() );
-
- $page->doEditContent(
- ContentHandler::makeContent( 'Bla bla', $page->getTitle(), CONTENT_MODEL_WIKITEXT ),
- 'second rev testGetNext'
- );
- $rev2 = $page->getRevision();
-
- $this->assertNotNull( $rev1->getNext() );
- $this->assertEquals( $rev2->getId(), $rev1->getNext()->getId() );
- }
-
- /**
- * @covers Revision::newNullRevision
- */
- public function testNewNullRevision() {
- $page = $this->createPage(
- 'RevisionStorageTest_testNewNullRevision',
- 'some testing text',
- CONTENT_MODEL_WIKITEXT
- );
- $orig = $page->getRevision();
-
- $dbw = wfGetDB( DB_MASTER );
- $rev = Revision::newNullRevision( $dbw, $page->getId(), 'a null revision', false );
-
- $this->assertNotEquals( $orig->getId(), $rev->getId(),
- 'new null revision shold have a different id from the original revision' );
- $this->assertEquals( $orig->getTextId(), $rev->getTextId(),
- 'new null revision shold have the same text id as the original revision' );
- $this->assertEquals( 'some testing text', $rev->getContent()->getNativeData() );
- }
-
- /**
- * @covers Revision::insertOn
- */
- public function testInsertOn() {
- $ip = '2600:387:ed7:947e:8c16:a1ad:dd34:1dd7';
-
- $orig = $this->makeRevision( [
- 'user_text' => $ip
- ] );
-
- // Make sure the revision was copied to ip_changes
- $dbr = wfGetDB( DB_REPLICA );
- $res = $dbr->select( 'ip_changes', '*', [ 'ipc_rev_id' => $orig->getId() ] );
- $row = $res->fetchObject();
-
- $this->assertEquals( IP::toHex( $ip ), $row->ipc_hex );
- $this->assertEquals( $orig->getTimestamp(), $row->ipc_rev_timestamp );
- }
-
- public static function provideUserWasLastToEdit() {
- yield 'actually the last edit' => [ 3, true ];
- yield 'not the current edit, but still by this user' => [ 2, true ];
- yield 'edit by another user' => [ 1, false ];
- yield 'first edit, by this user, but another user edited in the mean time' => [ 0, false ];
- }
-
- /**
- * @dataProvider provideUserWasLastToEdit
- */
- public function testUserWasLastToEdit( $sinceIdx, $expectedLast ) {
- $userA = User::newFromName( "RevisionStorageTest_userA" );
- $userB = User::newFromName( "RevisionStorageTest_userB" );
-
- if ( $userA->getId() === 0 ) {
- $userA = User::createNew( $userA->getName() );
- }
-
- if ( $userB->getId() === 0 ) {
- $userB = User::createNew( $userB->getName() );
- }
-
- $ns = $this->getDefaultWikitextNS();
-
- $dbw = wfGetDB( DB_MASTER );
- $revisions = [];
-
- // create revisions -----------------------------
- $page = WikiPage::factory( Title::newFromText(
- 'RevisionStorageTest_testUserWasLastToEdit', $ns ) );
- $page->insertOn( $dbw );
-
- $revisions[0] = new Revision( [
- 'page' => $page->getId(),
- // we need the title to determine the page's default content model
- 'title' => $page->getTitle(),
- 'timestamp' => '20120101000000',
- 'user' => $userA->getId(),
- 'text' => 'zero',
- 'content_model' => CONTENT_MODEL_WIKITEXT,
- 'summary' => 'edit zero'
- ] );
- $revisions[0]->insertOn( $dbw );
-
- $revisions[1] = new Revision( [
- 'page' => $page->getId(),
- // still need the title, because $page->getId() is 0 (there's no entry in the page table)
- 'title' => $page->getTitle(),
- 'timestamp' => '20120101000100',
- 'user' => $userA->getId(),
- 'text' => 'one',
- 'content_model' => CONTENT_MODEL_WIKITEXT,
- 'summary' => 'edit one'
- ] );
- $revisions[1]->insertOn( $dbw );
-
- $revisions[2] = new Revision( [
- 'page' => $page->getId(),
- 'title' => $page->getTitle(),
- 'timestamp' => '20120101000200',
- 'user' => $userB->getId(),
- 'text' => 'two',
- 'content_model' => CONTENT_MODEL_WIKITEXT,
- 'summary' => 'edit two'
- ] );
- $revisions[2]->insertOn( $dbw );
-
- $revisions[3] = new Revision( [
- 'page' => $page->getId(),
- 'title' => $page->getTitle(),
- 'timestamp' => '20120101000300',
- 'user' => $userA->getId(),
- 'text' => 'three',
- 'content_model' => CONTENT_MODEL_WIKITEXT,
- 'summary' => 'edit three'
- ] );
- $revisions[3]->insertOn( $dbw );
-
- $revisions[4] = new Revision( [
- 'page' => $page->getId(),
- 'title' => $page->getTitle(),
- 'timestamp' => '20120101000200',
- 'user' => $userA->getId(),
- 'text' => 'zero',
- 'content_model' => CONTENT_MODEL_WIKITEXT,
- 'summary' => 'edit four'
- ] );
- $revisions[4]->insertOn( $dbw );
-
- // test it ---------------------------------
- $since = $revisions[$sinceIdx]->getTimestamp();
-
- $wasLast = Revision::userWasLastToEdit( $dbw, $page->getId(), $userA->getId(), $since );
-
- $this->assertEquals( $expectedLast, $wasLast );
- }
-}
+++ /dev/null
-<?php
-
-/**
- * @group ContentHandler
- */
-class RevisionTest extends MediaWikiTestCase {
-
- protected function setUp() {
- global $wgContLang;
-
- parent::setUp();
-
- $this->setMwGlobals( [
- 'wgContLang' => Language::factory( 'en' ),
- 'wgLanguageCode' => 'en',
- 'wgLegacyEncoding' => false,
- 'wgCompressRevisions' => false,
-
- 'wgContentHandlerTextFallback' => 'ignore',
- ] );
-
- $this->mergeMwGlobalArrayValue(
- 'wgExtraNamespaces',
- [
- 12312 => 'Dummy',
- 12313 => 'Dummy_talk',
- ]
- );
-
- $this->mergeMwGlobalArrayValue(
- 'wgNamespaceContentModels',
- [
- 12312 => 'testing',
- ]
- );
-
- $this->mergeMwGlobalArrayValue(
- 'wgContentHandlers',
- [
- 'testing' => 'DummyContentHandlerForTesting',
- 'RevisionTestModifyableContent' => 'RevisionTestModifyableContentHandler',
- ]
- );
-
- MWNamespace::clearCaches();
- // Reset namespace cache
- $wgContLang->resetNamespaces();
- }
-
- protected function tearDown() {
- global $wgContLang;
-
- MWNamespace::clearCaches();
- // Reset namespace cache
- $wgContLang->resetNamespaces();
-
- parent::tearDown();
- }
-
- public function provideConstructFromArray() {
- yield 'with text' => [
- [
- 'text' => 'hello world.',
- 'content_model' => CONTENT_MODEL_JAVASCRIPT
- ],
- ];
- yield 'with content' => [
- [
- 'content' => new JavaScriptContent( 'hellow world.' )
- ],
- ];
- }
-
- /**
- * @dataProvider provideConstructFromArray
- */
- public function testConstructFromArray( $rowArray ) {
- $rev = new Revision( $rowArray );
- $this->assertNotNull( $rev->getContent(), 'no content object available' );
- $this->assertEquals( CONTENT_MODEL_JAVASCRIPT, $rev->getContent()->getModel() );
- $this->assertEquals( CONTENT_MODEL_JAVASCRIPT, $rev->getContentModel() );
- }
-
- public function provideConstructFromArrayThrowsExceptions() {
- yield 'content and text_id both not empty' => [
- [
- 'content' => new WikitextContent( 'GOAT' ),
- 'text_id' => 'someid',
- ],
- new MWException( "Text already stored in external store (id someid), " .
- "can't serialize content object" )
- ];
- yield 'with bad content object (class)' => [
- [ 'content' => new stdClass() ],
- new MWException( '`content` field must contain a Content object.' )
- ];
- yield 'with bad content object (string)' => [
- [ 'content' => 'ImAGoat' ],
- new MWException( '`content` field must contain a Content object.' )
- ];
- yield 'bad row format' => [
- 'imastring, not a row',
- new MWException( 'Revision constructor passed invalid row format.' )
- ];
- }
-
- /**
- * @dataProvider provideConstructFromArrayThrowsExceptions
- */
- public function testConstructFromArrayThrowsExceptions( $rowArray, Exception $expectedException ) {
- $this->setExpectedException(
- get_class( $expectedException ),
- $expectedException->getMessage(),
- $expectedException->getCode()
- );
- new Revision( $rowArray );
- }
-
- public function provideGetRevisionText() {
- yield 'Generic test' => [
- 'This is a goat of revision text.',
- [
- 'old_flags' => '',
- 'old_text' => 'This is a goat of revision text.',
- ],
- ];
- }
-
- /**
- * @covers Revision::getRevisionText
- * @dataProvider provideGetRevisionText
- */
- public function testGetRevisionText( $expected, $rowData, $prefix = 'old_', $wiki = false ) {
- $this->assertEquals(
- $expected,
- Revision::getRevisionText( (object)$rowData, $prefix, $wiki ) );
- }
-
- public function provideGetRevisionTextWithZlibExtension() {
- yield 'Generic gzip test' => [
- 'This is a small goat of revision text.',
- [
- 'old_flags' => 'gzip',
- 'old_text' => gzdeflate( 'This is a small goat of revision text.' ),
- ],
- ];
- }
-
- /**
- * @covers Revision::getRevisionText
- * @dataProvider provideGetRevisionTextWithZlibExtension
- */
- public function testGetRevisionWithZlibExtension( $expected, $rowData ) {
- $this->checkPHPExtension( 'zlib' );
- $this->testGetRevisionText( $expected, $rowData );
- }
-
- public function provideGetRevisionTextWithLegacyEncoding() {
- yield 'Utf8Native' => [
- "Wiki est l'\xc3\xa9cole superieur !",
- 'iso-8859-1',
- [
- 'old_flags' => 'utf-8',
- 'old_text' => "Wiki est l'\xc3\xa9cole superieur !",
- ]
- ];
- yield 'Utf8Legacy' => [
- "Wiki est l'\xc3\xa9cole superieur !",
- 'iso-8859-1',
- [
- 'old_flags' => '',
- 'old_text' => "Wiki est l'\xe9cole superieur !",
- ]
- ];
- }
-
- /**
- * @covers Revision::getRevisionText
- * @dataProvider provideGetRevisionTextWithLegacyEncoding
- */
- public function testGetRevisionWithLegacyEncoding( $expected, $encoding, $rowData ) {
- $GLOBALS['wgLegacyEncoding'] = $encoding;
- $this->testGetRevisionText( $expected, $rowData );
- }
-
- public function provideGetRevisionTextWithGzipAndLegacyEncoding() {
- yield 'Utf8NativeGzip' => [
- "Wiki est l'\xc3\xa9cole superieur !",
- 'iso-8859-1',
- [
- 'old_flags' => 'gzip,utf-8',
- 'old_text' => gzdeflate( "Wiki est l'\xc3\xa9cole superieur !" ),
- ]
- ];
- yield 'Utf8LegacyGzip' => [
- "Wiki est l'\xc3\xa9cole superieur !",
- 'iso-8859-1',
- [
- 'old_flags' => 'gzip',
- 'old_text' => gzdeflate( "Wiki est l'\xe9cole superieur !" ),
- ]
- ];
- }
-
- /**
- * @covers Revision::getRevisionText
- * @dataProvider provideGetRevisionTextWithGzipAndLegacyEncoding
- */
- public function testGetRevisionWithGzipAndLegacyEncoding( $expected, $encoding, $rowData ) {
- $this->checkPHPExtension( 'zlib' );
- $GLOBALS['wgLegacyEncoding'] = $encoding;
- $this->testGetRevisionText( $expected, $rowData );
- }
-
- /**
- * @covers Revision::compressRevisionText
- */
- public function testCompressRevisionTextUtf8() {
- $row = new stdClass;
- $row->old_text = "Wiki est l'\xc3\xa9cole superieur !";
- $row->old_flags = Revision::compressRevisionText( $row->old_text );
- $this->assertTrue( false !== strpos( $row->old_flags, 'utf-8' ),
- "Flags should contain 'utf-8'" );
- $this->assertFalse( false !== strpos( $row->old_flags, 'gzip' ),
- "Flags should not contain 'gzip'" );
- $this->assertEquals( "Wiki est l'\xc3\xa9cole superieur !",
- $row->old_text, "Direct check" );
- $this->assertEquals( "Wiki est l'\xc3\xa9cole superieur !",
- Revision::getRevisionText( $row ), "getRevisionText" );
- }
-
- /**
- * @covers Revision::compressRevisionText
- */
- public function testCompressRevisionTextUtf8Gzip() {
- $this->checkPHPExtension( 'zlib' );
- $this->setMwGlobals( 'wgCompressRevisions', true );
-
- $row = new stdClass;
- $row->old_text = "Wiki est l'\xc3\xa9cole superieur !";
- $row->old_flags = Revision::compressRevisionText( $row->old_text );
- $this->assertTrue( false !== strpos( $row->old_flags, 'utf-8' ),
- "Flags should contain 'utf-8'" );
- $this->assertTrue( false !== strpos( $row->old_flags, 'gzip' ),
- "Flags should contain 'gzip'" );
- $this->assertEquals( "Wiki est l'\xc3\xa9cole superieur !",
- gzinflate( $row->old_text ), "Direct check" );
- $this->assertEquals( "Wiki est l'\xc3\xa9cole superieur !",
- Revision::getRevisionText( $row ), "getRevisionText" );
- }
-
- /**
- * @param string $text
- * @param string $title
- * @param string $model
- * @param string $format
- *
- * @return Revision
- */
- private function newTestRevision( $text, $title = "Test",
- $model = CONTENT_MODEL_WIKITEXT, $format = null
- ) {
- if ( is_string( $title ) ) {
- $title = Title::newFromText( $title );
- }
-
- $content = ContentHandler::makeContent( $text, $title, $model, $format );
-
- $rev = new Revision(
- [
- 'id' => 42,
- 'page' => 23,
- 'title' => $title,
-
- 'content' => $content,
- 'length' => $content->getSize(),
- 'comment' => "testing",
- 'minor_edit' => false,
-
- 'content_format' => $format,
- ]
- );
-
- return $rev;
- }
-
- public function provideGetContentModel() {
- // NOTE: we expect the help namespace to always contain wikitext
- return [
- [ 'hello world', 'Help:Hello', null, null, CONTENT_MODEL_WIKITEXT ],
- [ 'hello world', 'User:hello/there.css', null, null, CONTENT_MODEL_CSS ],
- [ serialize( 'hello world' ), 'Dummy:Hello', null, null, "testing" ],
- ];
- }
-
- /**
- * @group Database
- * @dataProvider provideGetContentModel
- * @covers Revision::getContentModel
- */
- public function testGetContentModel( $text, $title, $model, $format, $expectedModel ) {
- $rev = $this->newTestRevision( $text, $title, $model, $format );
-
- $this->assertEquals( $expectedModel, $rev->getContentModel() );
- }
-
- public function provideGetContentFormat() {
- // NOTE: we expect the help namespace to always contain wikitext
- return [
- [ 'hello world', 'Help:Hello', null, null, CONTENT_FORMAT_WIKITEXT ],
- [ 'hello world', 'Help:Hello', CONTENT_MODEL_CSS, null, CONTENT_FORMAT_CSS ],
- [ 'hello world', 'User:hello/there.css', null, null, CONTENT_FORMAT_CSS ],
- [ serialize( 'hello world' ), 'Dummy:Hello', null, null, "testing" ],
- ];
- }
-
- /**
- * @group Database
- * @dataProvider provideGetContentFormat
- * @covers Revision::getContentFormat
- */
- public function testGetContentFormat( $text, $title, $model, $format, $expectedFormat ) {
- $rev = $this->newTestRevision( $text, $title, $model, $format );
-
- $this->assertEquals( $expectedFormat, $rev->getContentFormat() );
- }
-
- public function provideGetContentHandler() {
- // NOTE: we expect the help namespace to always contain wikitext
- return [
- [ 'hello world', 'Help:Hello', null, null, 'WikitextContentHandler' ],
- [ 'hello world', 'User:hello/there.css', null, null, 'CssContentHandler' ],
- [ serialize( 'hello world' ), 'Dummy:Hello', null, null, 'DummyContentHandlerForTesting' ],
- ];
- }
-
- /**
- * @group Database
- * @dataProvider provideGetContentHandler
- * @covers Revision::getContentHandler
- */
- public function testGetContentHandler( $text, $title, $model, $format, $expectedClass ) {
- $rev = $this->newTestRevision( $text, $title, $model, $format );
-
- $this->assertEquals( $expectedClass, get_class( $rev->getContentHandler() ) );
- }
-
- public function provideGetContent() {
- // NOTE: we expect the help namespace to always contain wikitext
- return [
- [ 'hello world', 'Help:Hello', null, null, Revision::FOR_PUBLIC, 'hello world' ],
- [
- serialize( 'hello world' ),
- 'Hello',
- "testing",
- null,
- Revision::FOR_PUBLIC,
- serialize( 'hello world' )
- ],
- [
- serialize( 'hello world' ),
- 'Dummy:Hello',
- null,
- null,
- Revision::FOR_PUBLIC,
- serialize( 'hello world' )
- ],
- ];
- }
-
- /**
- * @group Database
- * @dataProvider provideGetContent
- * @covers Revision::getContent
- */
- public function testGetContent( $text, $title, $model, $format,
- $audience, $expectedSerialization
- ) {
- $rev = $this->newTestRevision( $text, $title, $model, $format );
- $content = $rev->getContent( $audience );
-
- $this->assertEquals(
- $expectedSerialization,
- is_null( $content ) ? null : $content->serialize( $format )
- );
- }
-
- public function provideGetSize() {
- return [
- [ "hello world.", CONTENT_MODEL_WIKITEXT, 12 ],
- [ serialize( "hello world." ), "testing", 12 ],
- ];
- }
-
- /**
- * @covers Revision::getSize
- * @group Database
- * @dataProvider provideGetSize
- */
- public function testGetSize( $text, $model, $expected_size ) {
- $rev = $this->newTestRevision( $text, 'RevisionTest_testGetSize', $model );
- $this->assertEquals( $expected_size, $rev->getSize() );
- }
-
- public function provideGetSha1() {
- return [
- [ "hello world.", CONTENT_MODEL_WIKITEXT, Revision::base36Sha1( "hello world." ) ],
- [
- serialize( "hello world." ),
- "testing",
- Revision::base36Sha1( serialize( "hello world." ) )
- ],
- ];
- }
-
- /**
- * @covers Revision::getSha1
- * @group Database
- * @dataProvider provideGetSha1
- */
- public function testGetSha1( $text, $model, $expected_hash ) {
- $rev = $this->newTestRevision( $text, 'RevisionTest_testGetSha1', $model );
- $this->assertEquals( $expected_hash, $rev->getSha1() );
- }
-
- /**
- * Tests whether $rev->getContent() returns a clone when needed.
- *
- * @group Database
- * @covers Revision::getContent
- */
- public function testGetContentClone() {
- $content = new RevisionTestModifyableContent( "foo" );
-
- $rev = new Revision(
- [
- 'id' => 42,
- 'page' => 23,
- 'title' => Title::newFromText( "testGetContentClone_dummy" ),
-
- 'content' => $content,
- 'length' => $content->getSize(),
- 'comment' => "testing",
- 'minor_edit' => false,
- ]
- );
-
- /** @var RevisionTestModifyableContent $content */
- $content = $rev->getContent( Revision::RAW );
- $content->setText( "bar" );
-
- /** @var RevisionTestModifyableContent $content2 */
- $content2 = $rev->getContent( Revision::RAW );
- // content is mutable, expect clone
- $this->assertNotSame( $content, $content2, "expected a clone" );
- // clone should contain the original text
- $this->assertEquals( "foo", $content2->getText() );
-
- $content2->setText( "bla bla" );
- // clones should be independent
- $this->assertEquals( "bar", $content->getText() );
- }
-
- /**
- * Tests whether $rev->getContent() returns the same object repeatedly if appropriate.
- *
- * @group Database
- * @covers Revision::getContent
- */
- public function testGetContentUncloned() {
- $rev = $this->newTestRevision( "hello", "testGetContentUncloned_dummy", CONTENT_MODEL_WIKITEXT );
- $content = $rev->getContent( Revision::RAW );
- $content2 = $rev->getContent( Revision::RAW );
-
- // for immutable content like wikitext, this should be the same object
- $this->assertSame( $content, $content2 );
- }
-}
class RevisionTestModifyableContent extends TextContent {
+ const MODEL_ID = "RevisionTestModifyableContent";
+
public function __construct( $text ) {
- parent::__construct( $text, "RevisionTestModifyableContent" );
+ parent::__construct( $text, self::MODEL_ID );
}
public function copy() {
class RevisionTestModifyableContentHandler extends TextContentHandler {
public function __construct() {
- parent::__construct( "RevisionTestModifyableContent", [ CONTENT_FORMAT_TEXT ] );
+ parent::__construct( RevisionTestModifyableContent::MODEL_ID, [ CONTENT_FORMAT_TEXT ] );
}
public function unserializeContent( $text, $format = null ) {
--- /dev/null
+<?php
+
+/**
+ * @group ContentHandler
+ */
+class RevisionUnitTest extends MediaWikiTestCase {
+
+ public function provideConstructFromArray() {
+ yield 'with text' => [
+ [
+ 'text' => 'hello world.',
+ 'content_model' => CONTENT_MODEL_JAVASCRIPT
+ ],
+ ];
+ yield 'with content' => [
+ [
+ 'content' => new JavaScriptContent( 'hellow world.' )
+ ],
+ ];
+ }
+
+ /**
+ * @dataProvider provideConstructFromArray
+ */
+ public function testConstructFromArray( $rowArray ) {
+ $rev = new Revision( $rowArray );
+ $this->assertNotNull( $rev->getContent(), 'no content object available' );
+ $this->assertEquals( CONTENT_MODEL_JAVASCRIPT, $rev->getContent()->getModel() );
+ $this->assertEquals( CONTENT_MODEL_JAVASCRIPT, $rev->getContentModel() );
+ }
+
+ public function provideConstructFromArrayThrowsExceptions() {
+ yield 'content and text_id both not empty' => [
+ [
+ 'content' => new WikitextContent( 'GOAT' ),
+ 'text_id' => 'someid',
+ ],
+ new MWException( "Text already stored in external store (id someid), " .
+ "can't serialize content object" )
+ ];
+ yield 'with bad content object (class)' => [
+ [ 'content' => new stdClass() ],
+ new MWException( '`content` field must contain a Content object.' )
+ ];
+ yield 'with bad content object (string)' => [
+ [ 'content' => 'ImAGoat' ],
+ new MWException( '`content` field must contain a Content object.' )
+ ];
+ yield 'bad row format' => [
+ 'imastring, not a row',
+ new MWException( 'Revision constructor passed invalid row format.' )
+ ];
+ }
+
+ /**
+ * @dataProvider provideConstructFromArrayThrowsExceptions
+ */
+ public function testConstructFromArrayThrowsExceptions( $rowArray, Exception $expectedException ) {
+ $this->setExpectedException(
+ get_class( $expectedException ),
+ $expectedException->getMessage(),
+ $expectedException->getCode()
+ );
+ new Revision( $rowArray );
+ }
+
+ public function provideGetRevisionText() {
+ yield 'Generic test' => [
+ 'This is a goat of revision text.',
+ [
+ 'old_flags' => '',
+ 'old_text' => 'This is a goat of revision text.',
+ ],
+ ];
+ }
+
+ /**
+ * @covers Revision::getRevisionText
+ * @dataProvider provideGetRevisionText
+ */
+ public function testGetRevisionText( $expected, $rowData, $prefix = 'old_', $wiki = false ) {
+ $this->assertEquals(
+ $expected,
+ Revision::getRevisionText( (object)$rowData, $prefix, $wiki ) );
+ }
+
+ public function provideGetRevisionTextWithZlibExtension() {
+ yield 'Generic gzip test' => [
+ 'This is a small goat of revision text.',
+ [
+ 'old_flags' => 'gzip',
+ 'old_text' => gzdeflate( 'This is a small goat of revision text.' ),
+ ],
+ ];
+ }
+
+ /**
+ * @covers Revision::getRevisionText
+ * @dataProvider provideGetRevisionTextWithZlibExtension
+ */
+ public function testGetRevisionWithZlibExtension( $expected, $rowData ) {
+ $this->checkPHPExtension( 'zlib' );
+ $this->testGetRevisionText( $expected, $rowData );
+ }
+
+ public function provideGetRevisionTextWithLegacyEncoding() {
+ yield 'Utf8Native' => [
+ "Wiki est l'\xc3\xa9cole superieur !",
+ 'iso-8859-1',
+ [
+ 'old_flags' => 'utf-8',
+ 'old_text' => "Wiki est l'\xc3\xa9cole superieur !",
+ ]
+ ];
+ yield 'Utf8Legacy' => [
+ "Wiki est l'\xc3\xa9cole superieur !",
+ 'iso-8859-1',
+ [
+ 'old_flags' => '',
+ 'old_text' => "Wiki est l'\xe9cole superieur !",
+ ]
+ ];
+ }
+
+ /**
+ * @covers Revision::getRevisionText
+ * @dataProvider provideGetRevisionTextWithLegacyEncoding
+ */
+ public function testGetRevisionWithLegacyEncoding( $expected, $encoding, $rowData ) {
+ $this->setMwGlobals( 'wgLegacyEncoding', $encoding );
+ $this->testGetRevisionText( $expected, $rowData );
+ }
+
+ public function provideGetRevisionTextWithGzipAndLegacyEncoding() {
+ /**
+ * WARNING!
+ * Do not set the external flag!
+ * Otherwise, getRevisionText will hit the live database (if ExternalStore is enabled)!
+ */
+ yield 'Utf8NativeGzip' => [
+ "Wiki est l'\xc3\xa9cole superieur !",
+ 'iso-8859-1',
+ [
+ 'old_flags' => 'gzip,utf-8',
+ 'old_text' => gzdeflate( "Wiki est l'\xc3\xa9cole superieur !" ),
+ ]
+ ];
+ yield 'Utf8LegacyGzip' => [
+ "Wiki est l'\xc3\xa9cole superieur !",
+ 'iso-8859-1',
+ [
+ 'old_flags' => 'gzip',
+ 'old_text' => gzdeflate( "Wiki est l'\xe9cole superieur !" ),
+ ]
+ ];
+ }
+
+ /**
+ * @covers Revision::getRevisionText
+ * @dataProvider provideGetRevisionTextWithGzipAndLegacyEncoding
+ */
+ public function testGetRevisionWithGzipAndLegacyEncoding( $expected, $encoding, $rowData ) {
+ $this->checkPHPExtension( 'zlib' );
+ $this->setMwGlobals( 'wgLegacyEncoding', $encoding );
+ $this->testGetRevisionText( $expected, $rowData );
+ }
+
+ /**
+ * @covers Revision::compressRevisionText
+ */
+ public function testCompressRevisionTextUtf8() {
+ $row = new stdClass;
+ $row->old_text = "Wiki est l'\xc3\xa9cole superieur !";
+ $row->old_flags = Revision::compressRevisionText( $row->old_text );
+ $this->assertTrue( false !== strpos( $row->old_flags, 'utf-8' ),
+ "Flags should contain 'utf-8'" );
+ $this->assertFalse( false !== strpos( $row->old_flags, 'gzip' ),
+ "Flags should not contain 'gzip'" );
+ $this->assertEquals( "Wiki est l'\xc3\xa9cole superieur !",
+ $row->old_text, "Direct check" );
+ $this->assertEquals( "Wiki est l'\xc3\xa9cole superieur !",
+ Revision::getRevisionText( $row ), "getRevisionText" );
+ }
+
+ /**
+ * @covers Revision::compressRevisionText
+ */
+ public function testCompressRevisionTextUtf8Gzip() {
+ $this->checkPHPExtension( 'zlib' );
+ $this->setMwGlobals( 'wgCompressRevisions', true );
+
+ $row = new stdClass;
+ $row->old_text = "Wiki est l'\xc3\xa9cole superieur !";
+ $row->old_flags = Revision::compressRevisionText( $row->old_text );
+ $this->assertTrue( false !== strpos( $row->old_flags, 'utf-8' ),
+ "Flags should contain 'utf-8'" );
+ $this->assertTrue( false !== strpos( $row->old_flags, 'gzip' ),
+ "Flags should contain 'gzip'" );
+ $this->assertEquals( "Wiki est l'\xc3\xa9cole superieur !",
+ gzinflate( $row->old_text ), "Direct check" );
+ $this->assertEquals( "Wiki est l'\xc3\xa9cole superieur !",
+ Revision::getRevisionText( $row ), "getRevisionText" );
+ }
+
+}
class DummyContentForTesting extends AbstractContent {
+ const MODEL_ID = "testing";
+
public function __construct( $data ) {
- parent::__construct( "testing" );
+ parent::__construct( self::MODEL_ID );
$this->data = $data;
}
class DummyContentHandlerForTesting extends ContentHandler {
public function __construct( $dataModel ) {
- parent::__construct( $dataModel, [ "testing" ] );
+ parent::__construct( $dataModel, [ DummyContentForTesting::MODEL_ID ] );
}
/**
dépôts / lhc / web / wiklou.git / commitdiff