From 7342a4d4ead55cdb3b4b20a0f5b807e770f5a13a Mon Sep 17 00:00:00 2001 From: Mark Fisher Date: Mon, 30 Aug 2010 20:34:03 +0000 Subject: [PATCH] INT-1389 removed all dependencies on StringMessage from unit tests in spring-integration-jmx --- .../integration/control/ControlBusTests.java | 4 ++-- ...ficationPublishingMessageHandlerTests.java | 4 ++-- .../jmx/config/DynamicRouterTests.java | 23 ++++++++----------- ...tionInvokingChannelAdapterParserTests.java | 9 ++++---- ...OperationInvokingOutboundGatewayTests.java | 17 ++++++++------ 5 files changed, 29 insertions(+), 28 deletions(-) diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/control/ControlBusTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/control/ControlBusTests.java index bd2ca32ecf..968bf3af94 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration/control/ControlBusTests.java +++ b/spring-integration-jmx/src/test/java/org/springframework/integration/control/ControlBusTests.java @@ -37,9 +37,9 @@ import org.springframework.context.support.GenericApplicationContext; import org.springframework.integration.Message; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.channel.QueueChannel; +import org.springframework.integration.core.GenericMessage; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessageHandler; -import org.springframework.integration.core.StringMessage; import org.springframework.integration.endpoint.EventDrivenConsumer; import org.springframework.integration.endpoint.PollingConsumer; import org.springframework.integration.handler.BridgeHandler; @@ -196,7 +196,7 @@ public class ControlBusTests { MessageChannel channel = context.getBean("testChannel", MessageChannel.class); for (int i = 0; i < 100; i++) { try { - channel.send(new StringMessage("foo")); + channel.send(new GenericMessage("foo")); } catch (Exception e) { // ignore diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/NotificationPublishingMessageHandlerTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/NotificationPublishingMessageHandlerTests.java index 64bf6e56af..4144b5605d 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/NotificationPublishingMessageHandlerTests.java +++ b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/NotificationPublishingMessageHandlerTests.java @@ -31,7 +31,7 @@ import org.junit.Test; import org.springframework.beans.factory.support.RootBeanDefinition; import org.springframework.context.support.StaticApplicationContext; -import org.springframework.integration.core.StringMessage; +import org.springframework.integration.core.GenericMessage; import org.springframework.jmx.export.MBeanExporter; import org.springframework.jmx.support.ObjectNameManager; @@ -72,7 +72,7 @@ public class NotificationPublishingMessageHandlerTests { public void simplePublish() { NotificationPublishingMessageHandler adapter = context.getBean(NotificationPublishingMessageHandler.class); assertEquals(0, this.listener.notifications.size()); - adapter.handleMessage(new StringMessage("foo")); + adapter.handleMessage(new GenericMessage("foo")); assertEquals(1, this.listener.notifications.size()); Notification notification = this.listener.notifications.get(0); assertEquals(this.publisherObjectName, notification.getSource()); diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/DynamicRouterTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/DynamicRouterTests.java index 1f54746ce6..4e2242782e 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/DynamicRouterTests.java +++ b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/DynamicRouterTests.java @@ -13,28 +13,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.integration.jmx.config; -import java.util.HashMap; -import java.util.Map; +import static org.junit.Assert.assertEquals; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.integration.Message; import org.springframework.integration.channel.QueueChannel; +import org.springframework.integration.core.GenericMessage; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageChannel; -import org.springframework.integration.core.StringMessage; -import org.springframework.integration.jmx.JmxHeaders; -import org.springframework.jmx.export.annotation.ManagedOperation; -import org.springframework.jmx.export.annotation.ManagedResource; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.util.Assert; - -import static org.junit.Assert.assertEquals; /** * @author Oleg Zhurakousky @@ -43,6 +37,7 @@ import static org.junit.Assert.assertEquals; @ContextConfiguration @RunWith(SpringJUnit4ClassRunner.class) public class DynamicRouterTests { + @Autowired @Qualifier("controlChannel") private MessageChannel controlChannel; @@ -62,17 +57,19 @@ public class DynamicRouterTests { @Autowired @Qualifier("processCChannel") private QueueChannel processCChannel; - + + @Test public void testRouteChange() throws Exception { - routingChannel.send(new StringMessage("123")); + routingChannel.send(new GenericMessage("123")); assertEquals("123", processAChannel.receive().getPayload()); routingChannel.send(MessageBuilder.withPayload(123).build()); assertEquals(123, processBChannel.receive().getPayload()); controlChannel.send(MessageBuilder.withPayload(new String[]{"java.lang.String", "processCChannel"}).build()); - routingChannel.send(new StringMessage("123")); + routingChannel.send(new GenericMessage("123")); assertEquals("123", processCChannel.receive().getPayload()); } + } diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/OperationInvokingChannelAdapterParserTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/OperationInvokingChannelAdapterParserTests.java index 943c89941c..541b592391 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/OperationInvokingChannelAdapterParserTests.java +++ b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/OperationInvokingChannelAdapterParserTests.java @@ -21,11 +21,12 @@ import static org.junit.Assert.assertEquals; import org.junit.After; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.integration.Message; +import org.springframework.integration.core.GenericMessage; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageChannel; -import org.springframework.integration.core.StringMessage; import org.springframework.integration.jmx.JmxHeaders; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -54,9 +55,9 @@ public class OperationInvokingChannelAdapterParserTests { @Test public void adapterWithDefaults() throws Exception { assertEquals(0, testBean.messages.size()); - input.send(new StringMessage("test1")); - input.send(new StringMessage("test2")); - input.send(new StringMessage("test3")); + input.send(new GenericMessage("test1")); + input.send(new GenericMessage("test2")); + input.send(new GenericMessage("test3")); assertEquals(3, testBean.messages.size()); } diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/OperationInvokingOutboundGatewayTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/OperationInvokingOutboundGatewayTests.java index 2d621eb309..966b79b26d 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/OperationInvokingOutboundGatewayTests.java +++ b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/OperationInvokingOutboundGatewayTests.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.integration.jmx.config; import static org.junit.Assert.assertEquals; @@ -22,11 +23,12 @@ import java.util.List; import org.junit.After; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.integration.core.GenericMessage; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.PollableChannel; -import org.springframework.integration.core.StringMessage; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -37,6 +39,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @ContextConfiguration @RunWith(SpringJUnit4ClassRunner.class) public class OperationInvokingOutboundGatewayTests { + @Autowired @Qualifier("withReplyChannel") private MessageChannel withReplyChannel; @@ -59,21 +62,21 @@ public class OperationInvokingOutboundGatewayTests { @Test public void gatewayWithReplyChannel() throws Exception { - withReplyChannel.send(new StringMessage("1")); + withReplyChannel.send(new GenericMessage("1")); assertEquals(1, ((List) withReplyChannelOutput.receive().getPayload()).size()); - withReplyChannel.send(new StringMessage("2")); + withReplyChannel.send(new GenericMessage("2")); assertEquals(2, ((List) withReplyChannelOutput.receive().getPayload()).size()); - withReplyChannel.send(new StringMessage("3")); + withReplyChannel.send(new GenericMessage("3")); assertEquals(3, ((List) withReplyChannelOutput.receive().getPayload()).size()); } @Test public void gatewayWithNoReplyChannel() throws Exception { - withNoReplyChannel.send(new StringMessage("1")); + withNoReplyChannel.send(new GenericMessage("1")); assertEquals(1, testBean.messages.size()); - withNoReplyChannel.send(new StringMessage("2")); + withNoReplyChannel.send(new GenericMessage("2")); assertEquals(2, testBean.messages.size()); - withNoReplyChannel.send(new StringMessage("3")); + withNoReplyChannel.send(new GenericMessage("3")); assertEquals(3, testBean.messages.size()); }