Merge pull request #385 from wmde/idParserTest

Rename/refactor DispatchingEntityIdParserTest

Author: JeroenDeDauw

tests/unit/Entity/EntityIdParserTest.php …Entity/DispatchingEntityIdParserTest.phptests/unit/Entity/EntityIdParserTest.php renamed to tests/unit/Entity/DispatchingEntityIdParserTest.php tests/unit/Entity/EntityIdParserTest.php renamed to tests/unit/Entity/DispatchingEntityIdParserTest.php

@@ -9,26 +9,34 @@
 use Wikibase\DataModel\Entity\PropertyId;
 
 /**
+ * @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 >
  */
-class EntityIdParserTest extends \PHPUnit_Framework_TestCase {
+class DispatchingEntityIdParserTest extends \PHPUnit_Framework_TestCase {
+
+	private function getBasicParser() {
+		return new DispatchingEntityIdParser( BasicEntityIdParser::getBuilders() );
+	}
 
 	/**
-	 * @dataProvider idProvider
+	 * @dataProvider entityIdProvider
 	 */
 	public function testCanParseEntityId( EntityId $expected ) {
-		$actual = $this->newParser()->parse( $expected->getSerialization() );
+		$parser = $this->getBasicParser();
+		$actual = $parser->parse( $expected->getSerialization() );
 
 		$this->assertEquals( $actual, $expected );
 	}
 
-	public function idProvider() {
+	public function entityIdProvider() {
 		return array(
 			array( new ItemId( 'q42' ) ),
 			array( new ItemId( 'Q1337' ) ),
@@ -37,16 +45,13 @@ public function idProvider() {
 		);
 	}
 
-	protected function newParser() {
-		return new DispatchingEntityIdParser( BasicEntityIdParser::getBuilders() );
-	}
-
 	/**
 	 * @dataProvider invalidIdSerializationProvider
+	 * @expectedException \Wikibase\DataModel\Entity\EntityIdParsingException
 	 */
-	public function testCannotParserInvalidId( $invalidIdSerialization ) {
-		$this->setExpectedException( 'Wikibase\DataModel\Entity\EntityIdParsingException' );
-		$this->newParser()->parse( $invalidIdSerialization );
+	public function testCannotParseInvalidId( $invalidIdSerialization ) {
+		$parser = $this->getBasicParser();
+		$parser->parse( $invalidIdSerialization );
 	}
 
 	public function invalidIdSerializationProvider() {