Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix race condition in the PostgresChannelMessageTableSubscriberTests

Browse Source 
Adding two messages into a group may end up with wrong insert order.
Or better to say the timestamp of first messages inserted might be behind in the future after the second one.
This leads to a wrong order return for polling operation and, therefore, verification in the test.

* Fix `PostgresChannelMessageTableSubscriberTests` inserting `Thread.sleep(100);`
between `messageStore.addMessageToGroup()` operations
This commit is contained in:
Artem Bilan
2025-02-11 11:59:54 -05:00
parent 8dab7409b5
commit 32e3d18c94
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/postgres/PostgresChannelMessageTableSubscriberTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2022-2024 the original author or authors.
* Copyright 2022-2025 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -88,7 +88,6 @@ public class PostgresChannelMessageTableSubscriberTests implements PostgresConta
$BODY$
LANGUAGE PLPGSQL;
^^^ END OF SCRIPT ^^^
CREATE TRIGGER INT_CHANNEL_MESSAGE_NOTIFY_TRG
AFTER INSERT ON INT_CHANNEL_MESSAGE
FOR EACH ROW
@@ -150,6 +149,8 @@ public class PostgresChannelMessageTableSubscriberTests implements PostgresConta
latch.countDown();
});
messageStore.addMessageToGroup(groupId, new GenericMessage<>("1"));
// A little delay to avoid race condition with CREATED_DATE value
Thread.sleep(100);
messageStore.addMessageToGroup(groupId, new GenericMessage<>("2"));
assertThat(latch.await(10, TimeUnit.SECONDS)).isTrue();
assertThat(payloads).containsExactly("1", "2");
@@ -165,6 +166,8 @@ public class PostgresChannelMessageTableSubscriberTests implements PostgresConta
latch.countDown();
});
messageStore.addMessageToGroup(groupId, new GenericMessage<>("1"));
// A little delay to avoid race condition with CREATED_DATE value
Thread.sleep(100);
messageStore.addMessageToGroup(groupId, new GenericMessage<>("2"));
postgresChannelMessageTableSubscriber.start();
assertThat(latch.await(10, TimeUnit.SECONDS)).isTrue();
@@ -189,6 +192,8 @@ public class PostgresChannelMessageTableSubscriberTests implements PostgresConta
postgresSubscribableChannel.subscribe(messageHandler);
messageStore.addMessageToGroup(groupId, new GenericMessage<>("1"));
// A little delay to avoid race condition with CREATED_DATE value
Thread.sleep(100);
messageStore.addMessageToGroup(groupId, new GenericMessage<>("2"));
assertThat(latch.await(10, TimeUnit.SECONDS)).isTrue();
@@ -294,6 +299,8 @@ public class PostgresChannelMessageTableSubscriberTests implements PostgresConta
assertThat(connectionLatch.await(10, TimeUnit.SECONDS)).isTrue();
messageStore.addMessageToGroup(groupId, new GenericMessage<>("1"));
// A little delay to avoid race condition with CREATED_DATE value
Thread.sleep(100);
messageStore.addMessageToGroup(groupId, new GenericMessage<>("2"));
assertThat(latch.await(10, TimeUnit.SECONDS)).isTrue();
assertThat(payloads).containsExactlyInAnyOrder("1", "2");