jenkins-bot has submitted this change and it was merged. Change subject: Fix client and lib tests ......................................................................
Fix client and lib tests * lib UpdateRepoOnMoveJobTest::testGetSummary will only work on repo * client UpdateRepoOnMoveTest should use a mock SiteLinkLookup Change-Id: Ic52d5bfc13ee25aeb64b4845ddb856e438bc0564 --- M client/tests/phpunit/includes/UpdateRepoOnMoveTest.php M lib/tests/phpunit/UpdateRepoOnMoveJobTest.php 2 files changed, 15 insertions(+), 4 deletions(-) Approvals: Aude: Looks good to me, approved jenkins-bot: Verified diff --git a/client/tests/phpunit/includes/UpdateRepoOnMoveTest.php b/client/tests/phpunit/includes/UpdateRepoOnMoveTest.php index 907df77..ed3c6b0 100644 --- a/client/tests/phpunit/includes/UpdateRepoOnMoveTest.php +++ b/client/tests/phpunit/includes/UpdateRepoOnMoveTest.php @@ -2,8 +2,8 @@ namespace Wikibase\Test; use Wikibase\UpdateRepoOnMove; -use Wikibase\Client\WikibaseClient; use Wikibase\Settings; +use Wikibase\EntityId; /** * Tests for the UpdateRepoOnMove class. @@ -29,8 +29,6 @@ * @ingroup WikibaseClient * @ingroup Test * - * @group WikibaseClient - * * @licence GNU GPL v2+ * @author Marius Hoch < [email protected] > */ @@ -45,9 +43,19 @@ static $ret = array(); if ( !$ret ) { + $entityId = new EntityId( 'Item', 123 ); + + $siteLinkLookupMock = $this->getMockBuilder( '\Wikibase\SiteLinkLookup' ) + ->disableOriginalConstructor() + ->getMock(); + + $siteLinkLookupMock->expects( $this->any() ) + ->method( 'getEntityIdForSiteLink' ) + ->will( $this->returnValue( $entityId ) ); + $ret = array( 'repoDB' => wfWikiID(), - 'siteLinkLookup' => WikibaseClient::getDefaultInstance()->getStore()->getSiteLinkTable(), + 'siteLinkLookup' => $siteLinkLookupMock, 'user' => \User::newFromName( 'RandomUserWhichDoesntExist' ), 'siteId' => Settings::get( 'siteGlobalID' ), 'oldTitle' => \Title::newFromText( 'ThisOneDoesntExist' ), diff --git a/lib/tests/phpunit/UpdateRepoOnMoveJobTest.php b/lib/tests/phpunit/UpdateRepoOnMoveJobTest.php index 352a742..e818a16 100644 --- a/lib/tests/phpunit/UpdateRepoOnMoveJobTest.php +++ b/lib/tests/phpunit/UpdateRepoOnMoveJobTest.php @@ -82,6 +82,9 @@ * @group WikibaseRepoTest */ public function testGetSummary() { + if ( !defined( 'WB_VERSION' ) ) { + $this->markTestSkipped( 'Wikibase\Summary is only available on repo' ); + } $moveData = $this->getSampleData(); $job = $this->getNewFromMove( $moveData ); -- To view, visit https://gerrit.wikimedia.org/r/72106 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic52d5bfc13ee25aeb64b4845ddb856e438bc0564 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Hoo man <[email protected]> Gerrit-Reviewer: Aude <[email protected]> Gerrit-Reviewer: Daniel Kinzler <[email protected]> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
