From 5073188c4c68e42b9776aeae94c940e4c5edc9e5 Mon Sep 17 00:00:00 2001 From: Soby Chacko Date: Fri, 15 May 2020 16:32:19 -0400 Subject: [PATCH] Cleaning test classes --- .../processor/bridge/BridgeProcessorTests.java | 8 ++++---- .../processor/filter/FilterProcessorTests.java | 8 ++++---- .../groovy/GroovyProcessorIntegrationTests.java | 10 +++++----- .../enricher/HeaderEnricherProcessorTests.java | 8 ++++---- .../splitter/SplitterProcessorTests.java | 8 ++++---- .../transform/TransformProcessorTests.java | 8 ++++---- .../stream/app/sink/counter/CounterSinkTests.java | 15 +++++---------- .../cloud/stream/app/file/sink/FileSinkTests.java | 8 ++++---- .../cloud/stream/app/sink/jdbc/JdbcSinkTests.java | 8 ++++---- .../cloud/stream/app/sink/log/LogSinkTests.java | 8 ++++---- .../stream/app/sink/rabbit/OwnConnectionTest.java | 6 ------ .../sink/rabbit/RabbitSinkIntegrationTests.java | 7 ++++++- .../sink/rabbit/RabbitSinkInvalidConfigTests.java | 1 - .../stream/app/sink/redis/RedisSinkTests.java | 8 ++++---- .../stream/app/source/file/FileSourceTests.java | 8 ++++---- .../stream/app/source/http/HttpSourceTests.java | 3 ++- .../source/jdbc/JdbcSourceIntegrationTests.java | 2 +- .../stream/app/source/time/TimeSourceTests.java | 8 ++++---- .../cassandra/CassandraEntityInsertTests.java | 2 +- 19 files changed, 64 insertions(+), 70 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 bc0a5b7a..d0f1c9c2 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 @@ -21,7 +21,7 @@ import java.nio.charset.StandardCharsets; import org.junit.jupiter.api.Test; import org.springframework.boot.WebApplicationType; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.cloud.stream.binder.test.InputDestination; import org.springframework.cloud.stream.binder.test.OutputDestination; @@ -41,7 +41,7 @@ public class BridgeProcessorTests { @Test public void testFilterProcessor() { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( - TestChannelBinderConfiguration.getCompleteConfiguration(BridgeProcessorTestConfiguration.class)) + TestChannelBinderConfiguration.getCompleteConfiguration(BridgeProcessorTestApplication.class)) .web(WebApplicationType.NONE) .run()) { @@ -55,8 +55,8 @@ public class BridgeProcessorTests { } } - @EnableAutoConfiguration + @SpringBootApplication @Import({BridgeProcessorConfiguration.class}) - public static class BridgeProcessorTestConfiguration { + public static class BridgeProcessorTestApplication { } } 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 7de7c629..1e3707a9 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 @@ -21,7 +21,7 @@ import java.nio.charset.StandardCharsets; import org.junit.jupiter.api.Test; import org.springframework.boot.WebApplicationType; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.cloud.fn.filter.FilterFunctionConfiguration; import org.springframework.cloud.stream.binder.test.InputDestination; @@ -42,7 +42,7 @@ public class FilterProcessorTests { @Test public void testFilterProcessor() { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( - TestChannelBinderConfiguration.getCompleteConfiguration(FilterProcessorTestConfiguration.class)) + TestChannelBinderConfiguration.getCompleteConfiguration(FilterProcessorTestApplication.class)) .web(WebApplicationType.NONE) .run("--spring.cloud.function.definition=byteArrayTextToString|filterFunction", "--spel.function.expression=payload.length() > 5")) { @@ -62,9 +62,9 @@ public class FilterProcessorTests { } } - @EnableAutoConfiguration + @SpringBootApplication @Import({FilterFunctionConfiguration.class}) - public static class FilterProcessorTestConfiguration { + public static class FilterProcessorTestApplication { } } 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 b55e6360..2e638372 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 @@ -21,7 +21,7 @@ import java.nio.charset.StandardCharsets; import org.junit.jupiter.api.Test; import org.springframework.boot.WebApplicationType; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.cloud.stream.binder.test.InputDestination; import org.springframework.cloud.stream.binder.test.OutputDestination; @@ -38,7 +38,7 @@ public class GroovyProcessorIntegrationTests { @Test public void testGroovyProcessorWithScript() { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( - TestChannelBinderConfiguration.getCompleteConfiguration(GroovyProcessorTestConfiguration.class)) + TestChannelBinderConfiguration.getCompleteConfiguration(GroovyProcessorTestApplication.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(GroovyProcessorTestConfiguration.class)) + TestChannelBinderConfiguration.getCompleteConfiguration(GroovyProcessorTestApplication.class)) .web(WebApplicationType.NONE) .run("--spring.cloud.function.definition=byteArrayTextToString|groovyProcessorFunction", "--groovy-processor.script=script-with-grab.groovy")) { @@ -73,8 +73,8 @@ public class GroovyProcessorIntegrationTests { } - @EnableAutoConfiguration + @SpringBootApplication @Import({GroovyProcessorConfiguration.class}) - public static class GroovyProcessorTestConfiguration { + public static class GroovyProcessorTestApplication { } } 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 6df3578e..00f63507 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 @@ -20,7 +20,7 @@ import org.hamcrest.MatcherAssert; import org.junit.jupiter.api.Test; import org.springframework.boot.WebApplicationType; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.cloud.fn.header.enricher.HeaderEnricherFunctionConfiguration; import org.springframework.cloud.stream.binder.test.InputDestination; @@ -44,7 +44,7 @@ public class HeaderEnricherProcessorTests { @Test public void testHeaderEnricherProcessor() { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( - TestChannelBinderConfiguration.getCompleteConfiguration(HeaderEnricherProcessorTestConfiguration.class)) + TestChannelBinderConfiguration.getCompleteConfiguration(HeaderEnricherProcessorTestApplication.class)) .web(WebApplicationType.NONE) .run("--spring.cloud.function.definition=headerEnricherFunction", "--header.enricher.headers=foo='bar' \n baz='fiz' \n buz=payload \n jaz=@value", @@ -65,9 +65,9 @@ public class HeaderEnricherProcessorTests { } } - @EnableAutoConfiguration + @SpringBootApplication @Import({HeaderEnricherFunctionConfiguration.class}) - public static class HeaderEnricherProcessorTestConfiguration { + public static class HeaderEnricherProcessorTestApplication { @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 43d79cd8..c1c61d00 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 @@ -21,7 +21,7 @@ import java.nio.charset.StandardCharsets; import org.junit.jupiter.api.Test; import org.springframework.boot.WebApplicationType; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.cloud.fn.splitter.SplitterFunctionConfiguration; import org.springframework.cloud.stream.binder.test.InputDestination; @@ -39,7 +39,7 @@ public class SplitterProcessorTests { @Test public void testSplitterProcessor() { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( - TestChannelBinderConfiguration.getCompleteConfiguration(SplitterProcessorTestConfiguration.class)) + TestChannelBinderConfiguration.getCompleteConfiguration(SplitterProcessorTestApplication.class)) .web(WebApplicationType.NONE) .run("--spring.cloud.function.definition=byteArrayTextToString|splitterFunction", "--splitter.expression=payload.split(',')")) { @@ -58,8 +58,8 @@ public class SplitterProcessorTests { } } - @EnableAutoConfiguration + @SpringBootApplication @Import({SplitterFunctionConfiguration.class}) - public static class SplitterProcessorTestConfiguration { + public static class SplitterProcessorTestApplication { } } 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 2eea6838..1b3dd415 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 @@ -21,7 +21,7 @@ import java.nio.charset.StandardCharsets; import org.junit.jupiter.api.Test; import org.springframework.boot.WebApplicationType; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.cloud.fn.spel.SpelFunctionConfiguration; import org.springframework.cloud.stream.binder.test.InputDestination; @@ -39,7 +39,7 @@ public class TransformProcessorTests { @Test public void testTransformProcessor() { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( - TestChannelBinderConfiguration.getCompleteConfiguration(TransformProcessorTestConfiguration.class)) + TestChannelBinderConfiguration.getCompleteConfiguration(TransformProcessorTestApplication.class)) .web(WebApplicationType.NONE) .run("--spring.cloud.function.definition=byteArrayTextToString|spelFunction", "--spel.function.expression=payload.toUpperCase()")) { @@ -54,9 +54,9 @@ public class TransformProcessorTests { } } - @EnableAutoConfiguration + @SpringBootApplication @Import({SpelFunctionConfiguration.class}) - public static class TransformProcessorTestConfiguration { + public static class TransformProcessorTestApplication { } } 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 95f937ed..ab8973b2 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 @@ -21,13 +21,10 @@ import java.nio.charset.StandardCharsets; import io.micrometer.core.instrument.Counter; import io.micrometer.core.instrument.simple.SimpleMeterRegistry; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.boot.WebApplicationType; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.builder.SpringApplicationBuilder; -import org.springframework.boot.test.system.CapturedOutput; -import org.springframework.boot.test.system.OutputCaptureExtension; import org.springframework.cloud.fn.consumer.counter.CounterConsumerConfiguration; import org.springframework.cloud.stream.binder.test.InputDestination; import org.springframework.cloud.stream.binder.test.TestChannelBinderConfiguration; @@ -40,17 +37,15 @@ import static org.assertj.core.api.Assertions.assertThat; /** * @author Christian Tzolov */ -@ExtendWith(OutputCaptureExtension.class) public class CounterSinkTests { @Test - public void testCounterSink(CapturedOutput output) { + public void testCounterSink() { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( - TestChannelBinderConfiguration.getCompleteConfiguration(CounterSinkTestConfiguration.class)) + TestChannelBinderConfiguration.getCompleteConfiguration(CounterSinkTestApplication.class)) .web(WebApplicationType.NONE) .run("--spring.cloud.function.definition=byteArrayTextToString|counterConsumer", "--counter.name=counter666", - //"--counter.amount-expression=new String(payload).length()", "--counter.amount-expression=payload.length()", "--counter.tag.expression.foo='bar'")) { @@ -66,9 +61,9 @@ public class CounterSinkTests { } } - @EnableAutoConfiguration + @SpringBootApplication @Import({CounterConsumerConfiguration.class}) - public static class CounterSinkTestConfiguration { + public static class CounterSinkTestApplication { } } 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 2602e276..be987a97 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 @@ -24,7 +24,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; import org.springframework.boot.WebApplicationType; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.cloud.fn.consumer.file.FileConsumerConfiguration; import org.springframework.cloud.stream.binder.test.InputDestination; @@ -49,7 +49,7 @@ public class FileSinkTests { public void testFileSink() throws Exception { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration - .getCompleteConfiguration(FileSinkTestConfiguration.class)) + .getCompleteConfiguration(FileSinkTestApplication.class)) .web(WebApplicationType.NONE) .run("--spring.cloud.function.definition=fileConsumer", "--file.consumer.name=test", @@ -66,8 +66,8 @@ public class FileSinkTests { } } - @EnableAutoConfiguration + @SpringBootApplication @Import(FileConsumerConfiguration.class) - public static class FileSinkTestConfiguration { + public static class FileSinkTestApplication { } } 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 e681eb3f..70cbbd2b 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 @@ -19,7 +19,7 @@ package org.springframework.cloud.stream.app.sink.jdbc; import org.junit.jupiter.api.Test; import org.springframework.boot.WebApplicationType; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.cloud.fn.consumer.jdbc.JdbcConsumerConfiguration; import org.springframework.cloud.stream.binder.test.InputDestination; @@ -37,7 +37,7 @@ public class JdbcSinkTests { @Test public void testSimpleInserts() { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( - TestChannelBinderConfiguration.getCompleteConfiguration(JdbcSinkTestConfiguration.class)) + TestChannelBinderConfiguration.getCompleteConfiguration(JdbcSinkTestApplication.class)) .web(WebApplicationType.NONE) .run("--spring.cloud.function.definition=jdbcConsumer")) { @@ -52,9 +52,9 @@ public class JdbcSinkTests { } } - @EnableAutoConfiguration + @SpringBootApplication @Import(JdbcConsumerConfiguration.class) - public static class JdbcSinkTestConfiguration { + public static class JdbcSinkTestApplication { } 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 d70c4f6c..c50b98fc 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 @@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.boot.WebApplicationType; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.test.system.CapturedOutput; import org.springframework.boot.test.system.OutputCaptureExtension; @@ -43,7 +43,7 @@ public class LogSinkTests { @Test public void testSourceFromSupplier(CapturedOutput output) { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( - TestChannelBinderConfiguration.getCompleteConfiguration(LogSinkTestConfiguration.class)) + TestChannelBinderConfiguration.getCompleteConfiguration(LogSinkTestApplication.class)) .web(WebApplicationType.NONE) .run("--spring.cloud.function.definition=byteArrayTextToString|logConsumer")) { @@ -53,8 +53,8 @@ public class LogSinkTests { } } - @EnableAutoConfiguration + @SpringBootApplication @Import(LogConsumerConfiguration.class) - public static class LogSinkTestConfiguration { + public static class LogSinkTestApplication { } } diff --git a/applications/sink/rabbit-sink/src/test/java/org/springframework/cloud/stream/app/sink/rabbit/OwnConnectionTest.java b/applications/sink/rabbit-sink/src/test/java/org/springframework/cloud/stream/app/sink/rabbit/OwnConnectionTest.java index 87fbf028..d6680795 100644 --- a/applications/sink/rabbit-sink/src/test/java/org/springframework/cloud/stream/app/sink/rabbit/OwnConnectionTest.java +++ b/applications/sink/rabbit-sink/src/test/java/org/springframework/cloud/stream/app/sink/rabbit/OwnConnectionTest.java @@ -29,12 +29,6 @@ import static org.assertj.core.api.Assertions.assertThat; "rabbit.own-connection=true"}) public class OwnConnectionTest extends RabbitSinkIntegrationTests { - /** - * RabbitMQ - */ -// @ClassRule -// public static GenericContainer rabbitMq = new GenericContainer("rabbitmq:3.5.3") -// .withExposedPorts(5672); @Test public void test() { this.rabbitAdmin.declareQueue( 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 181526e2..4f9a2296 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 @@ -62,14 +62,19 @@ abstract class RabbitSinkIntegrationTests { @Qualifier("rabbitConsumer-in-0") @Autowired protected SubscribableChannel channels; + @Autowired protected RabbitConsumerProperties rabbitSinkProperties; + @Autowired protected RabbitTemplate rabbitTemplate; + @Autowired protected RabbitAdmin rabbitAdmin; + @Autowired(required = false) protected MessageConverter myConverter; + @Autowired protected CachingConnectionFactory bootFactory; @@ -94,6 +99,6 @@ abstract class RabbitSinkIntegrationTests { @SpringBootApplication @Import({RabbitConsumerConfiguration.class}) - public static class RabbitSinkTestConfiguration { + public static class RabbitSinkTestApplication { } } diff --git a/applications/sink/rabbit-sink/src/test/java/org/springframework/cloud/stream/app/sink/rabbit/RabbitSinkInvalidConfigTests.java b/applications/sink/rabbit-sink/src/test/java/org/springframework/cloud/stream/app/sink/rabbit/RabbitSinkInvalidConfigTests.java index a0c52026..d4ad34c4 100644 --- a/applications/sink/rabbit-sink/src/test/java/org/springframework/cloud/stream/app/sink/rabbit/RabbitSinkInvalidConfigTests.java +++ b/applications/sink/rabbit-sink/src/test/java/org/springframework/cloud/stream/app/sink/rabbit/RabbitSinkInvalidConfigTests.java @@ -65,5 +65,4 @@ public class RabbitSinkInvalidConfigTests { static class Config { } - } 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 6109685c..7477c188 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 @@ -22,7 +22,7 @@ import java.util.List; import org.junit.jupiter.api.Test; import org.springframework.boot.WebApplicationType; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.cloud.fn.consumer.redis.RedisConsumerConfiguration; import org.springframework.cloud.stream.binder.test.InputDestination; @@ -46,7 +46,7 @@ public class RedisSinkTests { public void testRedisSink() throws Exception { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration - .getCompleteConfiguration(RedisSinkTestConfiguration.class)) + .getCompleteConfiguration(RedisSinkTestApplication.class)) .web(WebApplicationType.NONE) .run("--spring.cloud.function.definition=redisConsumer", "--redis.consumer.key=foo")) { @@ -76,8 +76,8 @@ public class RedisSinkTests { } } - @EnableAutoConfiguration + @SpringBootApplication @Import(RedisConsumerConfiguration.class) - public static class RedisSinkTestConfiguration { + public static class RedisSinkTestApplication { } } 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 1afde145..f69dd466 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 @@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; import org.springframework.boot.WebApplicationType; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.cloud.fn.supplier.file.FileSupplierConfiguration; import org.springframework.cloud.stream.binder.test.OutputDestination; @@ -46,7 +46,7 @@ public class FileSourceTests { public void testFileSource() throws Exception { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration - .getCompleteConfiguration(FileSourceTestConfiguration.class)) + .getCompleteConfiguration(FileSourceTestApplication.class)) .web(WebApplicationType.NONE) .run("--spring.cloud.function.definition=fileSupplier", "--file.supplier.directory=" + tempDir.toAbsolutePath().toString())) { @@ -60,8 +60,8 @@ public class FileSourceTests { } } - @EnableAutoConfiguration + @SpringBootApplication @Import(FileSupplierConfiguration.class) - public static class FileSourceTestConfiguration { + public static class FileSourceTestApplication { } } 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 31b477e7..0e13c9f1 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 @@ -40,6 +40,7 @@ public class HttpSourceTests { @Autowired OutputDestination outputDestination; + @Autowired private TestRestTemplate testRestTemplate; @@ -53,6 +54,6 @@ public class HttpSourceTests { @SpringBootApplication @Import({HttpSupplierConfiguration.class, TestChannelBinderConfiguration.class, BindingServiceConfiguration.class}) - public static class HttpSourceTestConfiguration { + public static class HttpSourceTestApplication { } } 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 fd2f4ede..0cbbbe3a 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 JdbcSourceTestConfiguration { + public static class JdbcSourceTestApplication { } } 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 85a2dd32..79603791 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 @@ -22,7 +22,7 @@ import java.util.Date; import org.junit.jupiter.api.Test; import org.springframework.boot.WebApplicationType; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.cloud.fn.supplier.time.TimeProperties; import org.springframework.cloud.fn.supplier.time.TimeSupplierConfiguration; @@ -44,7 +44,7 @@ public class TimeSourceTests { public void testSourceFromSupplier() { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration - .getCompleteConfiguration(TimeSourceTestConfiguration.class)) + .getCompleteConfiguration(TimeSourceTestApplication.class)) .web(WebApplicationType.NONE) .run("--spring.cloud.function.definition=timeSupplier")) { @@ -61,8 +61,8 @@ public class TimeSourceTests { } } - @EnableAutoConfiguration + @SpringBootApplication @Import(TimeSupplierConfiguration.class) - public static class TimeSourceTestConfiguration { + public static class TimeSourceTestApplication { } } diff --git a/functions/consumer/cassandra-consumer/src/test/java/org/springframework/cloud/fn/consumer/cassandra/CassandraEntityInsertTests.java b/functions/consumer/cassandra-consumer/src/test/java/org/springframework/cloud/fn/consumer/cassandra/CassandraEntityInsertTests.java index 4159262a..7f7702f1 100644 --- a/functions/consumer/cassandra-consumer/src/test/java/org/springframework/cloud/fn/consumer/cassandra/CassandraEntityInsertTests.java +++ b/functions/consumer/cassandra-consumer/src/test/java/org/springframework/cloud/fn/consumer/cassandra/CassandraEntityInsertTests.java @@ -38,7 +38,7 @@ import static org.assertj.core.api.Assertions.assertThat; @DisabledOnOs(OS.WINDOWS) @TestPropertySource(properties = { "spring.data.cassandra.schema-action=RECREATE", - "cassandra.cluster.entity-base-packages=io.pivotal.java.function.cassandra.consumer.domain" }) + "cassandra.cluster.entity-base-packages=org.springframework.cloud.fn.consumer.cassandra.domain" }) class CassandraEntityInsertTests extends CassandraConsumerApplicationTests { @Test