Merge pull request #622 from wmde/refIdentity

Rework test for ReferenceList::indexOf using identity

Author: Benestar

src/ReferenceList.php

@@ -110,7 +110,7 @@ private function insertReferenceAtIndex( Reference $reference, $index ) {
 	 *
 	 * @param Reference $reference
 	 *
-	 * @return boolean
+	 * @return bool
 	 */
 	public function hasReference( Reference $reference ) {
 		return $this->hasReferenceHash( $reference->getHash() );
@@ -123,7 +123,7 @@ public function hasReference( Reference $reference ) {
 	 *
 	 * @param Reference $reference
 	 *
-	 * @return int|boolean
+	 * @return int|bool
 	 */
 	public function indexOf( Reference $reference ) {
 		foreach ( $this->references as $index => $ref ) {
@@ -153,7 +153,7 @@ public function removeReference( Reference $reference ) {
 	 *
 	 * @param string $referenceHash
 	 *
-	 * @return boolean
+	 * @return bool
 	 */
 	public function hasReferenceHash( $referenceHash ) {
 		return $this->getReference( $referenceHash ) !== null;

tests/unit/ReferenceListTest.php

@@ -246,14 +246,15 @@ public function testIndexOf( ReferenceList $array ) {
 		}
 	}
 
-	public function testIndexOf_falseForMissingReferences() {
-		$referenceList = new ReferenceList();
-		$reference = new Reference( array( new PropertyNoValueSnak( 1 ) ) );
-
-		$referenceList->addNewReference( new PropertyNoValueSnak( 1 ) );
+	public function testIndexOf_checksForIdentity() {
+		$reference1 = new Reference( array( new PropertyNoValueSnak( 1 ) ) );
+		$reference2 = new Reference( array( new PropertyNoValueSnak( 1 ) ) );
+		$referenceList = new ReferenceList( array( $reference1 ) );
 
-		$this->assertFalse( $referenceList->indexOf( new Reference() ) );
-		$this->assertFalse( $referenceList->indexOf( $reference ) );
+		$this->assertNotSame( $reference1, $reference2, 'post condition' );
+		$this->assertTrue( $reference1->equals( $reference2 ), 'post condition' );
+		$this->assertSame( 0, $referenceList->indexOf( $reference1 ), 'identity' );
+		$this->assertFalse( $referenceList->indexOf( $reference2 ), 'not equality' );
 	}
 
 	/**