jenkins-bot has submitted this change and it was merged.

Change subject: Remove Entity from ChangeOpAliasesTest
......................................................................


Remove Entity from ChangeOpAliasesTest

Entity is just not needed here.

Change-Id: Iaeebbb11247345ed7767e73645dbe5548c33efe3
---
M repo/tests/phpunit/includes/ChangeOp/ChangeOpAliasesTest.php
1 file changed, 14 insertions(+), 9 deletions(-)

Approvals:
  Bene: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/repo/tests/phpunit/includes/ChangeOp/ChangeOpAliasesTest.php 
b/repo/tests/phpunit/includes/ChangeOp/ChangeOpAliasesTest.php
index 811aaaa..edeb72a 100644
--- a/repo/tests/phpunit/includes/ChangeOp/ChangeOpAliasesTest.php
+++ b/repo/tests/phpunit/includes/ChangeOp/ChangeOpAliasesTest.php
@@ -4,7 +4,6 @@
 
 use InvalidArgumentException;
 use Wikibase\ChangeOp\ChangeOpAliases;
-use Wikibase\DataModel\Entity\Entity;
 use Wikibase\DataModel\Entity\Item;
 use Wikibase\ItemContent;
 
@@ -78,21 +77,27 @@
                        'remove' => array(
                                unserialize( serialize( $entity ) ),
                                new ChangeOpAliases( 'en', $existingEnAliases, 
'remove', $validatorFactory ),
-                               array()
+                               null
                        ),
                );
        }
 
        /**
         * @dataProvider changeOpAliasesProvider
-        *
-        * @param Entity $entity
-        * @param ChangeOpAliases $changeOpAliases
-        * @param string $expectedAliases
         */
-       public function testApply( $entity, $changeOpAliases, $expectedAliases 
) {
-               $changeOpAliases->apply( $entity );
-               $this->assertEquals( $expectedAliases, $entity->getAliases( 
'en' ) );
+       public function testApply(
+               Item $item,
+               ChangeOpAliases $changeOpAliases,
+               array $expectedAliases = null
+       ) {
+               $changeOpAliases->apply( $item );
+               $fingerprint = $item->getFingerprint();
+
+               if ( $expectedAliases === null ) {
+                       $this->assertFalse( $fingerprint->hasAliasGroup( 'en' ) 
);
+               } else {
+                       $this->assertEquals( $expectedAliases, 
$fingerprint->getAliasGroup( 'en' )->getAliases() );
+               }
        }
 
        public function validateProvider() {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iaeebbb11247345ed7767e73645dbe5548c33efe3
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Bene <[email protected]>
Gerrit-Reviewer: Jeroen De Dauw <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to