From 576e6f3f45e6cb9b0da15bba04f472ea77811d2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thiemo=20M=C3=A4ttig?= Date: Thu, 12 Feb 2015 10:35:18 +0100 Subject: [PATCH] Favor StatementList's argument list constructor --- tests/unit/Entity/Diff/EntityDiffTest.php | 2 +- tests/unit/Entity/ItemTest.php | 2 +- .../Statement/StatementListDifferTest.php | 42 +++---- tests/unit/Statement/StatementListTest.php | 117 +++++++++--------- 4 files changed, 79 insertions(+), 84 deletions(-) diff --git a/tests/unit/Entity/Diff/EntityDiffTest.php b/tests/unit/Entity/Diff/EntityDiffTest.php index bcc348ea..3dc6c658 100644 --- a/tests/unit/Entity/Diff/EntityDiffTest.php +++ b/tests/unit/Entity/Diff/EntityDiffTest.php @@ -94,7 +94,7 @@ public function diffProvider() { $statementListDiffer = new StatementListDiffer(); $diffOps['claim'] = $statementListDiffer->getDiff( - new StatementList( array( $statement ) ), + new StatementList( $statement ), new StatementList() ); diff --git a/tests/unit/Entity/ItemTest.php b/tests/unit/Entity/ItemTest.php index 45d43660..dcc4b3ff 100644 --- a/tests/unit/Entity/ItemTest.php +++ b/tests/unit/Entity/ItemTest.php @@ -617,7 +617,7 @@ public function testCanConstructWithStatementList() { $statement = new Statement( new Claim( new PropertyNoValueSnak( 42 ) ) ); $statement->setGuid( 'meh' ); - $statements = new StatementList( array( $statement ) ); + $statements = new StatementList( $statement ); $item = new Item( null, null, null, $statements ); diff --git a/tests/unit/Statement/StatementListDifferTest.php b/tests/unit/Statement/StatementListDifferTest.php index 1a58a658..a439c38c 100644 --- a/tests/unit/Statement/StatementListDifferTest.php +++ b/tests/unit/Statement/StatementListDifferTest.php @@ -34,10 +34,10 @@ private function assertResultsInDiff( StatementList $fromStatements, StatementLi } public function testGivenTwoIdenticalLists_diffIsEmpty() { - $statements = new StatementList( array( + $statements = new StatementList( $this->getNewStatement( 'zero', 'first' ), - $this->getNewStatement( 'one', 'second' ), - ) ); + $this->getNewStatement( 'one', 'second' ) + ); $this->assertResultsInDiff( $statements, $statements, new Diff() ); } @@ -49,16 +49,16 @@ private function getNewStatement( $guid, $hash ) { } public function testGivenToListWithExtraStatement_additionOperationInDiff() { - $fromStatements = new StatementList( array( + $fromStatements = new StatementList( $this->getNewStatement( 'zero', 'first' ), - $this->getNewStatement( 'one', 'second' ), - ) ); + $this->getNewStatement( 'one', 'second' ) + ); - $toStatements = new StatementList( array( + $toStatements = new StatementList( $this->getNewStatement( 'zero', 'first' ), $this->getNewStatement( 'two', 'third' ), - $this->getNewStatement( 'one', 'second' ), - ) ); + $this->getNewStatement( 'one', 'second' ) + ); $diff = new Diff( array( 'two' => new DiffOpAdd( $this->getNewStatement( 'two', 'third' ) ), @@ -68,15 +68,15 @@ public function testGivenToListWithExtraStatement_additionOperationInDiff() { } public function testGivenToListWithLessStatements_removalOperationsInDiff() { - $fromStatements = new StatementList( array( + $fromStatements = new StatementList( $this->getNewStatement( 'zero', 'first' ), $this->getNewStatement( 'one', 'second' ), - $this->getNewStatement( 'two', 'third' ), - ) ); + $this->getNewStatement( 'two', 'third' ) + ); - $toStatements = new StatementList( array( - $this->getNewStatement( 'one', 'second' ), - ) ); + $toStatements = new StatementList( + $this->getNewStatement( 'one', 'second' ) + ); $diff = new Diff( array( 'zero' => new DiffOpRemove( $this->getNewStatement( 'zero', 'first' ) ), @@ -87,17 +87,17 @@ public function testGivenToListWithLessStatements_removalOperationsInDiff() { } public function testGivenListWithChangedStatements_changeOperationsInDiff() { - $fromStatements = new StatementList( array( + $fromStatements = new StatementList( $this->getNewStatement( 'zero', 'first' ), $this->getNewStatement( 'one', 'second' ), - $this->getNewStatement( 'two', 'third' ), - ) ); + $this->getNewStatement( 'two', 'third' ) + ); - $toStatements = new StatementList( array( + $toStatements = new StatementList( $this->getNewStatement( 'zero', 'FIRST' ), $this->getNewStatement( 'one', 'second' ), - $this->getNewStatement( 'two', 'THIRD' ), - ) ); + $this->getNewStatement( 'two', 'THIRD' ) + ); $diff = new Diff( array( 'zero' => new DiffOpChange( diff --git a/tests/unit/Statement/StatementListTest.php b/tests/unit/Statement/StatementListTest.php index bb811332..c80e4c1e 100644 --- a/tests/unit/Statement/StatementListTest.php +++ b/tests/unit/Statement/StatementListTest.php @@ -27,13 +27,13 @@ public function testGivenNoStatements_getPropertyIdsReturnsEmptyArray() { } public function testGivenStatements_getPropertyIdsReturnsArrayWithoutDuplicates() { - $list = new StatementList( array( + $list = new StatementList( $this->getStatement( 1, 'kittens' ), $this->getStatement( 3, 'foo' ), $this->getStatement( 2, 'bar' ), $this->getStatement( 2, 'baz' ), - $this->getStatement( 1, 'bah' ), - ) ); + $this->getStatement( 1, 'bah' ) + ); $this->assertEquals( array( @@ -80,7 +80,7 @@ private function getStatement( $propertyId, $guid, $rank = Statement::RANK_NORMA public function testCanIterate() { $statement = $this->getStatement( 1, 'kittens' ); - $list = new StatementList( array( $statement ) ); + $list = new StatementList( $statement ); foreach ( $list as $statementFormList ) { $this->assertEquals( $statement, $statementFormList ); @@ -88,7 +88,7 @@ public function testCanIterate() { } public function testGetBestStatementPerProperty() { - $list = new StatementList( array( + $list = new StatementList( $this->getStatement( 1, 'one', Statement::RANK_PREFERRED ), $this->getStatement( 1, 'two', Statement::RANK_NORMAL ), $this->getStatement( 1, 'three', Statement::RANK_PREFERRED ), @@ -99,8 +99,8 @@ public function testGetBestStatementPerProperty() { $this->getStatement( 3, 'six', Statement::RANK_NORMAL ), $this->getStatement( 4, 'seven', Statement::RANK_PREFERRED ), - $this->getStatement( 4, 'eight', Claim::RANK_TRUTH ), - ) ); + $this->getStatement( 4, 'eight', Claim::RANK_TRUTH ) + ); $this->assertEquals( array( @@ -116,13 +116,13 @@ public function testGetBestStatementPerProperty() { } public function testGetUniqueMainSnaksReturnsListWithoutDuplicates() { - $list = new StatementList( array( + $list = new StatementList( $this->getStatementWithSnak( 1, 'foo' ), $this->getStatementWithSnak( 2, 'foo' ), $this->getStatementWithSnak( 1, 'foo' ), $this->getStatementWithSnak( 2, 'bar' ), - $this->getStatementWithSnak( 1, 'bar' ), - ) ); + $this->getStatementWithSnak( 1, 'bar' ) + ); $this->assertEquals( array( @@ -136,13 +136,13 @@ public function testGetUniqueMainSnaksReturnsListWithoutDuplicates() { } public function testGetAllSnaksReturnsAllSnaks() { - $list = new StatementList( array( + $list = new StatementList( $this->getStatementWithSnak( 1, 'foo' ), $this->getStatementWithSnak( 2, 'foo' ), $this->getStatementWithSnak( 1, 'foo' ), $this->getStatementWithSnak( 2, 'bar' ), - $this->getStatementWithSnak( 1, 'bar' ), - ) ); + $this->getStatementWithSnak( 1, 'bar' ) + ); $this->assertEquals( array( @@ -173,9 +173,9 @@ public function testAddStatementWithOnlyMainSnak() { $list->addNewStatement( $this->newSnak( 42, 'foo' ) ); $this->assertEquals( - new StatementList( array( + new StatementList( new Statement( new Claim( $this->newSnak( 42, 'foo' ) ) ) - ) ), + ), $list ); } @@ -191,14 +191,14 @@ public function testAddStatementWithQualifiersAsSnakArray() { ); $this->assertEquals( - new StatementList( array( + new StatementList( new Statement( new Claim( $this->newSnak( 42, 'foo' ), new SnakList( array( $this->newSnak( 1, 'bar' ) ) ) ) ) - ) ), + ), $list ); } @@ -215,12 +215,12 @@ public function testAddStatementWithQualifiersAsSnakList() { ); $this->assertEquals( - new StatementList( array( + new StatementList( new Statement( new Claim( $this->newSnak( 42, 'foo' ), $snakList ) ) - ) ), + ), $list ); } @@ -242,10 +242,7 @@ public function testAddStatementWithGuid() { $statement->setGuid( 'kittens' ); - $this->assertEquals( - new StatementList( array( $statement ) ), - $list - ); + $this->assertEquals( new StatementList( $statement ), $list ); } public function testCanConstructWithClaimsObjectContainingOnlyStatements() { @@ -321,10 +318,10 @@ public function testCountForEmptyList() { } public function testCountForNonEmptyList() { - $list = new StatementList( array( + $list = new StatementList( $this->getStatementWithSnak( 1, 'foo' ), - $this->getStatementWithSnak( 2, 'bar' ), - ) ); + $this->getStatementWithSnak( 2, 'bar' ) + ); $this->assertSame( 2, $list->count() ); } @@ -354,47 +351,47 @@ public function statementArrayProvider() { } public function testGivenDifferentLists_equalsReturnsFalse() { - $firstStatements = new StatementList( array( + $firstStatements = new StatementList( $this->getStatementWithSnak( 1, 'foo' ), - $this->getStatementWithSnak( 2, 'bar' ), - ) ); + $this->getStatementWithSnak( 2, 'bar' ) + ); - $secondStatements = new StatementList( array( + $secondStatements = new StatementList( $this->getStatementWithSnak( 1, 'foo' ), - $this->getStatementWithSnak( 2, 'SPAM' ), - ) ); + $this->getStatementWithSnak( 2, 'SPAM' ) + ); $this->assertFalse( $firstStatements->equals( $secondStatements ) ); } public function testGivenListsWithDifferentDuplicates_equalsReturnsFalse() { - $firstStatements = new StatementList( array( + $firstStatements = new StatementList( $this->getStatementWithSnak( 1, 'foo' ), $this->getStatementWithSnak( 1, 'foo' ), - $this->getStatementWithSnak( 2, 'bar' ), - ) ); + $this->getStatementWithSnak( 2, 'bar' ) + ); - $secondStatements = new StatementList( array( + $secondStatements = new StatementList( $this->getStatementWithSnak( 1, 'foo' ), $this->getStatementWithSnak( 2, 'bar' ), - $this->getStatementWithSnak( 2, 'bar' ), - ) ); + $this->getStatementWithSnak( 2, 'bar' ) + ); $this->assertFalse( $firstStatements->equals( $secondStatements ) ); } public function testGivenListsWithDifferentOrder_equalsReturnsFalse() { - $firstStatements = new StatementList( array( + $firstStatements = new StatementList( $this->getStatementWithSnak( 1, 'foo' ), $this->getStatementWithSnak( 2, 'bar' ), - $this->getStatementWithSnak( 3, 'baz' ), - ) ); + $this->getStatementWithSnak( 3, 'baz' ) + ); - $secondStatements = new StatementList( array( + $secondStatements = new StatementList( $this->getStatementWithSnak( 1, 'foo' ), $this->getStatementWithSnak( 3, 'baz' ), - $this->getStatementWithSnak( 2, 'bar' ), - ) ); + $this->getStatementWithSnak( 2, 'bar' ) + ); $this->assertFalse( $firstStatements->equals( $secondStatements ) ); } @@ -402,21 +399,21 @@ public function testGivenListsWithDifferentOrder_equalsReturnsFalse() { public function testEmptyListDoesNotEqualNonEmptyList() { $firstStatements = new StatementList(); - $secondStatements = new StatementList( array( + $secondStatements = new StatementList( $this->getStatementWithSnak( 1, 'foo' ), $this->getStatementWithSnak( 3, 'baz' ), - $this->getStatementWithSnak( 2, 'bar' ), - ) ); + $this->getStatementWithSnak( 2, 'bar' ) + ); $this->assertFalse( $firstStatements->equals( $secondStatements ) ); } public function testNonEmptyListDoesNotEqualEmptyList() { - $firstStatements = new StatementList( array( + $firstStatements = new StatementList( $this->getStatementWithSnak( 1, 'foo' ), $this->getStatementWithSnak( 3, 'baz' ), - $this->getStatementWithSnak( 2, 'bar' ), - ) ); + $this->getStatementWithSnak( 2, 'bar' ) + ); $secondStatements = new StatementList(); @@ -430,9 +427,7 @@ public function testEmptyListIsEmpty() { } public function testNonEmptyListIsNotEmpty() { - $list = new StatementList( array( - $this->getStatementWithSnak( 1, 'foo' ), - ) ); + $list = new StatementList( $this->getStatementWithSnak( 1, 'foo' ) ); $this->assertFalse( $list->isEmpty() ); } @@ -496,15 +491,15 @@ public function testGivenValidRank_getWithRankReturnsOnlyMatchingStatements() { $thirdStatement = new Statement( new Claim( new PropertyNoValueSnak( 9001 ) ) ); $thirdStatement->setRank( Statement::RANK_DEPRECATED ); - $list = new StatementList( array( $statement, $secondStatement, $thirdStatement ) ); + $list = new StatementList( $statement, $secondStatement, $thirdStatement ); $this->assertEquals( - new StatementList( array( $statement ) ), + new StatementList( $statement ), $list->getWithRank( Statement::RANK_PREFERRED ) ); $this->assertEquals( - new StatementList( array( $secondStatement, $thirdStatement ) ), + new StatementList( $secondStatement, $thirdStatement ), $list->getWithRank( array( Statement::RANK_NORMAL, Statement::RANK_DEPRECATED ) ) ); } @@ -521,7 +516,7 @@ public function testWhenOnlyDeprecatedStatements_getBestStatementsReturnsEmptyLi $secondStatement = new Statement( new Claim( new PropertyNoValueSnak( 9001 ) ) ); $secondStatement->setRank( Statement::RANK_DEPRECATED ); - $list = new StatementList( array( $statement, $secondStatement ) ); + $list = new StatementList( $statement, $secondStatement ); $this->assertEquals( new StatementList(), $list->getBestStatements() ); } @@ -538,9 +533,9 @@ public function testWhenPreferredStatements_getBestStatementsReturnsOnlyThose() $fourthStatement = new Statement( new Claim( new PropertyNoValueSnak( 23 ) ) ); $fourthStatement->setRank( Statement::RANK_PREFERRED ); - $list = new StatementList( array( $statement, $secondStatement, $thirdStatement, $fourthStatement ) ); + $list = new StatementList( $statement, $secondStatement, $thirdStatement, $fourthStatement ); $this->assertEquals( - new StatementList( array( $statement, $fourthStatement ) ), + new StatementList( $statement, $fourthStatement ), $list->getBestStatements() ); } @@ -555,9 +550,9 @@ public function testWhenNoPreferredStatements_getBestStatementsReturnsOnlyNormal $thirdStatement = new Statement( new Claim( new PropertyNoValueSnak( 9001 ) ) ); $thirdStatement->setRank( Statement::RANK_DEPRECATED ); - $list = new StatementList( array( $statement, $secondStatement, $thirdStatement ) ); + $list = new StatementList( $statement, $secondStatement, $thirdStatement ); $this->assertEquals( - new StatementList( array( $statement, $secondStatement ) ), + new StatementList( $statement, $secondStatement ), $list->getBestStatements() ); }