From 23c96506ff8d3e95712e3cc164150888a721e339 Mon Sep 17 00:00:00 2001 From: Iwein Fuld Date: Thu, 2 Sep 2010 18:04:30 +0000 Subject: [PATCH] Renamed 'testChannel's to pinpoint no subscriber isssue --- .../aop/AnnotationConfigRegistrationTests-context.xml | 2 +- .../integration/aop/AnnotationConfigRegistrationTests.java | 6 +++--- .../aop/MessagePublishingAnnotationUsageTests-context.xml | 2 +- .../aop/MessagePublishingAnnotationUsageTests.java | 6 +++--- .../aop/MessagePublishingInterceptorUsageTests-context.xml | 4 ++-- .../integration/config/EndpointParserTests.java | 2 +- .../integration/config/simpleEndpointTests.xml | 6 +++--- .../ProducerAndConsumerAutoStartupTests-context.xml | 6 +++--- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aop/AnnotationConfigRegistrationTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/aop/AnnotationConfigRegistrationTests-context.xml index f930fa1335..a2f1e4a78d 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aop/AnnotationConfigRegistrationTests-context.xml +++ b/spring-integration-core/src/test/java/org/springframework/integration/aop/AnnotationConfigRegistrationTests-context.xml @@ -9,7 +9,7 @@ - + diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aop/AnnotationConfigRegistrationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aop/AnnotationConfigRegistrationTests.java index 1e67b4335c..27eecdf3b0 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aop/AnnotationConfigRegistrationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aop/AnnotationConfigRegistrationTests.java @@ -41,7 +41,7 @@ public class AnnotationConfigRegistrationTests { private TestBean testBean; @Autowired - private QueueChannel testChannel; + private QueueChannel annotationConfigRegistrationTest; @Autowired private QueueChannel defaultChannel; @@ -51,7 +51,7 @@ public class AnnotationConfigRegistrationTests { public void verifyInterception() { String name = testBean.setName("John", "Doe", 123); Assert.assertNotNull(name); - Message message = testChannel.receive(0); + Message message = annotationConfigRegistrationTest.receive(0); Assert.assertNotNull(message); Assert.assertEquals("John DoeDoe", message.getPayload()); Assert.assertEquals(123, message.getHeaders().get("x")); @@ -70,7 +70,7 @@ public class AnnotationConfigRegistrationTests { public static class TestBean { - @Publisher(channel="testChannel") + @Publisher(channel="annotationConfigRegistrationTest") @Payload("#return + #args.lname") public String setName(String fname, String lname, @Header("x") int num) { return fname + " " + lname; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aop/MessagePublishingAnnotationUsageTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/aop/MessagePublishingAnnotationUsageTests-context.xml index b02bc7f49f..587fc5e513 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aop/MessagePublishingAnnotationUsageTests-context.xml +++ b/spring-integration-core/src/test/java/org/springframework/integration/aop/MessagePublishingAnnotationUsageTests-context.xml @@ -10,7 +10,7 @@ - + diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aop/MessagePublishingAnnotationUsageTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aop/MessagePublishingAnnotationUsageTests.java index 901b4c02a7..15b4effb2b 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aop/MessagePublishingAnnotationUsageTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aop/MessagePublishingAnnotationUsageTests.java @@ -80,18 +80,18 @@ public class MessagePublishingAnnotationUsageTests { public static class TestBean { - @Publisher(channel="testChannel") + @Publisher(channel="messagePublishingAnnotationUsageTestChannel") public String defaultPayload(String fname, @Header("last") String lname) { return fname + " " + lname; } - @Publisher(channel="testChannel") + @Publisher(channel="messagePublishingAnnotationUsageTestChannel") @Payload public String defaultPayloadButExplicitAnnotation(String fname, @Header String lname) { return fname + " " + lname; } - @Publisher(channel="testChannel") + @Publisher(channel="messagePublishingAnnotationUsageTestChannel") public String argumentAsPayload(@Payload String fname, @Header String lname) { return fname + " " + lname; } diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aop/MessagePublishingInterceptorUsageTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/aop/MessagePublishingInterceptorUsageTests-context.xml index aeda6a916d..38fdfa20d4 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aop/MessagePublishingInterceptorUsageTests-context.xml +++ b/spring-integration-core/src/test/java/org/springframework/integration/aop/MessagePublishingInterceptorUsageTests-context.xml @@ -10,7 +10,7 @@ - + @@ -47,7 +47,7 @@ class="org.springframework.integration.channel.MapBasedChannelResolver"> - + diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/EndpointParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/EndpointParserTests.java index 03feb8d9f3..17cb8db458 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/EndpointParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/EndpointParserTests.java @@ -37,7 +37,7 @@ public class EndpointParserTests { ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext( "simpleEndpointTests.xml", this.getClass()); context.start(); - MessageChannel channel = (MessageChannel) context.getBean("testChannel"); + MessageChannel channel = (MessageChannel) context.getBean("endpointParserTestInput"); TestHandler handler = (TestHandler) context.getBean("testHandler"); assertNull(handler.getMessageString()); channel.send(new GenericMessage("test")); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/simpleEndpointTests.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/simpleEndpointTests.xml index 120a6ba36f..75d4a57464 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/simpleEndpointTests.xml +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/simpleEndpointTests.xml @@ -6,12 +6,12 @@ http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd"> - - + + - + diff --git a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ProducerAndConsumerAutoStartupTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ProducerAndConsumerAutoStartupTests-context.xml index 3dc062809a..461183bc0a 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ProducerAndConsumerAutoStartupTests-context.xml +++ b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ProducerAndConsumerAutoStartupTests-context.xml @@ -7,15 +7,15 @@ http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.0.xsd"> - + - + - +