From 730332f3e6e8388b586c861f82a0b596333e269d Mon Sep 17 00:00:00 2001 From: Soby Chacko Date: Fri, 15 May 2020 14:01:00 -0400 Subject: [PATCH] Update test config class names --- .../stream/app/processor/bridge/BridgeProcessorTests.java | 4 ++-- .../stream/app/processor/filter/FilterProcessorTests.java | 4 ++-- .../processor/groovy/GroovyProcessorIntegrationTests.java | 6 +++--- .../header/enricher/HeaderEnricherProcessorTests.java | 4 ++-- .../app/processor/splitter/SplitterProcessorTests.java | 4 ++-- .../app/processor/transform/TransformProcessorTests.java | 4 ++-- .../cloud/stream/app/sink/counter/CounterSinkTests.java | 4 ++-- .../cloud/stream/app/file/sink/FileSinkTests.java | 4 ++-- .../cloud/stream/app/sink/jdbc/JdbcSinkTests.java | 4 ++-- .../cloud/stream/app/sink/log/LogSinkTests.java | 4 ++-- .../stream/app/sink/rabbit/RabbitSinkIntegrationTests.java | 2 +- .../cloud/stream/app/sink/redis/RedisSinkTests.java | 4 ++-- .../cloud/stream/app/source/file/FileSourceTests.java | 4 ++-- .../cloud/stream/app/source/http/HttpSourceTests.java | 2 +- .../stream/app/source/jdbc/JdbcSourceIntegrationTests.java | 2 +- .../cloud/stream/app/source/time/TimeSourceTests.java | 4 ++-- .../enricher/HeaderEnricherFunctionApplicationTests.java | 2 +- 17 files changed, 31 insertions(+), 31 deletions(-) diff --git a/applications/processor/bridge-processor/src/test/java/org/springframework/cloud/stream/app/processor/bridge/BridgeProcessorTests.java b/applications/processor/bridge-processor/src/test/java/org/springframework/cloud/stream/app/processor/bridge/BridgeProcessorTests.java index e230a875..bc0a5b7a 100644 --- a/applications/processor/bridge-processor/src/test/java/org/springframework/cloud/stream/app/processor/bridge/BridgeProcessorTests.java +++ b/applications/processor/bridge-processor/src/test/java/org/springframework/cloud/stream/app/processor/bridge/BridgeProcessorTests.java @@ -41,7 +41,7 @@ public class BridgeProcessorTests { @Test public void testFilterProcessor() { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( - TestChannelBinderConfiguration.getCompleteConfiguration(BridgeTestAppConfiguration.class)) + TestChannelBinderConfiguration.getCompleteConfiguration(BridgeProcessorTestConfiguration.class)) .web(WebApplicationType.NONE) .run()) { @@ -57,6 +57,6 @@ public class BridgeProcessorTests { @EnableAutoConfiguration @Import({BridgeProcessorConfiguration.class}) - public static class BridgeTestAppConfiguration { + public static class BridgeProcessorTestConfiguration { } } diff --git a/applications/processor/filter-processor/src/test/java/org/springframework/cloud/stream/app/processor/filter/FilterProcessorTests.java b/applications/processor/filter-processor/src/test/java/org/springframework/cloud/stream/app/processor/filter/FilterProcessorTests.java index 0d3e6745..7de7c629 100644 --- a/applications/processor/filter-processor/src/test/java/org/springframework/cloud/stream/app/processor/filter/FilterProcessorTests.java +++ b/applications/processor/filter-processor/src/test/java/org/springframework/cloud/stream/app/processor/filter/FilterProcessorTests.java @@ -42,7 +42,7 @@ public class FilterProcessorTests { @Test public void testFilterProcessor() { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( - TestChannelBinderConfiguration.getCompleteConfiguration(FilterProcessorConfiguration.class)) + TestChannelBinderConfiguration.getCompleteConfiguration(FilterProcessorTestConfiguration.class)) .web(WebApplicationType.NONE) .run("--spring.cloud.function.definition=byteArrayTextToString|filterFunction", "--spel.function.expression=payload.length() > 5")) { @@ -64,7 +64,7 @@ public class FilterProcessorTests { @EnableAutoConfiguration @Import({FilterFunctionConfiguration.class}) - public static class FilterProcessorConfiguration { + public static class FilterProcessorTestConfiguration { } } diff --git a/applications/processor/groovy-processor/src/test/java/org/springframework/cloud/stream/app/processor/groovy/GroovyProcessorIntegrationTests.java b/applications/processor/groovy-processor/src/test/java/org/springframework/cloud/stream/app/processor/groovy/GroovyProcessorIntegrationTests.java index abb0941a..b55e6360 100644 --- a/applications/processor/groovy-processor/src/test/java/org/springframework/cloud/stream/app/processor/groovy/GroovyProcessorIntegrationTests.java +++ b/applications/processor/groovy-processor/src/test/java/org/springframework/cloud/stream/app/processor/groovy/GroovyProcessorIntegrationTests.java @@ -38,7 +38,7 @@ public class GroovyProcessorIntegrationTests { @Test public void testGroovyProcessorWithScript() { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( - TestChannelBinderConfiguration.getCompleteConfiguration(GroovyProcessorTestAppConfiguration.class)) + TestChannelBinderConfiguration.getCompleteConfiguration(GroovyProcessorTestConfiguration.class)) .web(WebApplicationType.NONE) .run("--spring.cloud.function.definition=byteArrayTextToString|groovyProcessorFunction", "--groovy-processor.script=script.groovy", @@ -57,7 +57,7 @@ public class GroovyProcessorIntegrationTests { @Test public void testGroovyProcessorWithGrab() { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( - TestChannelBinderConfiguration.getCompleteConfiguration(GroovyProcessorTestAppConfiguration.class)) + TestChannelBinderConfiguration.getCompleteConfiguration(GroovyProcessorTestConfiguration.class)) .web(WebApplicationType.NONE) .run("--spring.cloud.function.definition=byteArrayTextToString|groovyProcessorFunction", "--groovy-processor.script=script-with-grab.groovy")) { @@ -75,6 +75,6 @@ public class GroovyProcessorIntegrationTests { @EnableAutoConfiguration @Import({GroovyProcessorConfiguration.class}) - public static class GroovyProcessorTestAppConfiguration { + public static class GroovyProcessorTestConfiguration { } } diff --git a/applications/processor/header-enricher-processor/src/test/java/org/springframework/cloud/stream/app/processor/header/enricher/HeaderEnricherProcessorTests.java b/applications/processor/header-enricher-processor/src/test/java/org/springframework/cloud/stream/app/processor/header/enricher/HeaderEnricherProcessorTests.java index 40fd4566..6df3578e 100644 --- a/applications/processor/header-enricher-processor/src/test/java/org/springframework/cloud/stream/app/processor/header/enricher/HeaderEnricherProcessorTests.java +++ b/applications/processor/header-enricher-processor/src/test/java/org/springframework/cloud/stream/app/processor/header/enricher/HeaderEnricherProcessorTests.java @@ -44,7 +44,7 @@ public class HeaderEnricherProcessorTests { @Test public void testHeaderEnricherProcessor() { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( - TestChannelBinderConfiguration.getCompleteConfiguration(HeaderEnricherProcessorConfiguration.class)) + TestChannelBinderConfiguration.getCompleteConfiguration(HeaderEnricherProcessorTestConfiguration.class)) .web(WebApplicationType.NONE) .run("--spring.cloud.function.definition=headerEnricherFunction", "--header.enricher.headers=foo='bar' \n baz='fiz' \n buz=payload \n jaz=@value", @@ -67,7 +67,7 @@ public class HeaderEnricherProcessorTests { @EnableAutoConfiguration @Import({HeaderEnricherFunctionConfiguration.class}) - public static class HeaderEnricherProcessorConfiguration { + public static class HeaderEnricherProcessorTestConfiguration { @Bean public String value() { diff --git a/applications/processor/splitter-processor/src/test/java/org/springframework/cloud/stream/app/processor/splitter/SplitterProcessorTests.java b/applications/processor/splitter-processor/src/test/java/org/springframework/cloud/stream/app/processor/splitter/SplitterProcessorTests.java index fe32bd85..43d79cd8 100644 --- a/applications/processor/splitter-processor/src/test/java/org/springframework/cloud/stream/app/processor/splitter/SplitterProcessorTests.java +++ b/applications/processor/splitter-processor/src/test/java/org/springframework/cloud/stream/app/processor/splitter/SplitterProcessorTests.java @@ -39,7 +39,7 @@ public class SplitterProcessorTests { @Test public void testSplitterProcessor() { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( - TestChannelBinderConfiguration.getCompleteConfiguration(SplitterProcessorConfiguration.class)) + TestChannelBinderConfiguration.getCompleteConfiguration(SplitterProcessorTestConfiguration.class)) .web(WebApplicationType.NONE) .run("--spring.cloud.function.definition=byteArrayTextToString|splitterFunction", "--splitter.expression=payload.split(',')")) { @@ -60,6 +60,6 @@ public class SplitterProcessorTests { @EnableAutoConfiguration @Import({SplitterFunctionConfiguration.class}) - public static class SplitterProcessorConfiguration { + public static class SplitterProcessorTestConfiguration { } } diff --git a/applications/processor/transform-processor/src/test/java/org/springframework/cloud/stream/app/processor/transform/TransformProcessorTests.java b/applications/processor/transform-processor/src/test/java/org/springframework/cloud/stream/app/processor/transform/TransformProcessorTests.java index fab71b65..2eea6838 100644 --- a/applications/processor/transform-processor/src/test/java/org/springframework/cloud/stream/app/processor/transform/TransformProcessorTests.java +++ b/applications/processor/transform-processor/src/test/java/org/springframework/cloud/stream/app/processor/transform/TransformProcessorTests.java @@ -39,7 +39,7 @@ public class TransformProcessorTests { @Test public void testTransformProcessor() { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( - TestChannelBinderConfiguration.getCompleteConfiguration(TransformProcessorConfiguration.class)) + TestChannelBinderConfiguration.getCompleteConfiguration(TransformProcessorTestConfiguration.class)) .web(WebApplicationType.NONE) .run("--spring.cloud.function.definition=byteArrayTextToString|spelFunction", "--spel.function.expression=payload.toUpperCase()")) { @@ -56,7 +56,7 @@ public class TransformProcessorTests { @EnableAutoConfiguration @Import({SpelFunctionConfiguration.class}) - public static class TransformProcessorConfiguration { + public static class TransformProcessorTestConfiguration { } } diff --git a/applications/sink/counter-sink/src/test/java/org/springframework/cloud/stream/app/sink/counter/CounterSinkTests.java b/applications/sink/counter-sink/src/test/java/org/springframework/cloud/stream/app/sink/counter/CounterSinkTests.java index 75732e2c..f6779b4e 100644 --- a/applications/sink/counter-sink/src/test/java/org/springframework/cloud/stream/app/sink/counter/CounterSinkTests.java +++ b/applications/sink/counter-sink/src/test/java/org/springframework/cloud/stream/app/sink/counter/CounterSinkTests.java @@ -46,7 +46,7 @@ public class CounterSinkTests { @Test public void testCounterSink(CapturedOutput output) { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( - TestChannelBinderConfiguration.getCompleteConfiguration(CounterSinkConfiguration.class)) + TestChannelBinderConfiguration.getCompleteConfiguration(CounterSinkTestConfiguration.class)) .web(WebApplicationType.NONE) .run("--spring.cloud.function.definition=byteArrayTextToString|counterConsumer", "--counter.name=counter666", @@ -69,7 +69,7 @@ public class CounterSinkTests { @EnableAutoConfiguration //@Import({CounterConsumerConfiguration.class, PayloadConverterConfiguration.class}) @Import({CounterConsumerConfiguration.class}) - public static class CounterSinkConfiguration { + public static class CounterSinkTestConfiguration { } } diff --git a/applications/sink/file-sink/src/test/java/org/springframework/cloud/stream/app/file/sink/FileSinkTests.java b/applications/sink/file-sink/src/test/java/org/springframework/cloud/stream/app/file/sink/FileSinkTests.java index eb6f283c..2602e276 100644 --- a/applications/sink/file-sink/src/test/java/org/springframework/cloud/stream/app/file/sink/FileSinkTests.java +++ b/applications/sink/file-sink/src/test/java/org/springframework/cloud/stream/app/file/sink/FileSinkTests.java @@ -49,7 +49,7 @@ public class FileSinkTests { public void testFileSink() throws Exception { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration - .getCompleteConfiguration(FileSinkConfiguration.class)) + .getCompleteConfiguration(FileSinkTestConfiguration.class)) .web(WebApplicationType.NONE) .run("--spring.cloud.function.definition=fileConsumer", "--file.consumer.name=test", @@ -68,6 +68,6 @@ public class FileSinkTests { @EnableAutoConfiguration @Import(FileConsumerConfiguration.class) - public static class FileSinkConfiguration { + public static class FileSinkTestConfiguration { } } diff --git a/applications/sink/jdbc-sink/src/test/java/org/springframework/cloud/stream/app/sink/jdbc/JdbcSinkTests.java b/applications/sink/jdbc-sink/src/test/java/org/springframework/cloud/stream/app/sink/jdbc/JdbcSinkTests.java index ac02e1e9..e681eb3f 100644 --- a/applications/sink/jdbc-sink/src/test/java/org/springframework/cloud/stream/app/sink/jdbc/JdbcSinkTests.java +++ b/applications/sink/jdbc-sink/src/test/java/org/springframework/cloud/stream/app/sink/jdbc/JdbcSinkTests.java @@ -37,7 +37,7 @@ public class JdbcSinkTests { @Test public void testSimpleInserts() { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( - TestChannelBinderConfiguration.getCompleteConfiguration(JdbcSinkConfiguration.class)) + TestChannelBinderConfiguration.getCompleteConfiguration(JdbcSinkTestConfiguration.class)) .web(WebApplicationType.NONE) .run("--spring.cloud.function.definition=jdbcConsumer")) { @@ -54,7 +54,7 @@ public class JdbcSinkTests { @EnableAutoConfiguration @Import(JdbcConsumerConfiguration.class) - public static class JdbcSinkConfiguration { + public static class JdbcSinkTestConfiguration { } static class Payload { diff --git a/applications/sink/log-sink/src/test/java/org/springframework/cloud/stream/app/sink/log/LogSinkTests.java b/applications/sink/log-sink/src/test/java/org/springframework/cloud/stream/app/sink/log/LogSinkTests.java index 41f55a15..d70c4f6c 100644 --- a/applications/sink/log-sink/src/test/java/org/springframework/cloud/stream/app/sink/log/LogSinkTests.java +++ b/applications/sink/log-sink/src/test/java/org/springframework/cloud/stream/app/sink/log/LogSinkTests.java @@ -43,7 +43,7 @@ public class LogSinkTests { @Test public void testSourceFromSupplier(CapturedOutput output) { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( - TestChannelBinderConfiguration.getCompleteConfiguration(LogSinkConfiguration.class)) + TestChannelBinderConfiguration.getCompleteConfiguration(LogSinkTestConfiguration.class)) .web(WebApplicationType.NONE) .run("--spring.cloud.function.definition=byteArrayTextToString|logConsumer")) { @@ -55,6 +55,6 @@ public class LogSinkTests { @EnableAutoConfiguration @Import(LogConsumerConfiguration.class) - public static class LogSinkConfiguration { + public static class LogSinkTestConfiguration { } } diff --git a/applications/sink/rabbit-sink/src/test/java/org/springframework/cloud/stream/app/sink/rabbit/RabbitSinkIntegrationTests.java b/applications/sink/rabbit-sink/src/test/java/org/springframework/cloud/stream/app/sink/rabbit/RabbitSinkIntegrationTests.java index e259c22b..181526e2 100644 --- a/applications/sink/rabbit-sink/src/test/java/org/springframework/cloud/stream/app/sink/rabbit/RabbitSinkIntegrationTests.java +++ b/applications/sink/rabbit-sink/src/test/java/org/springframework/cloud/stream/app/sink/rabbit/RabbitSinkIntegrationTests.java @@ -94,6 +94,6 @@ abstract class RabbitSinkIntegrationTests { @SpringBootApplication @Import({RabbitConsumerConfiguration.class}) - public static class RabbitSinkConfiguration { + public static class RabbitSinkTestConfiguration { } } diff --git a/applications/sink/redis-sink/src/test/java/org/springframework/cloud/stream/app/sink/redis/RedisSinkTests.java b/applications/sink/redis-sink/src/test/java/org/springframework/cloud/stream/app/sink/redis/RedisSinkTests.java index b5369a7e..6109685c 100644 --- a/applications/sink/redis-sink/src/test/java/org/springframework/cloud/stream/app/sink/redis/RedisSinkTests.java +++ b/applications/sink/redis-sink/src/test/java/org/springframework/cloud/stream/app/sink/redis/RedisSinkTests.java @@ -46,7 +46,7 @@ public class RedisSinkTests { public void testRedisSink() throws Exception { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration - .getCompleteConfiguration(RedisSinkConfiguration.class)) + .getCompleteConfiguration(RedisSinkTestConfiguration.class)) .web(WebApplicationType.NONE) .run("--spring.cloud.function.definition=redisConsumer", "--redis.consumer.key=foo")) { @@ -78,6 +78,6 @@ public class RedisSinkTests { @EnableAutoConfiguration @Import(RedisConsumerConfiguration.class) - public static class RedisSinkConfiguration { + public static class RedisSinkTestConfiguration { } } diff --git a/applications/source/file-source/src/test/java/org/springframework/cloud/stream/app/source/file/FileSourceTests.java b/applications/source/file-source/src/test/java/org/springframework/cloud/stream/app/source/file/FileSourceTests.java index 6a7fe9dd..1afde145 100644 --- a/applications/source/file-source/src/test/java/org/springframework/cloud/stream/app/source/file/FileSourceTests.java +++ b/applications/source/file-source/src/test/java/org/springframework/cloud/stream/app/source/file/FileSourceTests.java @@ -46,7 +46,7 @@ public class FileSourceTests { public void testFileSource() throws Exception { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration - .getCompleteConfiguration(FileSourceConfiguration.class)) + .getCompleteConfiguration(FileSourceTestConfiguration.class)) .web(WebApplicationType.NONE) .run("--spring.cloud.function.definition=fileSupplier", "--file.supplier.directory=" + tempDir.toAbsolutePath().toString())) { @@ -62,6 +62,6 @@ public class FileSourceTests { @EnableAutoConfiguration @Import(FileSupplierConfiguration.class) - public static class FileSourceConfiguration { + public static class FileSourceTestConfiguration { } } diff --git a/applications/source/http-source/src/test/java/org/springframework/cloud/stream/app/source/http/HttpSourceTests.java b/applications/source/http-source/src/test/java/org/springframework/cloud/stream/app/source/http/HttpSourceTests.java index 0dda8fde..31b477e7 100644 --- a/applications/source/http-source/src/test/java/org/springframework/cloud/stream/app/source/http/HttpSourceTests.java +++ b/applications/source/http-source/src/test/java/org/springframework/cloud/stream/app/source/http/HttpSourceTests.java @@ -53,6 +53,6 @@ public class HttpSourceTests { @SpringBootApplication @Import({HttpSupplierConfiguration.class, TestChannelBinderConfiguration.class, BindingServiceConfiguration.class}) - public static class HttpSourceConfiguration { + public static class HttpSourceTestConfiguration { } } diff --git a/applications/source/jdbc-source/src/test/java/org/springframework/cloud/stream/app/source/jdbc/JdbcSourceIntegrationTests.java b/applications/source/jdbc-source/src/test/java/org/springframework/cloud/stream/app/source/jdbc/JdbcSourceIntegrationTests.java index f12fb7cc..fd2f4ede 100644 --- a/applications/source/jdbc-source/src/test/java/org/springframework/cloud/stream/app/source/jdbc/JdbcSourceIntegrationTests.java +++ b/applications/source/jdbc-source/src/test/java/org/springframework/cloud/stream/app/source/jdbc/JdbcSourceIntegrationTests.java @@ -52,7 +52,7 @@ public class JdbcSourceIntegrationTests { @SpringBootApplication @Import(JdbcSupplierConfiguration.class) - public static class JdbcSourceConfiguration { + public static class JdbcSourceTestConfiguration { } } diff --git a/applications/source/time-source/src/test/java/org/springframework/cloud/stream/app/source/time/TimeSourceTests.java b/applications/source/time-source/src/test/java/org/springframework/cloud/stream/app/source/time/TimeSourceTests.java index c80a256e..85a2dd32 100644 --- a/applications/source/time-source/src/test/java/org/springframework/cloud/stream/app/source/time/TimeSourceTests.java +++ b/applications/source/time-source/src/test/java/org/springframework/cloud/stream/app/source/time/TimeSourceTests.java @@ -44,7 +44,7 @@ public class TimeSourceTests { public void testSourceFromSupplier() { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration - .getCompleteConfiguration(TimeSourceConfiguration.class)) + .getCompleteConfiguration(TimeSourceTestConfiguration.class)) .web(WebApplicationType.NONE) .run("--spring.cloud.function.definition=timeSupplier")) { @@ -63,6 +63,6 @@ public class TimeSourceTests { @EnableAutoConfiguration @Import(TimeSupplierConfiguration.class) - public static class TimeSourceConfiguration { + public static class TimeSourceTestConfiguration { } } diff --git a/functions/function/header-enricher-function/src/test/java/org/springframework/cloud/fn/header/enricher/HeaderEnricherFunctionApplicationTests.java b/functions/function/header-enricher-function/src/test/java/org/springframework/cloud/fn/header/enricher/HeaderEnricherFunctionApplicationTests.java index ab11df7e..e7734c85 100644 --- a/functions/function/header-enricher-function/src/test/java/org/springframework/cloud/fn/header/enricher/HeaderEnricherFunctionApplicationTests.java +++ b/functions/function/header-enricher-function/src/test/java/org/springframework/cloud/fn/header/enricher/HeaderEnricherFunctionApplicationTests.java @@ -59,7 +59,7 @@ public class HeaderEnricherFunctionApplicationTests { } @SpringBootApplication - static class HeaderEnricherTestApplication { + static class TestApplication { @Bean public String value() {