Thiemo Mättig (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/289606
Change subject: Replace static PHPUnit_Framework_Assert::… calls with $this->…
......................................................................
Replace static PHPUnit_Framework_Assert::… calls with $this->…
This is a relict from the time before PHP 5.5, because we could not
use $this inside closures. Technically the same because the methods
are static anyway, but bad style.
Change-Id: I34cc843e7e09bf61613e2d2ae0d0b53353d83519
---
M repo/tests/phpunit/includes/Hooks/LabelPrefetchHookHandlersTest.php
M repo/tests/phpunit/includes/Rdf/ValueSnakRdfBuilderFactoryTest.php
M repo/tests/phpunit/includes/Store/Sql/EntityPerPageIdPagerTest.php
3 files changed, 9 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/06/289606/1
diff --git
a/repo/tests/phpunit/includes/Hooks/LabelPrefetchHookHandlersTest.php
b/repo/tests/phpunit/includes/Hooks/LabelPrefetchHookHandlersTest.php
index 782e194..d848b0e 100644
--- a/repo/tests/phpunit/includes/Hooks/LabelPrefetchHookHandlersTest.php
+++ b/repo/tests/phpunit/includes/Hooks/LabelPrefetchHookHandlersTest.php
@@ -4,7 +4,6 @@
use ChangesList;
use FauxRequest;
-use PHPUnit_Framework_Assert;
use RequestContext;
use Title;
use Wikibase\Client\Store\TitleFactory;
@@ -120,9 +119,9 @@
sort( $expectedIdStrings );
sort( $entityIdStrings );
- PHPUnit_Framework_Assert::assertEquals(
$expectedIdStrings, $entityIdStrings );
- PHPUnit_Framework_Assert::assertEquals(
$expectedTermTypes, $termTypes );
- PHPUnit_Framework_Assert::assertEquals(
$expectedLanguageCodes, $languageCodes );
+ $this->assertEquals( $expectedIdStrings,
$entityIdStrings );
+ $this->assertEquals( $expectedTermTypes, $termTypes );
+ $this->assertEquals( $expectedLanguageCodes,
$languageCodes );
};
$linkBeginHookHandler = $this->getLabelPrefetchHookHandlers(
diff --git a/repo/tests/phpunit/includes/Rdf/ValueSnakRdfBuilderFactoryTest.php
b/repo/tests/phpunit/includes/Rdf/ValueSnakRdfBuilderFactoryTest.php
index d7f901e..e9eab08 100644
--- a/repo/tests/phpunit/includes/Rdf/ValueSnakRdfBuilderFactoryTest.php
+++ b/repo/tests/phpunit/includes/Rdf/ValueSnakRdfBuilderFactoryTest.php
@@ -3,7 +3,6 @@
namespace Wikibase\Test\Rdf;
use Closure;
-use PHPUnit_Framework_Assert;
use PHPUnit_Framework_TestCase;
use Wikibase\Rdf\ValueSnakRdfBuilder;
use Wikibase\Rdf\ValueSnakRdfBuilderFactory;
@@ -96,11 +95,11 @@
$valueSnakRdfBuilder,
&$called
) {
- PHPUnit_Framework_Assert::assertSame( $expectedMode,
$mode );
- PHPUnit_Framework_Assert::assertSame( $expectedVocab,
$vocab );
- PHPUnit_Framework_Assert::assertSame( $expectedWriter,
$writer );
- PHPUnit_Framework_Assert::assertSame( $expectedTracker,
$tracker );
- PHPUnit_Framework_Assert::assertSame( $expectedDedupe,
$dedupe );
+ $this->assertSame( $expectedMode, $mode );
+ $this->assertSame( $expectedVocab, $vocab );
+ $this->assertSame( $expectedWriter, $writer );
+ $this->assertSame( $expectedTracker, $tracker );
+ $this->assertSame( $expectedDedupe, $dedupe );
$called = true;
return $valueSnakRdfBuilder;
diff --git a/repo/tests/phpunit/includes/Store/Sql/EntityPerPageIdPagerTest.php
b/repo/tests/phpunit/includes/Store/Sql/EntityPerPageIdPagerTest.php
index 9ce767a..5b4d0e6 100644
--- a/repo/tests/phpunit/includes/Store/Sql/EntityPerPageIdPagerTest.php
+++ b/repo/tests/phpunit/includes/Store/Sql/EntityPerPageIdPagerTest.php
@@ -2,7 +2,6 @@
namespace Wikibase\Test;
-use PHPUnit_Framework_Assert;
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
@@ -45,7 +44,7 @@
EntityId $after = null,
$actualRedirectMode = EntityPerPage::NO_REDIRECTS
) use ( $keydIds, $redirectMode ) {
- PHPUnit_Framework_Assert::assertEquals( $redirectMode,
$actualRedirectMode );
+ $this->assertEquals( $redirectMode, $actualRedirectMode
);
reset( $keydIds );
while ( $after && current( $keydIds ) && key( $keydIds
) <= $after->getSerialization() ) {
--
To view, visit https://gerrit.wikimedia.org/r/289606
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I34cc843e7e09bf61613e2d2ae0d0b53353d83519
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
