From 375c4634f6c0da98f9eda072edebcdeafad03478 Mon Sep 17 00:00:00 2001 From: Mark Fisher Date: Wed, 27 Oct 2010 11:44:00 -0400 Subject: [PATCH] INT-786 renamed FeedMessageSourceBeanDefinitionParserTests to FeedInboundChannelAdapterParserTests (and all associated config files) --- ...ndChannelAdapterParserTests-file-context.xml} | 2 +- ...nelAdapterParserTests-file-usage-context.xml} | 2 +- ...apterParserTests-file-usage-noid-context.xml} | 2 +- ...ndChannelAdapterParserTests-http-context.xml} | 0 ...=> FeedInboundChannelAdapterParserTests.java} | 16 ++++++++-------- 5 files changed, 11 insertions(+), 11 deletions(-) rename spring-integration-feed/src/test/java/org/springframework/integration/feed/config/{FeedMessageSourceBeanDefinitionParserTests-file-context.xml => FeedInboundChannelAdapterParserTests-file-context.xml} (93%) rename spring-integration-feed/src/test/java/org/springframework/integration/feed/config/{FeedMessageSourceBeanDefinitionParserTests-file-usage-context.xml => FeedInboundChannelAdapterParserTests-file-usage-context.xml} (91%) rename spring-integration-feed/src/test/java/org/springframework/integration/feed/config/{FeedMessageSourceBeanDefinitionParserTests-file-usage-noid-context.xml => FeedInboundChannelAdapterParserTests-file-usage-noid-context.xml} (89%) rename spring-integration-feed/src/test/java/org/springframework/integration/feed/config/{FeedMessageSourceBeanDefinitionParserTests-http-context.xml => FeedInboundChannelAdapterParserTests-http-context.xml} (100%) rename spring-integration-feed/src/test/java/org/springframework/integration/feed/config/{FeedMessageSourceBeanDefinitionParserTests.java => FeedInboundChannelAdapterParserTests.java} (91%) diff --git a/spring-integration-feed/src/test/java/org/springframework/integration/feed/config/FeedMessageSourceBeanDefinitionParserTests-file-context.xml b/spring-integration-feed/src/test/java/org/springframework/integration/feed/config/FeedInboundChannelAdapterParserTests-file-context.xml similarity index 93% rename from spring-integration-feed/src/test/java/org/springframework/integration/feed/config/FeedMessageSourceBeanDefinitionParserTests-file-context.xml rename to spring-integration-feed/src/test/java/org/springframework/integration/feed/config/FeedInboundChannelAdapterParserTests-file-context.xml index 3e3cf9472f..21971eab13 100644 --- a/spring-integration-feed/src/test/java/org/springframework/integration/feed/config/FeedMessageSourceBeanDefinitionParserTests-file-context.xml +++ b/spring-integration-feed/src/test/java/org/springframework/integration/feed/config/FeedInboundChannelAdapterParserTests-file-context.xml @@ -18,6 +18,6 @@ - + \ No newline at end of file diff --git a/spring-integration-feed/src/test/java/org/springframework/integration/feed/config/FeedMessageSourceBeanDefinitionParserTests-file-usage-context.xml b/spring-integration-feed/src/test/java/org/springframework/integration/feed/config/FeedInboundChannelAdapterParserTests-file-usage-context.xml similarity index 91% rename from spring-integration-feed/src/test/java/org/springframework/integration/feed/config/FeedMessageSourceBeanDefinitionParserTests-file-usage-context.xml rename to spring-integration-feed/src/test/java/org/springframework/integration/feed/config/FeedInboundChannelAdapterParserTests-file-usage-context.xml index f8c51488c4..2a9b28321d 100644 --- a/spring-integration-feed/src/test/java/org/springframework/integration/feed/config/FeedMessageSourceBeanDefinitionParserTests-file-usage-context.xml +++ b/spring-integration-feed/src/test/java/org/springframework/integration/feed/config/FeedInboundChannelAdapterParserTests-file-usage-context.xml @@ -15,7 +15,7 @@ - + diff --git a/spring-integration-feed/src/test/java/org/springframework/integration/feed/config/FeedMessageSourceBeanDefinitionParserTests-file-usage-noid-context.xml b/spring-integration-feed/src/test/java/org/springframework/integration/feed/config/FeedInboundChannelAdapterParserTests-file-usage-noid-context.xml similarity index 89% rename from spring-integration-feed/src/test/java/org/springframework/integration/feed/config/FeedMessageSourceBeanDefinitionParserTests-file-usage-noid-context.xml rename to spring-integration-feed/src/test/java/org/springframework/integration/feed/config/FeedInboundChannelAdapterParserTests-file-usage-noid-context.xml index c084ff58b0..3978904c88 100644 --- a/spring-integration-feed/src/test/java/org/springframework/integration/feed/config/FeedMessageSourceBeanDefinitionParserTests-file-usage-noid-context.xml +++ b/spring-integration-feed/src/test/java/org/springframework/integration/feed/config/FeedInboundChannelAdapterParserTests-file-usage-noid-context.xml @@ -12,7 +12,7 @@ - + \ No newline at end of file diff --git a/spring-integration-feed/src/test/java/org/springframework/integration/feed/config/FeedMessageSourceBeanDefinitionParserTests-http-context.xml b/spring-integration-feed/src/test/java/org/springframework/integration/feed/config/FeedInboundChannelAdapterParserTests-http-context.xml similarity index 100% rename from spring-integration-feed/src/test/java/org/springframework/integration/feed/config/FeedMessageSourceBeanDefinitionParserTests-http-context.xml rename to spring-integration-feed/src/test/java/org/springframework/integration/feed/config/FeedInboundChannelAdapterParserTests-http-context.xml diff --git a/spring-integration-feed/src/test/java/org/springframework/integration/feed/config/FeedMessageSourceBeanDefinitionParserTests.java b/spring-integration-feed/src/test/java/org/springframework/integration/feed/config/FeedInboundChannelAdapterParserTests.java similarity index 91% rename from spring-integration-feed/src/test/java/org/springframework/integration/feed/config/FeedMessageSourceBeanDefinitionParserTests.java rename to spring-integration-feed/src/test/java/org/springframework/integration/feed/config/FeedInboundChannelAdapterParserTests.java index bcfe3ce86f..4109daf834 100644 --- a/spring-integration-feed/src/test/java/org/springframework/integration/feed/config/FeedMessageSourceBeanDefinitionParserTests.java +++ b/spring-integration-feed/src/test/java/org/springframework/integration/feed/config/FeedInboundChannelAdapterParserTests.java @@ -54,7 +54,7 @@ import com.sun.syndication.fetcher.impl.HttpURLFeedFetcher; * @author Mark Fisher * @since 2.0 */ -public class FeedMessageSourceBeanDefinitionParserTests { +public class FeedInboundChannelAdapterParserTests { private static CountDownLatch latch; @@ -69,7 +69,7 @@ public class FeedMessageSourceBeanDefinitionParserTests { @Test public void validateSuccessfulFileConfigurationWithCustomMetadataStore() { ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext( - "FeedMessageSourceBeanDefinitionParserTests-file-context.xml", this.getClass()); + "FeedInboundChannelAdapterParserTests-file-context.xml", this.getClass()); SourcePollingChannelAdapter adapter = context.getBean("feedAdapter", SourcePollingChannelAdapter.class); FeedEntryMessageSource source = (FeedEntryMessageSource) TestUtils.getPropertyValue(adapter, "source"); MetadataStore metadataStore = (MetadataStore) TestUtils.getPropertyValue(source, "metadataStore"); @@ -82,7 +82,7 @@ public class FeedMessageSourceBeanDefinitionParserTests { public void validateSuccessfulHttpConfigurationWithCustomMetadataStore() { ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext( - "FeedMessageSourceBeanDefinitionParserTests-http-context.xml", this.getClass()); + "FeedInboundChannelAdapterParserTests-http-context.xml", this.getClass()); SourcePollingChannelAdapter adapter = context.getBean("feedAdapter", SourcePollingChannelAdapter.class); FeedEntryMessageSource source = (FeedEntryMessageSource) TestUtils.getPropertyValue(adapter, "source"); MetadataStore metadataStore = (MetadataStore) TestUtils.getPropertyValue(source, "metadataStore"); @@ -102,7 +102,7 @@ public class FeedMessageSourceBeanDefinitionParserTests { //Test file samples.rss has 3 news items latch = spy(new CountDownLatch(3)); ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext( - "FeedMessageSourceBeanDefinitionParserTests-file-usage-context.xml", this.getClass()); + "FeedInboundChannelAdapterParserTests-file-usage-context.xml", this.getClass()); latch.await(5, TimeUnit.SECONDS); verify(latch, times(3)).countDown(); context.destroy(); @@ -111,7 +111,7 @@ public class FeedMessageSourceBeanDefinitionParserTests { // in this iteration no new feeds will be received and the latch will timeout latch = spy(new CountDownLatch(3)); context = new ClassPathXmlApplicationContext( - "FeedMessageSourceBeanDefinitionParserTests-file-usage-context.xml", this.getClass()); + "FeedInboundChannelAdapterParserTests-file-usage-context.xml", this.getClass()); latch.await(5, TimeUnit.SECONDS); verify(latch, times(0)).countDown(); context.destroy(); @@ -122,7 +122,7 @@ public class FeedMessageSourceBeanDefinitionParserTests { //Test file samples.rss has 3 news items latch = spy(new CountDownLatch(3)); ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext( - "FeedMessageSourceBeanDefinitionParserTests-file-usage-noid-context.xml", this.getClass()); + "FeedInboundChannelAdapterParserTests-file-usage-noid-context.xml", this.getClass()); latch.await(5, TimeUnit.SECONDS); verify(latch, times(3)).countDown(); context.destroy(); @@ -131,7 +131,7 @@ public class FeedMessageSourceBeanDefinitionParserTests { // in this iteration no new feeds will be received and the latch will timeout latch = spy(new CountDownLatch(3)); context = new ClassPathXmlApplicationContext( - "FeedMessageSourceBeanDefinitionParserTests-file-usage-noid-context.xml", this.getClass()); + "FeedInboundChannelAdapterParserTests-file-usage-noid-context.xml", this.getClass()); latch.await(5, TimeUnit.SECONDS); verify(latch, times(3)).countDown(); context.destroy(); @@ -147,7 +147,7 @@ public class FeedMessageSourceBeanDefinitionParserTests { } }); ApplicationContext context = new ClassPathXmlApplicationContext( - "FeedMessageSourceBeanDefinitionParserTests-http-context.xml", this.getClass()); + "FeedInboundChannelAdapterParserTests-http-context.xml", this.getClass()); DirectChannel feedChannel = context.getBean("feedChannel", DirectChannel.class); feedChannel.subscribe(handler); latch.await(5, TimeUnit.SECONDS);