From 4d9da8f0a4ea8f54dbc68a3cba1efe6d993cd8b8 Mon Sep 17 00:00:00 2001 From: dsyer Date: Fri, 1 Aug 2008 08:05:28 +0000 Subject: [PATCH] Fix some broken tests --- .../file/ResourceSplitterIntegrationTests.java | 2 +- ...aunchingMessageHandlerIntegrationTests.java | 18 ++++++++++-------- .../JobLaunchingMessageHandlerTests.java | 6 ------ ...ageOrientedStepIntegrationTests-context.xml | 4 ++-- ...gMessageHandlerIntegrationTests-context.xml | 8 +++----- 5 files changed, 16 insertions(+), 22 deletions(-) diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/file/ResourceSplitterIntegrationTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/file/ResourceSplitterIntegrationTests.java index 7d81c85ca..41ee5be78 100644 --- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/file/ResourceSplitterIntegrationTests.java +++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/file/ResourceSplitterIntegrationTests.java @@ -68,7 +68,7 @@ public class ResourceSplitterIntegrationTests { @Test public void testVanillaConversion() throws Exception { resources.send(new GenericMessage("classpath:*-context.xml")); - Message message = (Message) requests.receive(100L); + Message message = (Message) requests.receive(200L); assertNotNull(message); message = (Message) requests.receive(100L); assertNotNull(message); diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/launch/JobLaunchingMessageHandlerIntegrationTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/launch/JobLaunchingMessageHandlerIntegrationTests.java index c05c44264..826850dcd 100644 --- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/launch/JobLaunchingMessageHandlerIntegrationTests.java +++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/launch/JobLaunchingMessageHandlerIntegrationTests.java @@ -5,6 +5,7 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import java.util.HashMap; +import java.util.Map; import org.junit.Before; import org.junit.Test; @@ -18,8 +19,9 @@ import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.integration.channel.PollableChannel; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.message.Message; -import org.springframework.integration.message.MessageHandlingException; +import org.springframework.integration.message.MessageDeliveryException; import org.springframework.integration.message.MessageHeaders; +import org.springframework.integration.message.MessageTarget; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -30,7 +32,7 @@ public class JobLaunchingMessageHandlerIntegrationTests { @Autowired @Qualifier("requests") - private PollableChannel requestChannel; + private MessageTarget requestChannel; @Autowired @Qualifier("response") @@ -40,7 +42,6 @@ public class JobLaunchingMessageHandlerIntegrationTests { @Before public void setUp() { - requestChannel.purge(null); responseChannel.purge(null); } @@ -53,9 +54,9 @@ public class JobLaunchingMessageHandlerIntegrationTests { try { requestChannel.send(trigger); } - catch (MessageHandlingException e) { - String message = e.getMessage(); - assertTrue("Wrong message: " + message, message.contains("reply channel")); + catch (MessageDeliveryException e) { + String message = e.getCause().getMessage(); + assertTrue("Wrong message: " + message, message.contains("return address")); } Message executionMessage = (Message) responseChannel.receive(1000); @@ -68,8 +69,9 @@ public class JobLaunchingMessageHandlerIntegrationTests { public void testReply() { JobParametersBuilder builder = new JobParametersBuilder(); builder.addString("dontclash", "12"); - MessageHeaders headers = new MessageHeaders(new HashMap()); - headers.put(MessageHeaders.RETURN_ADDRESS, "response"); + Map map = new HashMap(); + map.put(MessageHeaders.RETURN_ADDRESS, "response"); + MessageHeaders headers = new MessageHeaders(map); GenericMessage trigger = new GenericMessage(new JobLaunchRequest(job, builder.toJobParameters()), headers); requestChannel.send(trigger); diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/launch/JobLaunchingMessageHandlerTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/launch/JobLaunchingMessageHandlerTests.java index 99fd3793a..60a663e5a 100644 --- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/launch/JobLaunchingMessageHandlerTests.java +++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/launch/JobLaunchingMessageHandlerTests.java @@ -16,7 +16,6 @@ import org.springframework.batch.core.launch.JobLauncher; import org.springframework.batch.integration.JobSupport; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.integration.bus.MessageBus; -import org.springframework.integration.channel.AbstractMessageChannel; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests; @@ -27,10 +26,6 @@ public class JobLaunchingMessageHandlerTests extends AbstractJUnit4SpringContext StubJobLauncher jobLauncher; - // @Autowired - // @Qualifier("jobs") TODO: Qualifier seems to be broken here why ????? - public AbstractMessageChannel jobsChannel; - @Autowired public MessageBus messageBus; @@ -38,7 +33,6 @@ public class JobLaunchingMessageHandlerTests extends AbstractJUnit4SpringContext public void setUp() { jobLauncher = new StubJobLauncher(); messageHandler = new JobLaunchingMessageHandler(jobLauncher); - jobsChannel = (AbstractMessageChannel) applicationContext.getBean("jobs"); } @Test diff --git a/spring-batch-integration/src/test/resources/org/springframework/batch/integration/job/MessageOrientedStepIntegrationTests-context.xml b/spring-batch-integration/src/test/resources/org/springframework/batch/integration/job/MessageOrientedStepIntegrationTests-context.xml index 1def4629e..7db883bac 100644 --- a/spring-batch-integration/src/test/resources/org/springframework/batch/integration/job/MessageOrientedStepIntegrationTests-context.xml +++ b/spring-batch-integration/src/test/resources/org/springframework/batch/integration/job/MessageOrientedStepIntegrationTests-context.xml @@ -23,8 +23,8 @@ - - + + diff --git a/spring-batch-integration/src/test/resources/org/springframework/batch/integration/launch/JobLaunchingMessageHandlerIntegrationTests-context.xml b/spring-batch-integration/src/test/resources/org/springframework/batch/integration/launch/JobLaunchingMessageHandlerIntegrationTests-context.xml index fd1c5fb63..027e7d8cb 100644 --- a/spring-batch-integration/src/test/resources/org/springframework/batch/integration/launch/JobLaunchingMessageHandlerIntegrationTests-context.xml +++ b/spring-batch-integration/src/test/resources/org/springframework/batch/integration/launch/JobLaunchingMessageHandlerIntegrationTests-context.xml @@ -14,14 +14,12 @@ - + - - + + - -