[MediaWiki-commits] [Gerrit] Simplify generation of test items for term conflict tests - change (mediawiki...Wikibase)

[Aude (Code Review)]

Aude has uploaded a new change for review.

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

Change subject: Simplify generation of test items for term conflict tests
......................................................................

Simplify generation of test items for term conflict tests

Change-Id: I1d13970847bbdb3659ce33040236bea8cba8c2e0
---
M lib/tests/phpunit/store/TermIndexTest.php
1 file changed, 16 insertions(+), 27 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/39/260239/2

diff --git a/lib/tests/phpunit/store/TermIndexTest.php 
b/lib/tests/phpunit/store/TermIndexTest.php
index 45e14f0..9592e74 100644
--- a/lib/tests/phpunit/store/TermIndexTest.php
+++ b/lib/tests/phpunit/store/TermIndexTest.php
@@ -500,25 +500,13 @@
        }
 
        private function getTermConflictEntities() {
-               $deFooBar1 = new Item( new ItemId( 'Q1' ) );
-               $deFooBar1->setLabel( 'de', 'Foo' );
-               $deFooBar1->setDescription( 'de', 'Bar' );
-
-               $deBarFoo2 = new Item( new ItemId( 'Q2' ) );
-               $deBarFoo2->setLabel( 'de', 'Bar' );
-               $deBarFoo2->setDescription( 'de', 'Foo' );
-
-               $enFooBar3 = new Item( new ItemId( 'Q3' ) );
-               $enFooBar3->setLabel( 'en', 'Foo' );
-               $enFooBar3->setDescription( 'en', 'Bar' );
-
-               $enBarFoo4 = new Item( new ItemId( 'Q4' ) );
-               $enBarFoo4->setLabel( 'en', 'Bar' );
-               $enBarFoo4->setDescription( 'en', 'Foo' );
-
-               $deFooQuux5 = new Item( new ItemId( 'Q5' ) );
-               $deFooQuux5->setLabel( 'de', 'Foo' );
-               $deFooQuux5->setDescription( 'de', 'Quux' );
+               $entities = array(
+                       $this->makeTermConflictItem( 'Q1', 'de', 'Foo', 'Bar' ),
+                       $this->makeTermConflictItem( 'Q2', 'de', 'Bar', 'Foo' ),
+                       $this->makeTermConflictItem( 'Q3', 'en', 'Foo', 'Bar' ),
+                       $this->makeTermConflictItem( 'Q4', 'en', 'Bar', 'Foo' ),
+                       $this->makeTermConflictItem( 'Q5', 'de', 'Foo', 'Quux' )
+               );
 
                $deFooBarP6 = Property::newFromType( 'string' );
                $deFooBarP6->setId( new PropertyId( 'P6' ) );
@@ -526,18 +514,19 @@
                $deFooBarP6->setAliases( 'de', array( 'AFoo' ) );
                $deFooBarP6->setDescription( 'de', 'Bar' );
 
-               $entities = array(
-                       $deFooBar1,
-                       $deBarFoo2,
-                       $enFooBar3,
-                       $enBarFoo4,
-                       $deFooQuux5,
-                       $deFooBarP6,
-               );
+               $entities[] = $deFooBarP6;
 
                return $entities;
        }
 
+       private function makeTermConflictItem( $id, $languageCode, $label, 
$description ) {
+               $item = new Item( new ItemId( $id ) );
+               $item->setLabel( $languageCode, $label );
+               $item->setDescription( $languageCode, $description );
+
+               return $item;
+       }
+
        public function labelConflictProvider() {
                $entities = $this->getTermConflictEntities();
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1d13970847bbdb3659ce33040236bea8cba8c2e0
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aude <aude.w...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>

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