Merge pull request #402 from wmde/idParserTests

Test coverage of {Basic|Dispatching}EntityIdParserTest

Author: JeroenDeDauw

tests/unit/Entity/BasicEntityIdParserTest.php

@@ -9,33 +9,55 @@
 
 /**
  * @covers Wikibase\DataModel\Entity\BasicEntityIdParser
- * @covers Wikibase\DataModel\Entity\DispatchingEntityIdParser
+ * @uses Wikibase\DataModel\Entity\DispatchingEntityIdParser
  *
  * @group Wikibase
  * @group WikibaseDataModel
  *
  * @licence GNU GPL v2+
  * @author Jeroen De Dauw < jeroendedauw@gmail.com >
+ * @author Thiemo Mättig
  */
 class BasicEntityIdParserTest extends \PHPUnit_Framework_TestCase {
 
 	/**
-	 * @dataProvider idProvider
+	 * @dataProvider entityIdProvider
 	 */
-	public function testCanParseEntityId( EntityId $expected ) {
+	public function testCanParseEntityId( $idString, EntityId $expected ) {
 		$parser = new BasicEntityIdParser();
-
-		$actual = $parser->parse( $expected->getSerialization() );
+		$actual = $parser->parse( $idString );
 
 		$this->assertEquals( $actual, $expected );
 	}
 
-	public function idProvider() {
+	public function entityIdProvider() {
+		return array(
+			array( 'q42', new ItemId( 'q42' ) ),
+			array( 'Q1337', new ItemId( 'Q1337' ) ),
+			array( 'p1', new PropertyId( 'p1' ) ),
+			array( 'P100000', new PropertyId( 'P100000' ) ),
+		);
+	}
+
+	/**
+	 * @dataProvider invalidIdSerializationProvider
+	 */
+	public function testCannotParseInvalidId( $invalidIdSerialization ) {
+		$parser = new BasicEntityIdParser();
+
+		$this->setExpectedException( 'Wikibase\DataModel\Entity\EntityIdParsingException' );
+		$parser->parse( $invalidIdSerialization );
+	}
+
+	public function invalidIdSerializationProvider() {
 		return array(
-			array( new ItemId( 'q42' ) ),
-			array( new ItemId( 'Q1337' ) ),
-			array( new PropertyId( 'p1' ) ),
-			array( new PropertyId( 'P100000' ) ),
+			array( 'FOO' ),
+			array( null ),
+			array( 42 ),
+			array( array() ),
+			array( '' ),
+			array( 'q0' ),
+			array( '1p' ),
 		);
 	}
 

tests/unit/Entity/DispatchingEntityIdParserTest.php

@@ -10,15 +10,14 @@
 
 /**
  * @covers Wikibase\DataModel\Entity\DispatchingEntityIdParser
- * @covers Wikibase\DataModel\Entity\EntityIdParser
- *
  * @uses Wikibase\DataModel\Entity\BasicEntityIdParser
  *
  * @group Wikibase
  * @group WikibaseDataModel
  *
  * @licence GNU GPL v2+
  * @author Jeroen De Dauw < jeroendedauw@gmail.com >
+ * @author Thiemo Mättig
  */
 class DispatchingEntityIdParserTest extends \PHPUnit_Framework_TestCase {
 
@@ -29,28 +28,29 @@ private function getBasicParser() {
 	/**
 	 * @dataProvider entityIdProvider
 	 */
-	public function testCanParseEntityId( EntityId $expected ) {
+	public function testCanParseEntityId( $idString, EntityId $expected ) {
 		$parser = $this->getBasicParser();
-		$actual = $parser->parse( $expected->getSerialization() );
+		$actual = $parser->parse( $idString );
 
 		$this->assertEquals( $actual, $expected );
 	}
 
 	public function entityIdProvider() {
 		return array(
-			array( new ItemId( 'q42' ) ),
-			array( new ItemId( 'Q1337' ) ),
-			array( new PropertyId( 'p1' ) ),
-			array( new PropertyId( 'P100000' ) ),
+			array( 'q42', new ItemId( 'q42' ) ),
+			array( 'Q1337', new ItemId( 'Q1337' ) ),
+			array( 'p1', new PropertyId( 'p1' ) ),
+			array( 'P100000', new PropertyId( 'P100000' ) ),
 		);
 	}
 
 	/**
 	 * @dataProvider invalidIdSerializationProvider
-	 * @expectedException \Wikibase\DataModel\Entity\EntityIdParsingException
 	 */
 	public function testCannotParseInvalidId( $invalidIdSerialization ) {
 		$parser = $this->getBasicParser();
+
+		$this->setExpectedException( 'Wikibase\DataModel\Entity\EntityIdParsingException' );
 		$parser->parse( $invalidIdSerialization );
 	}
 
@@ -66,4 +66,11 @@ public function invalidIdSerializationProvider() {
 		);
 	}
 
+	public function testCannotParseWithoutBuilders() {
+		$parser = new DispatchingEntityIdParser( array() );
+
+		$this->setExpectedException( 'Wikibase\DataModel\Entity\EntityIdParsingException' );
+		$parser->parse( 'Q1' );
+	}
+
 }