[transport] improve fs transport tests. cover reply_to and correlation_id.

Author: makasim

pkg/fs/Client/FsDriver.php

@@ -134,6 +134,8 @@ public function createTransportMessage(Message $message)
         $transportMessage->setProperties($properties);
         $transportMessage->setMessageId($message->getMessageId());
         $transportMessage->setTimestamp($message->getTimestamp());
+        $transportMessage->setReplyTo($message->getReplyTo());
+        $transportMessage->setCorrelationId($message->getCorrelationId());
 
         return $transportMessage;
     }
@@ -155,6 +157,8 @@ public function createClientMessage(PsrMessage $message)
         $clientMessage->setMessageId($message->getMessageId());
         $clientMessage->setTimestamp($message->getTimestamp());
         $clientMessage->setPriority(MessagePriority::NORMAL);
+        $clientMessage->setReplyTo($message->getReplyTo());
+        $clientMessage->setCorrelationId($message->getCorrelationId());
 
         return $clientMessage;
     }

pkg/fs/FsMessage.php

@@ -190,15 +190,15 @@ public function setTimestamp($timestamp)
      */
     public function setReplyTo($replyTo)
     {
-        $this->setHeader('reply-to', $replyTo);
+        $this->setHeader('reply_to', $replyTo);
     }
 
     /**
      * @return string|null
      */
     public function getReplyTo()
     {
-        return $this->getHeader('reply-to');
+        return $this->getHeader('reply_to');
     }
 
     /**

pkg/fs/Tests/Driver/FsDriverTest.php renamed to pkg/fs/Tests/Client/FsDriverTest.php

@@ -71,6 +71,8 @@ public function testShouldConvertTransportMessageToClientMessage()
         $transportMessage->setHeader('content_type', 'ContentType');
         $transportMessage->setMessageId('MessageId');
         $transportMessage->setTimestamp(1000);
+        $transportMessage->setReplyTo('theReplyTo');
+        $transportMessage->setCorrelationId('theCorrelationId');
 
         $driver = new FsDriver(
             $this->createPsrContextMock(),
@@ -87,13 +89,17 @@ public function testShouldConvertTransportMessageToClientMessage()
             'content_type' => 'ContentType',
             'message_id' => 'MessageId',
             'timestamp' => 1000,
+            'reply_to' => 'theReplyTo',
+            'correlation_id' => 'theCorrelationId',
         ], $clientMessage->getHeaders());
         $this->assertSame([
             'key' => 'val',
         ], $clientMessage->getProperties());
         $this->assertSame('MessageId', $clientMessage->getMessageId());
         $this->assertSame('ContentType', $clientMessage->getContentType());
         $this->assertSame(1000, $clientMessage->getTimestamp());
+        $this->assertSame('theReplyTo', $clientMessage->getReplyTo());
+        $this->assertSame('theCorrelationId', $clientMessage->getCorrelationId());
 
         $this->assertNull($clientMessage->getExpire());
         $this->assertSame(MessagePriority::NORMAL, $clientMessage->getPriority());
@@ -110,6 +116,8 @@ public function testShouldConvertClientMessageToTransportMessage()
         $clientMessage->setPriority(MessagePriority::VERY_HIGH);
         $clientMessage->setMessageId('MessageId');
         $clientMessage->setTimestamp(1000);
+        $clientMessage->setReplyTo('theReplyTo');
+        $clientMessage->setCorrelationId('theCorrelationId');
 
         $context = $this->createPsrContextMock();
         $context
@@ -133,12 +141,16 @@ public function testShouldConvertClientMessageToTransportMessage()
             'content_type' => 'ContentType',
             'message_id' => 'MessageId',
             'timestamp' => 1000,
+            'reply_to' => 'theReplyTo',
+            'correlation_id' => 'theCorrelationId',
         ], $transportMessage->getHeaders());
         $this->assertSame([
             'key' => 'val',
         ], $transportMessage->getProperties());
         $this->assertSame('MessageId', $transportMessage->getMessageId());
         $this->assertSame(1000, $transportMessage->getTimestamp());
+        $this->assertSame('theReplyTo', $transportMessage->getReplyTo());
+        $this->assertSame('theCorrelationId', $transportMessage->getCorrelationId());
     }
 
     public function testShouldSendMessageToRouter()

pkg/fs/Tests/FsMessageTest.php

@@ -144,7 +144,7 @@ public function testShouldAllowGetPreviouslySetReplyToAsHeader()
         $message = new FsMessage();
         $message->setReplyTo('theQueueName');
 
-        $this->assertSame(['reply-to' => 'theQueueName'], $message->getHeaders());
+        $this->assertSame(['reply_to' => 'theQueueName'], $message->getHeaders());
     }
 
     public function testColdBeSerializedToJson()