[MediaWiki-commits] [Gerrit] Simplify SiteLinkUsageLookupTest as much as possible - change (mediawiki...Wikibase)

[WMDE]

Thiemo Mättig (WMDE) has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/237637

Change subject: Simplify SiteLinkUsageLookupTest as much as possible
......................................................................

Simplify SiteLinkUsageLookupTest as much as possible

This is a direct follow-up for what I saw in I9d74588.

Change-Id: I303c0bf9b0286650e56f47771aca72deed2f21f0
---
M client/tests/phpunit/includes/Usage/SiteLinkUsageLookupTest.php
1 file changed, 9 insertions(+), 16 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/37/237637/1

diff --git a/client/tests/phpunit/includes/Usage/SiteLinkUsageLookupTest.php 
b/client/tests/phpunit/includes/Usage/SiteLinkUsageLookupTest.php
index cdaf1f8..0e8240f 100644
--- a/client/tests/phpunit/includes/Usage/SiteLinkUsageLookupTest.php
+++ b/client/tests/phpunit/includes/Usage/SiteLinkUsageLookupTest.php
@@ -2,6 +2,7 @@
 
 namespace Wikibase\Client\Tests\Usage\Sql;
 
+use MediaWikiTestCase;
 use Title;
 use Wikibase\Client\Store\TitleFactory;
 use Wikibase\Client\Usage\EntityUsage;
@@ -25,7 +26,7 @@
  * @license GPL 2+
  * @author Daniel Kinzler
  */
-class SiteLinkUsageLookupTest extends \MediaWikiTestCase {
+class SiteLinkUsageLookupTest extends MediaWikiTestCase {
 
        /**
         * @param ItemId[] $links
@@ -33,16 +34,15 @@
         * @return SiteLinkLookup
         */
        private function getSiteLinkLookup( array $links ) {
-               $titleFactory = $this->getTitleFactory();
                $siteLinkLookup = new HashSiteLinkStore();
 
                foreach ( $links as $pageId => $itemId ) {
-                       $title = $titleFactory->newFromID( $pageId );
+                       $pageName = "Page number $pageId";
 
                        $item = new Item( $itemId );
-                       $item->getSiteLinkList()->addSiteLink( new SiteLink( 
'testwiki', $title->getPrefixedText() ) );
-                       $item->getSiteLinkList()->addSiteLink( new SiteLink( 
'badwiki', $title->getPrefixedText() ) );
-                       $item->getSiteLinkList()->addSiteLink( new SiteLink( 
'sadwiki', "Other stuff" ) );
+                       $item->getSiteLinkList()->addSiteLink( new SiteLink( 
'testwiki', $pageName ) );
+                       $item->getSiteLinkList()->addSiteLink( new SiteLink( 
'badwiki', $pageName ) );
+                       $item->getSiteLinkList()->addSiteLink( new SiteLink( 
'sadwiki', 'Other stuff' ) );
 
                        $siteLinkLookup->saveLinksOfItem( $item );
                }
@@ -51,8 +51,6 @@
        }
 
        /**
-        * @note Assumptions: page titles are the same as page IDs.
-        *
         * @param SiteLinkLookup $siteLinks
         * @param TitleFactory $titleFactory
         *
@@ -74,19 +72,14 @@
                $titleFactory->expects( $this->any() )
                        ->method( 'newFromText' )
                        ->will( $this->returnCallback( function ( $text ) {
-                               if ( !preg_match( '/^Page number (\d+)$/', 
$text, $match ) ) {
-                                       throw new \InvalidArgumentException( 
'Bad title text: ' . $text );
-                               }
-
                                $title = Title::newFromText( $text );
-                               $title->resetArticleID( intval( $match[1] ) );
                                return $title;
                        } ) );
                $titleFactory->expects( $this->any() )
                        ->method( 'newFromID' )
-                       ->will( $this->returnCallback( function ( $id ) {
-                               $title = Title::newFromText( "Page number $id" 
);
-                               $title->resetArticleID( $id );
+                       ->will( $this->returnCallback( function ( $pageId ) {
+                               $title = Title::newFromText( "Page number 
$pageId" );
+                               $title->resetArticleID( $pageId );
                                return $title;
                        } ) );
 

-- 
To view, visit https://gerrit.wikimedia.org/r/237637
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I303c0bf9b0286650e56f47771aca72deed2f21f0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) <thiemo.maet...@wikimedia.de>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits