More StatementList tests

Author: thiemowmde

src/Statement/StatementList.php

@@ -54,7 +54,7 @@ public function __construct( $statements = array() /*...*/ ) {
 				throw new InvalidArgumentException( 'Every element in $statements must be an instance of Statement' );
 			}
 
-			$this->statements[] = $statement;
+			$this->addStatement( $statement );
 		}
 	}
 

tests/unit/Statement/StatementListTest.php

@@ -17,9 +17,66 @@
  *
  * @licence GNU GPL v2+
  * @author Jeroen De Dauw < jeroendedauw@gmail.com >
+ * @author Thiemo Mättig
  */
 class StatementListTest extends \PHPUnit_Framework_TestCase {
 
+	/**
+	 * @param int $propertyId
+	 * @param string|null $guid
+	 * @param int $rank
+	 *
+	 * @return Statement
+	 */
+	private function getStatement( $propertyId, $guid, $rank = Statement::RANK_NORMAL ) {
+		$statement = $this->getMockBuilder( 'Wikibase\DataModel\Statement\Statement' )
+			->disableOriginalConstructor()
+			->getMock();
+
+		$statement->expects( $this->any() )
+			->method( 'getGuid' )
+			->will( $this->returnValue( $guid ) );
+
+		$statement->expects( $this->any() )
+			->method( 'getPropertyId' )
+			->will( $this->returnValue( PropertyId::newFromNumber( $propertyId ) ) );
+
+		$statement->expects( $this->any() )
+			->method( 'getRank' )
+			->will( $this->returnValue( $rank ) );
+
+		return $statement;
+	}
+
+	private function getStatementWithSnak( $propertyId, $stringValue ) {
+		$snak = $this->newSnak( $propertyId, $stringValue );
+		$statement = new Statement( $snak );
+		$statement->setGuid( sha1( $snak->getHash() ) );
+		return $statement;
+	}
+
+	private function newSnak( $propertyId, $stringValue ) {
+		return new PropertyValueSnak( $propertyId, new StringValue( $stringValue ) );
+	}
+
+	public function testConstructorAcceptsDuplicatesWithNoGuid() {
+		$list = new StatementList(
+			$this->getStatement( 1, null ),
+			$this->getStatement( 1, null )
+		);
+
+		$this->assertSame( 2, $list->count() );
+	}
+
+	public function testConstructorAcceptsDuplicatesWithSameGuid() {
+		$list = new StatementList(
+			$this->getStatement( 1, 'duplicate' ),
+			$this->getStatement( 1, 'duplicate' )
+		);
+
+		$this->assertSame( 2, $list->count() );
+	}
+
 	public function testGivenNoStatements_getPropertyIdsReturnsEmptyArray() {
 		$list = new StatementList();
 		$this->assertSame( array(), $list->getPropertyIds() );
@@ -44,37 +101,18 @@ public function testGivenStatements_getPropertyIdsReturnsArrayWithoutDuplicates(
 		);
 	}
 
-	public function testGivenStatementsWithArrayKeys_reindexesArray() {
+	public function testGivenStatementsWithArrayKeys_toArrayReturnsReindexedArray() {
 		$statement = $this->getStatement( 1, 'guid' );
 		$list = new StatementList( array( 'ignore-me' => $statement ) );
 
 		$this->assertSame( array( 0 => $statement ), $list->toArray() );
 	}
 
-	/**
-	 * @param int $propertyId
-	 * @param string $guid
-	 * @param int $rank
-	 *
-	 * @return Statement
-	 */
-	private function getStatement( $propertyId, $guid, $rank = Statement::RANK_NORMAL ) {
-		$statement = $this->getMockBuilder( 'Wikibase\DataModel\Statement\Statement' )
-			->disableOriginalConstructor()->getMock();
-
-		$statement->expects( $this->any() )
-			->method( 'getGuid' )
-			->will( $this->returnValue( $guid ) );
-
-		$statement->expects( $this->any() )
-			->method( 'getPropertyId' )
-			->will( $this->returnValue( PropertyId::newFromNumber( $propertyId ) ) );
-
-		$statement->expects( $this->any() )
-			->method( 'getRank' )
-			->will( $this->returnValue( $rank ) );
+	public function testGivenSparseArray_toArrayReturnsReindexedArray() {
+		$statement = $this->getStatement( 1, 'guid' );
+		$list = new StatementList( array( 1 => $statement ) );
 
-		return $statement;
+		$this->assertSame( array( 0 => $statement ), $list->toArray() );
 	}
 
 	public function testCanIterate() {
@@ -154,17 +192,6 @@ public function testGetAllSnaksReturnsAllSnaks() {
 		);
 	}
 
-	private function getStatementWithSnak( $propertyId, $stringValue ) {
-		$snak = $this->newSnak( $propertyId, $stringValue );
-		$statement = new Statement( $snak );
-		$statement->setGuid( sha1( $snak->getHash() ) );
-		return $statement;
-	}
-
-	private function newSnak( $propertyId, $stringValue ) {
-		return new PropertyValueSnak( $propertyId, new StringValue( $stringValue ) );
-	}
-
 	public function testAddStatementWithOnlyMainSnak() {
 		$list = new StatementList();