Skip to content

Add GUID to Statement constructor #306

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JeroenDeDauw merged 1 commit into from
Apr 29, 2015
Merged

Add GUID to Statement constructor #306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/Statement/Statement.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,15 +67,18 @@ class Statement implements Hashable, Comparable, PropertyIdProvider {
* @param Snak $mainSnak
* @param Snaks|null $qualifiers
* @param ReferenceList|null $references
* @param string|null $guid
*/
public function __construct(
Snak $mainSnak,
Snaks $qualifiers = null,
ReferenceList $references = null
ReferenceList $references = null,
$guid = null
) {
$this->mainSnak = $mainSnak;
$this->qualifiers = $qualifiers ?: new SnakList();
$this->references = $references ?: new ReferenceList();
$this->setGuid( $guid );
}

/**
Expand Down
59 changes: 59 additions & 0 deletions tests/unit/Statement/StatementTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,16 @@
namespace Wikibase\DataModel\Tests\Statement;

use DataValues\StringValue;
use InvalidArgumentException;
use Wikibase\DataModel\Entity\PropertyId;
use Wikibase\DataModel\Reference;
use Wikibase\DataModel\ReferenceList;
use Wikibase\DataModel\Snak\PropertyNoValueSnak;
use Wikibase\DataModel\Snak\PropertySomeValueSnak;
use Wikibase\DataModel\Snak\PropertyValueSnak;
use Wikibase\DataModel\Snak\Snak;
use Wikibase\DataModel\Snak\SnakList;
use Wikibase\DataModel\Snak\Snaks;
use Wikibase\DataModel\Statement\Statement;

/**
Expand All @@ -24,6 +27,62 @@
*/
class StatementTest extends \PHPUnit_Framework_TestCase {

public function testMinimalConstructor() {
$mainSnak = new PropertyNoValueSnak( 1 );
$statement = new Statement( $mainSnak );
$this->assertTrue( $mainSnak->equals( $statement->getMainSnak() ) );
}

/**
* @dataProvider validConstructorArgumentsProvider
*/
public function testConstructorWithValidArguments(
Snak $mainSnak,
Snaks $qualifiers = null,
ReferenceList $references = null,
$guid
) {
$statement = new Statement( $mainSnak, $qualifiers, $references, $guid );
$this->assertTrue( $statement->getMainSnak()->equals( $mainSnak ) );
$this->assertTrue( $statement->getQualifiers()->equals( $qualifiers ?: new SnakList() ) );
$this->assertTrue( $statement->getReferences()->equals( $references ?: new ReferenceList() ) );
$this->assertSame( $guid, $statement->getGuid() );
}

public function validConstructorArgumentsProvider() {
$snak = new PropertyNoValueSnak( 1 );
$qualifiers = new SnakList( array( $snak ) );
$references = new ReferenceList( array( new Reference( array( $snak ) ) ) );

return array(
array( $snak, null, null, null ),
array( $snak, null, null, 'guid' ),
array( $snak, $qualifiers, $references, 'guid' ),
);
}

/**
* @dataProvider invalidConstructorArgumentsProvider
* @expectedException InvalidArgumentException
*/
public function testConstructorWithInvalidArguments(

@JeroenDeDauw JeroenDeDauw Apr 29, 2015

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Two simple methods here would be less code, less complexity and more clarity

@thiemowmde thiemowmde Apr 29, 2015

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

True. I was not happy with this provider too. See #468.

$mainSnak,
$qualifiers,
$references,
$guid
) {
new Statement( $mainSnak, $qualifiers, $references, $guid );
}

public function invalidConstructorArgumentsProvider() {
$snak = new PropertyNoValueSnak( 1 );

return array(
array( $snak, null, null, false ),
array( $snak, null, null, 1 ),
);
}

/**
* @dataProvider instanceProvider
*/
Expand Down