Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/102919
Change subject: Remove hardcoded ids from SetClaimTest
......................................................................
Remove hardcoded ids from SetClaimTest
Change-Id: I338337fd788797d647b1f931eac0601155d38548
---
M repo/tests/phpunit/includes/api/SetClaimTest.php
1 file changed, 31 insertions(+), 32 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/19/102919/1
diff --git a/repo/tests/phpunit/includes/api/SetClaimTest.php
b/repo/tests/phpunit/includes/api/SetClaimTest.php
index ed94dbd..b00f7cf 100644
--- a/repo/tests/phpunit/includes/api/SetClaimTest.php
+++ b/repo/tests/phpunit/includes/api/SetClaimTest.php
@@ -2,6 +2,7 @@
namespace Wikibase\Test\Api;
+use DataValues\StringValue;
use FormatJson;
use Wikibase\Claim;
use Wikibase\Claims;
@@ -42,53 +43,51 @@
*/
class SetClaimTest extends WikibaseApiTestCase {
+ private static $propertyIds;
+
public function setUp() {
parent::setUp();
- static $hasProperties = false;
-
- if ( !$hasProperties ) {
- // Create the properties once
- $propertyIds = self::getPropertyIds();
-
- foreach( $propertyIds as $propertyId ) {
- $prop = PropertyContent::newEmpty();
- $prop->getEntity()->setId( $propertyId );
- $prop->getEntity()->setDataTypeId( 'string' );
- $prop->save( 'testing' );
- }
-
- $hasProperties = true;
+ if ( !isset( self::$propertyIds ) ) {
+ self::$propertyIds = $this->setProperties();
}
}
- /**
- * @return PropertyId[]
- */
- protected static function getPropertyIds() {
- return array(
- new PropertyId( 'P42' ),
- new PropertyId( 'P9001' ),
- new PropertyId( 'P7201010' )
- );
+ private function setProperties() {
+ $propertyIds = array();
+
+ for( $i = 0; $i < 4; $i++ ) {
+ $propertyContent = PropertyContent::newEmpty();
+ $propertyId = PropertyId::newFromNumber(
$propertyContent->grabFreshId() );
+
+ $propertyContent->getEntity()->setId( $propertyId );
+ $propertyContent->getEntity()->setDataTypeId( 'string'
);
+ $propertyContent->save( 'testing' );
+
+ $propertyIds[] = $propertyId;
+ }
+
+ return $propertyIds;
}
/**
* @return Snak[]
*/
- protected static function snakProvider() {
- $propertyIds = self::getPropertyIds();
-
+ protected function snakProvider() {
$snaks = array();
- $snaks[] = new PropertyNoValueSnak( $propertyIds[0] );
- $snaks[] = new PropertySomeValueSnak( $propertyIds[1] );
- $snaks[] = new PropertyValueSnak( $propertyIds[2], new
\DataValues\StringValue( 'o_O' ) );
+ if ( !isset( self::$propertyIds ) ) {
+ self::$propertyIds = $this->setProperties();
+ }
+
+ $snaks[] = new PropertyNoValueSnak( self::$propertyIds[0] );
+ $snaks[] = new PropertySomeValueSnak( self::$propertyIds[1] );
+ $snaks[] = new PropertyValueSnak( self::$propertyIds[2], new
StringValue( 'o_O' ) );
return $snaks;
}
- public static function provideClaims() {
+ public function provideClaims() {
$testCases = array();
$ranks = array(
@@ -156,7 +155,7 @@
$this->makeRequest( $serializedClaim, $item->getId(),
1, 'reorder qualifiers' );
}
- $claim = new Statement( new PropertyNoValueSnak( 9001 ) );
+ $claim = new Statement( new PropertyNoValueSnak(
self::$propertyIds[0] ) );
$claim->setGuid( $guid );
// Update request
@@ -179,7 +178,7 @@
$guidGenerator = new ClaimGuidGenerator( $item->getId() );
for( $i = 1; $i <= 3; $i++ ) {
- $preexistingClaim = $item->newClaim( new
PropertyNoValueSnak( $i ) );
+ $preexistingClaim = $item->newClaim( new
PropertyNoValueSnak( self::$propertyIds[$i] ) );
$preexistingClaim->setGuid( $guidGenerator->newGuid() );
$claims->addClaim( $preexistingClaim );
}
--
To view, visit https://gerrit.wikimedia.org/r/102919
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I338337fd788797d647b1f931eac0601155d38548
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aude <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
