Update SQS test to be compatible with JSON API

jderusse · jderusse · commit d502276553cd · 2023-11-23T10:44:07.000+01:00
diff --git a/src/Service/Sqs/tests/Unit/Input/ChangeMessageVisibilityBatchRequestTest.php b/src/Service/Sqs/tests/Unit/Input/ChangeMessageVisibilityBatchRequestTest.php
@@ -22,15 +22,19 @@ public function testRequest(): void
         /** @see https://docs.aws.amazon.com/AWSSimpleQueueService/latest/APIReference/API_ChangeMessageVisibilityBatch.html */
         $expected = '
             POST / HTTP/1.0
-            Content-Type: application/x-www-form-urlencoded
+            Content-Type: application/x-amz-json-1.0
+            x-amz-target: AmazonSQS.ChangeMessageVisibilityBatch
 
-            Action=ChangeMessageVisibilityBatch
-            &ChangeMessageVisibilityBatchRequestEntry.1.Id=qwertyuiop
-            &ChangeMessageVisibilityBatchRequestEntry.1.ReceiptHandle=MbZj6wDWli%2BJvwwJaBV%2B3dcjk2YW2vA3%2BSTFFljT
-            &ChangeMessageVisibilityBatchRequestEntry.1.VisibilityTimeout=60
-            &QueueUrl=queueUrl
-            &Version=2012-11-05
-                ';
+            {
+                "QueueUrl": "queueUrl",
+                "Entries": [
+                    {
+                        "Id": "qwertyuiop",
+                        "ReceiptHandle": "MbZj6wDWli+JvwwJaBV+3dcjk2YW2vA3+STFFljT",
+                        "VisibilityTimeout": 60
+                    }
+                ]
+            }';
 
         self::assertRequestEqualsHttpRequest($expected, $input->request());
     }
diff --git a/src/Service/Sqs/tests/Unit/Input/ChangeMessageVisibilityRequestTest.php b/src/Service/Sqs/tests/Unit/Input/ChangeMessageVisibilityRequestTest.php
@@ -18,14 +18,14 @@ public function testRequest(): void
         /** @see https://docs.aws.amazon.com/AWSSimpleQueueService/latest/APIReference/API_ChangeMessageVisibility.html */
         $expected = '
             POST / HTTP/1.0
-            Content-Type: application/x-www-form-urlencoded
+            Content-Type: application/x-amz-json-1.0
+            x-amz-target: AmazonSQS.ChangeMessageVisibility
 
-            Action=ChangeMessageVisibility
-            &Version=2012-11-05
-            &QueueUrl=queueUrl
-            &ReceiptHandle=MbZj6wDWli%2BJvwwJaBV%2B3dcjk2YW2vA3%2BSTFFljT
-            &VisibilityTimeout=60
-        ';
+            {
+                "QueueUrl": "queueUrl",
+                "ReceiptHandle": "MbZj6wDWli+JvwwJaBV+3dcjk2YW2vA3+STFFljT",
+                "VisibilityTimeout": 60
+            }';
 
         self::assertRequestEqualsHttpRequest($expected, $input->request());
     }
diff --git a/src/Service/Sqs/tests/Unit/Input/CreateQueueRequestTest.php b/src/Service/Sqs/tests/Unit/Input/CreateQueueRequestTest.php
@@ -18,16 +18,18 @@ public function testRequest(): void
         /** @see https://docs.aws.amazon.com/AWSSimpleQueueService/latest/APIReference/API_CreateQueue.html */
         $expected = '
             POST / HTTP/1.0
-            Content-Type: application/x-www-form-urlencoded
+            Content-Type: application/x-amz-json-1.0
+            x-amz-target: AmazonSQS.CreateQueue
 
-            Action=CreateQueue
-            &Version=2012-11-05
-            &QueueName=MyQueue
-            &Attribute.1.Name=DelaySeconds
-            &Attribute.1.Value=45
-            &Tag.1.Key=team
-            &Tag.1.Value=Engineering
-        ';
+            {
+                "QueueName":"MyQueue",
+                "Attributes": {
+                    "DelaySeconds": "45"
+                },
+                "tags": {
+                    "team": "Engineering"
+                }
+            }';
 
         self::assertRequestEqualsHttpRequest($expected, $input->request());
     }
diff --git a/src/Service/Sqs/tests/Unit/Input/DeleteMessageBatchRequestTest.php b/src/Service/Sqs/tests/Unit/Input/DeleteMessageBatchRequestTest.php
@@ -21,14 +21,18 @@ public function testRequest(): void
         /** @see https://docs.aws.amazon.com/AWSSimpleQueueService/latest/APIReference/API_DeleteMessageBatch.html */
         $expected = '
             POST / HTTP/1.0
-            Content-Type: application/x-www-form-urlencoded
+            Content-Type: application/x-amz-json-1.0
+            x-amz-target: AmazonSQS.DeleteMessageBatch
 
-            Action=DeleteMessageBatch
-            &DeleteMessageBatchRequestEntry.1.Id=qwertyuiop
-            &DeleteMessageBatchRequestEntry.1.ReceiptHandle=MbZj6wDWli%2BJvwwJaBV%2B3dcjk2YW2vA3%2BSTFFljT
-            &QueueUrl=queueUrl
-            &Version=2012-11-05
-                ';
+            {
+                "QueueUrl": "queueUrl",
+                "Entries": [
+                    {
+                        "Id": "qwertyuiop",
+                        "ReceiptHandle": "MbZj6wDWli+JvwwJaBV+3dcjk2YW2vA3+STFFljT"
+                    }
+                ]
+            }';
 
         self::assertRequestEqualsHttpRequest($expected, $input->request());
     }
diff --git a/src/Service/Sqs/tests/Unit/Input/DeleteMessageRequestTest.php b/src/Service/Sqs/tests/Unit/Input/DeleteMessageRequestTest.php
@@ -17,13 +17,13 @@ public function testRequest(): void
         /** @see https://docs.aws.amazon.com/AWSSimpleQueueService/latest/APIReference/API_DeleteMessage.html */
         $expected = '
             POST / HTTP/1.0
-            Content-Type: application/x-www-form-urlencoded
+            Content-Type: application/x-amz-json-1.0
+            x-amz-target: AmazonSQS.DeleteMessage
 
-            Action=DeleteMessage
-            &Version=2012-11-05
-            &QueueUrl=queueUrl
-            &ReceiptHandle=MbZj6wDWli%2BJvwwJaBV%2B3dcjk2YW2vA3%2BSTFFljT
-        ';
+            {
+                "QueueUrl": "queueUrl",
+                "ReceiptHandle": "MbZj6wDWli+JvwwJaBV+3dcjk2YW2vA3+STFFljT"
+            }';
 
         self::assertRequestEqualsHttpRequest($expected, $input->request());
     }
diff --git a/src/Service/Sqs/tests/Unit/Input/DeleteQueueRequestTest.php b/src/Service/Sqs/tests/Unit/Input/DeleteQueueRequestTest.php
@@ -16,12 +16,12 @@ public function testRequest(): void
         /** @see https://docs.aws.amazon.com/AWSSimpleQueueService/latest/APIReference/API_DeleteQueue.html */
         $expected = '
             POST / HTTP/1.0
-            Content-Type: application/x-www-form-urlencoded
+            Content-Type: application/x-amz-json-1.0
+            x-amz-target: AmazonSQS.DeleteQueue
 
-            Action=DeleteQueue
-            &Version=2012-11-05
-            &QueueUrl=queueUrl
-        ';
+            {
+                "QueueUrl":"queueUrl"
+            }';
 
         self::assertRequestEqualsHttpRequest($expected, $input->request());
     }
diff --git a/src/Service/Sqs/tests/Unit/Input/GetQueueAttributesRequestTest.php b/src/Service/Sqs/tests/Unit/Input/GetQueueAttributesRequestTest.php
@@ -17,15 +17,13 @@ public function testRequest(): void
         /** @see https://docs.aws.amazon.com/AWSSimpleQueueService/latest/APIReference/API_GetQueueAttributes.html */
         $expected = '
             POST / HTTP/1.0
-            Content-Type: application/x-www-form-urlencoded
+            Content-Type: application/x-amz-json-1.0
+            x-amz-target: AmazonSQS.GetQueueAttributes
 
-            Action=GetQueueAttributes
-            &Version=2012-11-05
-            &QueueUrl=queueUrl
-            &AttributeName.1=VisibilityTimeout
-            &AttributeName.2=DelaySeconds
-            &AttributeName.3=ReceiveMessageWaitTimeSeconds
-        ';
+            {
+                "QueueUrl": "queueUrl",
+                "AttributeNames": ["VisibilityTimeout", "DelaySeconds", "ReceiveMessageWaitTimeSeconds"]
+            }';
 
         self::assertRequestEqualsHttpRequest($expected, $input->request());
     }
diff --git a/src/Service/Sqs/tests/Unit/Input/GetQueueUrlRequestTest.php b/src/Service/Sqs/tests/Unit/Input/GetQueueUrlRequestTest.php
@@ -17,13 +17,13 @@ public function testRequest(): void
         /** @see https://docs.aws.amazon.com/AWSSimpleQueueService/latest/APIReference/API_GetQueueUrl.html */
         $expected = '
             POST / HTTP/1.0
-            Content-Type: application/x-www-form-urlencoded
+            Content-Type: application/x-amz-json-1.0
+            x-amz-target: AmazonSQS.GetQueueUrl
 
-            Action=GetQueueUrl
-            &Version=2012-11-05
-            &QueueName=MyQueue
-            &QueueOwnerAWSAccountId=123456
-        ';
+            {
+                "QueueName": "MyQueue",
+                "QueueOwnerAWSAccountId": "123456"
+            }';
 
         self::assertRequestEqualsHttpRequest($expected, $input->request());
     }
diff --git a/src/Service/Sqs/tests/Unit/Input/ListQueuesRequestTest.php b/src/Service/Sqs/tests/Unit/Input/ListQueuesRequestTest.php
@@ -16,12 +16,12 @@ public function testRequest(): void
         /** @see https://docs.aws.amazon.com/AWSSimpleQueueService/latest/APIReference/API_ListQueues.html */
         $expected = '
             POST / HTTP/1.0
-            Content-Type: application/x-www-form-urlencoded
+            Content-Type: application/x-amz-json-1.0
+            x-amz-target: AmazonSQS.ListQueues
 
-            Action=ListQueues
-            &Version=2012-11-05
-            &QueueNamePrefix=M
-        ';
+            {
+                "QueueNamePrefix": "M"
+            }';
 
         self::assertRequestEqualsHttpRequest($expected, $input->request());
     }
diff --git a/src/Service/Sqs/tests/Unit/Input/PurgeQueueRequestTest.php b/src/Service/Sqs/tests/Unit/Input/PurgeQueueRequestTest.php
@@ -16,12 +16,12 @@ public function testRequest(): void
         /** @see https://docs.aws.amazon.com/AWSSimpleQueueService/latest/APIReference/API_PurgeQueue.html */
         $expected = '
             POST / HTTP/1.0
-            Content-Type: application/x-www-form-urlencoded
+            Content-Type: application/x-amz-json-1.0
+            x-amz-target: AmazonSQS.PurgeQueue
 
-            Action=PurgeQueue
-            &Version=2012-11-05
-            &QueueUrl=queueUrl
-        ';
+            {
+                "QueueUrl": "queueUrl"
+            }';
 
         self::assertRequestEqualsHttpRequest($expected, $input->request());
     }
diff --git a/src/Service/Sqs/tests/Unit/Input/ReceiveMessageRequestTest.php b/src/Service/Sqs/tests/Unit/Input/ReceiveMessageRequestTest.php
@@ -23,19 +23,18 @@ public function testRequest(): void
         /** @see https://docs.aws.amazon.com/AWSSimpleQueueService/latest/APIReference/API_ReceiveMessage.html */
         $expected = '
             POST / HTTP/1.0
-            Content-Type: application/x-www-form-urlencoded
+            Content-Type: application/x-amz-json-1.0
+            x-amz-target: AmazonSQS.ReceiveMessage
 
-            Action=ReceiveMessage
-            &Version=2012-11-05
-            &QueueUrl=queueUrl
-            &AttributeName.1=MessageGroupId
-            &AttributeName.2=MessageDeduplicationId
-            &MessageAttributeName.1=Attribute1
-            &MaxNumberOfMessages=5
-            &VisibilityTimeout=15
-            &WaitTimeSeconds=20
-            &ReceiveRequestAttemptId=abcdef
-        ';
+            {
+                "QueueUrl": "queueUrl",
+                "AttributeNames": ["MessageGroupId", "MessageDeduplicationId"],
+                "MessageAttributeNames": ["Attribute1"],
+                "MaxNumberOfMessages": 5,
+                "VisibilityTimeout": 15,
+                "WaitTimeSeconds": 20,
+                "ReceiveRequestAttemptId": "abcdef"
+            }';
 
         self::assertRequestEqualsHttpRequest($expected, $input->request());
     }
diff --git a/src/Service/Sqs/tests/Unit/Input/SendMessageBatchRequestTest.php b/src/Service/Sqs/tests/Unit/Input/SendMessageBatchRequestTest.php
@@ -29,20 +29,27 @@ public function testRequest(): void
         /** @see https://docs.aws.amazon.com/AWSSimpleQueueService/latest/APIReference/API_SendMessageBatch.html */
         $expected = '
             POST / HTTP/1.0
-            Content-Type: application/x-www-form-urlencoded
+            Content-Type: application/x-amz-json-1.0
+            x-amz-target: AmazonSQS.SendMessageBatch
 
-            Action=SendMessageBatch
-            &QueueUrl=queueUrl
-            &SendMessageBatchRequestEntry.1.Id=qwertyuiop
-            &SendMessageBatchRequestEntry.1.DelaySeconds=45
-            &SendMessageBatchRequestEntry.1.MessageAttribute.1.Value.DataType=String
-            &SendMessageBatchRequestEntry.1.MessageAttribute.1.Value.StringValue=my_attribute_value_1
-            &SendMessageBatchRequestEntry.1.MessageAttribute.1.Name=my_attribute_name_1
-            &SendMessageBatchRequestEntry.1.MessageBody=This+is+a+test+message
-            &SendMessageBatchRequestEntry.1.MessageDeduplicationId=abcdef
-            &SendMessageBatchRequestEntry.1.MessageGroupId=abcdef01
-            &Version=2012-11-05
-                ';
+            {
+                "QueueUrl": "queueUrl",
+                "Entries": [
+                    {
+                        "Id": "qwertyuiop",
+                        "MessageBody": "This is a test message",
+                        "DelaySeconds": 45,
+                        "MessageAttributes": {
+                            "my_attribute_name_1": {
+                                "DataType": "String",
+                                "StringValue": "my_attribute_value_1"
+                            }
+                        },
+                        "MessageDeduplicationId": "abcdef",
+                        "MessageGroupId": "abcdef01"
+                    }
+                ]
+            }';
 
         self::assertRequestEqualsHttpRequest($expected, $input->request());
     }
diff --git a/src/Service/Sqs/tests/Unit/Input/SendMessageRequestTest.php b/src/Service/Sqs/tests/Unit/Input/SendMessageRequestTest.php
@@ -31,23 +31,28 @@ public function testRequest(): void
         /** @see https://docs.aws.amazon.com/AWSSimpleQueueService/latest/APIReference/API_SendMessage.html */
         $expected = '
             POST / HTTP/1.0
-            Content-Type: application/x-www-form-urlencoded
+            Content-Type: application/x-amz-json-1.0
+            x-amz-target: AmazonSQS.SendMessage
 
-            Action=SendMessage
-            &Version=2012-11-05
-            &QueueUrl=queueUrl
-            &MessageBody=This+is+a+test+message
-            &DelaySeconds=45
-            &MessageAttribute.1.Name=my_attribute_name_1
-            &MessageAttribute.1.Value.StringValue=my_attribute_value_1
-            &MessageAttribute.1.Value.DataType=String
-            &MessageSystemAttribute.1.Name=AWSTraceHeader
-            &MessageSystemAttribute.1.Value.StringListValue.1=my_attribute_value_2
-            &MessageSystemAttribute.1.Value.StringListValue.2=my_attribute_value_3
-            &MessageSystemAttribute.1.Value.DataType=String
-            &MessageDeduplicationId=abcdef
-            &MessageGroupId=abcdef01
-        ';
+            {
+                "QueueUrl": "queueUrl",
+                "MessageBody": "This is a test message",
+                "DelaySeconds": 45,
+                "MessageAttributes": {
+                    "my_attribute_name_1": {
+                        "DataType": "String",
+                        "StringValue": "my_attribute_value_1"
+                    }
+                },
+                "MessageSystemAttributes": {
+                    "AWSTraceHeader": {
+                        "DataType": "String",
+                        "StringListValues": ["my_attribute_value_2", "my_attribute_value_3"]
+                    }
+                },
+                "MessageDeduplicationId": "abcdef",
+                "MessageGroupId": "abcdef01"
+            }';
 
         self::assertRequestEqualsHttpRequest($expected, $input->request());
     }
diff --git a/src/Service/Sqs/tests/Unit/Result/ChangeMessageVisibilityBatchResultTest.php b/src/Service/Sqs/tests/Unit/Result/ChangeMessageVisibilityBatchResultTest.php
@@ -14,21 +14,19 @@ class ChangeMessageVisibilityBatchResultTest extends TestCase
     public function testChangeMessageVisibilityBatchResult(): void
     {
         // see https://docs.aws.amazon.com/AWSSimpleQueueService/latest/APIReference/API_ChangeMessageVisibilityBatch.html
-        $response = new SimpleMockedResponse(<<<XML
-<ChangeMessageVisibilityBatchResponse>
-    <ChangeMessageVisibilityBatchResult>
-        <ChangeMessageVisibilityBatchResultEntry>
-            <Id>change_visibility_msg_2</Id>
-        </ChangeMessageVisibilityBatchResultEntry>
-        <ChangeMessageVisibilityBatchResultEntry>
-            <Id>change_visibility_msg_3</Id>
-        </ChangeMessageVisibilityBatchResultEntry>
-    </ChangeMessageVisibilityBatchResult>
-    <ResponseMetadata>
-        <RequestId>ca9668f7-ab1b-4f7a-8859-f15747ab17a7</RequestId>
-    </ResponseMetadata>
-</ChangeMessageVisibilityBatchResponse>
-XML
+        $response = new SimpleMockedResponse(<<<JSON
+{
+    "Failed": [],
+    "Successful": [
+        {
+            "Id": "change_visibility_msg_2"
+        },
+        {
+            "Id": "change_visibility_msg_3"
+        }
+    ]
+}
+JSON
         );
 
         $client = new MockHttpClient($response);
diff --git a/src/Service/Sqs/tests/Unit/Result/CreateQueueResultTest.php b/src/Service/Sqs/tests/Unit/Result/CreateQueueResultTest.php
@@ -15,17 +15,12 @@ class CreateQueueResultTest extends TestCase
 {
     public function testCreateQueueResult()
     {
-        $response = new SimpleMockedResponse(<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<CreateQueueResponse>
-    <CreateQueueResult>
-        <QueueUrl>https://queue.amazonaws.com/123456789012/MyQueue</QueueUrl>
-    </CreateQueueResult>
-    <ResponseMetadata>
-        <RequestId>7a62c49f-347e-4fc4-9331-6e8e7a96aa73</RequestId>
-    </ResponseMetadata>
-</CreateQueueResponse>
-XML
+        // see https://docs.aws.amazon.com/AWSSimpleQueueService/latest/APIReference/API_CreateQueue.html
+        $response = new SimpleMockedResponse(<<<JSON
+{
+    "QueueUrl":"https://queue.amazonaws.com/123456789012/MyQueue"
+}
+JSON
         );
 
         $client = new MockHttpClient($response);
diff --git a/src/Service/Sqs/tests/Unit/Result/DeleteMessageBatchResultTest.php b/src/Service/Sqs/tests/Unit/Result/DeleteMessageBatchResultTest.php
diff --git a/src/Service/Sqs/tests/Unit/Result/GetQueueAttributesResultTest.php b/src/Service/Sqs/tests/Unit/Result/GetQueueAttributesResultTest.php
diff --git a/src/Service/Sqs/tests/Unit/Result/GetQueueUrlResultTest.php b/src/Service/Sqs/tests/Unit/Result/GetQueueUrlResultTest.php
diff --git a/src/Service/Sqs/tests/Unit/Result/ListQueuesResultTest.php b/src/Service/Sqs/tests/Unit/Result/ListQueuesResultTest.php
diff --git a/src/Service/Sqs/tests/Unit/Result/ReceiveMessageResultTest.php b/src/Service/Sqs/tests/Unit/Result/ReceiveMessageResultTest.php
diff --git a/src/Service/Sqs/tests/Unit/Result/SendMessageBatchResultTest.php b/src/Service/Sqs/tests/Unit/Result/SendMessageBatchResultTest.php
diff --git a/src/Service/Sqs/tests/Unit/Result/SendMessageResultTest.php b/src/Service/Sqs/tests/Unit/Result/SendMessageResultTest.php
