Jeroen De Dauw has uploaded a new change for review.
https://gerrit.wikimedia.org/r/74031
Change subject: Update QueryRountrip integration test to use new factories
......................................................................
Update QueryRountrip integration test to use new factories
Change-Id: Icdd3d9e1c34b782489551d1f9f2ad33251693bfb
---
M Tests/Integration/Serialization/QueryRoundtripTest.php
1 file changed, 6 insertions(+), 28 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Ask
refs/changes/31/74031/1
diff --git a/Tests/Integration/Serialization/QueryRoundtripTest.php
b/Tests/Integration/Serialization/QueryRoundtripTest.php
index 5e1d1df..bd0a838 100644
--- a/Tests/Integration/Serialization/QueryRoundtripTest.php
+++ b/Tests/Integration/Serialization/QueryRoundtripTest.php
@@ -2,11 +2,7 @@
namespace Ask\Tests\Integration\Serialization;
-use Ask\Deserializers\DescriptionDeserializer;
-use Ask\Deserializers\QueryDeserializer;
-use Ask\Deserializers\QueryOptionsDeserializer;
-use Ask\Deserializers\SelectionRequestDeserializer;
-use Ask\Deserializers\SortExpressionDeserializer;
+use Ask\DeserializerFactory;
use Ask\Language\Description\AnyValue;
use Ask\Language\Description\Conjunction;
use Ask\Language\Description\SomeProperty;
@@ -18,15 +14,9 @@
use Ask\Language\Query;
use Ask\Language\Selection\PropertySelection;
use Ask\Language\Selection\SubjectSelection;
-use Ask\Serializers\DescriptionSerializer;
-use Ask\Serializers\QueryOptionsSerializer;
-use Ask\Serializers\QuerySerializer;
-use Ask\Serializers\SelectionRequestSerializer;
-use Ask\Serializers\SortExpressionSerializer;
+use Ask\SerializerFactory;
use DataValues\DataValueFactory;
use DataValues\StringValue;
-use Deserializers\DispatchingDeserializer;
-use Serializers\DispatchingSerializer;
/**
* @file
@@ -41,29 +31,17 @@
class QueryRoundtripTest extends \PHPUnit_Framework_TestCase {
protected function newQueryDeserializer() {
- $componentDeserializer = new DispatchingDeserializer();
-
- $componentDeserializer->addDeserializer( new
QueryOptionsDeserializer( $componentDeserializer ) );
-
$dvFactory = new DataValueFactory();
$dvFactory->registerDataValue( 'string',
'DataValues\StringValue' );
- $componentDeserializer->addDeserializer( new
DescriptionDeserializer( $dvFactory ) );
- $componentDeserializer->addDeserializer( new
SortExpressionDeserializer( $dvFactory ) );
- $componentDeserializer->addDeserializer( new
SelectionRequestDeserializer( $dvFactory ) );
+ $deserializerFactory = new DeserializerFactory( $dvFactory );
- return new QueryDeserializer( $componentDeserializer );
+ return $deserializerFactory->newQueryDeserializer();
}
protected function newQuerySerializer() {
- $dispatchingSerializer = new DispatchingSerializer();
-
- $dispatchingSerializer->addSerializer( new
DescriptionSerializer() );
- $dispatchingSerializer->addSerializer( new
SelectionRequestSerializer() );
- $dispatchingSerializer->addSerializer( new
QueryOptionsSerializer( $dispatchingSerializer ) );
- $dispatchingSerializer->addSerializer( new
SortExpressionSerializer() );
-
- return new QuerySerializer( $dispatchingSerializer );
+ $serializerFactory = new SerializerFactory();
+ return $serializerFactory->newQuerySerializer();
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/74031
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icdd3d9e1c34b782489551d1f9f2ad33251693bfb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Ask
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
