wiki.techinc.nl/tests/phpunit/includes/diff/DifferenceEngineTest.php

355 lines
11 KiB
PHP
Raw Normal View History

<?php
[MCR] Render multi-slot diffs Move logic for rendering a diff between two content objects out of DifferenceEngine, into a new SlotDiffRenderer class. Make DifferenceEngine use multiple SlotDiffRenderers, one per slot. This separates the class tree for changing high-level diff properties such as the header or the revision selection method (same as before: subclass DifferenceEngine and override ContentHandler::getDiffEngineClass or implement GetDifferenceEngine) and the one for changing the actual diff rendering for a given content type (subclass SlotDiffRenderer and override ContentHandler::getSlotDiffRenderer or implement GetSlotDiffRenderer). To keep B/C, when SlotDiffRenderer is not overridden for a given content type but DifferenceEngine is, that DifferenceEngine will be used instead. The weak point of the scheme is overriding the DifferenceEngine methods passing control to the SlotDiffRenderers (the ones calling getDifferenceEngines), without calling the parent. These are: showDiffStyle, getDiffBody, getDiffBodyCacheKeyParams. Extensions doing that will probably break in unpredictable ways (most likely, only showing the main slot diff). Nothing in gerrit does it, at least. A new GetSlotDiffRenderer hook is added to modify rendering for content models not owned by the extension, much like how GetDifferenceEngine works. Also deprecates public access to mNewRev/mOldRev and creates public getters instead. DifferenceEngine never supported external changes to those properties, this just acknowledges it. Bug: T194731 Change-Id: I2f8a9dbebd2290b7feafb20e2bb2a2693e18ba11 Depends-On: I04e885a33bfce5bccc807b9bcfe1eaa577a9fd47 Depends-On: I203d8895bf436b7fee53fe4718dede8a3b1768bc
2018-07-11 09:24:07 +00:00
use MediaWiki\Storage\MutableRevisionRecord;
use MediaWiki\Storage\RevisionRecord;
use MediaWiki\Storage\SlotRecord;
use Wikimedia\TestingAccessWrapper;
/**
* @covers DifferenceEngine
*
* @todo tests for the rest of DifferenceEngine!
*
* @group Database
* @group Diff
*
* @author Katie Filbert < aude.wiki@gmail.com >
*/
class DifferenceEngineTest extends MediaWikiTestCase {
protected $context;
private static $revisions;
protected function setUp() {
parent::setUp();
$title = $this->getTitle();
$this->context = new RequestContext();
$this->context->setTitle( $title );
if ( !self::$revisions ) {
self::$revisions = $this->doEdits();
}
}
/**
* @return Title
*/
protected function getTitle() {
$namespace = $this->getDefaultWikitextNS();
return Title::newFromText( 'Kitten', $namespace );
}
/**
* @return int[] Revision ids
*/
protected function doEdits() {
$title = $this->getTitle();
$page = WikiPage::factory( $title );
$strings = [ "it is a kitten", "two kittens", "three kittens", "four kittens" ];
$revisions = [];
foreach ( $strings as $string ) {
$content = ContentHandler::makeContent( $string, $title );
$page->doEditContent( $content, 'edit page' );
$revisions[] = $page->getLatest();
}
return $revisions;
}
public function testMapDiffPrevNext() {
$cases = $this->getMapDiffPrevNextCases();
foreach ( $cases as $case ) {
list( $expected, $old, $new, $message ) = $case;
$diffEngine = new DifferenceEngine( $this->context, $old, $new, 2, true, false );
$diffMap = $diffEngine->mapDiffPrevNext( $old, $new );
$this->assertEquals( $expected, $diffMap, $message );
}
}
private function getMapDiffPrevNextCases() {
$revs = self::$revisions;
return [
[ [ $revs[1], $revs[2] ], $revs[2], 'prev', 'diff=prev' ],
[ [ $revs[2], $revs[3] ], $revs[2], 'next', 'diff=next' ],
[ [ $revs[1], $revs[3] ], $revs[1], $revs[3], 'diff=' . $revs[3] ]
];
}
public function testLoadRevisionData() {
$cases = $this->getLoadRevisionDataCases();
foreach ( $cases as $case ) {
list( $expectedOld, $expectedNew, $old, $new, $message ) = $case;
$diffEngine = new DifferenceEngine( $this->context, $old, $new, 2, true, false );
$diffEngine->loadRevisionData();
$this->assertEquals( $diffEngine->getOldid(), $expectedOld, $message );
$this->assertEquals( $diffEngine->getNewid(), $expectedNew, $message );
}
}
private function getLoadRevisionDataCases() {
$revs = self::$revisions;
return [
[ $revs[2], $revs[3], $revs[3], 'prev', 'diff=prev' ],
[ $revs[2], $revs[3], $revs[2], 'next', 'diff=next' ],
[ $revs[1], $revs[3], $revs[1], $revs[3], 'diff=' . $revs[3] ],
[ $revs[1], $revs[3], $revs[1], 0, 'diff=0' ]
];
}
public function testGetOldid() {
$revs = self::$revisions;
$diffEngine = new DifferenceEngine( $this->context, $revs[1], $revs[2], 2, true, false );
$this->assertEquals( $revs[1], $diffEngine->getOldid(), 'diff get old id' );
}
public function testGetNewid() {
$revs = self::$revisions;
$diffEngine = new DifferenceEngine( $this->context, $revs[1], $revs[2], 2, true, false );
$this->assertEquals( $revs[2], $diffEngine->getNewid(), 'diff get new id' );
}
public function provideLocaliseTitleTooltipsTestData() {
return [
'moved paragraph left shoud get new location title' => [
'<a class="mw-diff-movedpara-left">⚫</a>',
'<a class="mw-diff-movedpara-left" title="(diff-paragraph-moved-tonew)">⚫</a>',
],
'moved paragraph right shoud get old location title' => [
'<a class="mw-diff-movedpara-right">⚫</a>',
'<a class="mw-diff-movedpara-right" title="(diff-paragraph-moved-toold)">⚫</a>',
],
'nothing changed when key not hit' => [
'<a class="mw-diff-movedpara-rightis">⚫</a>',
'<a class="mw-diff-movedpara-rightis">⚫</a>',
],
];
}
/**
* @dataProvider provideLocaliseTitleTooltipsTestData
*/
public function testAddLocalisedTitleTooltips( $input, $expected ) {
$this->setContentLang( 'qqx' );
$diffEngine = TestingAccessWrapper::newFromObject( new DifferenceEngine() );
$this->assertEquals( $expected, $diffEngine->addLocalisedTitleTooltips( $input ) );
}
[MCR] Render multi-slot diffs Move logic for rendering a diff between two content objects out of DifferenceEngine, into a new SlotDiffRenderer class. Make DifferenceEngine use multiple SlotDiffRenderers, one per slot. This separates the class tree for changing high-level diff properties such as the header or the revision selection method (same as before: subclass DifferenceEngine and override ContentHandler::getDiffEngineClass or implement GetDifferenceEngine) and the one for changing the actual diff rendering for a given content type (subclass SlotDiffRenderer and override ContentHandler::getSlotDiffRenderer or implement GetSlotDiffRenderer). To keep B/C, when SlotDiffRenderer is not overridden for a given content type but DifferenceEngine is, that DifferenceEngine will be used instead. The weak point of the scheme is overriding the DifferenceEngine methods passing control to the SlotDiffRenderers (the ones calling getDifferenceEngines), without calling the parent. These are: showDiffStyle, getDiffBody, getDiffBodyCacheKeyParams. Extensions doing that will probably break in unpredictable ways (most likely, only showing the main slot diff). Nothing in gerrit does it, at least. A new GetSlotDiffRenderer hook is added to modify rendering for content models not owned by the extension, much like how GetDifferenceEngine works. Also deprecates public access to mNewRev/mOldRev and creates public getters instead. DifferenceEngine never supported external changes to those properties, this just acknowledges it. Bug: T194731 Change-Id: I2f8a9dbebd2290b7feafb20e2bb2a2693e18ba11 Depends-On: I04e885a33bfce5bccc807b9bcfe1eaa577a9fd47 Depends-On: I203d8895bf436b7fee53fe4718dede8a3b1768bc
2018-07-11 09:24:07 +00:00
/**
* @dataProvider provideGenerateContentDiffBody
*/
public function testGenerateContentDiffBody(
Content $oldContent, Content $newContent, $expectedDiff
) {
// Set $wgExternalDiffEngine to something bogus to try to force use of
// the PHP engine rather than wikidiff2.
$this->setMwGlobals( [
'wgExternalDiffEngine' => '/dev/null',
] );
$differenceEngine = new DifferenceEngine();
$diff = $differenceEngine->generateContentDiffBody( $oldContent, $newContent );
$this->assertSame( $expectedDiff, $this->getPlainDiff( $diff ) );
}
public function provideGenerateContentDiffBody() {
$this->mergeMwGlobalArrayValue( 'wgContentHandlers', [
'testing-nontext' => DummyNonTextContentHandler::class,
] );
$content1 = ContentHandler::makeContent( 'xxx', null, CONTENT_MODEL_TEXT );
$content2 = ContentHandler::makeContent( 'yyy', null, CONTENT_MODEL_TEXT );
return [
'self-diff' => [ $content1, $content1, '' ],
'text diff' => [ $content1, $content2, '-xxx+yyy' ],
];
}
public function testGenerateTextDiffBody() {
// Set $wgExternalDiffEngine to something bogus to try to force use of
// the PHP engine rather than wikidiff2.
$this->setMwGlobals( [
'wgExternalDiffEngine' => '/dev/null',
] );
$oldText = "aaa\nbbb\nccc";
$newText = "aaa\nxxx\nccc";
$expectedDiff = " aaa aaa\n-bbb+xxx\n ccc ccc";
$differenceEngine = new DifferenceEngine();
$diff = $differenceEngine->generateTextDiffBody( $oldText, $newText );
$this->assertSame( $expectedDiff, $this->getPlainDiff( $diff ) );
}
public function testSetContent() {
// Set $wgExternalDiffEngine to something bogus to try to force use of
// the PHP engine rather than wikidiff2.
$this->setMwGlobals( [
'wgExternalDiffEngine' => '/dev/null',
] );
$oldContent = ContentHandler::makeContent( 'xxx', null, CONTENT_MODEL_TEXT );
$newContent = ContentHandler::makeContent( 'yyy', null, CONTENT_MODEL_TEXT );
$differenceEngine = new DifferenceEngine();
$differenceEngine->setContent( $oldContent, $newContent );
$diff = $differenceEngine->getDiffBody();
$this->assertSame( "Line 1:\nLine 1:\n-xxx+yyy", $this->getPlainDiff( $diff ) );
}
public function testSetRevisions() {
$main1 = SlotRecord::newUnsaved( 'main',
ContentHandler::makeContent( 'xxx', null, CONTENT_MODEL_TEXT ) );
$main2 = SlotRecord::newUnsaved( 'main',
ContentHandler::makeContent( 'yyy', null, CONTENT_MODEL_TEXT ) );
$rev1 = $this->getRevisionRecord( $main1 );
$rev2 = $this->getRevisionRecord( $main2 );
$differenceEngine = new DifferenceEngine();
$differenceEngine->setRevisions( $rev1, $rev2 );
$this->assertSame( $rev1, $differenceEngine->getOldRevision() );
$this->assertSame( $rev2, $differenceEngine->getNewRevision() );
$this->assertSame( true, $differenceEngine->loadRevisionData() );
$this->assertSame( true, $differenceEngine->loadText() );
$differenceEngine->setRevisions( null, $rev2 );
$this->assertSame( null, $differenceEngine->getOldRevision() );
}
/**
* @dataProvider provideGetDiffBody
*/
public function testGetDiffBody(
RevisionRecord $oldRevision = null, RevisionRecord $newRevision = null, $expectedDiff
) {
// Set $wgExternalDiffEngine to something bogus to try to force use of
// the PHP engine rather than wikidiff2.
$this->setMwGlobals( [
'wgExternalDiffEngine' => '/dev/null',
] );
if ( $expectedDiff instanceof Exception ) {
$this->setExpectedException( get_class( $expectedDiff ), $expectedDiff->getMessage() );
}
$differenceEngine = new DifferenceEngine();
$differenceEngine->setRevisions( $oldRevision, $newRevision );
if ( $expectedDiff instanceof Exception ) {
return;
}
$diff = $differenceEngine->getDiffBody();
$this->assertSame( $expectedDiff, $this->getPlainDiff( $diff ) );
}
public function provideGetDiffBody() {
$main1 = SlotRecord::newUnsaved( 'main',
ContentHandler::makeContent( 'xxx', null, CONTENT_MODEL_TEXT ) );
$main2 = SlotRecord::newUnsaved( 'main',
ContentHandler::makeContent( 'yyy', null, CONTENT_MODEL_TEXT ) );
$slot1 = SlotRecord::newUnsaved( 'slot',
ContentHandler::makeContent( 'aaa', null, CONTENT_MODEL_TEXT ) );
$slot2 = SlotRecord::newUnsaved( 'slot',
ContentHandler::makeContent( 'bbb', null, CONTENT_MODEL_TEXT ) );
return [
'revision vs. null' => [
null,
$this->getRevisionRecord( $main1, $slot1 ),
'',
],
'revision vs. itself' => [
$this->getRevisionRecord( $main1, $slot1 ),
$this->getRevisionRecord( $main1, $slot1 ),
'',
],
'different text in one slot' => [
$this->getRevisionRecord( $main1, $slot1 ),
$this->getRevisionRecord( $main1, $slot2 ),
"slotLine 1:\nLine 1:\n-aaa+bbb",
],
'different text in two slots' => [
$this->getRevisionRecord( $main1, $slot1 ),
$this->getRevisionRecord( $main2, $slot2 ),
"Line 1:\nLine 1:\n-xxx+yyy\nslotLine 1:\nLine 1:\n-aaa+bbb",
],
'new slot' => [
$this->getRevisionRecord( $main1 ),
$this->getRevisionRecord( $main1, $slot1 ),
"slotLine 1:\nLine 1:\n- +aaa",
],
];
}
public function testRecursion() {
// Set up a ContentHandler which will return a wrapped DifferenceEngine as
// SlotDiffRenderer, then pass it a content which uses the same ContentHandler.
// This tests the anti-recursion logic in DifferenceEngine::generateContentDiffBody.
$customDifferenceEngine = $this->getMockBuilder( DifferenceEngine::class )
->enableProxyingToOriginalMethods()
->getMock();
$customContentHandler = $this->getMockBuilder( ContentHandler::class )
->setConstructorArgs( [ 'foo', [] ] )
->setMethods( [ 'createDifferenceEngine' ] )
->getMockForAbstractClass();
$customContentHandler->expects( $this->any() )
->method( 'createDifferenceEngine' )
->willReturn( $customDifferenceEngine );
/** @var $customContentHandler ContentHandler */
$customContent = $this->getMockBuilder( Content::class )
->setMethods( [ 'getContentHandler' ] )
->getMockForAbstractClass();
$customContent->expects( $this->any() )
->method( 'getContentHandler' )
->willReturn( $customContentHandler );
/** @var $customContent Content */
$customContent2 = clone $customContent;
$slotDiffRenderer = $customContentHandler->getSlotDiffRenderer( RequestContext::getMain() );
$this->setExpectedException( Exception::class,
': could not maintain backwards compatibility. Please use a SlotDiffRenderer.' );
$slotDiffRenderer->getDiff( $customContent, $customContent2 );
}
/**
* Convert a HTML diff to a human-readable format and hopefully make the test less fragile.
* @param string diff
* @return string
*/
private function getPlainDiff( $diff ) {
$replacements = [
html_entity_decode( '&nbsp;' ) => ' ',
html_entity_decode( '&minus;' ) => '-',
];
return str_replace( array_keys( $replacements ), array_values( $replacements ),
trim( strip_tags( $diff ), "\n" ) );
}
/**
* @param SlotRecord[] $slots
* @return MutableRevisionRecord
*/
private function getRevisionRecord( ...$slots ) {
$title = Title::newFromText( 'Foo' );
$revision = new MutableRevisionRecord( $title );
foreach ( $slots as $slot ) {
$revision->setSlot( $slot );
}
return $revision;
}
}