diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/JmsInboundChannelAdapterTests-context.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/JmsInboundChannelAdapterTests-context.xml
index e13f87f220..0c396cc64a 100644
--- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/JmsInboundChannelAdapterTests-context.xml
+++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/JmsInboundChannelAdapterTests-context.xml
@@ -8,7 +8,7 @@
http://www.springframework.org/schema/integration/jms http://www.springframework.org/schema/integration/jms/spring-integration-jms.xsd">
diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/JmsInboundChannelAdapterTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/JmsInboundChannelAdapterTests.java
index bd1f4d4b73..9e98dbe267 100644
--- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/JmsInboundChannelAdapterTests.java
+++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/JmsInboundChannelAdapterTests.java
@@ -16,7 +16,6 @@
package org.springframework.integration.jms;
import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
import javax.jms.ConnectionFactory;
@@ -50,13 +49,12 @@ public class JmsInboundChannelAdapterTests extends ActiveMQMultiContextTests {
@Test
public void testTransactionalReceive() {
JmsTemplate template = new JmsTemplate(connectionFactory);
- template.convertAndSend("foo", "bar");
+ template.convertAndSend("incatQ", "bar");
assertNotNull(out.receive(20000));
/*
* INT-3288 - previously acknowledge="transacted"
* Caused by: javax.jms.JMSException: acknowledgeMode SESSION_TRANSACTED cannot be used for an non-transacted Session
*/
- assertNull(out.receive(1000));
}
@Configuration
diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/JmsOutboundChannelAdapterTests-context.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/JmsOutboundChannelAdapterTests-context.xml
index af8c0b1cfd..cf4eb39e79 100644
--- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/JmsOutboundChannelAdapterTests-context.xml
+++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/JmsOutboundChannelAdapterTests-context.xml
@@ -10,13 +10,13 @@
+ destination-name="outcatQ1"/>
diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/JmsOutboundChannelAdapterTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/JmsOutboundChannelAdapterTests.java
index 3338c6301f..03223ba344 100644
--- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/JmsOutboundChannelAdapterTests.java
+++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/JmsOutboundChannelAdapterTests.java
@@ -56,14 +56,14 @@ public class JmsOutboundChannelAdapterTests extends ActiveMQMultiContextTests {
@Test
public void testTransactionalSend() {
JmsTemplate template = new JmsTemplate(connectionFactory);
- template.convertAndSend("foo", "Hello, world!");
+ template.convertAndSend("outcatQ1", "Hello, world!");
template.setReceiveTimeout(20000);
- assertNotNull(template.receive("bar"));
+ assertNotNull(template.receive("outcatQ2"));
this.aborter.abort = true;
- template.convertAndSend("foo", "Hello, world!");
+ template.convertAndSend("outcatQ1", "Hello, world!");
template.setReceiveTimeout(1000);
- assertNull(template.receive("bar"));
+ assertNull(template.receive("outcatQ2"));
endpoint.stop();
}