Added tests for serialize/unserialize function

Author: igaponov

Tests/DependencyInjection/Fixtures/test.yml

@@ -147,13 +147,15 @@ old_sound_rabbit_mq:
     rpc_clients:
         foo_client:
             connection:      foo_connection
+            unserializer:    json_decode
 
         default_client:
 
     rpc_servers:
         foo_server:
             connection:      foo_connection
             callback:        foo_server.callback
+            serializer:      json_encode
 
         default_server:
             callback:        default_server.callback

Tests/DependencyInjection/OldSoundRabbitMqExtensionTest.php

@@ -473,7 +473,10 @@ public function testFooRpcClientDefinition()
         $this->assertEquals((string) $definition->getArgument(0), 'old_sound_rabbit_mq.connection.foo_connection');
         $this->assertEquals((string) $definition->getArgument(1), 'old_sound_rabbit_mq.channel.foo_client');
         $this->assertEquals(
-            array(array('initClient', array(true))),
+            array(
+                array('initClient', array(true)),
+                array('setUnserializer', array('json_decode'))
+            ),
             $definition->getMethodCalls()
         );
         $this->assertEquals('%old_sound_rabbit_mq.rpc_client.class%', $definition->getClass());
@@ -488,7 +491,10 @@ public function testDefaultRpcClientDefinition()
         $this->assertEquals((string) $definition->getArgument(0), 'old_sound_rabbit_mq.connection.default');
         $this->assertEquals((string) $definition->getArgument(1), 'old_sound_rabbit_mq.channel.default_client');
         $this->assertEquals(
-            array(array('initClient', array(true))),
+            array(
+                array('initClient', array(true)),
+                array('setUnserializer', array('unserialize'))
+            ),
             $definition->getMethodCalls()
         );
         $this->assertEquals('%old_sound_rabbit_mq.rpc_client.class%', $definition->getClass());
@@ -505,6 +511,7 @@ public function testFooRpcServerDefinition()
         $this->assertEquals(array(
                 array('initServer', array('foo_server')),
                 array('setCallback', array(array(new Reference('foo_server.callback'), 'execute'))),
+                array('setSerializer', array('json_encode')),
             ),
             $definition->getMethodCalls()
         );
@@ -522,6 +529,7 @@ public function testDefaultRpcServerDefinition()
         $this->assertEquals(array(
                 array('initServer', array('default_server')),
                 array('setCallback', array(array(new Reference('default_server.callback'), 'execute'))),
+                array('setSerializer', array('serialize')),
             ),
             $definition->getMethodCalls()
         );
@@ -550,6 +558,7 @@ public function testRpcServerWithQueueOptionsDefinition()
                     'ticket'       => null,
                     'routing_keys' => array(),
                 ))),
+                array('setSerializer', array('serialize')),
             ),
             $definition->getMethodCalls()
         );

Tests/RabbitMq/RpcClientTest.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace OldSound\RabbitMqBundle\Tests\RabbitMq;
+
+use OldSound\RabbitMqBundle\RabbitMq\RpcClient;
+
+class RpcClientTest extends \PHPUnit_Framework_TestCase
+{
+    public function testProcessMessageWithCustomUnserializer()
+    {
+        /** @var RpcClient $client */
+        $client = $this->getMockBuilder('\OldSound\RabbitMqBundle\RabbitMq\RpcClient')
+            ->setMethods(array('sendReply', 'maybeStopConsumer'))
+            ->disableOriginalConstructor()
+            ->getMock();
+        $message = $this->getMock('\PhpAmqpLib\Message\AMQPMessage', array('get'), array('message'));
+        $serializer = $this->getMock('\Symfony\Component\Serializer\SerializerInterface', array('serialize', 'deserialize'));
+        $serializer->expects($this->once())->method('deserialize')->with('message', 'json', null);
+        $client->initClient(true);
+        $client->setUnserializer(function($data) use ($serializer) {
+            $serializer->deserialize($data, 'json', null);
+        });
+        $client->processMessage($message);
+    }
+}

Tests/RabbitMq/RpcServerTest.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace OldSound\RabbitMqBundle\Tests\RabbitMq;
+
+use OldSound\RabbitMqBundle\RabbitMq\RpcServer;
+use PhpAmqpLib\Message\AMQPMessage;
+
+class RpcServerTest extends \PHPUnit_Framework_TestCase
+{
+    public function testProcessMessageWithCustomSerializer()
+    {
+        /** @var RpcServer $server */
+        $server = $this->getMockBuilder('\OldSound\RabbitMqBundle\RabbitMq\RpcServer')
+            ->setMethods(array('sendReply', 'maybeStopConsumer'))
+            ->disableOriginalConstructor()
+            ->getMock();
+        $message = $this->getMock('\PhpAmqpLib\Message\AMQPMessage', array('get'));
+        $message->delivery_info = array(
+            'channel' => $this->getMock('\PhpAmqpLib\Channel\AMQPChannel', array(), array(), '', false),
+            'delivery_tag' => null
+        );
+        $server->setCallback(function() {
+            return 'message';
+        });
+        $serializer = $this->getMock('\Symfony\Component\Serializer\SerializerInterface', array('serialize', 'deserialize'));
+        $serializer->expects($this->once())->method('serialize')->with('message', 'json');
+        $server->setSerializer(function($data) use ($serializer) {
+            $serializer->serialize($data, 'json');
+        });
+        $server->processMessage($message);
+    }
+}

composer.json

@@ -14,7 +14,8 @@
         "videlalvaro/php-amqplib"  : "~2.4.0"
     },
     "require-dev": {
-        "symfony/console": "~2.0"
+        "symfony/console": "~2.0",
+        "symfony/serializer": "~2.6"
     },
     "extra": {
         "branch-alias": {