[MediaWiki-commits] [Gerrit] Replace getClaims with getStatements in tests - change (mediawiki...Wikibase)

2015-07-05 Thread Bene (Code Review) 
Bene has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/222904

Change subject: Replace getClaims with getStatements in tests
..

Replace getClaims with getStatements in tests

Change-Id: I49724b4e84296649b3d76f36a76b7ca69b2cdd0d
---
M repo/tests/phpunit/includes/ChangeOp/ChangeOpMainSnakTest.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpRemoveStatementTest.php
2 files changed, 7 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/04/222904/1

diff --git a/repo/tests/phpunit/includes/ChangeOp/ChangeOpMainSnakTest.php 
b/repo/tests/phpunit/includes/ChangeOp/ChangeOpMainSnakTest.php
index b9658a4..9c22b90 100644
--- a/repo/tests/phpunit/includes/ChangeOp/ChangeOpMainSnakTest.php
+++ b/repo/tests/phpunit/includes/ChangeOp/ChangeOpMainSnakTest.php
@@ -104,10 +104,9 @@
// update an existing claim with a new main snak value
$item = $this-makeNewItemWithClaim( 'Q234', $snak );
$newSnak =  $this-makeSnak( 'P5', 'changedSnak' );
-   $claims = $item-getClaims();
-   $claim = reset( $claims );
+   $statements = $item-getStatements()-toArray();
 
-   $guid = $claim-getGuid();
+   $guid = $statements[0]-getGuid();
$changeOp = $this-newChangeOpMainSnak( $guid, $newSnak );
$expected = $newSnak-getDataValue();
$args['update claim by guid'] = array( $item, $changeOp, 
$expected );
@@ -121,11 +120,11 @@
public function testApply( Item $item, ChangeOpMainSnak $changeOp, 
DataValue $expected = null ) {
$this-assertTrue( $changeOp-apply( $item ), Applying the 
ChangeOp did not return true );
$this-assertNotEmpty( $changeOp-getStatementGuid() );
-   $claims = new Claims( $item-getClaims() );
+   $statements = $item-getStatements();
if ( $expected === null ) {
-   $this-assertEquals( $expected, 
$claims-getClaimWithGuid( $changeOp-getStatementGuid() ) );
+   $this-assertEquals( $expected, 
$statements-getFirstStatementWithGuid( $changeOp-getStatementGuid() ) );
} else {
-   $this-assertEquals( $expected, 
$claims-getClaimWithGuid( $changeOp-getStatementGuid() 
)-getMainSnak()-getDataValue() );
+   $this-assertEquals( $expected, 
$statements-getFirstStatementWithGuid( $changeOp-getStatementGuid() 
)-getMainSnak()-getDataValue() );
}
}
 
diff --git 
a/repo/tests/phpunit/includes/ChangeOp/ChangeOpRemoveStatementTest.php 
b/repo/tests/phpunit/includes/ChangeOp/ChangeOpRemoveStatementTest.php
index 5e693c2..d886eaf 100644
--- a/repo/tests/phpunit/includes/ChangeOp/ChangeOpRemoveStatementTest.php
+++ b/repo/tests/phpunit/includes/ChangeOp/ChangeOpRemoveStatementTest.php
@@ -67,8 +67,8 @@
public function testApplyAddNewClaim( Item $item, 
ChangeOpRemoveStatement $changeOp, DataValue $expected = null ) {
$this-assertTrue( $changeOp-apply( $item ), Applying the 
ChangeOp did not return true );
$this-assertNotEmpty( $changeOp-getGuid() );
-   $claims = new Claims( $item-getClaims() );
-   $this-assertEquals( $expected, $claims-getClaimWithGuid( 
$changeOp-getGuid() ) );
+   $statements = $item-getStatements();
+   $this-assertEquals( $expected, 
$statements-getFirstStatementWithGuid( $changeOp-getGuid() ) );
}
 
private function newItemWithClaim( $itemIdString, $snak ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/222904
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I49724b4e84296649b3d76f36a76b7ca69b2cdd0d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Bene benestar.wikime...@gmail.com

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Replace getClaims with getStatements in tests - change (mediawiki...Wikibase)

2015-07-05 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Replace getClaims with getStatements in tests
..


Replace getClaims with getStatements in tests

Change-Id: I49724b4e84296649b3d76f36a76b7ca69b2cdd0d
---
M repo/tests/phpunit/includes/ChangeOp/ChangeOpMainSnakTest.php
M repo/tests/phpunit/includes/ChangeOp/ChangeOpRemoveStatementTest.php
2 files changed, 7 insertions(+), 8 deletions(-)

Approvals:
  Addshore: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/repo/tests/phpunit/includes/ChangeOp/ChangeOpMainSnakTest.php 
b/repo/tests/phpunit/includes/ChangeOp/ChangeOpMainSnakTest.php
index b9658a4..9c22b90 100644
--- a/repo/tests/phpunit/includes/ChangeOp/ChangeOpMainSnakTest.php
+++ b/repo/tests/phpunit/includes/ChangeOp/ChangeOpMainSnakTest.php
@@ -104,10 +104,9 @@
// update an existing claim with a new main snak value
$item = $this-makeNewItemWithClaim( 'Q234', $snak );
$newSnak =  $this-makeSnak( 'P5', 'changedSnak' );
-   $claims = $item-getClaims();
-   $claim = reset( $claims );
+   $statements = $item-getStatements()-toArray();
 
-   $guid = $claim-getGuid();
+   $guid = $statements[0]-getGuid();
$changeOp = $this-newChangeOpMainSnak( $guid, $newSnak );
$expected = $newSnak-getDataValue();
$args['update claim by guid'] = array( $item, $changeOp, 
$expected );
@@ -121,11 +120,11 @@
public function testApply( Item $item, ChangeOpMainSnak $changeOp, 
DataValue $expected = null ) {
$this-assertTrue( $changeOp-apply( $item ), Applying the 
ChangeOp did not return true );
$this-assertNotEmpty( $changeOp-getStatementGuid() );
-   $claims = new Claims( $item-getClaims() );
+   $statements = $item-getStatements();
if ( $expected === null ) {
-   $this-assertEquals( $expected, 
$claims-getClaimWithGuid( $changeOp-getStatementGuid() ) );
+   $this-assertEquals( $expected, 
$statements-getFirstStatementWithGuid( $changeOp-getStatementGuid() ) );
} else {
-   $this-assertEquals( $expected, 
$claims-getClaimWithGuid( $changeOp-getStatementGuid() 
)-getMainSnak()-getDataValue() );
+   $this-assertEquals( $expected, 
$statements-getFirstStatementWithGuid( $changeOp-getStatementGuid() 
)-getMainSnak()-getDataValue() );
}
}
 
diff --git 
a/repo/tests/phpunit/includes/ChangeOp/ChangeOpRemoveStatementTest.php 
b/repo/tests/phpunit/includes/ChangeOp/ChangeOpRemoveStatementTest.php
index 5e693c2..d886eaf 100644
--- a/repo/tests/phpunit/includes/ChangeOp/ChangeOpRemoveStatementTest.php
+++ b/repo/tests/phpunit/includes/ChangeOp/ChangeOpRemoveStatementTest.php
@@ -67,8 +67,8 @@
public function testApplyAddNewClaim( Item $item, 
ChangeOpRemoveStatement $changeOp, DataValue $expected = null ) {
$this-assertTrue( $changeOp-apply( $item ), Applying the 
ChangeOp did not return true );
$this-assertNotEmpty( $changeOp-getGuid() );
-   $claims = new Claims( $item-getClaims() );
-   $this-assertEquals( $expected, $claims-getClaimWithGuid( 
$changeOp-getGuid() ) );
+   $statements = $item-getStatements();
+   $this-assertEquals( $expected, 
$statements-getFirstStatementWithGuid( $changeOp-getGuid() ) );
}
 
private function newItemWithClaim( $itemIdString, $snak ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/222904
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I49724b4e84296649b3d76f36a76b7ca69b2cdd0d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Bene benestar.wikime...@gmail.com
Gerrit-Reviewer: Addshore addshorew...@gmail.com
Gerrit-Reviewer: Jeroen De Dauw jeroended...@gmail.com
Gerrit-Reviewer: jenkins-bot 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits