Polish tests

awspring · Jan 16, 2025 · 2e07b3d · 2e07b3d
1 parent cf2fe1c
commit 2e07b3d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 14 deletions.
diff --git a/.../test/java/io/awspring/cloud/modulith/events/sns/SnsEventPublicationIntegrationTests.java b/.../test/java/io/awspring/cloud/modulith/events/sns/SnsEventPublicationIntegrationTests.java
@@ -35,6 +35,8 @@
 import org.testcontainers.utility.DockerImageName;
 import software.amazon.awssdk.services.sns.SnsClient;
 import software.amazon.awssdk.services.sqs.SqsAsyncClient;
+import software.amazon.awssdk.services.sqs.model.Message;
+import software.amazon.awssdk.services.sqs.model.MessageAttributeValue;
 import software.amazon.awssdk.services.sqs.model.QueueAttributeName;
 
 /**
@@ -100,22 +102,21 @@ void publishesEventToSns() {
 				.getQueueAttributes(r -> r.queueUrl(queueUrl).attributeNames(QueueAttributeName.QUEUE_ARN)).join()
 				.attributes().get(QueueAttributeName.QUEUE_ARN);
 
-		snsClient.subscribe(r -> r.topicArn(topicArn).protocol("sqs").endpoint(queueArn));
+		snsClient.subscribe(r -> r.attributes(Map.of("RawMessageDelivery", "true")).topicArn(topicArn).protocol("sqs").endpoint(queueArn));
 
 		publisher.publishEvent();
 
 		await().untilAsserted(() -> {
-
-			var response = sqsAsyncClient.receiveMessage(r -> r.queueUrl(queueUrl)).join();
+			var response = sqsAsyncClient.receiveMessage(r -> r.queueUrl(queueUrl).messageAttributeNames("testKey")).join();
 
 			assertThat(response.hasMessages()).isTrue();
 
 			// Assert header added
-
-			// assertThat(response.messages())
-			// .extracting(Message::attributesAsStrings) // headers is not attributes?
-			// .extracting(it -> it.get("testKey"))
-			// .containsExactly("testValue");
+			assertThat(response.messages())
+				.extracting(Message::messageAttributes)
+				.extracting(it -> it.get("testKey"))
+				.extracting(MessageAttributeValue::stringValue)
+				.containsExactly("testValue");
 		});
 	}
 

diff --git a/.../test/java/io/awspring/cloud/modulith/events/sqs/SqsEventPublicationIntegrationTests.java b/.../test/java/io/awspring/cloud/modulith/events/sqs/SqsEventPublicationIntegrationTests.java
@@ -34,6 +34,8 @@
 import org.testcontainers.containers.localstack.LocalStackContainer;
 import org.testcontainers.utility.DockerImageName;
 import software.amazon.awssdk.services.sqs.SqsAsyncClient;
+import software.amazon.awssdk.services.sqs.model.Message;
+import software.amazon.awssdk.services.sqs.model.MessageAttributeValue;
 import software.amazon.awssdk.services.sqs.model.QueueAttributeName;
 
 /**
@@ -95,16 +97,16 @@ void publishesEventToSqs() throws Exception {
 		publisher.publishEvent();
 
 		await().untilAsserted(() -> {
-			var response = sqsAsyncClient.receiveMessage(r -> r.queueUrl(queueUrl)).join();
+			var response = sqsAsyncClient.receiveMessage(r -> r.queueUrl(queueUrl).messageAttributeNames("testKey")).join();
 
 			assertThat(response.hasMessages()).isTrue();
 
 			// Assert header added
-
-			// assertThat(response.messages())
-			// .extracting(Message::attributesAsStrings) // attributes is not headers?
-			// .extracting(it -> it.get("testKey"))
-			// .containsExactly("testValue");
+			assertThat(response.messages())
+				.extracting(Message::messageAttributes)
+				.extracting(it -> it.get("testKey"))
+				.extracting(MessageAttributeValue::stringValue)
+				.containsExactly("testValue");
 		});
 	}