Merge pull request #581 from wmde/assertSame

Prefer assertSame over assertTrue

Author: JeroenDeDauw

tests/unit/Entity/EntityTest.php

@@ -368,7 +368,7 @@ public function testCopy( Entity $entity ) {
 		$this->assertTrue( $entity->equals( $copy ) );
 		$this->assertEquals( $entity->getId(), $copy->getId() );
 
-		$this->assertFalse( $entity === $copy );
+		$this->assertNotSame( $entity, $copy );
 	}
 
 	public function testCopyRetainsLabels() {

tests/unit/HashArray/HashArrayWithDuplicatesTest.php

@@ -106,12 +106,13 @@ public function testGetHash( HashArray $array ) {
 
 		$newHash = $array->getHash();
 
-		$this->assertFalse( $hash === $newHash, 'Hash should not be the same after adding an element' );
+		$this->assertNotSame( $hash, $newHash, 'Hash should not be the same after adding an element' );
 
 		$array->addElement( $element );
 
-		$this->assertFalse(
-			$newHash === $array->getHash(),
+		$this->assertNotSame(
+			$newHash,
+			$array->getHash(),
 			'Hash should not be the same after adding an existing element again'
 		);
 	}

tests/unit/HashArray/HashArrayWithoutDuplicatesTest.php

@@ -99,16 +99,19 @@ public function testRemoveDuplicates( HashArray $array ) {
 	public function testGetHash( HashArray $array ) {
 		$hash = $array->getHash();
 
-		$this->assertEquals( $hash, $array->getHash() );
+		$this->assertSame( $hash, $array->getHash() );
 
 		$elements = $this->elementInstancesProvider();
 		$element = array_shift( $elements );
 		$element = $element[0][0];
 
-		$hasElement = $array->hasElement( $element );
 		$array->addElement( $element );
 
-		$this->assertTrue( ( $hash === $array->getHash() ) === $hasElement );
+		if ( $array->hasElement( $element ) ) {
+			$this->assertSame( $hash, $array->getHash() );
+		} else {
+			$this->assertNotSame( $hash, $array->getHash() );
+		}
 	}
 
 	/**

tests/unit/Snak/SnakListTest.php

@@ -281,9 +281,9 @@ public function testOrderByProperty( SnakList $snakList, SnakList $expected, $or
 		$this->assertEquals( $expected, $orderedSnakList );
 
 		if ( $orderedSnakList->equals( $initialSnakList ) ) {
-			$this->assertTrue( $initialSnakList->getHash() === $snakList->getHash() );
+			$this->assertSame( $initialSnakList->getHash(), $snakList->getHash() );
 		} else {
-			$this->assertFalse( $initialSnakList->getHash() === $snakList->getHash() );
+			$this->assertNotSame( $initialSnakList->getHash(), $snakList->getHash() );
 		}
 	}