jenkins-bot has submitted this change and it was merged. Change subject: provideEntityHandels into the class that uses it ......................................................................
provideEntityHandels into the class that uses it If only one Testset uses it there is no point in it being in the base. Also this will spliting the current base into a helper easier Change-Id: Ic1a90d3dd339e6e8e9ca61e664fdca4d8f7fe05c --- M repo/tests/phpunit/includes/api/GetEntitiesTest.php M repo/tests/phpunit/includes/api/ModifyEntityTestBase.php 2 files changed, 10 insertions(+), 13 deletions(-) Approvals: Tobias Gritschacher: Looks good to me, approved jenkins-bot: Verified diff --git a/repo/tests/phpunit/includes/api/GetEntitiesTest.php b/repo/tests/phpunit/includes/api/GetEntitiesTest.php index a2fb930..908c8a8 100644 --- a/repo/tests/phpunit/includes/api/GetEntitiesTest.php +++ b/repo/tests/phpunit/includes/api/GetEntitiesTest.php @@ -131,6 +131,16 @@ $this->assertEquals( 1, count( $res['entities'] ) ); } + function provideEntityHandles() { + $handles = array(); + + foreach ( self::getEntityInput() as $handle => $entity ) { + $handles[] = array( $handle ); + } + + return $handles; + } + public static function provideGetItemByTitle() { $calls = array(); $handles = static::getEntityHandles(); diff --git a/repo/tests/phpunit/includes/api/ModifyEntityTestBase.php b/repo/tests/phpunit/includes/api/ModifyEntityTestBase.php index 50b7a5b..3437004 100644 --- a/repo/tests/phpunit/includes/api/ModifyEntityTestBase.php +++ b/repo/tests/phpunit/includes/api/ModifyEntityTestBase.php @@ -371,19 +371,6 @@ } /** - * data provider for passing each entity handle to the test function. - */ - function provideEntityHandles() { - $handles = array(); - - foreach ( self::getEntityInput() as $handle => $entity ) { - $handles[] = array( $handle ); - } - - return $handles; - } - - /** * returns the list handles for the well known test entities. */ static function getEntityHandles() { -- To view, visit https://gerrit.wikimedia.org/r/77900 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic1a90d3dd339e6e8e9ca61e664fdca4d8f7fe05c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Addshore <addshorew...@gmail.com> Gerrit-Reviewer: Tobias Gritschacher <tobias.gritschac...@wikimedia.de> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits