diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/JmsGatewayParserTests.java b/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/JmsGatewayParserTests.java index 722718b5aa..ff7c52aee5 100644 --- a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/JmsGatewayParserTests.java +++ b/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/JmsGatewayParserTests.java @@ -37,10 +37,10 @@ public class JmsGatewayParserTests { @Test public void testGatewayWithConnectionFactoryAndDestination() { ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext( - "messageDrivenAdapterWithConnectionFactoryAndDestination.xml", this.getClass()); + "jmsGatewayWithConnectionFactoryAndDestination.xml", this.getClass()); MessageChannel channel = new QueueChannel(1); - JmsGateway source = (JmsGateway) context.getBean("jmsSource"); - source.setRequestChannel(channel); + JmsGateway gateway = (JmsGateway) context.getBean("jmsGateway"); + gateway.setRequestChannel(channel); context.start(); Message message = channel.receive(3000); assertNotNull("message should not be null", message); @@ -51,12 +51,11 @@ public class JmsGatewayParserTests { @Test public void testGatewayWithConnectionFactoryAndDestinationName() { ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext( - "messageDrivenAdapterWithConnectionFactoryAndDestinationName.xml", this.getClass()); + "jmsGatewayWithConnectionFactoryAndDestinationName.xml", this.getClass()); MessageChannel channel = new QueueChannel(1); - JmsGateway source = (JmsGateway) context.getBean("jmsSource"); - source.setRequestChannel(channel); + JmsGateway gateway = (JmsGateway) context.getBean("jmsGateway"); + gateway.setRequestChannel(channel); context.start(); - assertEquals(JmsGateway.class, source.getClass()); Message message = channel.receive(3000); assertNotNull("message should not be null", message); assertEquals("message-driven-test", message.getPayload()); @@ -66,10 +65,10 @@ public class JmsGatewayParserTests { @Test public void testGatewayWithMessageConverter() { ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext( - "messageDrivenAdapterWithMessageConverter.xml", this.getClass()); + "jmsGatewayWithMessageConverter.xml", this.getClass()); MessageChannel channel = new QueueChannel(1); - JmsGateway source = (JmsGateway) context.getBean("jmsSource"); - source.setRequestChannel(channel); + JmsGateway gateway = (JmsGateway) context.getBean("jmsGateway"); + gateway.setRequestChannel(channel); context.start(); Message message = channel.receive(3000); assertNotNull("message should not be null", message); @@ -80,7 +79,7 @@ public class JmsGatewayParserTests { @Test(expected=BeanDefinitionStoreException.class) public void testGatewayWithConnectionFactoryOnly() { try { - new ClassPathXmlApplicationContext("messageDrivenAdapterWithConnectionFactoryOnly.xml", this.getClass()); + new ClassPathXmlApplicationContext("jmsGatewayWithConnectionFactoryOnly.xml", this.getClass()); } catch (RuntimeException e) { assertEquals(BeanCreationException.class, e.getCause().getClass()); @@ -91,7 +90,7 @@ public class JmsGatewayParserTests { @Test(expected=BeanDefinitionStoreException.class) public void testGatewayWithEmptyConnectionFactory() { try { - new ClassPathXmlApplicationContext("messageDrivenAdapterWithEmptyConnectionFactory.xml", this.getClass()); + new ClassPathXmlApplicationContext("jmsGatewayWithEmptyConnectionFactory.xml", this.getClass()); } catch (RuntimeException e) { assertEquals(BeanCreationException.class, e.getCause().getClass()); @@ -102,10 +101,10 @@ public class JmsGatewayParserTests { @Test public void testGatewayWithDefaultConnectionFactory() { ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext( - "messageDrivenAdapterWithDefaultConnectionFactory.xml", this.getClass()); + "jmsGatewayWithDefaultConnectionFactory.xml", this.getClass()); MessageChannel channel = new QueueChannel(1); - JmsGateway source = (JmsGateway) context.getBean("jmsSource"); - source.setRequestChannel(channel); + JmsGateway gateway = (JmsGateway) context.getBean("jmsGateway"); + gateway.setRequestChannel(channel); context.start(); Message message = channel.receive(3000); assertNotNull("message should not be null", message); diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/JmsSourceParserTests.java b/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/JmsSourceParserTests.java index cb1d43164a..ff57a0be18 100644 --- a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/JmsSourceParserTests.java +++ b/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/JmsSourceParserTests.java @@ -38,7 +38,7 @@ public class JmsSourceParserTests { @Test public void testSourceWithJmsTemplate() { ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext( - "pollingAdapterWithJmsTemplate.xml", this.getClass()); + "jmsSourceWithJmsTemplate.xml", this.getClass()); JmsSource source = (JmsSource) context.getBean("jmsSource"); Message message = source.receive(); assertNotNull("message should not be null", message); @@ -48,7 +48,7 @@ public class JmsSourceParserTests { @Test public void testSourceWithConnectionFactoryAndDestination() { ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext( - "pollingAdapterWithConnectionFactoryAndDestination.xml", this.getClass()); + "jmsSourceWithConnectionFactoryAndDestination.xml", this.getClass()); JmsSource source = (JmsSource) context.getBean("jmsSource"); Message message = source.receive(); assertNotNull("message should not be null", message); @@ -59,7 +59,7 @@ public class JmsSourceParserTests { @Test public void testSourceWithConnectionFactoryAndDestinationName() { ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext( - "pollingAdapterWithConnectionFactoryAndDestinationName.xml", this.getClass()); + "jmsSourceWithConnectionFactoryAndDestinationName.xml", this.getClass()); JmsSource source = (JmsSource) context.getBean("jmsSource"); Message message = source.receive(); assertNotNull("message should not be null", message); @@ -70,7 +70,7 @@ public class JmsSourceParserTests { @Test(expected=BeanDefinitionStoreException.class) public void testSourceWithConnectionFactoryOnly() { try { - new ClassPathXmlApplicationContext("pollingAdapterWithConnectionFactoryOnly.xml", this.getClass()); + new ClassPathXmlApplicationContext("jmsSourceWithConnectionFactoryOnly.xml", this.getClass()); } catch (RuntimeException e) { assertEquals(BeanCreationException.class, e.getCause().getClass()); @@ -81,7 +81,7 @@ public class JmsSourceParserTests { @Test(expected=BeanCreationException.class) public void testSourceWithDestinationOnly() { try { - new ClassPathXmlApplicationContext("pollingAdapterWithDestinationOnly.xml", this.getClass()); + new ClassPathXmlApplicationContext("jmsSourceWithDestinationOnly.xml", this.getClass()); } catch (RuntimeException e) { assertEquals(NoSuchBeanDefinitionException.class, e.getCause().getClass()); @@ -92,7 +92,7 @@ public class JmsSourceParserTests { @Test public void testSourceWithDestinationAndDefaultConnectionFactory() { ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext( - "pollingAdapterWithDestinationAndDefaultConnectionFactory.xml", this.getClass()); + "jmsSourceWithDestinationAndDefaultConnectionFactory.xml", this.getClass()); JmsSource source = (JmsSource) context.getBean("jmsSource"); Message message = source.receive(); assertNotNull("message should not be null", message); @@ -101,14 +101,14 @@ public class JmsSourceParserTests { } @Test(expected=BeanCreationException.class) - public void testPollingAdapterWithDestinationNameOnly() { - new ClassPathXmlApplicationContext("pollingAdapterWithDestinationNameOnly.xml", this.getClass()); + public void testSourceWithDestinationNameOnly() { + new ClassPathXmlApplicationContext("jmsSourceWithDestinationNameOnly.xml", this.getClass()); } @Test - public void testPollingAdapterWithDestinationNameAndDefaultConnectionFactory() { + public void testSourceWithDestinationNameAndDefaultConnectionFactory() { ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext( - "pollingAdapterWithDestinationNameAndDefaultConnectionFactory.xml", this.getClass()); + "jmsSourceWithDestinationNameAndDefaultConnectionFactory.xml", this.getClass()); JmsSource source = (JmsSource) context.getBean("jmsSource"); Message message = source.receive(); assertNotNull("message should not be null", message); @@ -118,7 +118,7 @@ public class JmsSourceParserTests { @Test public void testSourceEndpoint() { ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext( - "pollingJmsSourceEndpoint.xml", this.getClass()); + "jmsSourceEndpoint.xml", this.getClass()); context.start(); PollingSourceEndpoint endpoint = (PollingSourceEndpoint) context.getBean("endpoint"); assertEquals(JmsSource.class, endpoint.getSource().getClass()); diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/messageDrivenAdapterWithConnectionFactoryAndDestination.xml b/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewayWithConnectionFactoryAndDestination.xml similarity index 96% rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/messageDrivenAdapterWithConnectionFactoryAndDestination.xml rename to spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewayWithConnectionFactoryAndDestination.xml index 9b1b563a41..979a2d0e5e 100644 --- a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/messageDrivenAdapterWithConnectionFactoryAndDestination.xml +++ b/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewayWithConnectionFactoryAndDestination.xml @@ -9,7 +9,7 @@ - diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/messageDrivenAdapterWithConnectionFactoryAndDestinationName.xml b/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewayWithConnectionFactoryAndDestinationName.xml similarity index 96% rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/messageDrivenAdapterWithConnectionFactoryAndDestinationName.xml rename to spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewayWithConnectionFactoryAndDestinationName.xml index f26c5b0884..5463f619a4 100644 --- a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/messageDrivenAdapterWithConnectionFactoryAndDestinationName.xml +++ b/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewayWithConnectionFactoryAndDestinationName.xml @@ -11,7 +11,7 @@ - diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/messageDrivenAdapterWithConnectionFactoryOnly.xml b/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewayWithConnectionFactoryOnly.xml similarity index 96% rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/messageDrivenAdapterWithConnectionFactoryOnly.xml rename to spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewayWithConnectionFactoryOnly.xml index 58fda50c4b..58d3665816 100644 --- a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/messageDrivenAdapterWithConnectionFactoryOnly.xml +++ b/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewayWithConnectionFactoryOnly.xml @@ -11,7 +11,7 @@ - diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/messageDrivenAdapterWithDefaultConnectionFactory.xml b/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewayWithDefaultConnectionFactory.xml similarity index 96% rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/messageDrivenAdapterWithDefaultConnectionFactory.xml rename to spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewayWithDefaultConnectionFactory.xml index 00da02ba5b..a5850cb612 100644 --- a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/messageDrivenAdapterWithDefaultConnectionFactory.xml +++ b/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewayWithDefaultConnectionFactory.xml @@ -11,7 +11,7 @@ - diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/messageDrivenAdapterWithEmptyConnectionFactory.xml b/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewayWithEmptyConnectionFactory.xml similarity index 95% rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/messageDrivenAdapterWithEmptyConnectionFactory.xml rename to spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewayWithEmptyConnectionFactory.xml index ce1b2b4f37..c072501ef1 100644 --- a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/messageDrivenAdapterWithEmptyConnectionFactory.xml +++ b/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewayWithEmptyConnectionFactory.xml @@ -9,7 +9,7 @@ - diff --git a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/messageDrivenAdapterWithMessageConverter.xml b/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewayWithMessageConverter.xml similarity index 97% rename from spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/messageDrivenAdapterWithMessageConverter.xml rename to spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewayWithMessageConverter.xml index 1e10d871af..3b50f36dc6 100644 --- a/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/messageDrivenAdapterWithMessageConverter.xml +++ b/spring-integration-adapters/src/test/java/org/springframework/integration/adapter/jms/config/jmsGatewayWithMessageConverter.xml @@ -11,7 +11,7 @@ -