SpringCloud/stream-applications-acceptance-tests
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change to Type annotations

Browse Source
This commit is contained in:
David Turanski
2020-11-04 13:59:04 -05:00
parent 18243d5774
commit 3af880d92f
23 changed files with 103 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/common/Configuration.java
View File

@@ -17,6 +17,7 @@
package org.springframework.cloud.stream.apps.integration.test.common; package org.springframework.cloud.stream.apps.integration.test.common;
import java.time.Duration; import java.time.Duration;
import java.util.function.Supplier;
public abstract class Configuration { public abstract class Configuration {
@@ -30,4 +31,12 @@ public abstract class Configuration {
VERSION = System.getProperty(SPRING_CLOUD_STREAM_APPLICATIONS_VERSION, "3.1.0-SNAPSHOT"); VERSION = System.getProperty(SPRING_CLOUD_STREAM_APPLICATIONS_VERSION, "3.1.0-SNAPSHOT");
} }
public static class VersionSupplier implements Supplier<String> {
@Override
public String get() {
return VERSION;
}
}
} }

9
stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/processor/httprequest/KafkaHttpRequestProcessorTests.java
View File

@@ -19,15 +19,18 @@ package org.springframework.cloud.stream.apps.integration.test.processor.httpreq
import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Container;
import org.springframework.cloud.stream.app.test.integration.StreamAppContainer; import org.springframework.cloud.stream.app.test.integration.StreamAppContainer;
import org.springframework.cloud.stream.app.test.integration.StreamAppContainerTestUtils;
import org.springframework.cloud.stream.app.test.integration.junit.jupiter.KafkaStreamAppTest; import org.springframework.cloud.stream.app.test.integration.junit.jupiter.KafkaStreamAppTest;
import org.springframework.cloud.stream.app.test.integration.kafka.KafkaConfig; import org.springframework.cloud.stream.app.test.integration.kafka.KafkaStreamAppContainer;
import static org.springframework.cloud.stream.apps.integration.test.common.Configuration.VERSION; import static org.springframework.cloud.stream.apps.integration.test.common.Configuration.VERSION;
@KafkaStreamAppTest @KafkaStreamAppTest
class KafkaHttpRequestProcessorTests extends HttpRequestProcessorTests { class KafkaHttpRequestProcessorTests extends HttpRequestProcessorTests {
@Container @Container
private static StreamAppContainer container = configureProcessor(KafkaConfig private static StreamAppContainer container = configureProcessor(
.prepackagedContainerFor("http-request-processor", VERSION)); new KafkaStreamAppContainer(StreamAppContainerTestUtils.imageName(
"http-request-processor-kafka", VERSION)));
} }

10
stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/processor/httprequest/RabbitMQHttpRequestProcessorTests.java
View File

@@ -19,15 +19,17 @@ package org.springframework.cloud.stream.apps.integration.test.processor.httpreq
import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Container;
import org.springframework.cloud.stream.app.test.integration.StreamAppContainer; import org.springframework.cloud.stream.app.test.integration.StreamAppContainer;
import org.springframework.cloud.stream.app.test.integration.StreamAppContainerTestUtils;
import org.springframework.cloud.stream.app.test.integration.junit.jupiter.RabbitMQStreamAppTest; import org.springframework.cloud.stream.app.test.integration.junit.jupiter.RabbitMQStreamAppTest;
import org.springframework.cloud.stream.app.test.integration.rabbitmq.RabbitMQConfig; import org.springframework.cloud.stream.app.test.integration.rabbitmq.RabbitMQStreamAppContainer;
import static org.springframework.cloud.stream.apps.integration.test.common.Configuration.VERSION; import static org.springframework.cloud.stream.apps.integration.test.common.Configuration.VERSION;
@RabbitMQStreamAppTest @RabbitMQStreamAppTest
class RabbitMQHttpRequestProcessorTests extends HttpRequestProcessorTests { class RabbitMQHttpRequestProcessorTests extends HttpRequestProcessorTests {
@Container
private static StreamAppContainer container = configureProcessor(RabbitMQConfig
.prepackagedContainerFor("http-request-processor", VERSION));
@Container
private static StreamAppContainer container = configureProcessor(
new RabbitMQStreamAppContainer(StreamAppContainerTestUtils.imageName(
"http-request-processor-rabbit", VERSION)));
} }

11
stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/sink/jdbc/KafkaJdbcSinkTests.java
View File

@@ -16,16 +16,11 @@
package org.springframework.cloud.stream.apps.integration.test.sink.jdbc; package org.springframework.cloud.stream.apps.integration.test.sink.jdbc;
import org.springframework.cloud.stream.app.test.integration.StreamAppContainer; import org.springframework.cloud.stream.app.test.integration.junit.jupiter.KafkaBaseContainer;
import org.springframework.cloud.stream.app.test.integration.junit.jupiter.BaseContainer;
import org.springframework.cloud.stream.app.test.integration.junit.jupiter.KafkaStreamAppTest; import org.springframework.cloud.stream.app.test.integration.junit.jupiter.KafkaStreamAppTest;
import org.springframework.cloud.stream.app.test.integration.kafka.KafkaConfig; import org.springframework.cloud.stream.apps.integration.test.common.Configuration;
import static org.springframework.cloud.stream.apps.integration.test.common.Configuration.VERSION;
@KafkaStreamAppTest @KafkaStreamAppTest
@KafkaBaseContainer(name = "jdbc-sink-kafka", versionSupplier = Configuration.VersionSupplier.class)
public class KafkaJdbcSinkTests extends JdbcSinkTests { public class KafkaJdbcSinkTests extends JdbcSinkTests {
@BaseContainer
public static StreamAppContainer sink = KafkaConfig.prepackagedContainerFor("jdbc-sink", VERSION);
} }

12
stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/sink/jdbc/RabbitMQJdbcSinkTests.java
View File

@@ -16,17 +16,11 @@
package org.springframework.cloud.stream.apps.integration.test.sink.jdbc; package org.springframework.cloud.stream.apps.integration.test.sink.jdbc;
import org.springframework.cloud.stream.app.test.integration.StreamAppContainer; import org.springframework.cloud.stream.app.test.integration.junit.jupiter.RabbitMQBaseContainer;
import org.springframework.cloud.stream.app.test.integration.junit.jupiter.BaseContainer;
import org.springframework.cloud.stream.app.test.integration.junit.jupiter.RabbitMQStreamAppTest; import org.springframework.cloud.stream.app.test.integration.junit.jupiter.RabbitMQStreamAppTest;
import org.springframework.cloud.stream.app.test.integration.rabbitmq.RabbitMQConfig; import org.springframework.cloud.stream.apps.integration.test.common.Configuration;
import static org.springframework.cloud.stream.apps.integration.test.common.Configuration.VERSION;
@RabbitMQStreamAppTest @RabbitMQStreamAppTest
@RabbitMQBaseContainer(name = "jdbc-sink-rabbit", versionSupplier = Configuration.VersionSupplier.class)
public class RabbitMQJdbcSinkTests extends JdbcSinkTests { public class RabbitMQJdbcSinkTests extends JdbcSinkTests {
@BaseContainer
public static StreamAppContainer sink = RabbitMQConfig.prepackagedContainerFor("jdbc-sink", VERSION);
} }

11
stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/sink/mongodb/KafkaMongoDBSinkTests.java
View File

@@ -16,16 +16,11 @@
package org.springframework.cloud.stream.apps.integration.test.sink.mongodb; package org.springframework.cloud.stream.apps.integration.test.sink.mongodb;
import org.springframework.cloud.stream.app.test.integration.StreamAppContainer; import org.springframework.cloud.stream.app.test.integration.junit.jupiter.KafkaBaseContainer;
import org.springframework.cloud.stream.app.test.integration.junit.jupiter.BaseContainer;
import org.springframework.cloud.stream.app.test.integration.junit.jupiter.KafkaStreamAppTest; import org.springframework.cloud.stream.app.test.integration.junit.jupiter.KafkaStreamAppTest;
import org.springframework.cloud.stream.app.test.integration.kafka.KafkaConfig; import org.springframework.cloud.stream.apps.integration.test.common.Configuration;
import static org.springframework.cloud.stream.apps.integration.test.common.Configuration.VERSION;
@KafkaStreamAppTest @KafkaStreamAppTest
@KafkaBaseContainer(name = "mongodb-sink-kafka", versionSupplier = Configuration.VersionSupplier.class)
public class KafkaMongoDBSinkTests extends MongoDBSinkTests { public class KafkaMongoDBSinkTests extends MongoDBSinkTests {
@BaseContainer
public static StreamAppContainer sink = KafkaConfig.prepackagedContainerFor("mongodb-sink", VERSION);
} }

12
stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/sink/mongodb/RabbitMQMongoDBSinkTests.java
View File

@@ -16,17 +16,11 @@
package org.springframework.cloud.stream.apps.integration.test.sink.mongodb; package org.springframework.cloud.stream.apps.integration.test.sink.mongodb;
import org.springframework.cloud.stream.app.test.integration.StreamAppContainer; import org.springframework.cloud.stream.app.test.integration.junit.jupiter.RabbitMQBaseContainer;
import org.springframework.cloud.stream.app.test.integration.junit.jupiter.BaseContainer;
import org.springframework.cloud.stream.app.test.integration.junit.jupiter.RabbitMQStreamAppTest; import org.springframework.cloud.stream.app.test.integration.junit.jupiter.RabbitMQStreamAppTest;
import org.springframework.cloud.stream.app.test.integration.rabbitmq.RabbitMQConfig; import org.springframework.cloud.stream.apps.integration.test.common.Configuration;
import static org.springframework.cloud.stream.apps.integration.test.common.Configuration.VERSION;
@RabbitMQStreamAppTest @RabbitMQStreamAppTest
@RabbitMQBaseContainer(name = "mongodb-sink-rabbit", versionSupplier = Configuration.VersionSupplier.class)
public class RabbitMQMongoDBSinkTests extends MongoDBSinkTests { public class RabbitMQMongoDBSinkTests extends MongoDBSinkTests {
@BaseContainer
public static StreamAppContainer sink = RabbitMQConfig.prepackagedContainerFor("mongodb-sink", VERSION);
} }

12
stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/sink/tcp/KafkaTcpSinkTests.java
View File

@@ -16,17 +16,11 @@
package org.springframework.cloud.stream.apps.integration.test.sink.tcp; package org.springframework.cloud.stream.apps.integration.test.sink.tcp;
import org.springframework.cloud.stream.app.test.integration.StreamAppContainer; import org.springframework.cloud.stream.app.test.integration.junit.jupiter.KafkaBaseContainer;
import org.springframework.cloud.stream.app.test.integration.junit.jupiter.BaseContainer;
import org.springframework.cloud.stream.app.test.integration.junit.jupiter.KafkaStreamAppTest; import org.springframework.cloud.stream.app.test.integration.junit.jupiter.KafkaStreamAppTest;
import org.springframework.cloud.stream.app.test.integration.kafka.KafkaConfig; import org.springframework.cloud.stream.apps.integration.test.common.Configuration;
import static org.springframework.cloud.stream.apps.integration.test.common.Configuration.VERSION;
@KafkaStreamAppTest @KafkaStreamAppTest
@KafkaBaseContainer(name = "tcp-sink-kafka", versionSupplier = Configuration.VersionSupplier.class)
public class KafkaTcpSinkTests extends TcpSinkTests { public class KafkaTcpSinkTests extends TcpSinkTests {
@BaseContainer
public static StreamAppContainer sink = KafkaConfig.prepackagedContainerFor("tcp-sink", VERSION);
} }

11
stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/sink/tcp/RabbitMQTcpSinkTests.java
View File

@@ -16,16 +16,11 @@
package org.springframework.cloud.stream.apps.integration.test.sink.tcp; package org.springframework.cloud.stream.apps.integration.test.sink.tcp;
import org.springframework.cloud.stream.app.test.integration.StreamAppContainer; import org.springframework.cloud.stream.app.test.integration.junit.jupiter.RabbitMQBaseContainer;
import org.springframework.cloud.stream.app.test.integration.junit.jupiter.BaseContainer;
import org.springframework.cloud.stream.app.test.integration.junit.jupiter.RabbitMQStreamAppTest; import org.springframework.cloud.stream.app.test.integration.junit.jupiter.RabbitMQStreamAppTest;
import org.springframework.cloud.stream.app.test.integration.rabbitmq.RabbitMQConfig; import org.springframework.cloud.stream.apps.integration.test.common.Configuration;
import static org.springframework.cloud.stream.apps.integration.test.common.Configuration.VERSION;
@RabbitMQStreamAppTest @RabbitMQStreamAppTest
@RabbitMQBaseContainer(name = "tcp-sink-rabbit", versionSupplier = Configuration.VersionSupplier.class)
public class RabbitMQTcpSinkTests extends TcpSinkTests { public class RabbitMQTcpSinkTests extends TcpSinkTests {
@BaseContainer
public static StreamAppContainer sink = RabbitMQConfig.prepackagedContainerFor("tcp-sink", VERSION);
} }

12
stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/source/geode/KafkaGeodeSourceTests.java
View File

@@ -16,17 +16,11 @@
package org.springframework.cloud.stream.apps.integration.test.source.geode; package org.springframework.cloud.stream.apps.integration.test.source.geode;
import org.springframework.cloud.stream.app.test.integration.StreamAppContainer; import org.springframework.cloud.stream.app.test.integration.junit.jupiter.KafkaBaseContainer;
import org.springframework.cloud.stream.app.test.integration.junit.jupiter.BaseContainer;
import org.springframework.cloud.stream.app.test.integration.junit.jupiter.KafkaStreamAppTest; import org.springframework.cloud.stream.app.test.integration.junit.jupiter.KafkaStreamAppTest;
import org.springframework.cloud.stream.app.test.integration.kafka.KafkaConfig; import org.springframework.cloud.stream.apps.integration.test.common.Configuration;
import static org.springframework.cloud.stream.apps.integration.test.common.Configuration.VERSION;
@KafkaStreamAppTest @KafkaStreamAppTest
@KafkaBaseContainer(name = "geode-source-kafka", versionSupplier = Configuration.VersionSupplier.class)
public class KafkaGeodeSourceTests extends GeodeSourceTests { public class KafkaGeodeSourceTests extends GeodeSourceTests {
@BaseContainer
public static StreamAppContainer source = KafkaConfig.prepackagedContainerFor("geode-source", VERSION);
} }

12
stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/source/geode/RabbitMQGeodeSourceTests.java
View File

@@ -16,17 +16,11 @@
package org.springframework.cloud.stream.apps.integration.test.source.geode; package org.springframework.cloud.stream.apps.integration.test.source.geode;
import org.springframework.cloud.stream.app.test.integration.StreamAppContainer; import org.springframework.cloud.stream.app.test.integration.junit.jupiter.RabbitMQBaseContainer;
import org.springframework.cloud.stream.app.test.integration.junit.jupiter.BaseContainer;
import org.springframework.cloud.stream.app.test.integration.junit.jupiter.RabbitMQStreamAppTest; import org.springframework.cloud.stream.app.test.integration.junit.jupiter.RabbitMQStreamAppTest;
import org.springframework.cloud.stream.app.test.integration.rabbitmq.RabbitMQConfig; import org.springframework.cloud.stream.apps.integration.test.common.Configuration;
import static org.springframework.cloud.stream.apps.integration.test.common.Configuration.VERSION;
@RabbitMQStreamAppTest @RabbitMQStreamAppTest
@RabbitMQBaseContainer(name = "geode-source-rabbit", versionSupplier = Configuration.VersionSupplier.class)
public class RabbitMQGeodeSourceTests extends GeodeSourceTests { public class RabbitMQGeodeSourceTests extends GeodeSourceTests {
@BaseContainer
public static StreamAppContainer source = RabbitMQConfig.prepackagedContainerFor("geode-source", VERSION);
} }

11
stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/source/http/KafkaHttpSourceTests.java
View File

@@ -16,16 +16,11 @@
package org.springframework.cloud.stream.apps.integration.test.source.http; package org.springframework.cloud.stream.apps.integration.test.source.http;
import org.springframework.cloud.stream.app.test.integration.StreamAppContainer; import org.springframework.cloud.stream.app.test.integration.junit.jupiter.KafkaBaseContainer;
import org.springframework.cloud.stream.app.test.integration.junit.jupiter.BaseContainer;
import org.springframework.cloud.stream.app.test.integration.junit.jupiter.KafkaStreamAppTest; import org.springframework.cloud.stream.app.test.integration.junit.jupiter.KafkaStreamAppTest;
import org.springframework.cloud.stream.app.test.integration.kafka.KafkaConfig; import org.springframework.cloud.stream.apps.integration.test.common.Configuration;
import static org.springframework.cloud.stream.apps.integration.test.common.Configuration.VERSION;
@KafkaStreamAppTest @KafkaStreamAppTest
@KafkaBaseContainer(name = "http-source-kafka", versionSupplier = Configuration.VersionSupplier.class)
public class KafkaHttpSourceTests extends HttpSourceTests { public class KafkaHttpSourceTests extends HttpSourceTests {
@BaseContainer
public static StreamAppContainer source = KafkaConfig.prepackagedContainerFor("http-source", VERSION);
} }

11
stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/source/http/RabbitMQHttpSourceTests.java
View File

@@ -16,16 +16,11 @@
package org.springframework.cloud.stream.apps.integration.test.source.http; package org.springframework.cloud.stream.apps.integration.test.source.http;
import org.springframework.cloud.stream.app.test.integration.StreamAppContainer; import org.springframework.cloud.stream.app.test.integration.junit.jupiter.RabbitMQBaseContainer;
import org.springframework.cloud.stream.app.test.integration.junit.jupiter.BaseContainer;
import org.springframework.cloud.stream.app.test.integration.junit.jupiter.RabbitMQStreamAppTest; import org.springframework.cloud.stream.app.test.integration.junit.jupiter.RabbitMQStreamAppTest;
import org.springframework.cloud.stream.app.test.integration.rabbitmq.RabbitMQConfig; import org.springframework.cloud.stream.apps.integration.test.common.Configuration;
import static org.springframework.cloud.stream.apps.integration.test.common.Configuration.VERSION;
@RabbitMQStreamAppTest @RabbitMQStreamAppTest
@RabbitMQBaseContainer(name = "http-source-rabbit", versionSupplier = Configuration.VersionSupplier.class)
public class RabbitMQHttpSourceTests extends HttpSourceTests { public class RabbitMQHttpSourceTests extends HttpSourceTests {
@BaseContainer
public static StreamAppContainer source = RabbitMQConfig.prepackagedContainerFor("http-source", VERSION);
} }

11
stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/source/jdbc/KafkaJdbcSourceTests.java
View File

@@ -16,16 +16,11 @@
package org.springframework.cloud.stream.apps.integration.test.source.jdbc; package org.springframework.cloud.stream.apps.integration.test.source.jdbc;
import org.springframework.cloud.stream.app.test.integration.StreamAppContainer; import org.springframework.cloud.stream.app.test.integration.junit.jupiter.KafkaBaseContainer;
import org.springframework.cloud.stream.app.test.integration.junit.jupiter.BaseContainer;
import org.springframework.cloud.stream.app.test.integration.junit.jupiter.KafkaStreamAppTest; import org.springframework.cloud.stream.app.test.integration.junit.jupiter.KafkaStreamAppTest;
import org.springframework.cloud.stream.app.test.integration.kafka.KafkaConfig; import org.springframework.cloud.stream.apps.integration.test.common.Configuration;
import static org.springframework.cloud.stream.apps.integration.test.common.Configuration.VERSION;
@KafkaStreamAppTest @KafkaStreamAppTest
@KafkaBaseContainer(name = "jdbc-source-kafka", versionSupplier = Configuration.VersionSupplier.class)
public class KafkaJdbcSourceTests extends JdbcSourceTests { public class KafkaJdbcSourceTests extends JdbcSourceTests {
@BaseContainer
public static StreamAppContainer source = KafkaConfig.prepackagedContainerFor("jdbc-source", VERSION);
} }

11
stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/source/jdbc/RabbitMQJdbcSourceTests.java
View File

@@ -16,16 +16,11 @@
package org.springframework.cloud.stream.apps.integration.test.source.jdbc; package org.springframework.cloud.stream.apps.integration.test.source.jdbc;
import org.springframework.cloud.stream.app.test.integration.StreamAppContainer; import org.springframework.cloud.stream.app.test.integration.junit.jupiter.RabbitMQBaseContainer;
import org.springframework.cloud.stream.app.test.integration.junit.jupiter.BaseContainer;
import org.springframework.cloud.stream.app.test.integration.junit.jupiter.RabbitMQStreamAppTest; import org.springframework.cloud.stream.app.test.integration.junit.jupiter.RabbitMQStreamAppTest;
import org.springframework.cloud.stream.app.test.integration.rabbitmq.RabbitMQConfig; import org.springframework.cloud.stream.apps.integration.test.common.Configuration;
import static org.springframework.cloud.stream.apps.integration.test.common.Configuration.VERSION;
@RabbitMQStreamAppTest @RabbitMQStreamAppTest
@RabbitMQBaseContainer(name = "jdbc-source-rabbit", versionSupplier = Configuration.VersionSupplier.class)
public class RabbitMQJdbcSourceTests extends JdbcSourceTests { public class RabbitMQJdbcSourceTests extends JdbcSourceTests {
@BaseContainer
public static StreamAppContainer source = RabbitMQConfig.prepackagedContainerFor("jdbc-source", VERSION);
} }

11
stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/source/s3/KafkaS3SourceTests.java
View File

@@ -16,16 +16,11 @@
package org.springframework.cloud.stream.apps.integration.test.source.s3; package org.springframework.cloud.stream.apps.integration.test.source.s3;
import org.springframework.cloud.stream.app.test.integration.StreamAppContainer; import org.springframework.cloud.stream.app.test.integration.junit.jupiter.KafkaBaseContainer;
import org.springframework.cloud.stream.app.test.integration.junit.jupiter.BaseContainer;
import org.springframework.cloud.stream.app.test.integration.junit.jupiter.KafkaStreamAppTest; import org.springframework.cloud.stream.app.test.integration.junit.jupiter.KafkaStreamAppTest;
import org.springframework.cloud.stream.app.test.integration.kafka.KafkaConfig; import org.springframework.cloud.stream.apps.integration.test.common.Configuration;
import static org.springframework.cloud.stream.apps.integration.test.common.Configuration.VERSION;
@KafkaStreamAppTest @KafkaStreamAppTest
@KafkaBaseContainer(name = "s3-source-kafka", versionSupplier = Configuration.VersionSupplier.class)
public class KafkaS3SourceTests extends S3SourceTests { public class KafkaS3SourceTests extends S3SourceTests {
@BaseContainer
public static StreamAppContainer source = KafkaConfig.prepackagedContainerFor("s3-source", VERSION);
} }

11
stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/source/s3/RabbitMQS3SourceTests.java
View File

@@ -16,16 +16,11 @@
package org.springframework.cloud.stream.apps.integration.test.source.s3; package org.springframework.cloud.stream.apps.integration.test.source.s3;
import org.springframework.cloud.stream.app.test.integration.StreamAppContainer; import org.springframework.cloud.stream.app.test.integration.junit.jupiter.RabbitMQBaseContainer;
import org.springframework.cloud.stream.app.test.integration.junit.jupiter.BaseContainer;
import org.springframework.cloud.stream.app.test.integration.junit.jupiter.RabbitMQStreamAppTest; import org.springframework.cloud.stream.app.test.integration.junit.jupiter.RabbitMQStreamAppTest;
import org.springframework.cloud.stream.app.test.integration.rabbitmq.RabbitMQConfig; import org.springframework.cloud.stream.apps.integration.test.common.Configuration;
import static org.springframework.cloud.stream.apps.integration.test.common.Configuration.VERSION;
@RabbitMQStreamAppTest @RabbitMQStreamAppTest
@RabbitMQBaseContainer(name = "s3-source-rabbit", versionSupplier = Configuration.VersionSupplier.class)
public class RabbitMQS3SourceTests extends S3SourceTests { public class RabbitMQS3SourceTests extends S3SourceTests {
@BaseContainer
public static StreamAppContainer source = RabbitMQConfig.prepackagedContainerFor("s3-source", VERSION);
} }

12
stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/source/sftp/KafkaSftpSourceTests.java
View File

@@ -16,17 +16,11 @@
package org.springframework.cloud.stream.apps.integration.test.source.sftp; package org.springframework.cloud.stream.apps.integration.test.source.sftp;
import org.springframework.cloud.stream.app.test.integration.StreamAppContainer; import org.springframework.cloud.stream.app.test.integration.junit.jupiter.KafkaBaseContainer;
import org.springframework.cloud.stream.app.test.integration.junit.jupiter.BaseContainer;
import org.springframework.cloud.stream.app.test.integration.junit.jupiter.KafkaStreamAppTest; import org.springframework.cloud.stream.app.test.integration.junit.jupiter.KafkaStreamAppTest;
import org.springframework.cloud.stream.app.test.integration.kafka.KafkaConfig; import org.springframework.cloud.stream.apps.integration.test.common.Configuration;
import static org.springframework.cloud.stream.apps.integration.test.common.Configuration.VERSION;
@KafkaStreamAppTest @KafkaStreamAppTest
@KafkaBaseContainer(name = "sftp-source-kafka", versionSupplier = Configuration.VersionSupplier.class)
public class KafkaSftpSourceTests extends SftpSourceTests { public class KafkaSftpSourceTests extends SftpSourceTests {
@BaseContainer
public static StreamAppContainer source = KafkaConfig.prepackagedContainerFor("sftp-source", VERSION);
} }

12
stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/source/sftp/RabbitMQSftpSourceTests.java
View File

@@ -16,17 +16,11 @@
package org.springframework.cloud.stream.apps.integration.test.source.sftp; package org.springframework.cloud.stream.apps.integration.test.source.sftp;
import org.springframework.cloud.stream.app.test.integration.StreamAppContainer; import org.springframework.cloud.stream.app.test.integration.junit.jupiter.RabbitMQBaseContainer;
import org.springframework.cloud.stream.app.test.integration.junit.jupiter.BaseContainer;
import org.springframework.cloud.stream.app.test.integration.junit.jupiter.RabbitMQStreamAppTest; import org.springframework.cloud.stream.app.test.integration.junit.jupiter.RabbitMQStreamAppTest;
import org.springframework.cloud.stream.app.test.integration.rabbitmq.RabbitMQConfig; import org.springframework.cloud.stream.apps.integration.test.common.Configuration;
import static org.springframework.cloud.stream.apps.integration.test.common.Configuration.VERSION;
@RabbitMQStreamAppTest @RabbitMQStreamAppTest
@RabbitMQBaseContainer(name = "sftp-source-rabbit", versionSupplier = Configuration.VersionSupplier.class)
public class RabbitMQSftpSourceTests extends SftpSourceTests { public class RabbitMQSftpSourceTests extends SftpSourceTests {
@BaseContainer
public static StreamAppContainer source = RabbitMQConfig.prepackagedContainerFor("sftp-source", VERSION);
} }

8
stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/source/time/KafkaTimeSourceTests.java
View File

@@ -19,9 +19,9 @@ package org.springframework.cloud.stream.apps.integration.test.source.time;
import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Container;
import org.springframework.cloud.stream.app.test.integration.StreamAppContainer; import org.springframework.cloud.stream.app.test.integration.StreamAppContainer;
import org.springframework.cloud.stream.app.test.integration.StreamAppContainerTestUtils;
import org.springframework.cloud.stream.app.test.integration.junit.jupiter.KafkaStreamAppTest; import org.springframework.cloud.stream.app.test.integration.junit.jupiter.KafkaStreamAppTest;
import org.springframework.cloud.stream.app.test.integration.kafka.KafkaConfig; import org.springframework.cloud.stream.app.test.integration.kafka.KafkaStreamAppContainer;
import static org.springframework.cloud.stream.apps.integration.test.common.Configuration.VERSION; import static org.springframework.cloud.stream.apps.integration.test.common.Configuration.VERSION;
@@ -29,6 +29,6 @@ import static org.springframework.cloud.stream.apps.integration.test.common.Conf
class KafkaTimeSourceTests extends TimeSourceTests { class KafkaTimeSourceTests extends TimeSourceTests {
@Container @Container
static StreamAppContainer source = KafkaConfig.prepackagedContainerFor("time-source", VERSION); static StreamAppContainer source = new KafkaStreamAppContainer(StreamAppContainerTestUtils
.imageName(StreamAppContainerTestUtils.SPRINGCLOUDSTREAM_REPOSITOTRY, "time-source-kafka", VERSION));
} }

9
stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/source/time/RabbitMQTimeSourceTests.java
View File

@@ -19,15 +19,18 @@ package org.springframework.cloud.stream.apps.integration.test.source.time;
import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Container;
import org.springframework.cloud.stream.app.test.integration.StreamAppContainer; import org.springframework.cloud.stream.app.test.integration.StreamAppContainer;
import org.springframework.cloud.stream.app.test.integration.StreamAppContainerTestUtils;
import org.springframework.cloud.stream.app.test.integration.junit.jupiter.RabbitMQStreamAppTest; import org.springframework.cloud.stream.app.test.integration.junit.jupiter.RabbitMQStreamAppTest;
import org.springframework.cloud.stream.app.test.integration.rabbitmq.RabbitMQConfig; import org.springframework.cloud.stream.app.test.integration.rabbitmq.RabbitMQStreamAppContainer;
import static org.springframework.cloud.stream.apps.integration.test.common.Configuration.VERSION; import static org.springframework.cloud.stream.apps.integration.test.common.Configuration.VERSION;
@RabbitMQStreamAppTest @RabbitMQStreamAppTest
class RabbitMQTimeSourceTests extends TimeSourceTests { class RabbitMQTimeSourceTests extends TimeSourceTests {
@Container @Container
static StreamAppContainer source = RabbitMQConfig.prepackagedContainerFor("time-source", VERSION); static StreamAppContainer source = new RabbitMQStreamAppContainer(StreamAppContainerTestUtils
.imageName(StreamAppContainerTestUtils.SPRINGCLOUDSTREAM_REPOSITOTRY, "time-source-rabbit", VERSION));
} }

24
stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/stream/jdbclog/KafkaJdbcLogStreamTests.java
View File

@@ -23,9 +23,11 @@ import org.testcontainers.junit.jupiter.Container;
import org.testcontainers.utility.DockerImageName; import org.testcontainers.utility.DockerImageName;
import org.springframework.cloud.stream.app.test.integration.LogMatcher; import org.springframework.cloud.stream.app.test.integration.LogMatcher;
import org.springframework.cloud.stream.app.test.integration.StreamAppContainerTestUtils;
import org.springframework.cloud.stream.app.test.integration.StreamApps; import org.springframework.cloud.stream.app.test.integration.StreamApps;
import org.springframework.cloud.stream.app.test.integration.junit.jupiter.KafkaStreamAppTest; import org.springframework.cloud.stream.app.test.integration.junit.jupiter.KafkaStreamAppTest;
import org.springframework.cloud.stream.app.test.integration.kafka.KafkaConfig; import org.springframework.cloud.stream.app.test.integration.kafka.KafkaConfig;
import org.springframework.cloud.stream.app.test.integration.kafka.KafkaStreamAppContainer;
import static org.awaitility.Awaitility.await; import static org.awaitility.Awaitility.await;
import static org.springframework.cloud.stream.app.test.integration.AppLog.appLog; import static org.springframework.cloud.stream.app.test.integration.AppLog.appLog;
@@ -53,16 +55,20 @@ public class KafkaJdbcLogStreamTests {
private static final StreamApps streamApp = kafkaStreamApps(KafkaJdbcLogStreamTests.class.getSimpleName(), private static final StreamApps streamApp = kafkaStreamApps(KafkaJdbcLogStreamTests.class.getSimpleName(),
KafkaConfig.kafka) KafkaConfig.kafka)
.withSourceContainer( .withSourceContainer(
KafkaConfig.prepackagedContainerFor("jdbc-source", VERSION) new KafkaStreamAppContainer(StreamAppContainerTestUtils.imageName(
.withEnv("JDBC_SUPPLIER_QUERY", "SELECT * FROM People WHERE deleted='N'") "jdbc-source-kafka",
.withEnv("JDBC_SUPPLIER_UPDATE", "UPDATE People SET deleted='Y' WHERE id=:id") VERSION))
.withEnv("SPRING_DATASOURCE_PASSWORD", "secret") .withEnv("JDBC_SUPPLIER_QUERY", "SELECT * FROM People WHERE deleted='N'")
.withEnv("SPRING_DATASOURCE_USERNAME", "test") .withEnv("JDBC_SUPPLIER_UPDATE",
.withEnv("SPRING_DATASOURCE_DRIVER_CLASS_NAME", "org.mariadb.jdbc.Driver") "UPDATE People SET deleted='Y' WHERE id=:id")
.withEnv("SPRING_DATASOURCE_URL", .withEnv("SPRING_DATASOURCE_PASSWORD", "secret")
"jdbc:mariadb://mysql-for-stream:3306/test")) .withEnv("SPRING_DATASOURCE_USERNAME", "test")
.withEnv("SPRING_DATASOURCE_DRIVER_CLASS_NAME", "org.mariadb.jdbc.Driver")
.withEnv("SPRING_DATASOURCE_URL",
"jdbc:mariadb://mysql-for-stream:3306/test"))
.withSinkContainer( .withSinkContainer(
KafkaConfig.prepackagedContainerFor("log-sink", VERSION).withLogConsumer(logMatcher)) new KafkaStreamAppContainer(StreamAppContainerTestUtils.imageName(
"log-sink-kafka", VERSION)).withLogConsumer(logMatcher))
.build(); .build();
@Test @Test

12
stream-applications-integration-tests/src/test/java/org/springframework/cloud/stream/apps/integration/test/stream/tiktok/KafkaTikTokTests.java
View File

@@ -20,9 +20,11 @@ import org.junit.jupiter.api.Test;
import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Container;
import org.springframework.cloud.stream.app.test.integration.LogMatcher; import org.springframework.cloud.stream.app.test.integration.LogMatcher;
import org.springframework.cloud.stream.app.test.integration.StreamAppContainerTestUtils;
import org.springframework.cloud.stream.app.test.integration.StreamApps; import org.springframework.cloud.stream.app.test.integration.StreamApps;
import org.springframework.cloud.stream.app.test.integration.junit.jupiter.KafkaStreamAppTest; import org.springframework.cloud.stream.app.test.integration.junit.jupiter.KafkaStreamAppTest;
import org.springframework.cloud.stream.app.test.integration.kafka.KafkaConfig; import org.springframework.cloud.stream.app.test.integration.kafka.KafkaConfig;
import org.springframework.cloud.stream.app.test.integration.kafka.KafkaStreamAppContainer;
import static org.awaitility.Awaitility.await; import static org.awaitility.Awaitility.await;
import static org.springframework.cloud.stream.app.test.integration.kafka.KafkaStreamApps.kafkaStreamApps; import static org.springframework.cloud.stream.app.test.integration.kafka.KafkaStreamApps.kafkaStreamApps;
@@ -39,10 +41,14 @@ public class KafkaTikTokTests {
private static final StreamApps streamApp = kafkaStreamApps(KafkaTikTokTests.class.getSimpleName(), private static final StreamApps streamApp = kafkaStreamApps(KafkaTikTokTests.class.getSimpleName(),
KafkaConfig.kafka) KafkaConfig.kafka)
.withSourceContainer( .withSourceContainer(
KafkaConfig.prepackagedContainerFor("time-source", VERSION)) new KafkaStreamAppContainer(StreamAppContainerTestUtils.imageName(
"time-source-kafka",
VERSION)))
.withSinkContainer( .withSinkContainer(
KafkaConfig.prepackagedContainerFor("log-sink", VERSION).withLogConsumer(logMatcher) new KafkaStreamAppContainer(StreamAppContainerTestUtils.imageName(
.log()) "log-sink-kafka",
VERSION)).withLogConsumer(logMatcher)
.log())
.build(); .build();
@Test @Test