add test for reproducing #890

softwaremill · Jun 13, 2024 · 63901d3 · 63901d3
1 parent 338afcd
commit 63901d3
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 40 deletions.
diff --git a/...amazon-java-sdk/src/test/scala/org/elasticmq/rest/sqs/aws/AmazonJavaSdkNewTestSuite.scala b/...amazon-java-sdk/src/test/scala/org/elasticmq/rest/sqs/aws/AmazonJavaSdkNewTestSuite.scala
@@ -386,6 +386,25 @@ abstract class AmazonJavaSdkNewTestSuite
     messageAttributes(MessageGroupId) shouldBe "gp1"
   }
 
+  test("should ignore zero delay seconds on message level with fifo queue") {
+    // given
+    val queueUrl =
+      testClient.createQueue("testQueue1.fifo", Map(FifoQueueAttributeName -> "true", DelaySecondsAttributeName -> "5"))
+    testClient.sendMessage(
+      queueUrl,
+      "test123",
+      delaySeconds = Some(0),
+      messageGroupId = Option("group1"),
+      messageDeduplicationId = Option("dedup1")
+    )
+
+    // when
+    val messages = testClient.receiveMessage(queueUrl)
+
+    // then
+    messages shouldBe empty
+  }
+
   private def doTestSendAndReceiveMessageWithAttributes(
       content: String,
       messageAttributes: Map[String, MessageAttribute] = Map.empty,
@@ -395,7 +414,7 @@ abstract class AmazonJavaSdkNewTestSuite
   ) = {
     // given
     val queue = testClient.createQueue("testQueue1")
-    testClient.sendMessage(queue, content, messageAttributes, awsTraceHeader)
+    testClient.sendMessage(queue, content, messageAttributes = messageAttributes, awsTraceHeader = awsTraceHeader)
     val message = receiveSingleMessageObject(queue, requestedAttributes, requestedSystemAttributes).orNull
 
     // then

diff --git a/...ting-amazon-java-sdk/src/test/scala/org/elasticmq/rest/sqs/client/AwsSdkV1SqsClient.scala b/...ting-amazon-java-sdk/src/test/scala/org/elasticmq/rest/sqs/client/AwsSdkV1SqsClient.scala
@@ -1,30 +1,7 @@
 package org.elasticmq.rest.sqs.client
 
 import com.amazonaws.services.sqs.AmazonSQS
-import com.amazonaws.services.sqs.model.{
-  BatchResultErrorEntry,
-  CancelMessageMoveTaskRequest,
-  ChangeMessageVisibilityBatchRequest,
-  ChangeMessageVisibilityBatchRequestEntry,
-  CreateQueueRequest,
-  DeleteMessageBatchRequest,
-  DeleteMessageBatchRequestEntry,
-  GetQueueAttributesRequest,
-  GetQueueUrlRequest,
-  ListDeadLetterSourceQueuesRequest,
-  ListMessageMoveTasksRequest,
-  MessageAttributeValue,
-  MessageSystemAttributeValue,
-  PurgeQueueRequest,
-  QueueDoesNotExistException,
-  ReceiveMessageRequest,
-  ResourceNotFoundException,
-  SendMessageBatchRequest,
-  SendMessageBatchRequestEntry,
-  SendMessageRequest,
-  StartMessageMoveTaskRequest,
-  UnsupportedOperationException
-}
+import com.amazonaws.services.sqs.model.{BatchResultErrorEntry, CancelMessageMoveTaskRequest, ChangeMessageVisibilityBatchRequest, ChangeMessageVisibilityBatchRequestEntry, CreateQueueRequest, DeleteMessageBatchRequest, DeleteMessageBatchRequestEntry, GetQueueAttributesRequest, GetQueueUrlRequest, ListDeadLetterSourceQueuesRequest, ListMessageMoveTasksRequest, MessageAttributeValue, MessageSystemAttributeValue, PurgeQueueRequest, QueueDoesNotExistException, ReceiveMessageRequest, ResourceNotFoundException, SendMessageBatchRequest, SendMessageBatchRequestEntry, SendMessageRequest, StartMessageMoveTaskRequest, UnsupportedOperationException}
 import org.elasticmq._
 
 import java.nio.ByteBuffer
@@ -70,16 +47,21 @@ class AwsSdkV1SqsClient(client: AmazonSQS) extends SqsClient {
 
   override def sendMessage(
       queueUrl: QueueUrl,
-      messageBody: String,
-      messageAttributes: Map[String, MessageAttribute] = Map.empty,
-      awsTraceHeader: Option[String] = None,
-      messageGroupId: Option[String] = None,
-      messageDeduplicationId: Option[String] = None
+      messageBody: MessageMoveTaskStatus,
+      delaySeconds: Option[Int] = None,
+      messageAttributes: Map[
+        MessageMoveTaskStatus,
+        MessageAttribute
+      ] = Map.empty,
+      awsTraceHeader: Option[MessageMoveTaskStatus] = None,
+      messageGroupId: Option[MessageMoveTaskStatus] = None,
+      messageDeduplicationId: Option[MessageMoveTaskStatus] = None
   ): Either[SqsClientError, Unit] = interceptErrors {
     client.sendMessage(
       new SendMessageRequest()
         .withQueueUrl(queueUrl)
         .withMessageBody(messageBody)
+        .withDelaySeconds(delaySeconds.map(Int.box).orNull)
         .withMessageSystemAttributes(
           mapAwsTraceHeader(awsTraceHeader)
         )

diff --git a/...ting-amazon-java-sdk/src/test/scala/org/elasticmq/rest/sqs/client/AwsSdkV2SqsClient.scala b/...ting-amazon-java-sdk/src/test/scala/org/elasticmq/rest/sqs/client/AwsSdkV2SqsClient.scala
@@ -39,17 +39,22 @@ class AwsSdkV2SqsClient(client: software.amazon.awssdk.services.sqs.SqsClient) e
 
   override def sendMessage(
       queueUrl: QueueUrl,
-      messageBody: String,
-      messageAttributes: Map[String, MessageAttribute] = Map.empty,
-      awsTraceHeader: Option[String] = None,
-      messageGroupId: Option[String] = None,
-      messageDeduplicationId: Option[String] = None
+      messageBody: MessageMoveTaskStatus,
+      delaySeconds: Option[Int] = None,
+      messageAttributes: Map[
+        MessageMoveTaskStatus,
+        MessageAttribute
+      ] = Map.empty,
+      awsTraceHeader: Option[MessageMoveTaskStatus] = None,
+      messageGroupId: Option[MessageMoveTaskStatus] = None,
+      messageDeduplicationId: Option[MessageMoveTaskStatus] = None
   ): Either[SqsClientError, Unit] = interceptErrors {
     client.sendMessage(
       SendMessageRequest
         .builder()
         .queueUrl(queueUrl)
         .messageBody(messageBody)
+        .delaySeconds(delaySeconds.map(Int.box).orNull)
         .messageSystemAttributes(mapAwsTraceHeader(awsTraceHeader))
         .messageAttributes(mapMessageAttributes(messageAttributes))
         .messageGroupId(messageGroupId.orNull)

diff --git a/...-sqs-testing-amazon-java-sdk/src/test/scala/org/elasticmq/rest/sqs/client/SqsClient.scala b/...-sqs-testing-amazon-java-sdk/src/test/scala/org/elasticmq/rest/sqs/client/SqsClient.scala
@@ -16,11 +16,15 @@ trait SqsClient {
 
   def sendMessage(
       queueUrl: QueueUrl,
-      messageBody: String,
-      messageAttributes: Map[String, MessageAttribute] = Map.empty,
-      awsTraceHeader: Option[String] = None,
-      messageGroupId: Option[String] = None,
-      messageDeduplicationId: Option[String] = None
+      messageBody: MessageMoveTaskStatus,
+      delaySeconds: Option[Int] = None,
+      messageAttributes: Map[
+        MessageMoveTaskStatus,
+        MessageAttribute
+      ] = Map.empty,
+      awsTraceHeader: Option[MessageMoveTaskStatus] = None,
+      messageGroupId: Option[MessageMoveTaskStatus] = None,
+      messageDeduplicationId: Option[MessageMoveTaskStatus] = None
   ): Either[SqsClientError, Unit]
 
   def receiveMessage(