From 77abc55a1e71c3024be9e9aba1fc78e2bca21b72 Mon Sep 17 00:00:00 2001 From: Mark Fisher Date: Tue, 20 Dec 2011 12:44:03 -0500 Subject: [PATCH] INT-2322 --- spring-integration-amqp/pom.xml | 24 ++++----- ...sequencingMessageGroupProcessorTests.java} | 3 +- ....java => ResequencerIntegrationTests.java} | 8 +-- ....xml => GatewayInterfaceTests-context.xml} | 3 +- ...ceTest.java => GatewayInterfaceTests.java} | 24 ++++----- spring-integration-event/pom.xml | 16 +++--- spring-integration-feed/pom.xml | 24 ++++----- spring-integration-file/pom.xml | 16 +++--- ...Test.java => FileMessageHistoryTests.java} | 6 +-- ... => SimplePatternFileListFilterTests.java} | 18 ++++++- spring-integration-ftp/pom.xml | 24 ++++----- ...undRemoteFileSystemSynchronizerTests.java} | 4 +- spring-integration-gemfire/pom.xml | 36 ++++++------- ...reCqInboundChannelAdapterParserTests.java} | 3 +- ...fireInboundChannelAdapterParserTests.java} | 4 +- ...ireOutboundChannelAdapterParserTests.java} | 4 +- spring-integration-groovy/pom.xml | 12 ++--- spring-integration-http/pom.xml | 50 +++++++++++++------ spring-integration-ip/pom.xml | 16 +++--- spring-integration-jdbc/pom.xml | 24 ++++----- ...Test.java => StoredProcExecutorTests.java} | 3 +- ...Test.java => ProcedureParameterTests.java} | 3 +- spring-integration-jms/pom.xml | 24 ++++----- spring-integration-jmx/pom.xml | 24 ++++----- spring-integration-mail/pom.xml | 24 ++++----- spring-integration-mongodb/pom.xml | 24 ++++----- spring-integration-redis/pom.xml | 24 ++++----- spring-integration-rmi/pom.xml | 16 +++--- spring-integration-scripting/pom.xml | 36 ++++++------- spring-integration-security/pom.xml | 12 ++--- spring-integration-sftp/pom.xml | 40 +++++++-------- ...Test.java => SftpMessageHistoryTests.java} | 8 +-- spring-integration-stream/pom.xml | 12 ++--- spring-integration-test/pom.xml | 12 ++--- ...AbstractRequestResponseScenarioTests.java} | 19 ++++++- ...> SingleRequestResponseScenarioTests.java} | 3 +- ....xml => MessageScenariosTests-context.xml} | 0 ...osTest.java => MessageScenariosTests.java} | 19 ++++++- ...arioTest.java => SingleScenarioTests.java} | 20 +++++++- spring-integration-twitter/pom.xml | 16 +++--- spring-integration-ws/pom.xml | 24 ++++----- spring-integration-xml/pom.xml | 12 ++--- spring-integration-xmpp/pom.xml | 24 ++++----- ...Test.java => SmackMessageSampleTests.java} | 6 +-- 44 files changed, 410 insertions(+), 314 deletions(-) rename spring-integration-core/src/test/java/org/springframework/integration/aggregator/{ResequencingMessageGroupProcessorTest.java => ResequencingMessageGroupProcessorTests.java} (98%) rename spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/{ResequencerIntegrationTest.java => ResequencerIntegrationTests.java} (98%) rename spring-integration-core/src/test/java/org/springframework/integration/gateway/{GatewayInterfaceTest-context.xml => GatewayInterfaceTests-context.xml} (96%) rename spring-integration-core/src/test/java/org/springframework/integration/gateway/{GatewayInterfaceTest.java => GatewayInterfaceTests.java} (91%) rename spring-integration-file/src/test/java/org/springframework/integration/file/config/{FileMessageHistoryTest.java => FileMessageHistoryTests.java} (96%) rename spring-integration-file/src/test/java/org/springframework/integration/file/filters/{SimplePatternFileListFilterTest.java => SimplePatternFileListFilterTests.java} (51%) rename spring-integration-ftp/src/test/java/org/springframework/integration/ftp/inbound/{FtpInboundRemoteFileSystemSynchronizerTest.java => FtpInboundRemoteFileSystemSynchronizerTests.java} (97%) rename spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/config/xml/{GemfireCqInboundChannelAdapterParserTest.java => GemfireCqInboundChannelAdapterParserTests.java} (96%) rename spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/config/xml/{GemfireInboundChannelAdapterParserTest.java => GemfireInboundChannelAdapterParserTests.java} (96%) rename spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/config/xml/{GemfireOutboundChannelAdapterParserTest.java => GemfireOutboundChannelAdapterParserTests.java} (96%) rename spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/{StoredProcExecutorTest.java => StoredProcExecutorTests.java} (99%) rename spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/storedproc/{ProcedureParameterTest.java => ProcedureParameterTests.java} (98%) rename spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/{SftpMessageHistoryTest.java => SftpMessageHistoryTests.java} (89%) rename spring-integration-test/src/main/java/org/springframework/integration/test/support/{AbstractRequestResponseScenarioTest.java => AbstractRequestResponseScenarioTests.java} (83%) rename spring-integration-test/src/main/java/org/springframework/integration/test/support/{SingleRequestResponseScenarioTest.java => SingleRequestResponseScenarioTests.java} (90%) rename spring-integration-test/src/test/java/org/springframework/integration/test/support/{MessageScenariosTest-context.xml => MessageScenariosTests-context.xml} (100%) rename spring-integration-test/src/test/java/org/springframework/integration/test/support/{MessageScenariosTest.java => MessageScenariosTests.java} (76%) rename spring-integration-test/src/test/java/org/springframework/integration/test/support/{SingleScenarioTest.java => SingleScenarioTests.java} (51%) rename spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/{SmackMessageSampleTest.java => SmackMessageSampleTests.java} (94%) diff --git a/spring-integration-amqp/pom.xml b/spring-integration-amqp/pom.xml index dae4b25be4..25fac3dce7 100644 --- a/spring-integration-amqp/pom.xml +++ b/spring-integration-amqp/pom.xml @@ -88,6 +88,12 @@ + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + org.springframework spring-test @@ -150,18 +156,18 @@ 3.0.6.RELEASE compile - - org.easymock - easymock - 2.3 - test - org.springframework.integration spring-integration-test 2.1.0.BUILD-SNAPSHOT test + + org.easymock + easymock + 2.3 + test + org.easymock easymockclassextension @@ -187,12 +193,6 @@ 1.1 test - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - org.mockito mockito-all diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ResequencingMessageGroupProcessorTest.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ResequencingMessageGroupProcessorTests.java similarity index 98% rename from spring-integration-core/src/test/java/org/springframework/integration/aggregator/ResequencingMessageGroupProcessorTest.java rename to spring-integration-core/src/test/java/org/springframework/integration/aggregator/ResequencingMessageGroupProcessorTests.java index 43eab81051..4376cca851 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ResequencingMessageGroupProcessorTest.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ResequencingMessageGroupProcessorTests.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.integration.aggregator; import org.junit.Test; @@ -29,7 +30,7 @@ import static org.junit.Assert.assertThat; /** * @author Iwein Fuld */ -public class ResequencingMessageGroupProcessorTest { +public class ResequencingMessageGroupProcessorTests { private ResequencingMessageGroupProcessor processor = new ResequencingMessageGroupProcessor(); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/ResequencerIntegrationTest.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/ResequencerIntegrationTests.java similarity index 98% rename from spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/ResequencerIntegrationTest.java rename to spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/ResequencerIntegrationTests.java index 1e6d531d59..015e21c4bf 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/ResequencerIntegrationTest.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/ResequencerIntegrationTests.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.integration.aggregator.integration; import org.junit.Test; @@ -30,14 +31,15 @@ import org.springframework.integration.test.util.TestUtils; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; + /** * @author Oleg Zhurakousky */ -public class ResequencerIntegrationTest { +public class ResequencerIntegrationTests { @Test public void validateUnboundedResequencerLight(){ - ApplicationContext context = new ClassPathXmlApplicationContext("ResequencerIntegrationTest-context.xml", ResequencerIntegrationTest.class); + ApplicationContext context = new ClassPathXmlApplicationContext("ResequencerIntegrationTest-context.xml", ResequencerIntegrationTests.class); MessageChannel inputChannel = context .getBean("resequencerLightInput", MessageChannel.class); QueueChannel outputChannel = context .getBean("outputChannel", QueueChannel.class); EventDrivenConsumer edc = context.getBean("resequencerLight", EventDrivenConsumer.class); @@ -90,7 +92,7 @@ public class ResequencerIntegrationTest { @Test public void validateUnboundedResequencerDeep(){ - ApplicationContext context = new ClassPathXmlApplicationContext("ResequencerIntegrationTest-context.xml", ResequencerIntegrationTest.class); + ApplicationContext context = new ClassPathXmlApplicationContext("ResequencerIntegrationTest-context.xml", ResequencerIntegrationTests.class); MessageChannel inputChannel = context .getBean("resequencerDeepInput", MessageChannel.class); QueueChannel outputChannel = context .getBean("outputChannel", QueueChannel.class); EventDrivenConsumer edc = context.getBean("resequencerDeep", EventDrivenConsumer.class); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayInterfaceTest-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayInterfaceTests-context.xml similarity index 96% rename from spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayInterfaceTest-context.xml rename to spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayInterfaceTests-context.xml index 69b076bf9d..217e18539a 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayInterfaceTest-context.xml +++ b/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayInterfaceTests-context.xml @@ -6,10 +6,9 @@ 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/gateway/GatewayInterfaceTest.java b/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayInterfaceTests.java similarity index 91% rename from spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayInterfaceTest.java rename to spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayInterfaceTests.java index c31ea1f863..33924b6c83 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayInterfaceTest.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayInterfaceTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.integration.gateway; import static junit.framework.Assert.assertEquals; @@ -35,13 +36,12 @@ import org.springframework.integration.core.MessageHandler; /** * @author Oleg Zhurakousky - * */ -public class GatewayInterfaceTest { +public class GatewayInterfaceTests { @Test public void testWithServiceSuperclassAnnotatedMethod(){ - ApplicationContext ac = new ClassPathXmlApplicationContext("GatewayInterfaceTest-context.xml", this.getClass()); + ApplicationContext ac = new ClassPathXmlApplicationContext("GatewayInterfaceTests-context.xml", this.getClass()); DirectChannel channel = ac.getBean("requestChannelFoo", DirectChannel.class); MessageHandler handler = mock(MessageHandler.class); channel.subscribe(handler); @@ -52,7 +52,7 @@ public class GatewayInterfaceTest { @Test public void testWithServiceAnnotatedMethod(){ - ApplicationContext ac = new ClassPathXmlApplicationContext("GatewayInterfaceTest-context.xml", this.getClass()); + ApplicationContext ac = new ClassPathXmlApplicationContext("GatewayInterfaceTests-context.xml", this.getClass()); DirectChannel channel = ac.getBean("requestChannelBar", DirectChannel.class); MessageHandler handler = mock(MessageHandler.class); channel.subscribe(handler); @@ -63,7 +63,7 @@ public class GatewayInterfaceTest { @Test public void testWithServiceSuperclassUnAnnotatedMethod(){ - ApplicationContext ac = new ClassPathXmlApplicationContext("GatewayInterfaceTest-context.xml", this.getClass()); + ApplicationContext ac = new ClassPathXmlApplicationContext("GatewayInterfaceTests-context.xml", this.getClass()); DirectChannel channel = ac.getBean("requestChannelBaz", DirectChannel.class); MessageHandler handler = mock(MessageHandler.class); channel.subscribe(handler); @@ -74,7 +74,7 @@ public class GatewayInterfaceTest { @Test public void testWithServiceCastAsSuperclassAnnotatedMethod(){ - ApplicationContext ac = new ClassPathXmlApplicationContext("GatewayInterfaceTest-context.xml", this.getClass()); + ApplicationContext ac = new ClassPathXmlApplicationContext("GatewayInterfaceTests-context.xml", this.getClass()); DirectChannel channel = ac.getBean("requestChannelFoo", DirectChannel.class); MessageHandler handler = mock(MessageHandler.class); channel.subscribe(handler); @@ -85,7 +85,7 @@ public class GatewayInterfaceTest { @Test public void testWithServiceCastAsSuperclassUnAnnotatedMethod(){ - ApplicationContext ac = new ClassPathXmlApplicationContext("GatewayInterfaceTest-context.xml", this.getClass()); + ApplicationContext ac = new ClassPathXmlApplicationContext("GatewayInterfaceTests-context.xml", this.getClass()); DirectChannel channel = ac.getBean("requestChannelBaz", DirectChannel.class); MessageHandler handler = mock(MessageHandler.class); channel.subscribe(handler); @@ -96,7 +96,7 @@ public class GatewayInterfaceTest { @Test public void testWithServiceHashcode() throws Exception{ - ApplicationContext ac = new ClassPathXmlApplicationContext("GatewayInterfaceTest-context.xml", this.getClass()); + ApplicationContext ac = new ClassPathXmlApplicationContext("GatewayInterfaceTests-context.xml", this.getClass()); DirectChannel channel = ac.getBean("requestChannelBaz", DirectChannel.class); MessageHandler handler = mock(MessageHandler.class); channel.subscribe(handler); @@ -107,7 +107,7 @@ public class GatewayInterfaceTest { @Test public void testWithServiceToString(){ - ApplicationContext ac = new ClassPathXmlApplicationContext("GatewayInterfaceTest-context.xml", this.getClass()); + ApplicationContext ac = new ClassPathXmlApplicationContext("GatewayInterfaceTests-context.xml", this.getClass()); DirectChannel channel = ac.getBean("requestChannelBaz", DirectChannel.class); MessageHandler handler = mock(MessageHandler.class); channel.subscribe(handler); @@ -118,7 +118,7 @@ public class GatewayInterfaceTest { @Test public void testWithServiceEquals() throws Exception{ - ApplicationContext ac = new ClassPathXmlApplicationContext("GatewayInterfaceTest-context.xml", this.getClass()); + ApplicationContext ac = new ClassPathXmlApplicationContext("GatewayInterfaceTests-context.xml", this.getClass()); DirectChannel channel = ac.getBean("requestChannelBaz", DirectChannel.class); MessageHandler handler = mock(MessageHandler.class); channel.subscribe(handler); @@ -137,7 +137,7 @@ public class GatewayInterfaceTest { @Test public void testWithServiceGetClass(){ - ApplicationContext ac = new ClassPathXmlApplicationContext("GatewayInterfaceTest-context.xml", this.getClass()); + ApplicationContext ac = new ClassPathXmlApplicationContext("GatewayInterfaceTests-context.xml", this.getClass()); DirectChannel channel = ac.getBean("requestChannelBaz", DirectChannel.class); MessageHandler handler = mock(MessageHandler.class); channel.subscribe(handler); diff --git a/spring-integration-event/pom.xml b/spring-integration-event/pom.xml index 997a30175f..4cbdc9385d 100644 --- a/spring-integration-event/pom.xml +++ b/spring-integration-event/pom.xml @@ -94,6 +94,12 @@ 2.3 test + + org.springframework.integration + spring-integration-test + 2.1.0.BUILD-SNAPSHOT + test + org.easymock easymockclassextension @@ -102,9 +108,9 @@ org.springframework.integration - spring-integration-test + spring-integration-core 2.1.0.BUILD-SNAPSHOT - test + compile org.springframework @@ -118,12 +124,6 @@ 1.1 test - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - org.springframework spring-test diff --git a/spring-integration-feed/pom.xml b/spring-integration-feed/pom.xml index 79e73c760d..4b29bff247 100644 --- a/spring-integration-feed/pom.xml +++ b/spring-integration-feed/pom.xml @@ -88,6 +88,12 @@ + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + net.java.dev.rome rome-fetcher @@ -118,18 +124,18 @@ 1.2.12 test - - org.easymock - easymock - 2.3 - test - org.springframework.integration spring-integration-test 2.1.0.BUILD-SNAPSHOT test + + org.easymock + easymock + 2.3 + test + org.easymock easymockclassextension @@ -148,12 +154,6 @@ 1.1 test - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - org.mockito mockito-all diff --git a/spring-integration-file/pom.xml b/spring-integration-file/pom.xml index c0068989e6..1bbbbf2932 100644 --- a/spring-integration-file/pom.xml +++ b/spring-integration-file/pom.xml @@ -94,6 +94,12 @@ 2.3 test + + org.springframework.integration + spring-integration-test + 2.1.0.BUILD-SNAPSHOT + test + org.easymock easymockclassextension @@ -102,9 +108,9 @@ org.springframework.integration - spring-integration-test + spring-integration-core 2.1.0.BUILD-SNAPSHOT - test + compile org.springframework @@ -118,12 +124,6 @@ 1.1 test - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - org.springframework spring-test diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileMessageHistoryTest.java b/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileMessageHistoryTests.java similarity index 96% rename from spring-integration-file/src/test/java/org/springframework/integration/file/config/FileMessageHistoryTest.java rename to spring-integration-file/src/test/java/org/springframework/integration/file/config/FileMessageHistoryTests.java index 004ff3a002..f797e073ed 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileMessageHistoryTest.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileMessageHistoryTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.integration.file.config; import org.junit.Test; @@ -38,9 +39,8 @@ import static org.junit.Assert.assertThat; /** * @author Oleg Zhurakousky * @author Iwein Fuld - * */ -public class FileMessageHistoryTest { +public class FileMessageHistoryTests { @Test diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/filters/SimplePatternFileListFilterTest.java b/spring-integration-file/src/test/java/org/springframework/integration/file/filters/SimplePatternFileListFilterTests.java similarity index 51% rename from spring-integration-file/src/test/java/org/springframework/integration/file/filters/SimplePatternFileListFilterTest.java rename to spring-integration-file/src/test/java/org/springframework/integration/file/filters/SimplePatternFileListFilterTests.java index 4d34937005..b5d1912a84 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/filters/SimplePatternFileListFilterTest.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/filters/SimplePatternFileListFilterTests.java @@ -1,3 +1,19 @@ +/* + * Copyright 2002-2011 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.springframework.integration.file.filters; import org.junit.Test; @@ -12,7 +28,7 @@ import static org.junit.Assert.assertThat; * * Minimal test set to ensure AntPathMatcher is used correctly. */ -public class SimplePatternFileListFilterTest { +public class SimplePatternFileListFilterTests { @Test public void shouldMatchExactly() { diff --git a/spring-integration-ftp/pom.xml b/spring-integration-ftp/pom.xml index 04dc74a492..be6837f579 100644 --- a/spring-integration-ftp/pom.xml +++ b/spring-integration-ftp/pom.xml @@ -112,6 +112,12 @@ 1.2.12 test + + org.springframework.integration + spring-integration-test + 2.1.0.BUILD-SNAPSHOT + test + commons-net commons-net @@ -124,18 +130,18 @@ 2.3 test - - org.springframework.integration - spring-integration-test - 2.1.0.BUILD-SNAPSHOT - test - org.easymock easymockclassextension 2.3 test + + org.springframework.integration + spring-integration-file + 2.1.0.BUILD-SNAPSHOT + compile + javax.activation activation @@ -143,12 +149,6 @@ compile true - - org.springframework.integration - spring-integration-file - 2.1.0.BUILD-SNAPSHOT - compile - org.hamcrest hamcrest-all diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/inbound/FtpInboundRemoteFileSystemSynchronizerTest.java b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/inbound/FtpInboundRemoteFileSystemSynchronizerTests.java similarity index 97% rename from spring-integration-ftp/src/test/java/org/springframework/integration/ftp/inbound/FtpInboundRemoteFileSystemSynchronizerTest.java rename to spring-integration-ftp/src/test/java/org/springframework/integration/ftp/inbound/FtpInboundRemoteFileSystemSynchronizerTests.java index db3f689522..b7bf62d996 100644 --- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/inbound/FtpInboundRemoteFileSystemSynchronizerTest.java +++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/inbound/FtpInboundRemoteFileSystemSynchronizerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -50,7 +50,7 @@ import static org.mockito.Mockito.when; * @author Oleg Zhurakousky * @since 2.0 */ -public class FtpInboundRemoteFileSystemSynchronizerTest { +public class FtpInboundRemoteFileSystemSynchronizerTests { private static FTPClient ftpClient = mock(FTPClient.class); diff --git a/spring-integration-gemfire/pom.xml b/spring-integration-gemfire/pom.xml index 5eb0532092..db26c6cb8f 100644 --- a/spring-integration-gemfire/pom.xml +++ b/spring-integration-gemfire/pom.xml @@ -92,12 +92,24 @@ + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + org.springframework spring-test 3.0.6.RELEASE test + + org.springframework.integration + spring-integration-stream + 2.1.0.BUILD-SNAPSHOT + test + org.springframework.data spring-data-gemfire @@ -136,6 +148,12 @@ 3.0.6.RELEASE compile + + org.springframework.integration + spring-integration-test + 2.1.0.BUILD-SNAPSHOT + test + org.easymock easymock @@ -154,30 +172,12 @@ 3.0.6.RELEASE compile - - org.springframework.integration - spring-integration-test - 2.1.0.BUILD-SNAPSHOT - test - org.hamcrest hamcrest-all 1.1 test - - org.springframework.integration - spring-integration-stream - 2.1.0.BUILD-SNAPSHOT - test - - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - org.mockito mockito-all diff --git a/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/config/xml/GemfireCqInboundChannelAdapterParserTest.java b/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/config/xml/GemfireCqInboundChannelAdapterParserTests.java similarity index 96% rename from spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/config/xml/GemfireCqInboundChannelAdapterParserTest.java rename to spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/config/xml/GemfireCqInboundChannelAdapterParserTests.java index 9232106a4d..2575c515df 100644 --- a/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/config/xml/GemfireCqInboundChannelAdapterParserTest.java +++ b/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/config/xml/GemfireCqInboundChannelAdapterParserTests.java @@ -10,6 +10,7 @@ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ + package org.springframework.integration.gemfire.config.xml; import org.junit.Test; @@ -22,7 +23,7 @@ import static org.springframework.integration.gemfire.config.xml.ParserTestUtil. /** * @author Dan Oxlade */ -public class GemfireCqInboundChannelAdapterParserTest { +public class GemfireCqInboundChannelAdapterParserTests { private GemfireCqInboundChannelAdapterParser underTest = new GemfireCqInboundChannelAdapterParser(); diff --git a/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/config/xml/GemfireInboundChannelAdapterParserTest.java b/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/config/xml/GemfireInboundChannelAdapterParserTests.java similarity index 96% rename from spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/config/xml/GemfireInboundChannelAdapterParserTest.java rename to spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/config/xml/GemfireInboundChannelAdapterParserTests.java index e398f8d69b..f7eb2c7df2 100644 --- a/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/config/xml/GemfireInboundChannelAdapterParserTest.java +++ b/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/config/xml/GemfireInboundChannelAdapterParserTests.java @@ -10,6 +10,7 @@ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ + package org.springframework.integration.gemfire.config.xml; import org.junit.Test; @@ -22,7 +23,8 @@ import static org.springframework.integration.gemfire.config.xml.ParserTestUtil. /** * @author Dan Oxlade */ -public class GemfireInboundChannelAdapterParserTest { +public class GemfireInboundChannelAdapterParserTests { + private GemfireInboundChannelAdapterParser underTest = new GemfireInboundChannelAdapterParser(); @Test(expected = BeanDefinitionParsingException.class) diff --git a/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/config/xml/GemfireOutboundChannelAdapterParserTest.java b/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/config/xml/GemfireOutboundChannelAdapterParserTests.java similarity index 96% rename from spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/config/xml/GemfireOutboundChannelAdapterParserTest.java rename to spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/config/xml/GemfireOutboundChannelAdapterParserTests.java index 6e80ad6edc..0a10899d35 100644 --- a/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/config/xml/GemfireOutboundChannelAdapterParserTest.java +++ b/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/config/xml/GemfireOutboundChannelAdapterParserTests.java @@ -10,6 +10,7 @@ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ + package org.springframework.integration.gemfire.config.xml; import org.junit.Test; @@ -22,7 +23,8 @@ import static org.springframework.integration.gemfire.config.xml.ParserTestUtil. /** * @author Dan Oxlade */ -public class GemfireOutboundChannelAdapterParserTest { +public class GemfireOutboundChannelAdapterParserTests { + private GemfireOutboundChannelAdapterParser underTest = new GemfireOutboundChannelAdapterParser(); @Test(expected = BeanDefinitionParsingException.class) diff --git a/spring-integration-groovy/pom.xml b/spring-integration-groovy/pom.xml index dccea50d68..b4c3c99c3c 100644 --- a/spring-integration-groovy/pom.xml +++ b/spring-integration-groovy/pom.xml @@ -100,6 +100,12 @@ 2.3 test + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + org.springframework spring-context-support @@ -118,12 +124,6 @@ 1.1 test - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - org.springframework spring-test diff --git a/spring-integration-http/pom.xml b/spring-integration-http/pom.xml index 5a5de8cd13..9d35c03b04 100644 --- a/spring-integration-http/pom.xml +++ b/spring-integration-http/pom.xml @@ -88,6 +88,25 @@ + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + + + net.java.dev.rome + rome-fetcher + 1.0.0 + compile + + + junit + junit + + + true + org.springframework spring-test @@ -100,6 +119,12 @@ 2.4 provided + + log4j + log4j + 1.2.12 + test + cglib cglib-nodep @@ -107,9 +132,9 @@ test - log4j - log4j - 1.2.12 + org.springframework.integration + spring-integration-test + 2.1.0.BUILD-SNAPSHOT test @@ -131,12 +156,6 @@ true - - org.springframework.integration - spring-integration-test - 2.1.0.BUILD-SNAPSHOT - test - org.easymock easymockclassextension @@ -155,12 +174,6 @@ 1.1 test - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - org.mockito mockito-all @@ -173,6 +186,13 @@ 4.8.2 test + + net.java.dev.rome + rome + 1.0.0 + compile + true + UTF8 diff --git a/spring-integration-ip/pom.xml b/spring-integration-ip/pom.xml index 19579151d5..d2f5fe93c5 100644 --- a/spring-integration-ip/pom.xml +++ b/spring-integration-ip/pom.xml @@ -94,6 +94,12 @@ 2.3 test + + org.springframework.integration + spring-integration-test + 2.1.0.BUILD-SNAPSHOT + test + org.easymock easymockclassextension @@ -102,9 +108,9 @@ org.springframework.integration - spring-integration-test + spring-integration-core 2.1.0.BUILD-SNAPSHOT - test + compile org.springframework @@ -118,12 +124,6 @@ 1.1 test - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - org.springframework spring-test diff --git a/spring-integration-jdbc/pom.xml b/spring-integration-jdbc/pom.xml index 0c6f40dda9..1ce7d67036 100644 --- a/spring-integration-jdbc/pom.xml +++ b/spring-integration-jdbc/pom.xml @@ -92,6 +92,12 @@ + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + com.h2database h2 @@ -134,6 +140,12 @@ 3.0.6.RELEASE compile + + org.springframework.integration + spring-integration-test + 2.1.0.BUILD-SNAPSHOT + test + org.easymock easymock @@ -146,12 +158,6 @@ 3.0.6.RELEASE compile - - org.springframework.integration - spring-integration-test - 2.1.0.BUILD-SNAPSHOT - test - org.springframework spring-jdbc @@ -182,12 +188,6 @@ 1.8.0.10 test - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - org.mockito mockito-all diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcExecutorTest.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcExecutorTests.java similarity index 99% rename from spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcExecutorTest.java rename to spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcExecutorTests.java index f4d8b37373..0aaea5d870 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcExecutorTest.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcExecutorTests.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.integration.jdbc; import static org.junit.Assert.assertEquals; @@ -31,7 +32,7 @@ import org.springframework.integration.jdbc.storedproc.ProcedureParameter; import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.core.SqlParameter; -public class StoredProcExecutorTest { +public class StoredProcExecutorTests { @Test public void testStoredProcExecutorWithNullDataSource() { diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/storedproc/ProcedureParameterTest.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/storedproc/ProcedureParameterTests.java similarity index 98% rename from spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/storedproc/ProcedureParameterTest.java rename to spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/storedproc/ProcedureParameterTests.java index ea978ee101..f2ff1d4b85 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/storedproc/ProcedureParameterTest.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/storedproc/ProcedureParameterTests.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.integration.jdbc.storedproc; import static org.junit.Assert.assertEquals; @@ -25,7 +26,7 @@ import java.util.Map; import org.junit.Test; -public class ProcedureParameterTest { +public class ProcedureParameterTests { @Test public void testProcedureParameterStringObjectString() { diff --git a/spring-integration-jms/pom.xml b/spring-integration-jms/pom.xml index ad30a1f289..0309b9c1a4 100644 --- a/spring-integration-jms/pom.xml +++ b/spring-integration-jms/pom.xml @@ -94,6 +94,12 @@ 5.3.0 test + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + org.springframework spring-oxm @@ -136,18 +142,18 @@ 3.0.6.RELEASE compile - - org.easymock - easymock - 2.3 - test - org.springframework.integration spring-integration-test 2.1.0.BUILD-SNAPSHOT test + + org.easymock + easymock + 2.3 + test + org.easymock easymockclassextension @@ -166,12 +172,6 @@ 1.1 test - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - org.mockito mockito-all diff --git a/spring-integration-jmx/pom.xml b/spring-integration-jmx/pom.xml index a4599c60a6..63f6b3227b 100644 --- a/spring-integration-jmx/pom.xml +++ b/spring-integration-jmx/pom.xml @@ -88,6 +88,12 @@ + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + org.aspectj aspectjweaver @@ -112,18 +118,18 @@ 1.2.12 test - - org.easymock - easymock - 2.3 - test - org.springframework.integration spring-integration-test 2.1.0.BUILD-SNAPSHOT test + + org.easymock + easymock + 2.3 + test + org.easymock easymockclassextension @@ -142,12 +148,6 @@ 1.1 test - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - org.mockito mockito-all diff --git a/spring-integration-mail/pom.xml b/spring-integration-mail/pom.xml index 45b607bce9..1e522c4929 100644 --- a/spring-integration-mail/pom.xml +++ b/spring-integration-mail/pom.xml @@ -88,6 +88,12 @@ + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + org.springframework spring-context-support @@ -112,18 +118,18 @@ 1.2.12 test - - org.easymock - easymock - 2.3 - test - org.springframework.integration spring-integration-test 2.1.0.BUILD-SNAPSHOT test + + org.easymock + easymock + 2.3 + test + org.easymock easymockclassextension @@ -143,12 +149,6 @@ 1.1 test - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - org.mockito mockito-all diff --git a/spring-integration-mongodb/pom.xml b/spring-integration-mongodb/pom.xml index 62b4c8be9c..1b14b801f5 100644 --- a/spring-integration-mongodb/pom.xml +++ b/spring-integration-mongodb/pom.xml @@ -88,18 +88,18 @@ - - org.springframework.integration - spring-integration-test - 2.1.0.BUILD-SNAPSHOT - test - org.easymock easymock 2.3 test + + org.springframework.integration + spring-integration-test + 2.1.0.BUILD-SNAPSHOT + test + org.easymock easymockclassextension @@ -112,18 +112,18 @@ 1.0.0.RC1 compile - - org.springframework - spring-context - 3.0.6.RELEASE - compile - org.springframework.integration spring-integration-core 2.1.0.BUILD-SNAPSHOT compile + + org.springframework + spring-context + 3.0.6.RELEASE + compile + org.hamcrest hamcrest-all diff --git a/spring-integration-redis/pom.xml b/spring-integration-redis/pom.xml index 5672d160cd..c5dbc5327b 100644 --- a/spring-integration-redis/pom.xml +++ b/spring-integration-redis/pom.xml @@ -88,18 +88,18 @@ + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + org.springframework spring-test 3.0.6.RELEASE test - - org.springframework.integration - spring-integration-test - 2.1.0.BUILD-SNAPSHOT - test - log4j log4j @@ -124,6 +124,12 @@ 3.0.6.RELEASE compile + + org.springframework.integration + spring-integration-test + 2.1.0.BUILD-SNAPSHOT + test + org.easymock easymock @@ -160,12 +166,6 @@ 2.3 test - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - org.springframework spring-context diff --git a/spring-integration-rmi/pom.xml b/spring-integration-rmi/pom.xml index 3df94235ee..f4903b7fff 100644 --- a/spring-integration-rmi/pom.xml +++ b/spring-integration-rmi/pom.xml @@ -94,6 +94,12 @@ 2.3 test + + org.springframework.integration + spring-integration-test + 2.1.0.BUILD-SNAPSHOT + test + org.springframework spring-aop @@ -108,9 +114,9 @@ org.springframework.integration - spring-integration-test + spring-integration-core 2.1.0.BUILD-SNAPSHOT - test + compile org.springframework @@ -124,12 +130,6 @@ 1.1 test - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - org.springframework spring-test diff --git a/spring-integration-scripting/pom.xml b/spring-integration-scripting/pom.xml index 0ab2425d73..6a86afcfd2 100644 --- a/spring-integration-scripting/pom.xml +++ b/spring-integration-scripting/pom.xml @@ -88,6 +88,12 @@ + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + org.springframework spring-test @@ -118,18 +124,18 @@ 1.6.3 test - - org.easymock - easymock - 2.3 - test - org.springframework.integration spring-integration-test 2.1.0.BUILD-SNAPSHOT test + + org.easymock + easymock + 2.3 + test + org.easymock easymockclassextension @@ -137,21 +143,15 @@ test - org.hamcrest - hamcrest-all - 1.1 + org.codehaus.groovy + groovy-all + 1.8.4 test - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - - - org.codehaus.groovy - groovy-all - 1.7.5 + org.hamcrest + hamcrest-all + 1.1 test diff --git a/spring-integration-security/pom.xml b/spring-integration-security/pom.xml index e5c87fc38b..7d59875654 100644 --- a/spring-integration-security/pom.xml +++ b/spring-integration-security/pom.xml @@ -88,18 +88,18 @@ - - org.springframework - spring-test - 3.0.6.RELEASE - test - org.springframework.integration spring-integration-core 2.1.0.BUILD-SNAPSHOT compile + + org.springframework + spring-test + 3.0.6.RELEASE + test + org.springframework.security spring-security-config diff --git a/spring-integration-sftp/pom.xml b/spring-integration-sftp/pom.xml index fe8eafc6f8..c83a90c0fc 100644 --- a/spring-integration-sftp/pom.xml +++ b/spring-integration-sftp/pom.xml @@ -90,9 +90,9 @@ org.springframework.integration - spring-integration-test + spring-integration-core 2.1.0.BUILD-SNAPSHOT - test + compile org.springframework @@ -100,36 +100,36 @@ 3.0.6.RELEASE compile - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - org.springframework spring-test 3.0.6.RELEASE test - - org.springframework.integration - spring-integration-file - 2.1.0.BUILD-SNAPSHOT - compile - log4j log4j 1.2.12 test + + org.springframework.integration + spring-integration-stream + 2.1.0.BUILD-SNAPSHOT + compile + cglib cglib-nodep 2.2 test + + org.springframework.integration + spring-integration-test + 2.1.0.BUILD-SNAPSHOT + test + org.easymock easymock @@ -142,6 +142,12 @@ 2.3 test + + org.springframework.integration + spring-integration-file + 2.1.0.BUILD-SNAPSHOT + compile + javax.activation activation @@ -167,12 +173,6 @@ 0.1.45 compile - - org.springframework.integration - spring-integration-stream - 2.1.0.BUILD-SNAPSHOT - compile - junit junit-dep diff --git a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/SftpMessageHistoryTest.java b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/SftpMessageHistoryTests.java similarity index 89% rename from spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/SftpMessageHistoryTest.java rename to spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/SftpMessageHistoryTests.java index 9dc3b6f0ca..066a2ea3c9 100644 --- a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/SftpMessageHistoryTest.java +++ b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/SftpMessageHistoryTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.integration.sftp.config; import static junit.framework.Assert.assertEquals; @@ -24,13 +25,12 @@ import org.springframework.integration.endpoint.SourcePollingChannelAdapter; /** * @author Oleg Zhurakousky - * */ -public class SftpMessageHistoryTest { +public class SftpMessageHistoryTests { @Test public void testMessageHistoryCompliance(){ - ApplicationContext ac = new ClassPathXmlApplicationContext("MessageHistory-context.xml", SftpMessageHistoryTest.class); + ApplicationContext ac = new ClassPathXmlApplicationContext("MessageHistory-context.xml", SftpMessageHistoryTests.class); SourcePollingChannelAdapter spca = ac.getBean("sftpAdapter", SourcePollingChannelAdapter.class); assertEquals("sftpAdapter", spca.getComponentName()); assertEquals("sftp:inbound-channel-adapter", spca.getComponentType()); diff --git a/spring-integration-stream/pom.xml b/spring-integration-stream/pom.xml index fa4cfbd22b..3f460f6052 100644 --- a/spring-integration-stream/pom.xml +++ b/spring-integration-stream/pom.xml @@ -100,6 +100,12 @@ 2.3 test + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + org.springframework spring-context @@ -112,12 +118,6 @@ 1.1 test - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - org.springframework spring-test diff --git a/spring-integration-test/pom.xml b/spring-integration-test/pom.xml index c8abfb5064..2e3b44448b 100644 --- a/spring-integration-test/pom.xml +++ b/spring-integration-test/pom.xml @@ -100,6 +100,12 @@ 2.3 test + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + org.springframework spring-context @@ -112,12 +118,6 @@ 1.1 test - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - org.springframework spring-test diff --git a/spring-integration-test/src/main/java/org/springframework/integration/test/support/AbstractRequestResponseScenarioTest.java b/spring-integration-test/src/main/java/org/springframework/integration/test/support/AbstractRequestResponseScenarioTests.java similarity index 83% rename from spring-integration-test/src/main/java/org/springframework/integration/test/support/AbstractRequestResponseScenarioTest.java rename to spring-integration-test/src/main/java/org/springframework/integration/test/support/AbstractRequestResponseScenarioTests.java index 90369007f8..12d26ed297 100644 --- a/spring-integration-test/src/main/java/org/springframework/integration/test/support/AbstractRequestResponseScenarioTest.java +++ b/spring-integration-test/src/main/java/org/springframework/integration/test/support/AbstractRequestResponseScenarioTests.java @@ -1,3 +1,19 @@ +/* + * Copyright 2002-2011 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.springframework.integration.test.support; import static org.junit.Assert.assertNotNull; @@ -29,7 +45,8 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; * @author David Turanski */ @RunWith(SpringJUnit4ClassRunner.class) -public abstract class AbstractRequestResponseScenarioTest { +public abstract class AbstractRequestResponseScenarioTests { + private List scenarios = null; @Autowired diff --git a/spring-integration-test/src/main/java/org/springframework/integration/test/support/SingleRequestResponseScenarioTest.java b/spring-integration-test/src/main/java/org/springframework/integration/test/support/SingleRequestResponseScenarioTests.java similarity index 90% rename from spring-integration-test/src/main/java/org/springframework/integration/test/support/SingleRequestResponseScenarioTest.java rename to spring-integration-test/src/main/java/org/springframework/integration/test/support/SingleRequestResponseScenarioTests.java index 83e895f5d9..dcb041767b 100644 --- a/spring-integration-test/src/main/java/org/springframework/integration/test/support/SingleRequestResponseScenarioTest.java +++ b/spring-integration-test/src/main/java/org/springframework/integration/test/support/SingleRequestResponseScenarioTests.java @@ -18,9 +18,10 @@ import java.util.List; /** * Convenience class for a single {@link RequestResponseScenario} test + * * @author David Turanski */ -public abstract class SingleRequestResponseScenarioTest extends AbstractRequestResponseScenarioTest { +public abstract class SingleRequestResponseScenarioTests extends AbstractRequestResponseScenarioTests { @Override protected List defineRequestResponseScenarios() { diff --git a/spring-integration-test/src/test/java/org/springframework/integration/test/support/MessageScenariosTest-context.xml b/spring-integration-test/src/test/java/org/springframework/integration/test/support/MessageScenariosTests-context.xml similarity index 100% rename from spring-integration-test/src/test/java/org/springframework/integration/test/support/MessageScenariosTest-context.xml rename to spring-integration-test/src/test/java/org/springframework/integration/test/support/MessageScenariosTests-context.xml diff --git a/spring-integration-test/src/test/java/org/springframework/integration/test/support/MessageScenariosTest.java b/spring-integration-test/src/test/java/org/springframework/integration/test/support/MessageScenariosTests.java similarity index 76% rename from spring-integration-test/src/test/java/org/springframework/integration/test/support/MessageScenariosTest.java rename to spring-integration-test/src/test/java/org/springframework/integration/test/support/MessageScenariosTests.java index 6723cc0142..9a4e21f65f 100644 --- a/spring-integration-test/src/test/java/org/springframework/integration/test/support/MessageScenariosTest.java +++ b/spring-integration-test/src/test/java/org/springframework/integration/test/support/MessageScenariosTests.java @@ -1,3 +1,19 @@ +/* + * Copyright 2002-2011 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.springframework.integration.test.support; import static org.junit.Assert.assertEquals; @@ -9,11 +25,12 @@ import java.util.List; import org.springframework.integration.Message; import org.springframework.integration.support.MessageBuilder; import org.springframework.test.context.ContextConfiguration; + import static org.springframework.integration.test.matcher.PayloadMatcher.hasPayload; import static org.springframework.integration.test.matcher.HeaderMatcher.hasHeader; @ContextConfiguration -public class MessageScenariosTest extends AbstractRequestResponseScenarioTest { +public class MessageScenariosTests extends AbstractRequestResponseScenarioTests { @Override protected List defineRequestResponseScenarios() { diff --git a/spring-integration-test/src/test/java/org/springframework/integration/test/support/SingleScenarioTest.java b/spring-integration-test/src/test/java/org/springframework/integration/test/support/SingleScenarioTests.java similarity index 51% rename from spring-integration-test/src/test/java/org/springframework/integration/test/support/SingleScenarioTest.java rename to spring-integration-test/src/test/java/org/springframework/integration/test/support/SingleScenarioTests.java index 16e944429f..87c2000515 100644 --- a/spring-integration-test/src/test/java/org/springframework/integration/test/support/SingleScenarioTest.java +++ b/spring-integration-test/src/test/java/org/springframework/integration/test/support/SingleScenarioTests.java @@ -1,11 +1,27 @@ +/* + * Copyright 2002-2011 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.springframework.integration.test.support; import static org.junit.Assert.assertEquals; import org.springframework.test.context.ContextConfiguration; -@ContextConfiguration("MessageScenariosTest-context.xml") -public class SingleScenarioTest extends SingleRequestResponseScenarioTest { +@ContextConfiguration("MessageScenariosTests-context.xml") +public class SingleScenarioTests extends SingleRequestResponseScenarioTests { /* (non-Javadoc) * @see org.springframework.integration.test.support.SingleRequestResponseScenarioTest#defineRequestResponseScenario() diff --git a/spring-integration-twitter/pom.xml b/spring-integration-twitter/pom.xml index d6f7c1dab1..ac97f18a46 100644 --- a/spring-integration-twitter/pom.xml +++ b/spring-integration-twitter/pom.xml @@ -90,9 +90,9 @@ org.springframework.integration - spring-integration-test + spring-integration-core 2.1.0.BUILD-SNAPSHOT - test + compile org.springframework @@ -118,6 +118,12 @@ 3.0.6.RELEASE compile + + org.springframework.integration + spring-integration-test + 2.1.0.BUILD-SNAPSHOT + test + org.easymock easymock @@ -137,12 +143,6 @@ compile true - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - org.hamcrest hamcrest-all diff --git a/spring-integration-ws/pom.xml b/spring-integration-ws/pom.xml index 3862f89567..7f00f3f8e9 100644 --- a/spring-integration-ws/pom.xml +++ b/spring-integration-ws/pom.xml @@ -88,6 +88,12 @@ + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + com.sun.xml.messaging.saaj saaj-impl @@ -170,6 +176,12 @@ + + org.springframework.integration + spring-integration-test + 2.1.0.BUILD-SNAPSHOT + test + org.easymock easymock @@ -182,12 +194,6 @@ 2.3 test - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - stax stax-api @@ -207,12 +213,6 @@ 1.1 test - - org.springframework.integration - spring-integration-test - 2.1.0.BUILD-SNAPSHOT - test - org.mockito mockito-all diff --git a/spring-integration-xml/pom.xml b/spring-integration-xml/pom.xml index e685a1a5e6..dbb69fef8b 100644 --- a/spring-integration-xml/pom.xml +++ b/spring-integration-xml/pom.xml @@ -88,12 +88,6 @@ - - org.springframework.integration - spring-integration-test - 2.1.0.BUILD-SNAPSHOT - test - org.springframework.integration spring-integration-core @@ -130,6 +124,12 @@ 1.2.12 test + + org.springframework.integration + spring-integration-test + 2.1.0.BUILD-SNAPSHOT + test + org.easymock easymock diff --git a/spring-integration-xmpp/pom.xml b/spring-integration-xmpp/pom.xml index 7646fc4543..b86d7223fc 100644 --- a/spring-integration-xmpp/pom.xml +++ b/spring-integration-xmpp/pom.xml @@ -88,6 +88,12 @@ + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + org.springframework spring-context-support @@ -118,18 +124,18 @@ 1.2.12 test - - org.easymock - easymock - 2.3 - test - org.springframework.integration spring-integration-test 2.1.0.BUILD-SNAPSHOT test + + org.easymock + easymock + 2.3 + test + org.easymock easymockclassextension @@ -161,12 +167,6 @@ 1.1 test - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - org.mockito mockito-all diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/SmackMessageSampleTest.java b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/SmackMessageSampleTests.java similarity index 94% rename from spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/SmackMessageSampleTest.java rename to spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/SmackMessageSampleTests.java index 2e51c8f572..37005844cb 100644 --- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/SmackMessageSampleTest.java +++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/SmackMessageSampleTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.integration.xmpp.ignore; import org.junit.Ignore; @@ -26,9 +27,8 @@ import org.springframework.integration.message.GenericMessage; /** * @author Oleg Zhurakousky - * */ -public class SmackMessageSampleTest { +public class SmackMessageSampleTests { @Test @Ignore