From 5c5bcdf2fc3752d138a2abc1ab6ce66365cf15ce Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Thu, 27 Dec 2007 19:11:25 +0000
Subject: [PATCH] Added timeout to prevent indefinitely blocking tests.

---
 .../org/springframework/integration/bus/MessageBusTests.java   | 2 +-
 .../MessageEndpointAnnotationPostProcessorTests.java           | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/spring-integration-core/src/test/java/org/springframework/integration/bus/MessageBusTests.java b/spring-integration-core/src/test/java/org/springframework/integration/bus/MessageBusTests.java
index a34a928a7f..37abf14c0d 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/bus/MessageBusTests.java
+++ b/spring-integration-core/src/test/java/org/springframework/integration/bus/MessageBusTests.java
@@ -47,7 +47,7 @@ public class MessageBusTests {
 		endpoint.setDefaultOutputChannelName("targetChannel");
 		bus.registerEndpoint("endpoint", endpoint);
 		bus.start();
-		Message<?> result = targetChannel.receive();
+		Message<?> result = targetChannel.receive(1000);
 		assertEquals("test", result.getPayload());
 		bus.stop();
 	}
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/annotation/MessageEndpointAnnotationPostProcessorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/annotation/MessageEndpointAnnotationPostProcessorTests.java
index 824ec05c62..00a9fda046 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/annotation/MessageEndpointAnnotationPostProcessorTests.java
+++ b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/annotation/MessageEndpointAnnotationPostProcessorTests.java
@@ -19,6 +19,7 @@ package org.springframework.integration.endpoint.annotation;
 import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
+
 import org.springframework.context.support.AbstractApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.integration.channel.MessageChannel;
@@ -37,7 +38,7 @@ public class MessageEndpointAnnotationPostProcessorTests {
 		MessageChannel inputChannel = (MessageChannel) context.getBean("inputChannel");
 		MessageChannel outputChannel = (MessageChannel) context.getBean("outputChannel");
 		inputChannel.send(new GenericMessage<String>(1, "world"));
-		Message<String> message = outputChannel.receive();
+		Message<String> message = outputChannel.receive(1000);
 		assertEquals("hello world", message.getPayload());
 		context.stop();
 	}