test(AMQP): improve tests for gzipped messages

Author: seblavenant

features/bootstrap/SendContext.php

@@ -111,9 +111,9 @@ public function theMessageInQueueContainsAndIsAJsonMessage(string $content, stri
     }
 
     /**
-     * @Then The message in queue :queueName contains a gzipped message
+     * @Then The message in queue :queueName contains :content and is a gzipped message
      */
-    public function theMessageInQueueContainsAGzippedMessage(string $queueName): void
+    public function theMessageInQueueContainsAGzippedMessage(string $content, string $queueName): void
     {
         $message = $this->theMessageInQueueContains(self::TEXT_ROUTING_KEY, false, $queueName, ContentType::BINARY);
 
@@ -124,6 +124,7 @@ public function theMessageInQueueContainsAGzippedMessage(string $queueName): voi
         Assert::assertArrayHasKey(GZip::HEADER_COMPRESSION_CONTENT_TYPE, $headers);
         Assert::assertSame(Gzip::COMPRESSION_ALGORITHM, $headers[Gzip::HEADER_COMPRESSION]);
         Assert::assertSame(ContentType::TEXT, $headers[Gzip::HEADER_COMPRESSION_CONTENT_TYPE]);
+        Assert::assertSame($content, gzdecode(base64_decode($message['payload'])));
     }
 
     private function theMessageInQueueContains(string $routingKey, string|bool $content, string $queueName, string $contentType): array

features/send.feature

@@ -21,4 +21,4 @@ Scenario: Send json message
 Scenario: Send gzipped text message
     When I send the gzipped text message 'Compressed text'
     Then The queue 'test_1' must contain 1 message
-    And The message in queue 'test_1' contains a gzipped message
+    And The message in queue 'test_1' contains 'Compressed text' and is a gzipped message

tests/Workers/MessageAdapterTest.php

@@ -6,6 +6,7 @@
 
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
+use Puzzle\AMQP\Messages\Bodies\Binary;
 use Swarrot\Broker\Message;
 use Puzzle\AMQP\Messages\ContentType;
 use Puzzle\AMQP\Messages\Bodies\Text;
@@ -252,6 +253,31 @@ public static function providerTestCloneIntoWritableMessage(): array
         ];
     }
 
+    public function testCloneIntoWritableMessageFromCompressedMessage(): void
+    {
+        $readableMessage = InMemory::build('old.routing.key', new Binary('This is fine'), [
+            'compression' => 'gzip',
+            'compression_content-type' => 'application/json',
+        ], [
+            'content_type' => 'application/octet-stream',
+        ]);
+
+        $message = $readableMessage->cloneIntoWritableMessage(
+            new \Puzzle\AMQP\Messages\Message('new.routing.key'),
+        );
+
+        self::assertInstanceOf(WritableMessage::class, $message);
+        self::assertSame('new.routing.key', $message->getRoutingKey());
+
+        $headers = $message->getHeaders();
+        $this->assertSameArrayExceptOrder(
+            ['compression', 'compression_content-type', 'routing_key', 'app_id', 'message_datetime'],
+            array_keys($headers)
+        );
+        self::assertSame('application/json', $headers['compression_content-type']);
+        self::assertSame('gzip', $headers['compression']);
+    }
+
     public function testToStringInvalidUtf8(): void
     {
         $invalidUTF8Message = new Message(