[MediaWiki-commits] [Gerrit] Clean some of the insanity in EntityChangeTest - change (mediawiki...Wikibase)

[Hoo man (Code Review)]

Hoo man has submitted this change and it was merged.

Change subject: Clean some of the insanity in EntityChangeTest
......................................................................


Clean some of the insanity in EntityChangeTest

Change-Id: Iba2f30d6047a4f0982073180204d3f8135f32397
---
M lib/tests/phpunit/changes/EntityChangeTest.php
M lib/tests/phpunit/changes/ItemChangeTest.php
2 files changed, 17 insertions(+), 22 deletions(-)

Approvals:
  Hoo man: Looks good to me, approved
  WikidataJenkins: Verified



diff --git a/lib/tests/phpunit/changes/EntityChangeTest.php 
b/lib/tests/phpunit/changes/EntityChangeTest.php
index ad5ec2b..e13b8c8 100644
--- a/lib/tests/phpunit/changes/EntityChangeTest.php
+++ b/lib/tests/phpunit/changes/EntityChangeTest.php
@@ -2,7 +2,7 @@
 
 namespace Wikibase\Test;
 
-use Wikibase\Entity;
+use Wikibase\DataModel\Entity\Entity;
 use Wikibase\EntityChange;
 
 /**
@@ -16,7 +16,6 @@
  * @group WikibaseChange
  *
  * @licence GNU GPL v2+
- * @author Jeroen De Dauw < jeroended...@gmail.com >
  * @author Katie Filbert < aude.w...@gmail.com >
  * @author Daniel Kinzler
  */
@@ -106,21 +105,6 @@
                        $changes );
 
                return $cases;
-       }
-
-       /**
-        * @dataProvider entityProvider
-        *
-        * @param Entity $entity
-        */
-       public function testNewFromUpdate( Entity $entity ) {
-               /* @var EntityChange $entityChange */
-               $class = $this->getRowClass();
-               $entityChange = $class::newFromUpdate( EntityChange::UPDATE, 
null, $entity );
-               $this->assertInstanceOf( $class, $entityChange );
-
-               $this->assertEquals( $entity->isEmpty(), 
$entityChange->getDiff()->isEmpty(),
-                       "The diff must be empty if and only if the entity was 
empty" );
        }
 
        /**
diff --git a/lib/tests/phpunit/changes/ItemChangeTest.php 
b/lib/tests/phpunit/changes/ItemChangeTest.php
index b335fc4..d9820d2 100644
--- a/lib/tests/phpunit/changes/ItemChangeTest.php
+++ b/lib/tests/phpunit/changes/ItemChangeTest.php
@@ -2,14 +2,14 @@
 
 namespace Wikibase\Test;
 
-use Diff\Diff;
-use Diff\DiffOpChange;
+use Diff\DiffOp\Diff\Diff;
+use Diff\DiffOp\DiffOpChange;
 use Exception;
-use Wikibase\Entity;
+use Wikibase\DataModel\Entity\Entity;
 use Wikibase\EntityChange;
-use Wikibase\Item;
+use Wikibase\DataModel\Entity\Item;
 use Wikibase\ItemChange;
-use Wikibase\ItemDiff;
+use Wikibase\DataModel\Entity\ItemDiff;
 
 /**
  * @covers Wikibase\ItemChange
@@ -162,4 +162,15 @@
                        throw $exception;
                }
        }
+
+       public function testNewFromUpdate() {
+               $item = Item::newEmpty();
+               $item->setId( 112 );
+               $item->setLabel( 'ja', '\u30d3\u30fc\u30eb' );
+
+               $itemChange = ItemChange::newFromUpdate( EntityChange::UPDATE, 
null, $item );
+
+               $this->assertFalse( $itemChange->isEmpty() );
+       }
+
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iba2f30d6047a4f0982073180204d3f8135f32397
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw <jeroended...@gmail.com>
Gerrit-Reviewer: Hoo man <h...@online.de>
Gerrit-Reviewer: WikidataJenkins <wikidata-servi...@wikimedia.de>
Gerrit-Reviewer: jenkins-bot <>

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