Fixes flaky test.

spring-projects · Oct 12, 2024 · 967a7c4 · 967a7c4
1 parent e8378da
commit 967a7c4
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 24 deletions.
diff --git a/...a/org/springframework/kafka/retrytopic/AsyncCompletableFutureRetryTopicScenarioTests.java b/...a/org/springframework/kafka/retrytopic/AsyncCompletableFutureRetryTopicScenarioTests.java
@@ -212,10 +212,10 @@ void firstShortFailAndLastLongSuccessRetryTest(
 		assertThat(awaitLatch(latchContainer.dltCountdownLatch1)).isTrue();
 
 		assertThat(destinationTopic.getDestinationName()).isEqualTo(expectedRetryTopic);
-		assertThat(testTopicListener1.receivedMsgs).containsExactly(expectedReceivedMsgs);
-		assertThat(testTopicListener1.receivedTopics).containsExactly(expectedReceivedTopics);
+		assertThat(testTopicListener1.receivedMsgs).containsExactlyInAnyOrder(expectedReceivedMsgs);
+		assertThat(testTopicListener1.receivedTopics).containsExactlyInAnyOrder(expectedReceivedTopics);
 
-		assertThat(myCustomDltProcessor1.receivedMsg).containsExactly(expectedDltMsgs);
+		assertThat(myCustomDltProcessor1.receivedMsg).containsExactlyInAnyOrder(expectedDltMsgs);
 	}
 
 	@Test
@@ -261,10 +261,10 @@ void firstLongSuccessAndLastShortFailed(
 		assertThat(awaitLatch(latchContainer.dltCountdownLatch2)).isTrue();
 
 		assertThat(destinationTopic.getDestinationName()).isEqualTo(expectedRetryTopic);
-		assertThat(zero2TopicListener.receivedMsgs).containsExactly(expectedReceivedMsgs);
-		assertThat(zero2TopicListener.receivedTopics).containsExactly(expectedReceivedTopics);
+		assertThat(zero2TopicListener.receivedMsgs).containsExactlyInAnyOrder(expectedReceivedMsgs);
+		assertThat(zero2TopicListener.receivedTopics).containsExactlyInAnyOrder(expectedReceivedTopics);
 
-		assertThat(myCustomDltProcessor2.receivedMsg).containsExactly(expectedDltMsgs);
+		assertThat(myCustomDltProcessor2.receivedMsg).containsExactlyInAnyOrder(expectedDltMsgs);
 	}
 
 	@Test
@@ -325,10 +325,10 @@ void longFailMsgTwiceThenShortSucessMsgThird(
 		assertThat(awaitLatch(latchContainer.dltCountdownLatch3)).isTrue();
 
 		assertThat(destinationTopic.getDestinationName()).isEqualTo(expectedRetryTopic);
-		assertThat(testTopicListener3.receivedMsgs).containsExactly(expectedReceivedMsgs);
-		assertThat(testTopicListener3.receivedTopics).containsExactly(expectedReceivedTopics);
+		assertThat(testTopicListener3.receivedMsgs).containsExactlyInAnyOrder(expectedReceivedMsgs);
+		assertThat(testTopicListener3.receivedTopics).containsExactlyInAnyOrder(expectedReceivedTopics);
 
-		assertThat(myCustomDltProcessor3.receivedMsg).containsExactly(expectedDltMsgs);
+		assertThat(myCustomDltProcessor3.receivedMsg).containsExactlyInAnyOrder(expectedDltMsgs);
 	}
 
 	@Test
@@ -386,10 +386,10 @@ void longSuccessMsgTwiceThenShortFailMsgTwice(
 		assertThat(awaitLatch(latchContainer.dltCountdownLatch4)).isTrue();
 
 		assertThat(destinationTopic.getDestinationName()).isEqualTo(expectedRetryTopic);
-		assertThat(topicListener4.receivedMsgs).containsExactly(expectedReceivedMsgs);
-		assertThat(topicListener4.receivedTopics).containsExactly(expectedReceivedTopics);
+		assertThat(topicListener4.receivedMsgs).containsExactlyInAnyOrder(expectedReceivedMsgs);
+		assertThat(topicListener4.receivedTopics).containsExactlyInAnyOrder(expectedReceivedTopics);
 
-		assertThat(myCustomDltProcessor4.receivedMsg).containsExactly(expectedDltMsgs);
+		assertThat(myCustomDltProcessor4.receivedMsg).containsExactlyInAnyOrder(expectedDltMsgs);
 	}
 
 	@Test

diff --git a/.../src/test/java/org/springframework/kafka/retrytopic/AsyncMonoRetryTopicScenarioTests.java b/.../src/test/java/org/springframework/kafka/retrytopic/AsyncMonoRetryTopicScenarioTests.java
@@ -212,10 +212,10 @@ void firstShortFailAndLastLongSuccessRetryTest(
 		assertThat(awaitLatch(latchContainer.dltCountdownLatch1)).isTrue();
 
 		assertThat(destinationTopic.getDestinationName()).isEqualTo(expectedRetryTopic);
-		assertThat(testTopicListener1.receivedMsgs).containsExactly(expectedReceivedMsgs);
-		assertThat(testTopicListener1.receivedTopics).containsExactly(expectedReceivedTopics);
+		assertThat(testTopicListener1.receivedMsgs).containsExactlyInAnyOrder(expectedReceivedMsgs);
+		assertThat(testTopicListener1.receivedTopics).containsExactlyInAnyOrder(expectedReceivedTopics);
 
-		assertThat(myCustomDltProcessor1.receivedMsg).containsExactly(expectedDltMsgs);
+		assertThat(myCustomDltProcessor1.receivedMsg).containsExactlyInAnyOrder(expectedDltMsgs);
 	}
 
 	@Test
@@ -260,10 +260,10 @@ void firstLongSuccessAndLastShortFailed(
 		assertThat(awaitLatch(latchContainer.dltCountdownLatch2)).isTrue();
 
 		assertThat(destinationTopic.getDestinationName()).isEqualTo(expectedRetryTopic);
-		assertThat(zero2TopicListener.receivedMsgs).containsExactly(expectedReceivedMsgs);
-		assertThat(zero2TopicListener.receivedTopics).containsExactly(expectedReceivedTopics);
+		assertThat(zero2TopicListener.receivedMsgs).containsExactlyInAnyOrder(expectedReceivedMsgs);
+		assertThat(zero2TopicListener.receivedTopics).containsExactlyInAnyOrder(expectedReceivedTopics);
 
-		assertThat(myCustomDltProcessor2.receivedMsg).containsExactly(expectedDltMsgs);
+		assertThat(myCustomDltProcessor2.receivedMsg).containsExactlyInAnyOrder(expectedDltMsgs);
 	}
 
 	@Test
@@ -324,10 +324,10 @@ void longFailMsgTwiceThenShortSuccessMsgThird(
 		assertThat(awaitLatch(latchContainer.dltCountdownLatch3)).isTrue();
 
 		assertThat(destinationTopic.getDestinationName()).isEqualTo(expectedRetryTopic);
-		assertThat(testTopicListener3.receivedMsgs).containsExactly(expectedReceivedMsgs);
-		assertThat(testTopicListener3.receivedTopics).containsExactly(expectedReceivedTopics);
+		assertThat(testTopicListener3.receivedMsgs).containsExactlyInAnyOrder(expectedReceivedMsgs);
+		assertThat(testTopicListener3.receivedTopics).containsExactlyInAnyOrder(expectedReceivedTopics);
 
-		assertThat(myCustomDltProcessor3.receivedMsg).containsExactly(expectedDltMsgs);
+		assertThat(myCustomDltProcessor3.receivedMsg).containsExactlyInAnyOrder(expectedDltMsgs);
 	}
 
 	@Test
@@ -385,10 +385,10 @@ void longSuccessMsgTwiceThenShortFailMsgTwice(
 		assertThat(awaitLatch(latchContainer.dltCountdownLatch4)).isTrue();
 
 		assertThat(destinationTopic.getDestinationName()).isEqualTo(expectedRetryTopic);
-		assertThat(topicListener4.receivedMsgs).containsExactly(expectedReceivedMsgs);
-		assertThat(topicListener4.receivedTopics).containsExactly(expectedReceivedTopics);
+		assertThat(topicListener4.receivedMsgs).containsExactlyInAnyOrder(expectedReceivedMsgs);
+		assertThat(topicListener4.receivedTopics).containsExactlyInAnyOrder(expectedReceivedTopics);
 
-		assertThat(myCustomDltProcessor4.receivedMsg).containsExactly(expectedDltMsgs);
+		assertThat(myCustomDltProcessor4.receivedMsg).containsExactlyInAnyOrder(expectedDltMsgs);
 	}
 
 	@Test