[MediaWiki-commits] [Gerrit] Fix outdated doc in EntityViewPlaceholderExpanderTest - change (mediawiki...Wikibase)

[WMDE]

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

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

Change subject: Fix outdated doc in EntityViewPlaceholderExpanderTest
......................................................................

Fix outdated doc in EntityViewPlaceholderExpanderTest

This also makes a method parameter optional. I think this makes the
code easier to read.

Change-Id: I63b0d05317c08896072de088d1345dc64b83dae8
---
M repo/tests/phpunit/includes/View/EntityViewPlaceholderExpanderTest.php
1 file changed, 17 insertions(+), 10 deletions(-)


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

diff --git 
a/repo/tests/phpunit/includes/View/EntityViewPlaceholderExpanderTest.php 
b/repo/tests/phpunit/includes/View/EntityViewPlaceholderExpanderTest.php
index d85adef..ac271b1 100644
--- a/repo/tests/phpunit/includes/View/EntityViewPlaceholderExpanderTest.php
+++ b/repo/tests/phpunit/includes/View/EntityViewPlaceholderExpanderTest.php
@@ -3,12 +3,10 @@
 namespace Wikibase\Test;
 
 use Language;
-use Title;
 use User;
 use Wikibase\DataModel\Entity\Item;
 use Wikibase\DataModel\Entity\ItemId;
 use Wikibase\EntityRevision;
-use Wikibase\Lib\Store\EntityLookup;
 use Wikibase\Lib\Store\EntityRevisionLookup;
 use Wikibase\Lib\Store\StorageException;
 use Wikibase\Repo\View\EntityViewPlaceholderExpander;
@@ -29,8 +27,10 @@
 
        /**
         * @param User $user
-        * @param EntityLookup $entityLookup
+        * @param EntityRevisionLookup $entityRevisionLookup
         * @param ItemId $itemId
+        *
+        * @return EntityViewPlaceholderExpander
         */
        private function newExpander( User $user, EntityRevisionLookup 
$entityRevisionLookup, ItemId $itemId ) {
                $title = $this->getMockBuilder( 'Title')
@@ -108,13 +108,20 @@
                return $item;
        }
 
-       private function newUser( $isAnon ) {
-               $user = $this->getMockBuilder( '\User' )
+       /**
+        * @param bool $isAnon
+        *
+        * @return User
+        */
+       private function newUser( $isAnon = false ) {
+               $user = $this->getMockBuilder( 'User' )
                        ->disableOriginalConstructor()
                        ->getMock();
                $user->expects( $this->any() )
                        ->method( 'isAnon' )
                        ->will( $this->returnValue( $isAnon ) );
+
+               /** @var User $user */
                $user->setName( 'EntityViewPlaceholderExpanderTest-DummyUser' );
 
                return $user;
@@ -123,7 +130,7 @@
        public function testGetHtmlForPlaceholder() {
                $item = $this->getItem();
                $entityRevisionLookup = $this->getEntityRevisionLookup( $item );
-               $expander = $this->newExpander( $this->newUser( false ), 
$entityRevisionLookup, $item->getId() );
+               $expander = $this->newExpander( $this->newUser(), 
$entityRevisionLookup, $item->getId() );
 
                $html = $expander->getHtmlForPlaceholder( 'termbox-toc' );
                $this->assertInternalType( 'string', $html );
@@ -135,7 +142,7 @@
        public function testRenderTermBoxTocEntry() {
                $item = $this->getItem();
                $entityRevisionLookup = $this->getEntityRevisionLookup( $item );
-               $expander = $this->newExpander( $this->newUser( false ), 
$entityRevisionLookup, $item->getId() );
+               $expander = $this->newExpander( $this->newUser(), 
$entityRevisionLookup, $item->getId() );
 
                // According to the mock objects, this should generate a term 
box for
                // 'de' and 'ru', since 'en' is already covered by the 
interface language.
@@ -147,7 +154,7 @@
        public function testRenderTermBox() {
                $item = $this->getItem();
                $entityRevisionLookup = $this->getEntityRevisionLookup( $item );
-               $expander = $this->newExpander( $this->newUser( false ), 
$entityRevisionLookup, $item->getId() );
+               $expander = $this->newExpander( $this->newUser(), 
$entityRevisionLookup, $item->getId() );
 
                // According to the mock objects, this should generate a term 
box for
                // 'de' and 'ru', since 'en' is already covered by the 
interface language.
@@ -165,7 +172,7 @@
                $itemId = $item->getId();
                $entityRevisionLookup = 
$this->getExceptionThrowingEntityRevisionLookup();
 
-               $expander = $this->newExpander( $this->newUser( false ), 
$entityRevisionLookup, $itemId );
+               $expander = $this->newExpander( $this->newUser(), 
$entityRevisionLookup, $itemId );
 
                $html = $expander->renderTermBox( $itemId, 1 );
                $this->assertEquals( '', $html );
@@ -179,7 +186,7 @@
                $expander = $this->newExpander( $this->newUser( true ), 
$entityRevisionLookup, $itemId );
                $this->assertArrayEquals( array(), 
$expander->getExtraUserLanguages() );
 
-               $expander = $this->newExpander( $this->newUser( false ), 
$entityRevisionLookup, $itemId );
+               $expander = $this->newExpander( $this->newUser(), 
$entityRevisionLookup, $itemId );
                $this->assertArrayEquals( array( 'de', 'ru' ), 
$expander->getExtraUserLanguages() );
        }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I63b0d05317c08896072de088d1345dc64b83dae8
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