Merge pull request #727 from wmde/abstractTestStuff

Inline all abstract stuff from HashArrayTest to the implementations

Author: JeroenDeDauw

tests/unit/HashArray/HashArrayTest.php

@@ -14,29 +14,6 @@
  */
 abstract class HashArrayTest extends \PHPUnit_Framework_TestCase {
 
-	public abstract function constructorProvider();
-
-	/**
-	 * Returns the name of the concrete class being tested.
-	 *
-	 * @since 0.4
-	 *
-	 * @return string
-	 */
-	abstract public function getInstanceClass();
-
-	public function instanceProvider() {
-		$class = $this->getInstanceClass();
-
-		$instances = [];
-
-		foreach ( $this->constructorProvider() as $args ) {
-			$instances[] = [ new $class( array_key_exists( 0, $args ) ? $args[0] : [] ) ];
-		}
-
-		return $instances;
-	}
-
 	/**
 	 * @param array $elements
 	 *

tests/unit/HashArray/HashArrayWithoutDuplicatesTest.php

@@ -4,6 +4,7 @@
 
 use Hashable;
 use Wikibase\DataModel\Fixtures\HashArrayElement;
+use Wikibase\DataModel\Fixtures\HashArrayWithoutDuplicates;
 use Wikibase\DataModel\HashArray;
 use Wikibase\DataModel\Snak\PropertyNoValueSnak;
 
@@ -19,17 +20,10 @@
  */
 class HashArrayWithoutDuplicatesTest extends HashArrayTest {
 
-	public function constructorProvider() {
-		$argLists = [];
-
-		$argLists[] = [ HashArrayElement::getInstances() ];
-		$argLists[] = [ array_merge( HashArrayElement::getInstances(), HashArrayElement::getInstances() ) ];
-
-		return $argLists;
-	}
-
-	public function getInstanceClass() {
-		return 'Wikibase\DataModel\Fixtures\HashArrayWithoutDuplicates';
+	public function instanceProvider() {
+		return [
+			[ new HashArrayWithoutDuplicates( HashArrayElement::getInstances() ) ],
+		];
 	}
 
 	public function elementInstancesProvider() {

tests/unit/Snak/SnakListTest.php

@@ -33,13 +33,6 @@
  */
 class SnakListTest extends HashArrayTest {
 
-	/**
-	 * @see HashArrayTest::getInstanceClass
-	 */
-	public function getInstanceClass() {
-		return 'Wikibase\DataModel\Snak\SnakList';
-	}
-
 	public function elementInstancesProvider() {
 		$id42 = new PropertyId( 'P42' );
 
@@ -52,25 +45,24 @@ public function elementInstancesProvider() {
 		return $argLists;
 	}
 
-	public function constructorProvider() {
+	public function instanceProvider() {
 		$id42 = new PropertyId( 'P42' );
 		$id9001 = new PropertyId( 'P9001' );
 
 		return [
-			[],
-			[ [] ],
-			[ [
+			[ new SnakList() ],
+			[ new SnakList( [
 				new PropertyNoValueSnak( $id42 )
-			] ],
-			[ [
+			] ) ],
+			[ new SnakList( [
 				new PropertyNoValueSnak( $id42 ),
 				new PropertyNoValueSnak( $id9001 ),
-			] ],
-			[ [
+			] ) ],
+			[ new SnakList( [
 				new PropertyNoValueSnak( $id42 ),
 				new PropertyNoValueSnak( $id9001 ),
 				new PropertyValueSnak( $id42, new StringValue( 'a' ) ),
-			] ],
+			] ) ],
 		];
 	}