address pr feedbacks

Author: xinsong-cui

services/sqs/e2eTest/src/SqsMd5ChecksumValidationTest.kt

@@ -117,40 +117,36 @@ class SqsMd5ChecksumValidationTest {
 
     @Test
     fun testSendMessage(): Unit = runBlocking {
-        assertDoesNotThrow {
-            correctChecksumClient.sendMessage(
-                SendMessageRequest {
-                    queueUrl = correctChecksumTestQueueUrl
-                    messageBody = TEST_MESSAGE_BODY
-                    messageAttributes = hashMapOf(
-                        TEST_MESSAGE_ATTRIBUTES_NAME to MessageAttributeValue {
-                            dataType = "String"
-                            stringValue = TEST_MESSAGE_ATTRIBUTES_VALUE
-                        },
-                    )
-                    messageSystemAttributes = hashMapOf(
-                        MessageSystemAttributeNameForSends.AwsTraceHeader to MessageSystemAttributeValue {
-                            dataType = "String"
-                            stringValue = TEST_MESSAGE_SYSTEM_ATTRIBUTES_VALUE
-                        },
-                    )
-                },
-            )
-        }
+        correctChecksumClient.sendMessage(
+            SendMessageRequest {
+                queueUrl = correctChecksumTestQueueUrl
+                messageBody = TEST_MESSAGE_BODY
+                messageAttributes = hashMapOf(
+                    TEST_MESSAGE_ATTRIBUTES_NAME to MessageAttributeValue {
+                        dataType = "String"
+                        stringValue = TEST_MESSAGE_ATTRIBUTES_VALUE
+                    },
+                )
+                messageSystemAttributes = hashMapOf(
+                    MessageSystemAttributeNameForSends.AwsTraceHeader to MessageSystemAttributeValue {
+                        dataType = "String"
+                        stringValue = TEST_MESSAGE_SYSTEM_ATTRIBUTES_VALUE
+                    },
+                )
+            },
+        )
     }
 
     @Test
     fun testReceiveMessage(): Unit = runBlocking {
-        assertDoesNotThrow {
-            correctChecksumClient.receiveMessage(
-                ReceiveMessageRequest {
-                    queueUrl = correctChecksumTestQueueUrl
-                    maxNumberOfMessages = 1
-                    messageAttributeNames = listOf(TEST_MESSAGE_ATTRIBUTES_NAME)
-                    messageSystemAttributeNames = listOf(MessageSystemAttributeName.AwsTraceHeader)
-                },
-            )
-        }
+        correctChecksumClient.receiveMessage(
+            ReceiveMessageRequest {
+                queueUrl = correctChecksumTestQueueUrl
+                maxNumberOfMessages = 1
+                messageAttributeNames = listOf(TEST_MESSAGE_ATTRIBUTES_NAME)
+                messageSystemAttributeNames = listOf(MessageSystemAttributeName.AwsTraceHeader)
+            },
+        )
     }
 
     @Test
@@ -159,14 +155,12 @@ class SqsMd5ChecksumValidationTest {
             buildSendMessageBatchRequestEntry(batchId)
         }
 
-        assertDoesNotThrow {
-            correctChecksumClient.sendMessageBatch(
-                SendMessageBatchRequest {
-                    queueUrl = correctChecksumTestQueueUrl
-                    this.entries = entries
-                },
-            )
-        }
+        correctChecksumClient.sendMessageBatch(
+            SendMessageBatchRequest {
+                queueUrl = correctChecksumTestQueueUrl
+                this.entries = entries
+            },
+        )
     }
 
     @Test

services/sqs/e2eTest/src/SqsTestUtils.kt

@@ -18,8 +18,8 @@ import kotlin.time.Duration.Companion.seconds
 object SqsTestUtils {
     const val DEFAULT_REGION = "us-west-2"
 
-    const val TEST_QUEUE_WRONG_CHECKSUM_PREFIX = "sqs-test-queue-wrong-checksum"
-    const val TEST_QUEUE_CORRECT_CHECKSUM_PREFIX = "sqs-test-queue-correct-checksum"
+    const val TEST_QUEUE_WRONG_CHECKSUM_PREFIX = "sqs-test-queue-wrong-checksum-"
+    const val TEST_QUEUE_CORRECT_CHECKSUM_PREFIX = "sqs-test-queue-correct-checksum-"
 
     const val TEST_MESSAGE_BODY = "Hello World"
     const val TEST_MESSAGE_ATTRIBUTES_NAME = "TestAttribute"