Make DispatchableDe/Serializer tests as specific as possible

tests/unit/Deserializers/AliasGroupListDeserializerTest.php

@@ -2,7 +2,7 @@
 
 namespace Tests\Wikibase\DataModel\Deserializers;
 
-use Deserializers\Deserializer;
+use PHPUnit_Framework_TestCase;
 use Wikibase\DataModel\Deserializers\AliasGroupListDeserializer;
 use Wikibase\DataModel\Term\AliasGroup;
 use Wikibase\DataModel\Term\AliasGroupList;
@@ -14,17 +14,15 @@
  * @author Addshore
  * @author Bene* < benestar.wikimedia@gmail.com >
  */
-class AliasGroupListDeserializerTest extends DeserializerBaseTest {
+class AliasGroupListDeserializerTest extends PHPUnit_Framework_TestCase {
 
 	/**
-	 * @return Deserializer
+	 * @dataProvider nonDeserializableProvider
 	 */
-	public function buildDeserializer() {
-		return new AliasGroupListDeserializer();
-	}
-
-	public function deserializableProvider() {
-		return array( array() );
+	public function testDeserializeThrowsDeserializationException( $nonDeserializable ) {
+		$deserializer = new AliasGroupListDeserializer();
+		$this->setExpectedException( 'Deserializers\Exceptions\DeserializationException' );
+		$deserializer->deserialize( $nonDeserializable );
 	}
 
 	/**
@@ -57,6 +55,14 @@ public function nonDeserializableProvider() {
 		);
 	}
 
+	/**
+	 * @dataProvider deserializationProvider
+	 */
+	public function testDeserialization( $object, $serialization ) {
+		$deserializer = new AliasGroupListDeserializer();
+		$this->assertEquals( $object, $deserializer->deserialize( $serialization ) );
+	}
+
 	/**
 	 * @return array[] an array of array( object deserialized, serialization )
 	 */

tests/unit/Deserializers/DispatchableDeserializerTest.php

@@ -0,0 +1,69 @@
+<?php
+
+namespace Tests\Wikibase\DataModel\Deserializers;
+
+use Deserializers\DispatchableDeserializer;
+use PHPUnit_Framework_TestCase;
+
+/**
+ * @licence GNU GPL v2+
+ * @author Thomas Pellissier Tanon
+ * @author Thiemo Mättig
+ */
+abstract class DispatchableDeserializerTest extends PHPUnit_Framework_TestCase {
+
+	/**
+	 * @return DispatchableDeserializer
+	 */
+	protected abstract function buildDeserializer();
+
+	public function testImplementsDispatchableDeserializerInterface() {
+		$this->assertInstanceOf( 'Deserializers\DispatchableDeserializer', $this->buildDeserializer() );
+	}
+
+	/**
+	 * @dataProvider deserializableProvider
+	 */
+	public function testIsDeserializerForReturnsTrue( $deserializable ) {
+		$this->assertTrue( $this->buildDeserializer()->isDeserializerFor( $deserializable ) );
+	}
+
+	/**
+	 * @return array[] things that are deserialized by the deserializer
+	 */
+	public abstract function deserializableProvider();
+
+	/**
+	 * @dataProvider nonDeserializableProvider
+	 */
+	public function testIsDeserializerForReturnsFalse( $nonDeserializable ) {
+		$this->assertFalse( $this->buildDeserializer()->isDeserializerFor( $nonDeserializable ) );
+	}
+
+	/**
+	 * @dataProvider nonDeserializableProvider
+	 */
+	public function testDeserializeThrowsDeserializationException( $nonDeserializable ) {
+		$deserializer = $this->buildDeserializer();
+		$this->setExpectedException( 'Deserializers\Exceptions\DeserializationException' );
+		$deserializer->deserialize( $nonDeserializable );
+	}
+
+	/**
+	 * @return array[] things that aren't deserialized by the deserializer
+	 */
+	public abstract function nonDeserializableProvider();
+
+	/**
+	 * @dataProvider deserializationProvider
+	 */
+	public function testDeserialization( $object, $serialization ) {
+		$this->assertEquals( $object, $this->buildDeserializer()->deserialize( $serialization ) );
+	}
+
+	/**
+	 * @return array[] an array of array( object deserialized, serialization )
+	 */
+	public abstract function deserializationProvider();
+
+}

tests/unit/Deserializers/EntityIdDeserializerTest.php

@@ -2,6 +2,7 @@
 
 namespace Tests\Wikibase\DataModel\Deserializers;
 
+use PHPUnit_Framework_TestCase;
 use Wikibase\DataModel\Deserializers\EntityIdDeserializer;
 use Wikibase\DataModel\Entity\EntityIdParsingException;
 use Wikibase\DataModel\Entity\ItemId;
@@ -12,9 +13,9 @@
  * @licence GNU GPL v2+
  * @author Thomas Pellissier Tanon
  */
-class EntityIdDeserializerTest extends DeserializerBaseTest {
+class EntityIdDeserializerTest extends PHPUnit_Framework_TestCase {
 
-	public function buildDeserializer() {
+	private function buildDeserializer() {
 		$entityIdParserMock = $this->getMock( '\Wikibase\DataModel\Entity\EntityIdParser' );
 		$entityIdParserMock->expects( $this->any() )
 			->method( 'parse' )
@@ -24,8 +25,13 @@ public function buildDeserializer() {
 		return new EntityIdDeserializer( $entityIdParserMock );
 	}
 
-	public function deserializableProvider() {
-		return array( array() );
+	/**
+	 * @dataProvider nonDeserializableProvider
+	 */
+	public function testDeserializeThrowsDeserializationException( $nonDeserializable ) {
+		$deserializer = $this->buildDeserializer();
+		$this->setExpectedException( 'Deserializers\Exceptions\DeserializationException' );
+		$deserializer->deserialize( $nonDeserializable );
 	}
 
 	public function nonDeserializableProvider() {
@@ -39,6 +45,14 @@ public function nonDeserializableProvider() {
 		);
 	}
 
+	/**
+	 * @dataProvider deserializationProvider
+	 */
+	public function testDeserialization( $object, $serialization ) {
+		$deserializer = $this->buildDeserializer();
+		$this->assertEquals( $object, $deserializer->deserialize( $serialization ) );
+	}
+
 	public function deserializationProvider() {
 		return array(
 			array(

tests/unit/Deserializers/ItemDeserializerTest.php

@@ -21,9 +21,9 @@
  * @author Thomas Pellissier Tanon
  * @author Bene* < benestar.wikimedia@gmail.com >
  */
-class ItemDeserializerTest extends DeserializerBaseTest {
+class ItemDeserializerTest extends DispatchableDeserializerTest {
 
-	public function buildDeserializer() {
+	protected function buildDeserializer() {
 		$entityIdDeserializerMock = $this->getMock( '\Deserializers\Deserializer' );
 		$entityIdDeserializerMock->expects( $this->any() )
 			->method( 'deserialize' )

tests/unit/Deserializers/PropertyDeserializerTest.php

@@ -20,9 +20,9 @@
  * @author Thomas Pellissier Tanon
  * @author Bene* < benestar.wikimedia@gmail.com >
  */
-class PropertyDeserializerTest extends DeserializerBaseTest {
+class PropertyDeserializerTest extends DispatchableDeserializerTest {
 
-	public function buildDeserializer() {
+	protected function buildDeserializer() {
 		$entityIdDeserializerMock = $this->getMock( '\Deserializers\Deserializer' );
 		$entityIdDeserializerMock->expects( $this->any() )
 			->method( 'deserialize' )

tests/unit/Deserializers/ReferenceDeserializerTest.php

@@ -15,9 +15,9 @@
  * @licence GNU GPL v2+
  * @author Thomas Pellissier Tanon
  */
-class ReferenceDeserializerTest extends DeserializerBaseTest {
+class ReferenceDeserializerTest extends DispatchableDeserializerTest {
 
-	public function buildDeserializer() {
+	protected function buildDeserializer() {
 		$snaksDeserializerMock = $this->getMock( '\Deserializers\Deserializer' );
 		$snaksDeserializerMock->expects( $this->any() )
 			->method( 'deserialize' )

tests/unit/Deserializers/ReferenceListDeserializerTest.php

@@ -2,6 +2,7 @@
 
 namespace Tests\Wikibase\DataModel\Deserializers;
 
+use PHPUnit_Framework_TestCase;
 use Wikibase\DataModel\Deserializers\ReferenceListDeserializer;
 use Wikibase\DataModel\Reference;
 use Wikibase\DataModel\ReferenceList;
@@ -12,9 +13,9 @@
  * @licence GNU GPL v2+
  * @author Thomas Pellissier Tanon
  */
-class ReferenceListDeserializerTest extends DeserializerBaseTest {
+class ReferenceListDeserializerTest extends PHPUnit_Framework_TestCase {
 
-	public function buildDeserializer() {
+	private function buildDeserializer() {
 		$referenceDeserializerMock = $this->getMock( '\Deserializers\Deserializer' );
 
 		$referenceDeserializerMock->expects( $this->any() )
@@ -28,8 +29,13 @@ public function buildDeserializer() {
 		return new ReferenceListDeserializer( $referenceDeserializerMock );
 	}
 
-	public function deserializableProvider() {
-		return array( array() );
+	/**
+	 * @dataProvider nonDeserializableProvider
+	 */
+	public function testDeserializeThrowsDeserializationException( $nonDeserializable ) {
+		$deserializer = $this->buildDeserializer();
+		$this->setExpectedException( 'Deserializers\Exceptions\DeserializationException' );
+		$deserializer->deserialize( $nonDeserializable );
 	}
 
 	public function nonDeserializableProvider() {

tests/unit/Deserializers/SiteLinkDeserializerTest.php

@@ -2,6 +2,7 @@
 
 namespace Tests\Wikibase\DataModel\Deserializers;
 
+use PHPUnit_Framework_TestCase;
 use Wikibase\DataModel\Deserializers\SiteLinkDeserializer;
 use Wikibase\DataModel\Entity\ItemId;
 use Wikibase\DataModel\Entity\PropertyId;
@@ -13,9 +14,9 @@
  * @licence GNU GPL v2+
  * @author Thomas Pellissier Tanon
  */
-class SiteLinkDeserializerTest extends DeserializerBaseTest {
+class SiteLinkDeserializerTest extends PHPUnit_Framework_TestCase {
 
-	public function buildDeserializer() {
+	private function buildDeserializer() {
 		$entityIdDeserializerMock = $this->getMock( '\Deserializers\Deserializer' );
 		$entityIdDeserializerMock->expects( $this->any() )
 			->method( 'deserialize' )
@@ -25,8 +26,13 @@ public function buildDeserializer() {
 		return new SiteLinkDeserializer( $entityIdDeserializerMock );
 	}
 
-	public function deserializableProvider() {
-		return array( array() );
+	/**
+	 * @dataProvider nonDeserializableProvider
+	 */
+	public function testDeserializeThrowsDeserializationException( $nonDeserializable ) {
+		$deserializer = $this->buildDeserializer();
+		$this->setExpectedException( 'Deserializers\Exceptions\DeserializationException' );
+		$deserializer->deserialize( $nonDeserializable );
 	}
 
 	public function nonDeserializableProvider() {
@@ -55,6 +61,13 @@ public function nonDeserializableProvider() {
 		);
 	}
 
+	/**
+	 * @dataProvider deserializationProvider
+	 */
+	public function testDeserialization( $object, $serialization ) {
+		$this->assertEquals( $object, $this->buildDeserializer()->deserialize( $serialization ) );
+	}
+
 	public function deserializationProvider() {
 		return array(
 			array(

tests/unit/Deserializers/SnakDeserializerTest.php

@@ -18,9 +18,9 @@
  * @licence GNU GPL v2+
  * @author Thomas Pellissier Tanon
  */
-class SnakDeserializerTest extends DeserializerBaseTest {
+class SnakDeserializerTest extends DispatchableDeserializerTest {
 
-	public function buildDeserializer() {
+	protected function buildDeserializer() {
 		$entityIdDeserializerMock = $this->getMock( '\Deserializers\Deserializer' );
 		$entityIdDeserializerMock->expects( $this->any() )
 			->method( 'deserialize' )