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

Fix timing in UDP tests (send could occur before receiver ready)

Browse Source
This commit is contained in:
Gary Russell
2010-04-03 19:52:30 +00:00
parent 58141fc260
commit 8a6e3938d3
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
org.springframework.integration.ip/src/test/java/org/springframework/integration/ip/udp/UdpMulticastEndToEndTests.java
View File

@@ -18,6 +18,7 @@ package org.springframework.integration.ip.udp;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.util.Date;
import java.util.concurrent.CountDownLatch;
@@ -61,6 +62,8 @@ public class UdpMulticastEndToEndTests implements Runnable {
private boolean okToRun = true;
private CountDownLatch readyToReceive = new CountDownLatch(1);
private static long hangAroundFor = 0;
@@ -81,6 +84,9 @@ public class UdpMulticastEndToEndTests implements Runnable {
public void launchSender(ApplicationContext applicationContext) throws Exception {
ChannelResolver channelResolver = new BeanFactoryChannelResolver(applicationContext);
MessageChannel inputChannel = channelResolver.resolveChannelName("mcInputChannel");
if (!readyToReceive.await(30, TimeUnit.SECONDS)) {
fail("Receiver failed to start in 30s");
}
try {
testingIpText = ">>>>>>> Testing IP (multicast) " + new Date();
inputChannel.send(new StringMessage(testingIpText));
@@ -117,6 +123,7 @@ public class UdpMulticastEndToEndTests implements Runnable {
UdpMulticastEndToEndTests.class);
while (okToRun) {
try {
readyToReceive.countDown();
sentFirst.await();
}
catch (InterruptedException e) {

14
org.springframework.integration.ip/src/test/java/org/springframework/integration/ip/udp/UdpUnicastEndToEndTests.java
View File

@@ -18,6 +18,7 @@ package org.springframework.integration.ip.udp;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.util.Date;
import java.util.concurrent.CountDownLatch;
@@ -60,15 +61,17 @@ public class UdpUnicastEndToEndTests implements Runnable {
private boolean okToRun = true;
private static long hangAroundFor = 0;
private CountDownLatch readyToReceive = new CountDownLatch(1);
private static long hangAroundFor = 0;
@Test
public void runIt() throws Exception {
UdpUnicastEndToEndTests launcher = new UdpUnicastEndToEndTests();
Thread t = new Thread(launcher);
t.start(); // launch the receiver
AbstractApplicationContext applicationContext = new ClassPathXmlApplicationContext("testIp-out-context.xml", UdpUnicastEndToEndTests.class);
AbstractApplicationContext applicationContext = new ClassPathXmlApplicationContext(
"testIp-out-context.xml", UdpUnicastEndToEndTests.class);
launcher.launchSender(applicationContext);
applicationContext.stop();
}
@@ -77,6 +80,9 @@ public class UdpUnicastEndToEndTests implements Runnable {
public void launchSender(ApplicationContext applicationContext) throws Exception {
ChannelResolver channelResolver = new BeanFactoryChannelResolver(applicationContext);
MessageChannel inputChannel = channelResolver.resolveChannelName("inputChannel");
if (!readyToReceive.await(30, TimeUnit.SECONDS)) {
fail("Receiver failed to start in 30s");
}
try {
testingIpText = ">>>>>>> Testing IP " + new Date();
inputChannel.send(new StringMessage(testingIpText));
@@ -108,9 +114,11 @@ public class UdpUnicastEndToEndTests implements Runnable {
*/
@SuppressWarnings("unchecked")
public void run() {
AbstractApplicationContext ctx = new ClassPathXmlApplicationContext("testIp-in-context.xml", UdpUnicastEndToEndTests.class);
AbstractApplicationContext ctx = new ClassPathXmlApplicationContext(
"testIp-in-context.xml", UdpUnicastEndToEndTests.class);
while (okToRun) {
try {
readyToReceive.countDown();
sentFirst.await();
}
catch (InterruptedException e) {