Thiemo Mättig (WMDE) has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/352356 )
Change subject: Do not use getMockBuilder on interfaces
......................................................................
Do not use getMockBuilder on interfaces
There is just no need to do so on an interface.
Change-Id: I3a9c514987c50fbcdbbc48d9e5e0a9e81618d4f1
---
M tests/phpunit/CrossCheck/Comparer/DispatchingDataValueComparerTest.php
M tests/phpunit/CrossCheck/CrossCheckerTest.php
M tests/phpunit/CrossCheck/ValueParser/MultilingualTextValueParserTest.php
M tests/phpunit/Serializer/SerializerFactoryTest.php
4 files changed, 10 insertions(+), 13 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQualityExternalValidation
refs/changes/56/352356/1
diff --git
a/tests/phpunit/CrossCheck/Comparer/DispatchingDataValueComparerTest.php
b/tests/phpunit/CrossCheck/Comparer/DispatchingDataValueComparerTest.php
index ef1a6f3..e838fd9 100644
--- a/tests/phpunit/CrossCheck/Comparer/DispatchingDataValueComparerTest.php
+++ b/tests/phpunit/CrossCheck/Comparer/DispatchingDataValueComparerTest.php
@@ -116,9 +116,7 @@
* @return DataValueComparer
*/
private function mockDataValueComparer( $acceptedType,
$comparisonResult ) {
- $mock = $this->getMockBuilder( DataValueComparer::class )
- ->setMethods( array( 'canCompare',
'compare' ) )
- ->getMock();
+ $mock = $this->getMock( DataValueComparer::class );
$mock->expects( $this->any() )
->method( 'compare' )
diff --git a/tests/phpunit/CrossCheck/CrossCheckerTest.php
b/tests/phpunit/CrossCheck/CrossCheckerTest.php
index 696b2eb..64fbad5 100644
--- a/tests/phpunit/CrossCheck/CrossCheckerTest.php
+++ b/tests/phpunit/CrossCheck/CrossCheckerTest.php
@@ -328,9 +328,7 @@
->method( 'newComparativeValueParser' )
->will( $this->returnValue( $comparativeValueParser ) );
- $dataValueComparer = $this->getMockBuilder(
DataValueComparer::class )
- ->setMethods( array( 'compare' ) )
- ->getMockForAbstractClass();
+ $dataValueComparer = $this->getMock( DataValueComparer::class );
$dataValueComparer->expects( $this->any() )
->method( 'compare' )
->will( $this->returnValue( ComparisonResult::STATUS_MATCH ) );
diff --git
a/tests/phpunit/CrossCheck/ValueParser/MultilingualTextValueParserTest.php
b/tests/phpunit/CrossCheck/ValueParser/MultilingualTextValueParserTest.php
index bfeb350..b57457d 100644
--- a/tests/phpunit/CrossCheck/ValueParser/MultilingualTextValueParserTest.php
+++ b/tests/phpunit/CrossCheck/ValueParser/MultilingualTextValueParserTest.php
@@ -42,9 +42,8 @@
}
protected function buildParser() {
- $valueParserMock = $this->getMockBuilder( ValueParser::class )
- ->setMethods( array( 'parse' ) )
- ->getMock();
+ $valueParserMock = $this->getMock( ValueParser::class );
+
$valueParserMock->expects( $this->any() )
->method( 'parse' )
->will( $this->returnValue( new MonolingualTextValue(
'en', 'foo' ) ) );
diff --git a/tests/phpunit/Serializer/SerializerFactoryTest.php
b/tests/phpunit/Serializer/SerializerFactoryTest.php
index 3ad31f9..f257b7d 100644
--- a/tests/phpunit/Serializer/SerializerFactoryTest.php
+++ b/tests/phpunit/Serializer/SerializerFactoryTest.php
@@ -100,11 +100,13 @@
private function buildSerializerFactory() {
$dataValueSerializer = new DataValueSerializer();
- $referenceSerializer = new ReferenceSerializer(
- new SnakListSerializer( new SnakSerializer(
$dataValueSerializer ), false )
- );
+ $snakSerializer = new SnakSerializer( $dataValueSerializer );
+ $useObjectsForMaps = false;
- return new SerializerFactory( $dataValueSerializer,
$referenceSerializer );
+ return new SerializerFactory(
+ $dataValueSerializer,
+ new ReferenceSerializer( new SnakListSerializer(
$snakSerializer, $useObjectsForMaps ) )
+ );
}
private function assertSerializesWithoutException( Serializer
$serializer, $object ) {
--
To view, visit https://gerrit.wikimedia.org/r/352356
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3a9c514987c50fbcdbbc48d9e5e0a9e81618d4f1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseQualityExternalValidation
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
