diff --git a/functions/consumer/analytics-consumer/src/test/java/org/springframework/cloud/fn/consumer/analytics/AnalyticsConsumerParentTest.java b/functions/consumer/analytics-consumer/src/test/java/org/springframework/cloud/fn/consumer/analytics/AnalyticsConsumerParentTest.java index c1fab040..9473a821 100644 --- a/functions/consumer/analytics-consumer/src/test/java/org/springframework/cloud/fn/consumer/analytics/AnalyticsConsumerParentTest.java +++ b/functions/consumer/analytics-consumer/src/test/java/org/springframework/cloud/fn/consumer/analytics/AnalyticsConsumerParentTest.java @@ -43,6 +43,6 @@ public class AnalyticsConsumerParentTest { } @SpringBootApplication - static class TestApplication { + static class AnalyticsConsumerTestApplication { } } diff --git a/functions/consumer/cassandra-consumer/src/test/java/org/springframework/cloud/fn/consumer/cassandra/CassandraConsumerApplicationTests.java b/functions/consumer/cassandra-consumer/src/test/java/org/springframework/cloud/fn/consumer/cassandra/CassandraConsumerApplicationTests.java index c140bbd5..14a4f7e1 100644 --- a/functions/consumer/cassandra-consumer/src/test/java/org/springframework/cloud/fn/consumer/cassandra/CassandraConsumerApplicationTests.java +++ b/functions/consumer/cassandra-consumer/src/test/java/org/springframework/cloud/fn/consumer/cassandra/CassandraConsumerApplicationTests.java @@ -98,7 +98,7 @@ abstract class CassandraConsumerApplicationTests { } @SpringBootApplication - static class TestApplication { + static class CassandraConsumerTestApplication { } diff --git a/functions/consumer/file-consumer/src/test/java/org/springframework/cloud/fn/consumer/file/AbstractFileConsumerTests.java b/functions/consumer/file-consumer/src/test/java/org/springframework/cloud/fn/consumer/file/AbstractFileConsumerTests.java index 5a97e081..0a26929d 100644 --- a/functions/consumer/file-consumer/src/test/java/org/springframework/cloud/fn/consumer/file/AbstractFileConsumerTests.java +++ b/functions/consumer/file-consumer/src/test/java/org/springframework/cloud/fn/consumer/file/AbstractFileConsumerTests.java @@ -53,6 +53,6 @@ public class AbstractFileConsumerTests { } @SpringBootApplication - static class TestApplication { + static class FileConsumerTestApplication { } } diff --git a/functions/consumer/ftp-consumer/src/test/java/org/springframework/cloud/fn/consumer/ftp/FtpConsumerTests.java b/functions/consumer/ftp-consumer/src/test/java/org/springframework/cloud/fn/consumer/ftp/FtpConsumerTests.java index b2888656..e7815d31 100644 --- a/functions/consumer/ftp-consumer/src/test/java/org/springframework/cloud/fn/consumer/ftp/FtpConsumerTests.java +++ b/functions/consumer/ftp-consumer/src/test/java/org/springframework/cloud/fn/consumer/ftp/FtpConsumerTests.java @@ -71,6 +71,6 @@ public class FtpConsumerTests extends FtpTestSupport { } @SpringBootApplication - static class TestApplication { + static class FtpConsumerTestApplication { } } diff --git a/functions/consumer/jdbc-consumer/src/test/java/org/springframework/cloud/fn/consumer/jdbc/JdbcConsumerApplicationTests.java b/functions/consumer/jdbc-consumer/src/test/java/org/springframework/cloud/fn/consumer/jdbc/JdbcConsumerApplicationTests.java index fe88a485..c069ca3b 100644 --- a/functions/consumer/jdbc-consumer/src/test/java/org/springframework/cloud/fn/consumer/jdbc/JdbcConsumerApplicationTests.java +++ b/functions/consumer/jdbc-consumer/src/test/java/org/springframework/cloud/fn/consumer/jdbc/JdbcConsumerApplicationTests.java @@ -87,7 +87,7 @@ public class JdbcConsumerApplicationTests { } @SpringBootApplication - static class TestApplication { + static class JdbcConsumerTestApplication { } } diff --git a/functions/consumer/log-consumer/src/test/java/org/springframework/cloud/fn/consumer/log/LogConsumerApplicationTests.java b/functions/consumer/log-consumer/src/test/java/org/springframework/cloud/fn/consumer/log/LogConsumerApplicationTests.java index 08e555ec..997dbae5 100644 --- a/functions/consumer/log-consumer/src/test/java/org/springframework/cloud/fn/consumer/log/LogConsumerApplicationTests.java +++ b/functions/consumer/log-consumer/src/test/java/org/springframework/cloud/fn/consumer/log/LogConsumerApplicationTests.java @@ -87,6 +87,6 @@ class LogConsumerApplicationTests { } @SpringBootApplication - static class TestApplication { + static class LogConsumerTestApplication { } } diff --git a/functions/consumer/mongodb-consumer/src/test/java/org/springframework/cloud/fn/consumer/mongo/MongoDbConsumerApplicationTests.java b/functions/consumer/mongodb-consumer/src/test/java/org/springframework/cloud/fn/consumer/mongo/MongoDbConsumerApplicationTests.java index 260aabad..3a761af7 100644 --- a/functions/consumer/mongodb-consumer/src/test/java/org/springframework/cloud/fn/consumer/mongo/MongoDbConsumerApplicationTests.java +++ b/functions/consumer/mongodb-consumer/src/test/java/org/springframework/cloud/fn/consumer/mongo/MongoDbConsumerApplicationTests.java @@ -87,6 +87,6 @@ class MongoDbConsumerApplicationTests { } @SpringBootApplication - static class TestApplication { + static class MongoDbConsumerTestApplication { } } diff --git a/functions/consumer/mqtt-consumer/src/test/java/org/springframework/cloud/fn/consumer/mqtt/MqttConsumerTests.java b/functions/consumer/mqtt-consumer/src/test/java/org/springframework/cloud/fn/consumer/mqtt/MqttConsumerTests.java index cb4f140f..b610b7d1 100644 --- a/functions/consumer/mqtt-consumer/src/test/java/org/springframework/cloud/fn/consumer/mqtt/MqttConsumerTests.java +++ b/functions/consumer/mqtt-consumer/src/test/java/org/springframework/cloud/fn/consumer/mqtt/MqttConsumerTests.java @@ -69,7 +69,7 @@ public class MqttConsumerTests { } @SpringBootApplication - static class TestApplication { + static class MqttConsumerTestApplication { @Autowired private MqttPahoClientFactory mqttClientFactory; diff --git a/functions/consumer/redis-consumer/src/test/java/org/springframework/cloud/fn/consumer/redis/AbstractRedisConsumerTests.java b/functions/consumer/redis-consumer/src/test/java/org/springframework/cloud/fn/consumer/redis/AbstractRedisConsumerTests.java index 2b0a6cb0..a49439e2 100644 --- a/functions/consumer/redis-consumer/src/test/java/org/springframework/cloud/fn/consumer/redis/AbstractRedisConsumerTests.java +++ b/functions/consumer/redis-consumer/src/test/java/org/springframework/cloud/fn/consumer/redis/AbstractRedisConsumerTests.java @@ -43,7 +43,7 @@ public class AbstractRedisConsumerTests { StringRedisTemplate redisTemplate; @SpringBootApplication - static class TestApplication { + static class RedisConsumerTestApplication { } } diff --git a/functions/consumer/s3-consumer/src/test/java/org/springframework/cloud/fn/consumer/s3/AbstractAwsS3ConsumerMockTests.java b/functions/consumer/s3-consumer/src/test/java/org/springframework/cloud/fn/consumer/s3/AbstractAwsS3ConsumerMockTests.java index a67cb616..b757f8e7 100644 --- a/functions/consumer/s3-consumer/src/test/java/org/springframework/cloud/fn/consumer/s3/AbstractAwsS3ConsumerMockTests.java +++ b/functions/consumer/s3-consumer/src/test/java/org/springframework/cloud/fn/consumer/s3/AbstractAwsS3ConsumerMockTests.java @@ -103,7 +103,7 @@ public abstract class AbstractAwsS3ConsumerMockTests { } @SpringBootApplication - public static class S3ConsumerApplication { + public static class S3ConsumerTestApplication { @Bean public CountDownLatch aclLatch() { diff --git a/functions/consumer/sftp-consumer/src/test/java/org/springframework/cloud/fn/consumer/sftp/SftpConsumerTests.java b/functions/consumer/sftp-consumer/src/test/java/org/springframework/cloud/fn/consumer/sftp/SftpConsumerTests.java index cc9e16e3..07225706 100644 --- a/functions/consumer/sftp-consumer/src/test/java/org/springframework/cloud/fn/consumer/sftp/SftpConsumerTests.java +++ b/functions/consumer/sftp-consumer/src/test/java/org/springframework/cloud/fn/consumer/sftp/SftpConsumerTests.java @@ -73,7 +73,7 @@ public class SftpConsumerTests extends SftpTestSupport { } @SpringBootApplication - static class TestApplication { + static class SftpConsumerTestApplication { } } diff --git a/functions/function/filter-function/src/test/java/org/springframework/cloud/fn/filter/FilterFunctionApplicationTests.java b/functions/function/filter-function/src/test/java/org/springframework/cloud/fn/filter/FilterFunctionApplicationTests.java index 88f26c30..f17469f6 100644 --- a/functions/function/filter-function/src/test/java/org/springframework/cloud/fn/filter/FilterFunctionApplicationTests.java +++ b/functions/function/filter-function/src/test/java/org/springframework/cloud/fn/filter/FilterFunctionApplicationTests.java @@ -49,6 +49,6 @@ public class FilterFunctionApplicationTests { } @SpringBootApplication - static class TestApplication { + static class FilterFunctionTestApplication { } } 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 e7734c85..bf81d8ec 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 TestApplication { + static class HeaderEnricherFunctionTestApplication { @Bean public String value() { diff --git a/functions/function/http-request-function/src/test/java/org/springframework/cloud/fn/http/request/HttpRequestFunctionApplicationTests.java b/functions/function/http-request-function/src/test/java/org/springframework/cloud/fn/http/request/HttpRequestFunctionTestApplicationTests.java similarity index 97% rename from functions/function/http-request-function/src/test/java/org/springframework/cloud/fn/http/request/HttpRequestFunctionApplicationTests.java rename to functions/function/http-request-function/src/test/java/org/springframework/cloud/fn/http/request/HttpRequestFunctionTestApplicationTests.java index 4dae06db..bd7a01dd 100644 --- a/functions/function/http-request-function/src/test/java/org/springframework/cloud/fn/http/request/HttpRequestFunctionApplicationTests.java +++ b/functions/function/http-request-function/src/test/java/org/springframework/cloud/fn/http/request/HttpRequestFunctionTestApplicationTests.java @@ -44,7 +44,7 @@ import org.springframework.messaging.support.MessageBuilder; import static org.assertj.core.api.Assertions.assertThat; -public class HttpRequestFunctionApplicationTests { +public class HttpRequestFunctionTestApplicationTests { private MockWebServer server; private ApplicationContextRunner runner; @@ -53,7 +53,7 @@ public class HttpRequestFunctionApplicationTests { void setup() { this.server = new MockWebServer(); this.runner = new ApplicationContextRunner() - .withUserConfiguration(HttpRequestFunctionApplication.class) + .withUserConfiguration(HttpRequestFunctionTestApplication.class) .withPropertyValues( "http.request.url=" + url()); } @@ -193,6 +193,6 @@ public class HttpRequestFunctionApplicationTests { } @SpringBootApplication - static class HttpRequestFunctionApplication { + static class HttpRequestFunctionTestApplication { } } diff --git a/functions/function/spel-function/src/test/java/org/springframework/cloud/fn/spel/SpelFunctionApplicationTests.java b/functions/function/spel-function/src/test/java/org/springframework/cloud/fn/spel/SpelFunctionApplicationTests.java index b3a66186..e3e00851 100644 --- a/functions/function/spel-function/src/test/java/org/springframework/cloud/fn/spel/SpelFunctionApplicationTests.java +++ b/functions/function/spel-function/src/test/java/org/springframework/cloud/fn/spel/SpelFunctionApplicationTests.java @@ -54,7 +54,7 @@ public class SpelFunctionApplicationTests { } @SpringBootApplication - static class TestApplication { + static class SpelFunctionTestApplication { } } diff --git a/functions/function/splitter-function/src/test/java/org/springframework/cloud/fn/splitter/SplitterFunctionApplicationTests.java b/functions/function/splitter-function/src/test/java/org/springframework/cloud/fn/splitter/SplitterFunctionApplicationTests.java index 42a9d0d1..5c3a1baf 100644 --- a/functions/function/splitter-function/src/test/java/org/springframework/cloud/fn/splitter/SplitterFunctionApplicationTests.java +++ b/functions/function/splitter-function/src/test/java/org/springframework/cloud/fn/splitter/SplitterFunctionApplicationTests.java @@ -44,6 +44,6 @@ public class SplitterFunctionApplicationTests { } @SpringBootApplication - static class TestApplication { + static class SplitterFunctionTestApplication { } } diff --git a/functions/function/task-launch-request-function/src/test/java/org/springframework/cloud/fn/task/launch/request/TaskLaunchRequestFunctionApplicationTests.java b/functions/function/task-launch-request-function/src/test/java/org/springframework/cloud/fn/task/launch/request/TaskLaunchRequestFunctionApplicationTests.java index ddd8bfca..e1098b5e 100644 --- a/functions/function/task-launch-request-function/src/test/java/org/springframework/cloud/fn/task/launch/request/TaskLaunchRequestFunctionApplicationTests.java +++ b/functions/function/task-launch-request-function/src/test/java/org/springframework/cloud/fn/task/launch/request/TaskLaunchRequestFunctionApplicationTests.java @@ -44,7 +44,7 @@ public class TaskLaunchRequestFunctionApplicationTests { @BeforeEach public void setUp() { - springApplicationBuilder = new SpringApplicationBuilder(TestApplication.class) + springApplicationBuilder = new SpringApplicationBuilder(TaskLaunchRequestFunctionTestApplication.class) .web(WebApplicationType.NONE); } @@ -194,7 +194,7 @@ public class TaskLaunchRequestFunctionApplicationTests { } @SpringBootApplication - protected static class TestApplication { + protected static class TaskLaunchRequestFunctionTestApplication { @Bean @ConditionalOnProperty("customTaskNameExtractor") diff --git a/functions/function/tasklauncher-function/src/test/java/org/springframework/cloud/fn/tasklauncher/TaskLauncherFunctionApplicationTests.java b/functions/function/tasklauncher-function/src/test/java/org/springframework/cloud/fn/tasklauncher/TaskLauncherFunctionApplicationTests.java index 9010dc99..1fe763f8 100644 --- a/functions/function/tasklauncher-function/src/test/java/org/springframework/cloud/fn/tasklauncher/TaskLauncherFunctionApplicationTests.java +++ b/functions/function/tasklauncher-function/src/test/java/org/springframework/cloud/fn/tasklauncher/TaskLauncherFunctionApplicationTests.java @@ -146,6 +146,6 @@ public class TaskLauncherFunctionApplicationTests { } @SpringBootApplication - static class TestApplication { + static class TaskLauncherFunctionTestApplication { } } diff --git a/functions/function/twitter-function/src/test/java/org/springframework/cloud/fn/twitter/geo/TwitterGeoFunctionTest.java b/functions/function/twitter-function/src/test/java/org/springframework/cloud/fn/twitter/geo/TwitterGeoFunctionTest.java index e2d8721f..5884b03c 100644 --- a/functions/function/twitter-function/src/test/java/org/springframework/cloud/fn/twitter/geo/TwitterGeoFunctionTest.java +++ b/functions/function/twitter-function/src/test/java/org/springframework/cloud/fn/twitter/geo/TwitterGeoFunctionTest.java @@ -262,7 +262,7 @@ public abstract class TwitterGeoFunctionTest { @SpringBootConfiguration @EnableAutoConfiguration @Import(TwitterGeoFunctionConfiguration.class) - public static class TestTwitterGeoProcessorApplication { + public static class TwitterGeoFunctionTestApplication { @Bean @Primary public twitter4j.conf.Configuration twitterConfiguration2(TwitterConnectionProperties properties, diff --git a/functions/function/twitter-function/src/test/java/org/springframework/cloud/fn/twitter/trend/TwitterTrendFunctionTests.java b/functions/function/twitter-function/src/test/java/org/springframework/cloud/fn/twitter/trend/TwitterTrendFunctionTests.java index 246be793..5e9d4e24 100644 --- a/functions/function/twitter-function/src/test/java/org/springframework/cloud/fn/twitter/trend/TwitterTrendFunctionTests.java +++ b/functions/function/twitter-function/src/test/java/org/springframework/cloud/fn/twitter/trend/TwitterTrendFunctionTests.java @@ -122,7 +122,7 @@ public abstract class TwitterTrendFunctionTests { @SpringBootConfiguration @EnableAutoConfiguration @Import(TwitterTrendFunctionConfiguration.class) - public static class TestTwitterTrendFunctionApplication { + public static class TwitterTrendFunctionTestApplication { @Bean @Primary public twitter4j.conf.Configuration twitterConfiguration2(TwitterConnectionProperties properties, diff --git a/functions/function/twitter-function/src/test/java/org/springframework/cloud/fn/twitter/users/TwitterUsersFunctionTests.java b/functions/function/twitter-function/src/test/java/org/springframework/cloud/fn/twitter/users/TwitterUsersFunctionTests.java index 6841020b..75607e65 100644 --- a/functions/function/twitter-function/src/test/java/org/springframework/cloud/fn/twitter/users/TwitterUsersFunctionTests.java +++ b/functions/function/twitter-function/src/test/java/org/springframework/cloud/fn/twitter/users/TwitterUsersFunctionTests.java @@ -187,7 +187,7 @@ public abstract class TwitterUsersFunctionTests { @SpringBootConfiguration @EnableAutoConfiguration @Import(TwitterUsersFunctionConfiguration.class) - static class TestTwitterUsersApplication { + static class TwitterUsersFunctionTestApplication { @Bean @Primary public twitter4j.conf.Configuration twitterConfiguration2(TwitterConnectionProperties properties, diff --git a/functions/supplier/file-supplier/src/test/java/org/springframework/cloud/fn/supplier/file/AbstractFileSupplierTests.java b/functions/supplier/file-supplier/src/test/java/org/springframework/cloud/fn/supplier/file/AbstractFileSupplierTests.java index fd048d62..e128b678 100644 --- a/functions/supplier/file-supplier/src/test/java/org/springframework/cloud/fn/supplier/file/AbstractFileSupplierTests.java +++ b/functions/supplier/file-supplier/src/test/java/org/springframework/cloud/fn/supplier/file/AbstractFileSupplierTests.java @@ -56,6 +56,6 @@ public class AbstractFileSupplierTests { } @SpringBootApplication - static class TestApplication { + static class FileSupplierTestApplication { } } diff --git a/functions/supplier/ftp-supplier/src/test/java/org/springframework/cloud/fn/supplier/ftp/FtpSupplierTests.java b/functions/supplier/ftp-supplier/src/test/java/org/springframework/cloud/fn/supplier/ftp/FtpSupplierTests.java index 6fbcfe16..4fd2c480 100644 --- a/functions/supplier/ftp-supplier/src/test/java/org/springframework/cloud/fn/supplier/ftp/FtpSupplierTests.java +++ b/functions/supplier/ftp-supplier/src/test/java/org/springframework/cloud/fn/supplier/ftp/FtpSupplierTests.java @@ -82,7 +82,7 @@ public class FtpSupplierTests extends FtpTestSupport { } @SpringBootApplication - static class TestApplication { + static class FtpSupplierTestApplication { // These properties can be moved into the SpringBootApplication annotation, but providing here // as a way to demonstrate how we can provide ConfigurationProperties as a bean in the application itself diff --git a/functions/supplier/http-supplier/src/test/java/org/springframework/cloud/fn/supplier/http/HttpSupplierApplicationTests.java b/functions/supplier/http-supplier/src/test/java/org/springframework/cloud/fn/supplier/http/HttpSupplierApplicationTests.java index 37f0bdce..374735a3 100644 --- a/functions/supplier/http-supplier/src/test/java/org/springframework/cloud/fn/supplier/http/HttpSupplierApplicationTests.java +++ b/functions/supplier/http-supplier/src/test/java/org/springframework/cloud/fn/supplier/http/HttpSupplierApplicationTests.java @@ -133,7 +133,7 @@ public class HttpSupplierApplicationTests { } @SpringBootApplication - static class TestApplication { + static class HttpSupplierTestApplication { } } diff --git a/functions/supplier/jdbc-supplier/src/test/java/org/springframework/cloud/fn/supplier/jdbc/DefaultJdbcSupplierTests.java b/functions/supplier/jdbc-supplier/src/test/java/org/springframework/cloud/fn/supplier/jdbc/DefaultJdbcSupplierTests.java index f3cd2dcc..a5f5cd01 100644 --- a/functions/supplier/jdbc-supplier/src/test/java/org/springframework/cloud/fn/supplier/jdbc/DefaultJdbcSupplierTests.java +++ b/functions/supplier/jdbc-supplier/src/test/java/org/springframework/cloud/fn/supplier/jdbc/DefaultJdbcSupplierTests.java @@ -77,6 +77,6 @@ public class DefaultJdbcSupplierTests { } @SpringBootApplication - static class TestApplication { + static class JdbcSupplierTestApplication { } } diff --git a/functions/supplier/jdbc-supplier/src/test/java/org/springframework/cloud/fn/supplier/jdbc/NonSplitJdbcSupplierTests.java b/functions/supplier/jdbc-supplier/src/test/java/org/springframework/cloud/fn/supplier/jdbc/NonSplitJdbcSupplierTests.java index 0a24fab3..eb6f550f 100644 --- a/functions/supplier/jdbc-supplier/src/test/java/org/springframework/cloud/fn/supplier/jdbc/NonSplitJdbcSupplierTests.java +++ b/functions/supplier/jdbc-supplier/src/test/java/org/springframework/cloud/fn/supplier/jdbc/NonSplitJdbcSupplierTests.java @@ -59,6 +59,6 @@ public class NonSplitJdbcSupplierTests { } @SpringBootApplication - static class TestApplication { + static class JdbcSupplierTestApplication { } } diff --git a/functions/supplier/mongodb-supplier/src/test/java/org/springframework/cloud/fn/supplier/mongo/MongodbSupplierApplicationTests.java b/functions/supplier/mongodb-supplier/src/test/java/org/springframework/cloud/fn/supplier/mongo/MongodbSupplierApplicationTests.java index 890d6f3c..c1d4fcc8 100644 --- a/functions/supplier/mongodb-supplier/src/test/java/org/springframework/cloud/fn/supplier/mongo/MongodbSupplierApplicationTests.java +++ b/functions/supplier/mongodb-supplier/src/test/java/org/springframework/cloud/fn/supplier/mongo/MongodbSupplierApplicationTests.java @@ -92,6 +92,6 @@ class MongodbSupplierApplicationTests { } @SpringBootApplication - static class TestApplication { + static class MongoDbSupplierTestApplication { } } diff --git a/functions/supplier/mqtt-supplier/src/test/java/org/springframework/cloud/fn/supplier/mqtt/MqttSupplierTests.java b/functions/supplier/mqtt-supplier/src/test/java/org/springframework/cloud/fn/supplier/mqtt/MqttSupplierTests.java index edf3bbda..819ab208 100644 --- a/functions/supplier/mqtt-supplier/src/test/java/org/springframework/cloud/fn/supplier/mqtt/MqttSupplierTests.java +++ b/functions/supplier/mqtt-supplier/src/test/java/org/springframework/cloud/fn/supplier/mqtt/MqttSupplierTests.java @@ -87,7 +87,7 @@ public class MqttSupplierTests { } @SpringBootApplication - static class TestApplication { + static class MqttSupplierTestApplication { @Autowired private MqttPahoClientFactory mqttClientFactory; diff --git a/functions/supplier/s3-supplier/src/test/java/org/springframework/cloud/fn/supplier/s3/AbstractAwsS3SupplierMockTests.java b/functions/supplier/s3-supplier/src/test/java/org/springframework/cloud/fn/supplier/s3/AbstractAwsS3SupplierMockTests.java index b62ef668..161c7a2e 100644 --- a/functions/supplier/s3-supplier/src/test/java/org/springframework/cloud/fn/supplier/s3/AbstractAwsS3SupplierMockTests.java +++ b/functions/supplier/s3-supplier/src/test/java/org/springframework/cloud/fn/supplier/s3/AbstractAwsS3SupplierMockTests.java @@ -119,7 +119,7 @@ public abstract class AbstractAwsS3SupplierMockTests { } @SpringBootApplication - public static class S3SupplierApplication { + public static class S3SupplierTestApplication { @Bean @Primary diff --git a/functions/supplier/sftp-supplier/src/test/java/org/springframework/cloud/fn/supplier/sftp/SftpSupplierApplicationTests.java b/functions/supplier/sftp-supplier/src/test/java/org/springframework/cloud/fn/supplier/sftp/SftpSupplierApplicationTests.java index c20f0b9f..4125d71e 100644 --- a/functions/supplier/sftp-supplier/src/test/java/org/springframework/cloud/fn/supplier/sftp/SftpSupplierApplicationTests.java +++ b/functions/supplier/sftp-supplier/src/test/java/org/springframework/cloud/fn/supplier/sftp/SftpSupplierApplicationTests.java @@ -53,7 +53,7 @@ public class SftpSupplierApplicationTests extends SftpTestSupport { @BeforeEach void setUpDefaultProperties() { defaultApplicationContextRunner = new ApplicationContextRunner() - .withUserConfiguration(TestApp.class) + .withUserConfiguration(SftpSupplierTestApplication.class) .withPropertyValues( "sftp.supplier.factory.host=localhost", "sftp.supplier.factory.port=${sftp.factory.port}", @@ -199,7 +199,7 @@ public class SftpSupplierApplicationTests extends SftpTestSupport { Paths.get(remoteTemporaryFolder.toString(), "sftpSecondSource", "doesNotMatter.txt"), "source3"); new ApplicationContextRunner() - .withUserConfiguration(TestApp.class) + .withUserConfiguration(SftpSupplierTestApplication.class) .withPropertyValues( "sftp.supplier.stream=true", "sftp.supplier.factories.one.host=localhost", @@ -247,7 +247,7 @@ public class SftpSupplierApplicationTests extends SftpTestSupport { Paths.get(remoteTemporaryFolder.toString(), "sftpSecondSource", "sftpSource3.txt"), "doesNotMatter"); new ApplicationContextRunner() - .withUserConfiguration(TestApp.class) + .withUserConfiguration(SftpSupplierTestApplication.class) .withPropertyValues( "file.consumer.mode = ref", "sftp.supplier.localDir=" + this.targetLocalDirectory.getAbsolutePath(), @@ -308,7 +308,7 @@ public class SftpSupplierApplicationTests extends SftpTestSupport { } @SpringBootApplication - static class TestApp { + static class SftpSupplierTestApplication { } } diff --git a/functions/supplier/tcp-supplier/src/test/java/org/springframework/cloud/fn/supplier/tcp/AbstractTcpSupplierTests.java b/functions/supplier/tcp-supplier/src/test/java/org/springframework/cloud/fn/supplier/tcp/AbstractTcpSupplierTests.java index 8597a46d..8f08d2ed 100644 --- a/functions/supplier/tcp-supplier/src/test/java/org/springframework/cloud/fn/supplier/tcp/AbstractTcpSupplierTests.java +++ b/functions/supplier/tcp-supplier/src/test/java/org/springframework/cloud/fn/supplier/tcp/AbstractTcpSupplierTests.java @@ -105,7 +105,7 @@ public class AbstractTcpSupplierTests { } @SpringBootApplication - public static class TcpConsumerTestApplication { + public static class TcpSupplierTestApplication { } } diff --git a/functions/supplier/time-supplier/src/test/java/org/springframework/cloud/fn/supplier/time/TimeSupplierApplicationTests.java b/functions/supplier/time-supplier/src/test/java/org/springframework/cloud/fn/supplier/time/TimeSupplierApplicationTests.java index a2e383d5..2812f492 100644 --- a/functions/supplier/time-supplier/src/test/java/org/springframework/cloud/fn/supplier/time/TimeSupplierApplicationTests.java +++ b/functions/supplier/time-supplier/src/test/java/org/springframework/cloud/fn/supplier/time/TimeSupplierApplicationTests.java @@ -38,6 +38,6 @@ public abstract class TimeSupplierApplicationTests { protected abstract void testTimeSupplier(); @SpringBootApplication - static class TestApplication { + static class TimeSupplierTestApplication { } } diff --git a/functions/supplier/twitter-supplier/src/test/java/org/springframework/cloud/fn/supplier/twitter/status/stream/TwitterStreamSupplierTests.java b/functions/supplier/twitter-supplier/src/test/java/org/springframework/cloud/fn/supplier/twitter/status/stream/TwitterStreamSupplierTests.java index 196d7dc4..8c4664d5 100644 --- a/functions/supplier/twitter-supplier/src/test/java/org/springframework/cloud/fn/supplier/twitter/status/stream/TwitterStreamSupplierTests.java +++ b/functions/supplier/twitter-supplier/src/test/java/org/springframework/cloud/fn/supplier/twitter/status/stream/TwitterStreamSupplierTests.java @@ -195,7 +195,7 @@ public abstract class TwitterStreamSupplierTests { @SpringBootConfiguration @EnableAutoConfiguration @Import(TwitterStreamSupplierConfiguration.class) - public static class TestTwitterStreamSourceApplication { + public static class TwitterStreamSupplierTestApplication { @Bean @Primary diff --git a/functions/supplier/websocket-supplier/src/test/java/org/springframework/cloud/fn/supplier/websocket/WebsocketSupplierTests.java b/functions/supplier/websocket-supplier/src/test/java/org/springframework/cloud/fn/supplier/websocket/WebsocketSupplierTests.java index bfe5a5fe..54bd71a5 100644 --- a/functions/supplier/websocket-supplier/src/test/java/org/springframework/cloud/fn/supplier/websocket/WebsocketSupplierTests.java +++ b/functions/supplier/websocket-supplier/src/test/java/org/springframework/cloud/fn/supplier/websocket/WebsocketSupplierTests.java @@ -97,6 +97,6 @@ public class WebsocketSupplierTests { } @SpringBootApplication - static class TestApplication { + static class WebsocketSupplierTestApplication { } }