jenkins-bot has submitted this change and it was merged.
Change subject: (bug 48453) Set site's local ID in tests.
......................................................................
(bug 48453) Set site's local ID in tests.
This makes sure the Site objects created by ChangeHandlerTest
have an approipriate navigation ID set.
Change-Id: Ifa8f7f515630a6d4a9af42960021a9869a99dba3
---
M client/tests/phpunit/includes/ChangeHandlerTest.php
M lib/tests/phpunit/changes/TestChanges.php
2 files changed, 7 insertions(+), 0 deletions(-)
Approvals:
Tobias Gritschacher: Looks good to me, but someone else must approve
Jeroen De Dauw: Looks good to me, approved
jenkins-bot: Verified
diff --git a/client/tests/phpunit/includes/ChangeHandlerTest.php
b/client/tests/phpunit/includes/ChangeHandlerTest.php
index 53115d6..f4e4fe7 100644
--- a/client/tests/phpunit/includes/ChangeHandlerTest.php
+++ b/client/tests/phpunit/includes/ChangeHandlerTest.php
@@ -50,6 +50,7 @@
$this->site = new \MediaWikiSite();
$this->site->setGlobalId( 'enwiki' );
$this->site->setLanguageCode( 'en' );
+ $this->site->addNavigationId( 'en' );
$repo = self::getMockRepo();
$usageIndex = new EntityUsageIndex( $this->site, $repo );
diff --git a/lib/tests/phpunit/changes/TestChanges.php
b/lib/tests/phpunit/changes/TestChanges.php
index a559af7..e7dec2c 100644
--- a/lib/tests/phpunit/changes/TestChanges.php
+++ b/lib/tests/phpunit/changes/TestChanges.php
@@ -103,6 +103,12 @@
$changes['item-deletion'] =
EntityChange::newFromUpdate( EntityChange::REMOVE, $old, null );
// -----
+
+ //FIXME: EntityChange::newFromUpdate causes
Item::getSiteLinks to be called,
+ // which uses SiteLink::newFromText, which in
turn uses the Sites singleton
+ // which relies on the database. This is
inconsistent with the Site objects
+ // generated here, or elsewhere in test cases.
+
$link = self::makeSiteLink( 'dewiki', "Dummy" );
$new->addSiteLink( $link, 'add' );
$changes['set-dewiki-sitelink'] =
EntityChange::newFromUpdate( EntityChange::UPDATE, $old, $new );
--
To view, visit https://gerrit.wikimedia.org/r/64058
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifa8f7f515630a6d4a9af42960021a9869a99dba3
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Daniel Kinzler <[email protected]>
Gerrit-Reviewer: Aude <[email protected]>
Gerrit-Reviewer: Jeroen De Dauw <[email protected]>
Gerrit-Reviewer: Tobias Gritschacher <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
