Thiemo Mättig (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/255920
Change subject: Remove wrong parent::... call from EntityContentDataCodecTest
......................................................................
Remove wrong parent::... call from EntityContentDataCodecTest
Introduced in I64046ee.
I'm also narrowing a few interfaces, in one case to avoid type hinting
against a deprecated class.
Bug: T119753
Change-Id: I12a0dda0c8b907854001ffcf22f2e9d2c988141c
---
M lib/tests/phpunit/store/EntityContentDataCodecTest.php
1 file changed, 6 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/20/255920/1
diff --git a/lib/tests/phpunit/store/EntityContentDataCodecTest.php
b/lib/tests/phpunit/store/EntityContentDataCodecTest.php
index 2a0e353..0f50780 100644
--- a/lib/tests/phpunit/store/EntityContentDataCodecTest.php
+++ b/lib/tests/phpunit/store/EntityContentDataCodecTest.php
@@ -4,8 +4,7 @@
use DataValues\Deserializers\DataValueDeserializer;
use DataValues\Serializers\DataValueSerializer;
-use Wikibase\DataModel\Entity\Entity;
-use Wikibase\DataModel\Entity\EntityId;
+use MediaWikiTestCase;
use Wikibase\DataModel\Entity\EntityRedirect;
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
@@ -23,15 +22,13 @@
* @licence GNU GPL v2+
* @author Daniel Kinzler
*/
-class EntityContentDataCodecTest extends \MediaWikiTestCase {
+class EntityContentDataCodecTest extends MediaWikiTestCase {
- protected function getCodec( $maxBlobSize = 0 ) {
- parent::setUp();
-
+ private function getCodec( $maxBlobSize = 0 ) {
$idParser = new BasicEntityIdParser();
$serializerFactory = new SerializerFactory( new
DataValueSerializer() );
- $deserializerFactory = new DeserializerFactory( new
DataValueDeserializer( array() ), $idParser );
+ $deserializerFactory = new DeserializerFactory( new
DataValueDeserializer(), $idParser );
$codec = new EntityContentDataCodec(
$idParser,
@@ -55,7 +52,7 @@
/**
* @dataProvider entityIdProvider
*/
- public function testEntityIdDecoding( $data, EntityId $id ) {
+ public function testEntityIdDecoding( $data, ItemId $id ) {
$entity = $this->getCodec()->decodeEntity( $data,
CONTENT_FORMAT_JSON );
$this->assertEquals( $id, $entity->getId() );
}
@@ -79,7 +76,7 @@
/**
* @dataProvider entityProvider
*/
- public function testEncodeAndDecodeEntity( Entity $entity, $format ) {
+ public function testEncodeAndDecodeEntity( Item $entity, $format ) {
$blob = $this->getCodec()->encodeEntity( $entity, $format );
$this->assertType( 'string', $blob );
--
To view, visit https://gerrit.wikimedia.org/r/255920
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I12a0dda0c8b907854001ffcf22f2e9d2c988141c
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
