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

INT-1389 removed all dependencies on StringMessage from unit tests in spring-integration-jmx

Browse Source
This commit is contained in:
Mark Fisher
2010-08-30 20:34:03 +00:00
parent 8fa9c68f68
commit 7342a4d4ea
5 changed files with 29 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-integration-jmx/src/test/java/org/springframework/integration/control/ControlBusTests.java
View File

@@ -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<String>("foo"));
}
catch (Exception e) {
// ignore

4
spring-integration-jmx/src/test/java/org/springframework/integration/jmx/NotificationPublishingMessageHandlerTests.java
View File

@@ -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<String>("foo"));
assertEquals(1, this.listener.notifications.size());
Notification notification = this.listener.notifications.get(0);
assertEquals(this.publisherObjectName, notification.getSource());

23
spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/DynamicRouterTests.java
View File

@@ -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<String>("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<String>("123"));
assertEquals("123", processCChannel.receive().getPayload());
}
}

9
spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/OperationInvokingChannelAdapterParserTests.java
View File

@@ -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<String>("test1"));
input.send(new GenericMessage<String>("test2"));
input.send(new GenericMessage<String>("test3"));
assertEquals(3, testBean.messages.size());
}

17
spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/OperationInvokingOutboundGatewayTests.java
View File

@@ -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<String>("1"));
assertEquals(1, ((List<?>) withReplyChannelOutput.receive().getPayload()).size());
withReplyChannel.send(new StringMessage("2"));
withReplyChannel.send(new GenericMessage<String>("2"));
assertEquals(2, ((List<?>) withReplyChannelOutput.receive().getPayload()).size());
withReplyChannel.send(new StringMessage("3"));
withReplyChannel.send(new GenericMessage<String>("3"));
assertEquals(3, ((List<?>) withReplyChannelOutput.receive().getPayload()).size());
}
@Test
public void gatewayWithNoReplyChannel() throws Exception {
withNoReplyChannel.send(new StringMessage("1"));
withNoReplyChannel.send(new GenericMessage<String>("1"));
assertEquals(1, testBean.messages.size());
withNoReplyChannel.send(new StringMessage("2"));
withNoReplyChannel.send(new GenericMessage<String>("2"));
assertEquals(2, testBean.messages.size());
withNoReplyChannel.send(new StringMessage("3"));
withNoReplyChannel.send(new GenericMessage<String>("3"));
assertEquals(3, testBean.messages.size());
}