You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ga...@apache.org on 2015/09/09 00:35:25 UTC

[10/10] jclouds git commit: JCLOUDS-217: SQS: Do not encode parameters.

JCLOUDS-217: SQS: Do not encode parameters.

SQS API tests should not encode parameters when constructing the
expected HTTP requests.


Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/9b15fdfd
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/9b15fdfd
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/9b15fdfd

Branch: refs/heads/master
Commit: 9b15fdfde8b856db5845ce346ba102c732c0ccdf
Parents: d70127f
Author: Timur Alperovich <ti...@gmail.com>
Authored: Tue Aug 25 21:22:09 2015 -0700
Committer: Timur Alperovich <ti...@gmail.com>
Committed: Tue Sep 8 15:19:03 2015 -0700

----------------------------------------------------------------------
 .../sqs/features/MessageApiExpectTest.java      | 70 ++++++++++----------
 .../sqs/features/PermissionApiExpectTest.java   |  8 +--
 .../sqs/features/QueueApiExpectTest.java        | 28 ++++----
 3 files changed, 53 insertions(+), 53 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jclouds/blob/9b15fdfd/apis/sqs/src/test/java/org/jclouds/sqs/features/MessageApiExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/sqs/src/test/java/org/jclouds/sqs/features/MessageApiExpectTest.java b/apis/sqs/src/test/java/org/jclouds/sqs/features/MessageApiExpectTest.java
index 87f214a..bb56261 100644
--- a/apis/sqs/src/test/java/org/jclouds/sqs/features/MessageApiExpectTest.java
+++ b/apis/sqs/src/test/java/org/jclouds/sqs/features/MessageApiExpectTest.java
@@ -43,10 +43,10 @@ public class MessageApiExpectTest extends BaseSQSApiExpectTest {
          .addHeader("Host", "sqs.us-east-1.amazonaws.com")
          .addFormParam("Action", "SendMessage")
          .addFormParam("MessageBody", "hardyharhar")
-         .addFormParam("Signature", "PVzszzgIcT1xt9%2BEzGzWB2Bt8zDadBc48HsgF89AoJE%3D")
+         .addFormParam("Signature", "PVzszzgIcT1xt9+EzGzWB2Bt8zDadBc48HsgF89AoJE=")
          .addFormParam("SignatureMethod", "HmacSHA256")
          .addFormParam("SignatureVersion", "2")
-         .addFormParam("Timestamp", "2009-11-08T15%3A54%3A08.897Z")
+         .addFormParam("Timestamp", "2009-11-08T15:54:08.897Z")
          .addFormParam("Version", "2011-10-01")
          .addFormParam("AWSAccessKeyId", "identity").build();
 
@@ -70,10 +70,10 @@ public class MessageApiExpectTest extends BaseSQSApiExpectTest {
          .addFormParam("SendMessageBatchRequestEntry.1.MessageBody", "payload1")
          .addFormParam("SendMessageBatchRequestEntry.2.Id", "2")
          .addFormParam("SendMessageBatchRequestEntry.2.MessageBody", "payload2")
-         .addFormParam("Signature", "2AYMDMLhoLncALJgBfHBGfOkaTB5ut3PeFRJeWffxdI%3D")
+         .addFormParam("Signature", "2AYMDMLhoLncALJgBfHBGfOkaTB5ut3PeFRJeWffxdI=")
          .addFormParam("SignatureMethod", "HmacSHA256")
          .addFormParam("SignatureVersion", "2")
-         .addFormParam("Timestamp", "2009-11-08T15%3A54%3A08.897Z")
+         .addFormParam("Timestamp", "2009-11-08T15:54:08.897Z")
          .addFormParam("Version", "2011-10-01")
          .addFormParam("AWSAccessKeyId", "identity").build();
 
@@ -98,10 +98,10 @@ public class MessageApiExpectTest extends BaseSQSApiExpectTest {
          .addFormParam("SendMessageBatchRequestEntry.1.MessageBody", "payload1")
          .addFormParam("SendMessageBatchRequestEntry.2.Id", "foo2")
          .addFormParam("SendMessageBatchRequestEntry.2.MessageBody", "payload2")
-         .addFormParam("Signature", "f9v8e/rPXTI3zhBYMhg7U8yCfvPqHjAV8bFjhGL6%2BXc%3D")
+         .addFormParam("Signature", "f9v8e/rPXTI3zhBYMhg7U8yCfvPqHjAV8bFjhGL6+Xc=")
          .addFormParam("SignatureMethod", "HmacSHA256")
          .addFormParam("SignatureVersion", "2")
-         .addFormParam("Timestamp", "2009-11-08T15%3A54%3A08.897Z")
+         .addFormParam("Timestamp", "2009-11-08T15:54:08.897Z")
          .addFormParam("Version", "2011-10-01")
          .addFormParam("AWSAccessKeyId", "identity").build();
    
@@ -130,10 +130,10 @@ public class MessageApiExpectTest extends BaseSQSApiExpectTest {
          .addFormParam("SendMessageBatchRequestEntry.2.DelaySeconds", "10")
          .addFormParam("SendMessageBatchRequestEntry.2.Id", "foo2")
          .addFormParam("SendMessageBatchRequestEntry.2.MessageBody", "payload2")
-         .addFormParam("Signature", "COjjEaJ76EwziEFtkT2FuSRSbrCIu/hlJf1Zmu7cYoU%3D")
+         .addFormParam("Signature", "COjjEaJ76EwziEFtkT2FuSRSbrCIu/hlJf1Zmu7cYoU=")
          .addFormParam("SignatureMethod", "HmacSHA256")
          .addFormParam("SignatureVersion", "2")
-         .addFormParam("Timestamp", "2009-11-08T15%3A54%3A08.897Z")
+         .addFormParam("Timestamp", "2009-11-08T15:54:08.897Z")
          .addFormParam("Version", "2011-10-01")
          .addFormParam("AWSAccessKeyId", "identity").build();
 
@@ -163,10 +163,10 @@ public class MessageApiExpectTest extends BaseSQSApiExpectTest {
          .addFormParam("SendMessageBatchRequestEntry.2.DelaySeconds", "10")
          .addFormParam("SendMessageBatchRequestEntry.2.Id", "2")
          .addFormParam("SendMessageBatchRequestEntry.2.MessageBody", "payload2")
-         .addFormParam("Signature", "8AVNvSVXPSnoXjJAc6h1rysMBBZPnSycbnmD2/qpdV8%3D")
+         .addFormParam("Signature", "8AVNvSVXPSnoXjJAc6h1rysMBBZPnSycbnmD2/qpdV8=")
          .addFormParam("SignatureMethod", "HmacSHA256")
          .addFormParam("SignatureVersion", "2")
-         .addFormParam("Timestamp", "2009-11-08T15%3A54%3A08.897Z")
+         .addFormParam("Timestamp", "2009-11-08T15:54:08.897Z")
          .addFormParam("Version", "2011-10-01")
          .addFormParam("AWSAccessKeyId", "identity").build();
    
@@ -193,10 +193,10 @@ public class MessageApiExpectTest extends BaseSQSApiExpectTest {
          .addFormParam("SendMessageBatchRequestEntry.2.DelaySeconds", "10")
          .addFormParam("SendMessageBatchRequestEntry.2.Id", "foo2")
          .addFormParam("SendMessageBatchRequestEntry.2.MessageBody", "payload2")
-         .addFormParam("Signature", "M2X8Al%2BbyyDM%2B9kdN28rMn1yJWl78hJ5i4GnaMZ1sYg%3D")
+         .addFormParam("Signature", "M2X8Al+byyDM+9kdN28rMn1yJWl78hJ5i4GnaMZ1sYg=")
          .addFormParam("SignatureMethod", "HmacSHA256")
          .addFormParam("SignatureVersion", "2")
-         .addFormParam("Timestamp", "2009-11-08T15%3A54%3A08.897Z")
+         .addFormParam("Timestamp", "2009-11-08T15:54:08.897Z")
          .addFormParam("Version", "2011-10-01")
          .addFormParam("AWSAccessKeyId", "identity").build();
 
@@ -226,10 +226,10 @@ public class MessageApiExpectTest extends BaseSQSApiExpectTest {
          .addFormParam("SendMessageBatchRequestEntry.2.DelaySeconds", "10")
          .addFormParam("SendMessageBatchRequestEntry.2.Id", "2")
          .addFormParam("SendMessageBatchRequestEntry.2.MessageBody", "payload2")
-         .addFormParam("Signature", "nbA4UnKDAuQCiCcvQHH/1UjMMeo2s3d94A27Q3t9SlI%3D")
+         .addFormParam("Signature", "nbA4UnKDAuQCiCcvQHH/1UjMMeo2s3d94A27Q3t9SlI=")
          .addFormParam("SignatureMethod", "HmacSHA256")
          .addFormParam("SignatureVersion", "2")
-         .addFormParam("Timestamp", "2009-11-08T15%3A54%3A08.897Z")
+         .addFormParam("Timestamp", "2009-11-08T15:54:08.897Z")
          .addFormParam("Version", "2011-10-01")
          .addFormParam("AWSAccessKeyId", "identity").build();
    
@@ -251,10 +251,10 @@ public class MessageApiExpectTest extends BaseSQSApiExpectTest {
          .endpoint("https://sqs.us-east-1.amazonaws.com/993194456877/adrian-sqs11/")
          .addHeader("Host", "sqs.us-east-1.amazonaws.com")
          .addFormParam("Action", "ReceiveMessage")
-         .addFormParam("Signature", "UURXsAjggoaz5P1h2EFswRd8Ji9euHmXhHvrAmIqM1E%3D")
+         .addFormParam("Signature", "UURXsAjggoaz5P1h2EFswRd8Ji9euHmXhHvrAmIqM1E=")
          .addFormParam("SignatureMethod", "HmacSHA256")
          .addFormParam("SignatureVersion", "2")
-         .addFormParam("Timestamp", "2009-11-08T15%3A54%3A08.897Z")
+         .addFormParam("Timestamp", "2009-11-08T15:54:08.897Z")
          .addFormParam("Version", "2011-10-01")
          .addFormParam("AWSAccessKeyId", "identity").build();
 
@@ -276,10 +276,10 @@ public class MessageApiExpectTest extends BaseSQSApiExpectTest {
          .addHeader("Host", "sqs.us-east-1.amazonaws.com")
          .addFormParam("Action", "ReceiveMessage")
          .addFormParam("MaxNumberOfMessages", "10")
-         .addFormParam("Signature", "pZ9B4%2BTBvQA4n0joP4t8ue5x0xmKMd9prpVLVoT/7qU%3D")
+         .addFormParam("Signature", "pZ9B4+TBvQA4n0joP4t8ue5x0xmKMd9prpVLVoT/7qU=")
          .addFormParam("SignatureMethod", "HmacSHA256")
          .addFormParam("SignatureVersion", "2")
-         .addFormParam("Timestamp", "2009-11-08T15%3A54%3A08.897Z")
+         .addFormParam("Timestamp", "2009-11-08T15:54:08.897Z")
          .addFormParam("Version", "2011-10-01")
          .addFormParam("AWSAccessKeyId", "identity").build();
 
@@ -293,17 +293,17 @@ public class MessageApiExpectTest extends BaseSQSApiExpectTest {
       assertEquals(apiWhenExist.getMessageApiForQueue(queue).receive(10).toString(), new ReceiveMessageResponseTest()
             .expected().toString());
    }
-   
+
    public HttpRequest deleteMessage = HttpRequest.builder()
          .method("POST")
          .endpoint("https://sqs.us-east-1.amazonaws.com/993194456877/adrian-sqs11/")
          .addHeader("Host", "sqs.us-east-1.amazonaws.com")
          .addFormParam("Action", "DeleteMessage")
          .addFormParam("ReceiptHandle", "eXJYhj5rDr9cAe")
-         .addFormParam("Signature", "9/kuCc2i78gMsmul%2BRsOPcdQ1OLUKrItqgGIRRBJb8M%3D")
+         .addFormParam("Signature", "9/kuCc2i78gMsmul+RsOPcdQ1OLUKrItqgGIRRBJb8M=")
          .addFormParam("SignatureMethod", "HmacSHA256")
          .addFormParam("SignatureVersion", "2")
-         .addFormParam("Timestamp", "2009-11-08T15%3A54%3A08.897Z")
+         .addFormParam("Timestamp", "2009-11-08T15:54:08.897Z")
          .addFormParam("Version", "2011-10-01")
          .addFormParam("AWSAccessKeyId", "identity").build();
 
@@ -330,10 +330,10 @@ public class MessageApiExpectTest extends BaseSQSApiExpectTest {
          .addFormParam("DeleteMessageBatchRequestEntry.1.ReceiptHandle", "eXJYhj5rDr9cAe")
          .addFormParam("DeleteMessageBatchRequestEntry.2.Id", "2")
          .addFormParam("DeleteMessageBatchRequestEntry.2.ReceiptHandle", "fffeeerrr")
-         .addFormParam("Signature", "S4xIobjm3LOkJvibeI2X54nxKJw9r1a5zj/dvHlfDMY%3D")
+         .addFormParam("Signature", "S4xIobjm3LOkJvibeI2X54nxKJw9r1a5zj/dvHlfDMY=")
          .addFormParam("SignatureMethod", "HmacSHA256")
          .addFormParam("SignatureVersion", "2")
-         .addFormParam("Timestamp", "2009-11-08T15%3A54%3A08.897Z")
+         .addFormParam("Timestamp", "2009-11-08T15:54:08.897Z")
          .addFormParam("Version", "2011-10-01")
          .addFormParam("AWSAccessKeyId", "identity").build();
 
@@ -358,10 +358,10 @@ public class MessageApiExpectTest extends BaseSQSApiExpectTest {
          .addFormParam("DeleteMessageBatchRequestEntry.1.ReceiptHandle", "eXJYhj5rDr9cAe")
          .addFormParam("DeleteMessageBatchRequestEntry.2.Id", "foo2")
          .addFormParam("DeleteMessageBatchRequestEntry.2.ReceiptHandle", "fffeeerrr")
-         .addFormParam("Signature", "kwHC3F3ZoJvfibhZWVTeIwFHUzoaVMR4OViyJbsmuV0%3D")
+         .addFormParam("Signature", "kwHC3F3ZoJvfibhZWVTeIwFHUzoaVMR4OViyJbsmuV0=")
          .addFormParam("SignatureMethod", "HmacSHA256")
          .addFormParam("SignatureVersion", "2")
-         .addFormParam("Timestamp", "2009-11-08T15%3A54%3A08.897Z")
+         .addFormParam("Timestamp", "2009-11-08T15:54:08.897Z")
          .addFormParam("Version", "2011-10-01")
          .addFormParam("AWSAccessKeyId", "identity").build();
 
@@ -385,10 +385,10 @@ public class MessageApiExpectTest extends BaseSQSApiExpectTest {
          .addHeader("Host", "sqs.us-east-1.amazonaws.com")
          .addFormParam("Action", "ChangeMessageVisibility")
          .addFormParam("ReceiptHandle", "eXJYhj5rDr9cAe")
-         .addFormParam("Signature", "gvmSHleGLkmszYU6aURCBImuec2k0O3pg3tAYhDvkNs%3D")
+         .addFormParam("Signature", "gvmSHleGLkmszYU6aURCBImuec2k0O3pg3tAYhDvkNs=")
          .addFormParam("SignatureMethod", "HmacSHA256")
          .addFormParam("SignatureVersion", "2")
-         .addFormParam("Timestamp", "2009-11-08T15%3A54%3A08.897Z")
+         .addFormParam("Timestamp", "2009-11-08T15:54:08.897Z")
          .addFormParam("Version", "2011-10-01")
          .addFormParam("VisibilityTimeout", "10")
          .addFormParam("AWSAccessKeyId", "identity").build();
@@ -418,10 +418,10 @@ public class MessageApiExpectTest extends BaseSQSApiExpectTest {
          .addFormParam("ChangeMessageVisibilityBatchRequestEntry.2.Id", "foo2")
          .addFormParam("ChangeMessageVisibilityBatchRequestEntry.2.ReceiptHandle", "bbbbbbbbb")
          .addFormParam("ChangeMessageVisibilityBatchRequestEntry.2.VisibilityTimeout", "10")
-         .addFormParam("Signature", "KjDusYiiC3hTdy3ZxLwBRHryrNoNaFb2AHJqUDu3mtQ%3D")
+         .addFormParam("Signature", "KjDusYiiC3hTdy3ZxLwBRHryrNoNaFb2AHJqUDu3mtQ=")
          .addFormParam("SignatureMethod", "HmacSHA256")
          .addFormParam("SignatureVersion", "2")
-         .addFormParam("Timestamp", "2009-11-08T15%3A54%3A08.897Z")
+         .addFormParam("Timestamp", "2009-11-08T15:54:08.897Z")
          .addFormParam("Version", "2011-10-01")
          .addFormParam("AWSAccessKeyId", "identity").build();
 
@@ -451,10 +451,10 @@ public class MessageApiExpectTest extends BaseSQSApiExpectTest {
          .addFormParam("ChangeMessageVisibilityBatchRequestEntry.2.Id", "2")
          .addFormParam("ChangeMessageVisibilityBatchRequestEntry.2.ReceiptHandle", "bbbbbbbbb")
          .addFormParam("ChangeMessageVisibilityBatchRequestEntry.2.VisibilityTimeout", "10")
-         .addFormParam("Signature", "zj2cftkpHtiYb9iOjPR3AhcVhoobi0JvOy22PvQJtho%3D")
+         .addFormParam("Signature", "zj2cftkpHtiYb9iOjPR3AhcVhoobi0JvOy22PvQJtho=")
          .addFormParam("SignatureMethod", "HmacSHA256")
          .addFormParam("SignatureVersion", "2")
-         .addFormParam("Timestamp", "2009-11-08T15%3A54%3A08.897Z")
+         .addFormParam("Timestamp", "2009-11-08T15:54:08.897Z")
          .addFormParam("Version", "2011-10-01")
          .addFormParam("AWSAccessKeyId", "identity").build();
    
@@ -481,10 +481,10 @@ public class MessageApiExpectTest extends BaseSQSApiExpectTest {
                                                                            .addFormParam("ChangeMessageVisibilityBatchRequestEntry.2.Id", "foo2")
                                                                            .addFormParam("ChangeMessageVisibilityBatchRequestEntry.2.ReceiptHandle", "bbbbbbbbb")
                                                                            .addFormParam("ChangeMessageVisibilityBatchRequestEntry.2.VisibilityTimeout", "10")
-                                                                           .addFormParam("Signature", "y/gaaxoE5wrG2P7NIAyfDo7DTgRx2PLJUi9/zNnWQ6A%3D")
+                                                                           .addFormParam("Signature", "y/gaaxoE5wrG2P7NIAyfDo7DTgRx2PLJUi9/zNnWQ6A=")
                                                                            .addFormParam("SignatureMethod", "HmacSHA256")
                                                                            .addFormParam("SignatureVersion", "2")
-                                                                           .addFormParam("Timestamp", "2009-11-08T15%3A54%3A08.897Z")
+                                                                           .addFormParam("Timestamp", "2009-11-08T15:54:08.897Z")
                                                                            .addFormParam("Version", "2011-10-01")
                                                                            .addFormParam("AWSAccessKeyId", "identity").build();
 
@@ -513,10 +513,10 @@ public class MessageApiExpectTest extends BaseSQSApiExpectTest {
                                                                       .addFormParam("ChangeMessageVisibilityBatchRequestEntry.2.Id", "2")
                                                                       .addFormParam("ChangeMessageVisibilityBatchRequestEntry.2.ReceiptHandle", "bbbbbbbbb")
                                                                       .addFormParam("ChangeMessageVisibilityBatchRequestEntry.2.VisibilityTimeout", "10")
-                                                                      .addFormParam("Signature", "f5aq7zdKFErM3%2BIdtDX5NOzPO7mqCRzPGj2wUUEWjgE%3D")
+                                                                      .addFormParam("Signature", "f5aq7zdKFErM3+IdtDX5NOzPO7mqCRzPGj2wUUEWjgE=")
                                                                       .addFormParam("SignatureMethod", "HmacSHA256")
                                                                       .addFormParam("SignatureVersion", "2")
-                                                                      .addFormParam("Timestamp", "2009-11-08T15%3A54%3A08.897Z")
+                                                                      .addFormParam("Timestamp", "2009-11-08T15:54:08.897Z")
                                                                       .addFormParam("Version", "2011-10-01")
                                                                       .addFormParam("AWSAccessKeyId", "identity").build();
    

http://git-wip-us.apache.org/repos/asf/jclouds/blob/9b15fdfd/apis/sqs/src/test/java/org/jclouds/sqs/features/PermissionApiExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/sqs/src/test/java/org/jclouds/sqs/features/PermissionApiExpectTest.java b/apis/sqs/src/test/java/org/jclouds/sqs/features/PermissionApiExpectTest.java
index ae8abbe..5fa66c0 100644
--- a/apis/sqs/src/test/java/org/jclouds/sqs/features/PermissionApiExpectTest.java
+++ b/apis/sqs/src/test/java/org/jclouds/sqs/features/PermissionApiExpectTest.java
@@ -34,10 +34,10 @@ public class PermissionApiExpectTest extends BaseSQSApiExpectTest {
          .addFormParam("AWSAccountId.1", "125074342641")
          .addFormParam("ActionName.1", "ReceiveMessage")
          .addFormParam("Label", "testLabel")
-         .addFormParam("Signature", "J9sV4q1rJ7dWYJDQp9JxsfEKNXQhpQBYIwBYi1IeXV0%3D")
+         .addFormParam("Signature", "J9sV4q1rJ7dWYJDQp9JxsfEKNXQhpQBYIwBYi1IeXV0=")
          .addFormParam("SignatureMethod", "HmacSHA256")
          .addFormParam("SignatureVersion", "2")
-         .addFormParam("Timestamp", "2009-11-08T15%3A54%3A08.897Z")
+         .addFormParam("Timestamp", "2009-11-08T15:54:08.897Z")
          .addFormParam("Version", "2011-10-01")
          .addFormParam("AWSAccessKeyId", "identity").build();
 
@@ -61,10 +61,10 @@ public class PermissionApiExpectTest extends BaseSQSApiExpectTest {
          .addHeader("Host", "sqs.us-east-1.amazonaws.com")
          .addFormParam("Action", "RemovePermission")
          .addFormParam("Label", "testLabel")
-         .addFormParam("Signature", "VOA0L1uRVKQDQL1Klt0cYUajGoxN4Ur%2B7ISQ2I4RpRs%3D")
+         .addFormParam("Signature", "VOA0L1uRVKQDQL1Klt0cYUajGoxN4Ur+7ISQ2I4RpRs=")
          .addFormParam("SignatureMethod", "HmacSHA256")
          .addFormParam("SignatureVersion", "2")
-         .addFormParam("Timestamp", "2009-11-08T15%3A54%3A08.897Z")
+         .addFormParam("Timestamp", "2009-11-08T15:54:08.897Z")
          .addFormParam("Version", "2011-10-01")
          .addFormParam("AWSAccessKeyId", "identity").build();
 

http://git-wip-us.apache.org/repos/asf/jclouds/blob/9b15fdfd/apis/sqs/src/test/java/org/jclouds/sqs/features/QueueApiExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/sqs/src/test/java/org/jclouds/sqs/features/QueueApiExpectTest.java b/apis/sqs/src/test/java/org/jclouds/sqs/features/QueueApiExpectTest.java
index 6b9d1dd..07ccb95 100644
--- a/apis/sqs/src/test/java/org/jclouds/sqs/features/QueueApiExpectTest.java
+++ b/apis/sqs/src/test/java/org/jclouds/sqs/features/QueueApiExpectTest.java
@@ -40,10 +40,10 @@ public class QueueApiExpectTest extends BaseSQSApiExpectTest {
          .addHeader("Host", "sqs.us-east-1.amazonaws.com")
          .addFormParam("Action", "GetQueueUrl")
          .addFormParam("QueueName", "queueName")
-         .addFormParam("Signature", "ZjHLpNl6NLqK%2BsqOyEFqEJMWGeOLuNBd3%2B0Z9RGPYWU%3D")
+         .addFormParam("Signature", "ZjHLpNl6NLqK+sqOyEFqEJMWGeOLuNBd3+0Z9RGPYWU=")
          .addFormParam("SignatureMethod", "HmacSHA256")
          .addFormParam("SignatureVersion", "2")
-         .addFormParam("Timestamp", "2009-11-08T15%3A54%3A08.897Z")
+         .addFormParam("Timestamp", "2009-11-08T15:54:08.897Z")
          .addFormParam("Version", "2011-10-01")
          .addFormParam("AWSAccessKeyId", "identity").build();
 
@@ -66,10 +66,10 @@ public class QueueApiExpectTest extends BaseSQSApiExpectTest {
          .addFormParam("Action", "GetQueueUrl")
          .addFormParam("QueueName", "queueName")
          .addFormParam("QueueOwnerAWSAccountId", "120908098979")
-         .addFormParam("Signature", "O0E%2B3jh2vN6bKqmb4/XPTHUmPO1iat9o8YnIFH463g8%3D")
+         .addFormParam("Signature", "O0E+3jh2vN6bKqmb4/XPTHUmPO1iat9o8YnIFH463g8=")
          .addFormParam("SignatureMethod", "HmacSHA256")
          .addFormParam("SignatureVersion", "2")
-         .addFormParam("Timestamp", "2009-11-08T15%3A54%3A08.897Z")
+         .addFormParam("Timestamp", "2009-11-08T15:54:08.897Z")
          .addFormParam("Version", "2011-10-01")
          .addFormParam("AWSAccessKeyId", "identity").build();
 
@@ -106,10 +106,10 @@ public class QueueApiExpectTest extends BaseSQSApiExpectTest {
          .addHeader("Host", "sqs.us-east-1.amazonaws.com")
          .addFormParam("Action", "CreateQueue")
          .addFormParam("QueueName", "queueName")
-         .addFormParam("Signature", "I7tmwiCzJ9cvw79pmlz1rOILh2C2ZV6OpLk23JGx6AU%3D")
+         .addFormParam("Signature", "I7tmwiCzJ9cvw79pmlz1rOILh2C2ZV6OpLk23JGx6AU=")
          .addFormParam("SignatureMethod", "HmacSHA256")
          .addFormParam("SignatureVersion", "2")
-         .addFormParam("Timestamp", "2009-11-08T15%3A54%3A08.897Z")
+         .addFormParam("Timestamp", "2009-11-08T15:54:08.897Z")
          .addFormParam("Version", "2011-10-01")
          .addFormParam("AWSAccessKeyId", "identity").build();
 
@@ -130,10 +130,10 @@ public class QueueApiExpectTest extends BaseSQSApiExpectTest {
          .addHeader("Host", "sqs.us-east-1.amazonaws.com")
          .addFormParam("Action", "GetQueueAttributes")
          .addFormParam("AttributeName.1", "VisibilityTimeout")
-         .addFormParam("Signature", "AfydayBBaIk4UGikHHY1CFNmOOAcTnogpFWydZyNass%3D")
+         .addFormParam("Signature", "AfydayBBaIk4UGikHHY1CFNmOOAcTnogpFWydZyNass=")
          .addFormParam("SignatureMethod", "HmacSHA256")
          .addFormParam("SignatureVersion", "2")
-         .addFormParam("Timestamp", "2009-11-08T15%3A54%3A08.897Z")
+         .addFormParam("Timestamp", "2009-11-08T15:54:08.897Z")
          .addFormParam("Version", "2011-10-01")
          .addFormParam("AWSAccessKeyId", "identity").build();
 
@@ -157,10 +157,10 @@ public class QueueApiExpectTest extends BaseSQSApiExpectTest {
          .addHeader("Host", "sqs.us-east-1.amazonaws.com")
          .addFormParam("Action", "GetQueueAttributes")
          .addFormParam("AttributeName.1", "All")
-         .addFormParam("Signature", "welFLn0TV6JlH6s6s60XZTJeJfFXGiXN4qNPrBx7aHc%3D")
+         .addFormParam("Signature", "welFLn0TV6JlH6s6s60XZTJeJfFXGiXN4qNPrBx7aHc=")
          .addFormParam("SignatureMethod", "HmacSHA256")
          .addFormParam("SignatureVersion", "2")
-         .addFormParam("Timestamp", "2009-11-08T15%3A54%3A08.897Z")
+         .addFormParam("Timestamp", "2009-11-08T15:54:08.897Z")
          .addFormParam("Version", "2011-10-01")
          .addFormParam("AWSAccessKeyId", "identity").build();
 
@@ -182,10 +182,10 @@ public class QueueApiExpectTest extends BaseSQSApiExpectTest {
          .addFormParam("Action", "GetQueueAttributes")
          .addFormParam("AttributeName.1", "VisibilityTimeout")
          .addFormParam("AttributeName.2", "DelaySeconds")
-         .addFormParam("Signature", "9KaiOOWWyFPTVMOnyHA3ZoXbPBPSD4AZ4q460UNMfDs%3D")
+         .addFormParam("Signature", "9KaiOOWWyFPTVMOnyHA3ZoXbPBPSD4AZ4q460UNMfDs=")
          .addFormParam("SignatureMethod", "HmacSHA256")
          .addFormParam("SignatureVersion", "2")
-         .addFormParam("Timestamp", "2009-11-08T15%3A54%3A08.897Z")
+         .addFormParam("Timestamp", "2009-11-08T15:54:08.897Z")
          .addFormParam("Version", "2011-10-01")
          .addFormParam("AWSAccessKeyId", "identity").build();
 
@@ -208,10 +208,10 @@ public class QueueApiExpectTest extends BaseSQSApiExpectTest {
          .addFormParam("Action", "SetQueueAttributes")
          .addFormParam("Attribute.Name", "MaximumMessageSize")
          .addFormParam("Attribute.Value", "1")
-         .addFormParam("Signature", "ktBkQ3c/rwGcBSec0fkckfo73xmcoTuub5fxudM1qh0%3D")
+         .addFormParam("Signature", "ktBkQ3c/rwGcBSec0fkckfo73xmcoTuub5fxudM1qh0=")
          .addFormParam("SignatureMethod", "HmacSHA256")
          .addFormParam("SignatureVersion", "2")
-         .addFormParam("Timestamp", "2009-11-08T15%3A54%3A08.897Z")
+         .addFormParam("Timestamp", "2009-11-08T15:54:08.897Z")
          .addFormParam("Version", "2011-10-01")
          .addFormParam("AWSAccessKeyId", "identity").build();