From b8ca2efe7e817035995118834198eb2207f900bb Mon Sep 17 00:00:00 2001 From: Ismail Simsek <6005685+ismailsimsek@users.noreply.github.com> Date: Sun, 8 Sep 2024 13:41:56 +0200 Subject: [PATCH] Tests: Change deprecated Quarkus annotations to new one --- .../IcebergChangeConsumerMangodbTest.java | 16 ++++++------- .../IcebergChangeConsumerMysqlTest.java | 18 +++++++------- ...ebergChangeConsumerMysqlTestUnwrapped.java | 6 ++--- .../iceberg/IcebergChangeConsumerTest.java | 7 +++--- .../IcebergChangeConsumerTestUnwraapped.java | 6 ++--- ...ChangeConsumerUpsertDeleteDeletesTest.java | 4 ++-- .../IcebergChangeConsumerUpsertTest.java | 24 ++++++++++--------- .../IcebergEventsChangeConsumerTest.java | 16 ++++++------- .../batchsizewait/MaxBatchSizeWaitTest.java | 15 ++++++------ .../history/IcebergSchemaHistoryTest.java | 17 +++++++------ .../offset/IcebergOffsetBackingStoreTest.java | 19 +++++++-------- .../IcebergTableOperatorTest.java | 6 ++--- 12 files changed, 73 insertions(+), 81 deletions(-) diff --git a/debezium-server-iceberg-sink/src/test/java/io/debezium/server/iceberg/IcebergChangeConsumerMangodbTest.java b/debezium-server-iceberg-sink/src/test/java/io/debezium/server/iceberg/IcebergChangeConsumerMangodbTest.java index 995f24ab..196c79f4 100644 --- a/debezium-server-iceberg-sink/src/test/java/io/debezium/server/iceberg/IcebergChangeConsumerMangodbTest.java +++ b/debezium-server-iceberg-sink/src/test/java/io/debezium/server/iceberg/IcebergChangeConsumerMangodbTest.java @@ -11,28 +11,26 @@ import io.debezium.server.iceberg.testresources.BaseSparkTest; import io.debezium.server.iceberg.testresources.S3Minio; import io.debezium.server.iceberg.testresources.SourceMangoDB; -import io.quarkus.test.common.QuarkusTestResource; +import io.quarkus.test.common.WithTestResource; import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.QuarkusTestProfile; import io.quarkus.test.junit.TestProfile; - -import java.time.Duration; -import java.util.HashMap; -import java.util.Map; - import org.apache.spark.sql.Dataset; import org.apache.spark.sql.Row; import org.awaitility.Awaitility; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; +import java.time.Duration; +import java.util.HashMap; +import java.util.Map; + /** * * @author Ismail Simsek */ @QuarkusTest -@QuarkusTestResource(value = S3Minio.class, restrictToAnnotatedClass = true) -@QuarkusTestResource(value = SourceMangoDB.class, restrictToAnnotatedClass = true) +@WithTestResource(value = S3Minio.class) +@WithTestResource(value = SourceMangoDB.class) @TestProfile(IcebergChangeConsumerMangodbTest.TestProfile.class) public class IcebergChangeConsumerMangodbTest extends BaseSparkTest { diff --git a/debezium-server-iceberg-sink/src/test/java/io/debezium/server/iceberg/IcebergChangeConsumerMysqlTest.java b/debezium-server-iceberg-sink/src/test/java/io/debezium/server/iceberg/IcebergChangeConsumerMysqlTest.java index 22b515bf..d3fc2220 100644 --- a/debezium-server-iceberg-sink/src/test/java/io/debezium/server/iceberg/IcebergChangeConsumerMysqlTest.java +++ b/debezium-server-iceberg-sink/src/test/java/io/debezium/server/iceberg/IcebergChangeConsumerMysqlTest.java @@ -8,31 +8,29 @@ package io.debezium.server.iceberg; +import com.google.common.collect.Lists; import io.debezium.server.iceberg.testresources.BaseTest; import io.debezium.server.iceberg.testresources.S3Minio; import io.debezium.server.iceberg.testresources.SourceMysqlDB; -import io.quarkus.test.common.QuarkusTestResource; +import io.quarkus.test.common.WithTestResource; import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.QuarkusTestProfile; import io.quarkus.test.junit.TestProfile; - -import java.time.Duration; -import java.util.HashMap; -import java.util.Map; - -import com.google.common.collect.Lists; import org.apache.iceberg.data.Record; import org.apache.iceberg.io.CloseableIterable; import org.awaitility.Awaitility; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; +import java.time.Duration; +import java.util.HashMap; +import java.util.Map; + /** * @author Ismail Simsek */ @QuarkusTest -@QuarkusTestResource(value = S3Minio.class, restrictToAnnotatedClass = true) -@QuarkusTestResource(value = SourceMysqlDB.class, restrictToAnnotatedClass = true) +@WithTestResource(value = S3Minio.class) +@WithTestResource(value = SourceMysqlDB.class) @TestProfile(IcebergChangeConsumerMysqlTest.TestProfile.class) public class IcebergChangeConsumerMysqlTest extends BaseTest { diff --git a/debezium-server-iceberg-sink/src/test/java/io/debezium/server/iceberg/IcebergChangeConsumerMysqlTestUnwrapped.java b/debezium-server-iceberg-sink/src/test/java/io/debezium/server/iceberg/IcebergChangeConsumerMysqlTestUnwrapped.java index 2d3fb0cd..eee35347 100644 --- a/debezium-server-iceberg-sink/src/test/java/io/debezium/server/iceberg/IcebergChangeConsumerMysqlTestUnwrapped.java +++ b/debezium-server-iceberg-sink/src/test/java/io/debezium/server/iceberg/IcebergChangeConsumerMysqlTestUnwrapped.java @@ -12,7 +12,7 @@ import io.debezium.server.iceberg.testresources.BaseTest; import io.debezium.server.iceberg.testresources.S3Minio; import io.debezium.server.iceberg.testresources.SourceMysqlDB; -import io.quarkus.test.common.QuarkusTestResource; +import io.quarkus.test.common.WithTestResource; import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.QuarkusTestProfile; import io.quarkus.test.junit.TestProfile; @@ -32,8 +32,8 @@ * @author Ismail Simsek */ @QuarkusTest -@QuarkusTestResource(value = S3Minio.class, restrictToAnnotatedClass = true) -@QuarkusTestResource(value = SourceMysqlDB.class, restrictToAnnotatedClass = true) +@WithTestResource(value = S3Minio.class) +@WithTestResource(value = SourceMysqlDB.class) @TestProfile(IcebergChangeConsumerMysqlTestUnwrapped.TestProfile.class) public class IcebergChangeConsumerMysqlTestUnwrapped extends BaseTest { diff --git a/debezium-server-iceberg-sink/src/test/java/io/debezium/server/iceberg/IcebergChangeConsumerTest.java b/debezium-server-iceberg-sink/src/test/java/io/debezium/server/iceberg/IcebergChangeConsumerTest.java index e65805a8..45fcc466 100644 --- a/debezium-server-iceberg-sink/src/test/java/io/debezium/server/iceberg/IcebergChangeConsumerTest.java +++ b/debezium-server-iceberg-sink/src/test/java/io/debezium/server/iceberg/IcebergChangeConsumerTest.java @@ -12,7 +12,7 @@ import io.debezium.server.iceberg.testresources.BaseSparkTest; import io.debezium.server.iceberg.testresources.S3Minio; import io.debezium.server.iceberg.testresources.SourcePostgresqlDB; -import io.quarkus.test.common.QuarkusTestResource; +import io.quarkus.test.common.WithTestResource; import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.QuarkusTestProfile; import io.quarkus.test.junit.TestProfile; @@ -25,7 +25,6 @@ import org.apache.spark.sql.Row; import org.awaitility.Awaitility; import org.eclipse.microprofile.config.inject.ConfigProperty; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -43,8 +42,8 @@ * @author Ismail Simsek */ @QuarkusTest -@QuarkusTestResource(value = S3Minio.class, restrictToAnnotatedClass = true) -@QuarkusTestResource(value = SourcePostgresqlDB.class, restrictToAnnotatedClass = true) +@WithTestResource(value = S3Minio.class) +@WithTestResource(value = SourcePostgresqlDB.class) @TestProfile(IcebergChangeConsumerTest.TestProfile.class) public class IcebergChangeConsumerTest extends BaseSparkTest { diff --git a/debezium-server-iceberg-sink/src/test/java/io/debezium/server/iceberg/IcebergChangeConsumerTestUnwraapped.java b/debezium-server-iceberg-sink/src/test/java/io/debezium/server/iceberg/IcebergChangeConsumerTestUnwraapped.java index 79fa360c..31b3768d 100644 --- a/debezium-server-iceberg-sink/src/test/java/io/debezium/server/iceberg/IcebergChangeConsumerTestUnwraapped.java +++ b/debezium-server-iceberg-sink/src/test/java/io/debezium/server/iceberg/IcebergChangeConsumerTestUnwraapped.java @@ -12,7 +12,7 @@ import io.debezium.server.iceberg.testresources.BaseSparkTest; import io.debezium.server.iceberg.testresources.S3Minio; import io.debezium.server.iceberg.testresources.SourcePostgresqlDB; -import io.quarkus.test.common.QuarkusTestResource; +import io.quarkus.test.common.WithTestResource; import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.QuarkusTestProfile; import io.quarkus.test.junit.TestProfile; @@ -36,8 +36,8 @@ * @author Ismail Simsek */ @QuarkusTest -@QuarkusTestResource(value = S3Minio.class, restrictToAnnotatedClass = true) -@QuarkusTestResource(value = SourcePostgresqlDB.class, restrictToAnnotatedClass = true) +@WithTestResource(value = S3Minio.class) +@WithTestResource(value = SourcePostgresqlDB.class) @TestProfile(IcebergChangeConsumerTestUnwraapped.TestProfile.class) public class IcebergChangeConsumerTestUnwraapped extends BaseSparkTest { diff --git a/debezium-server-iceberg-sink/src/test/java/io/debezium/server/iceberg/IcebergChangeConsumerUpsertDeleteDeletesTest.java b/debezium-server-iceberg-sink/src/test/java/io/debezium/server/iceberg/IcebergChangeConsumerUpsertDeleteDeletesTest.java index ea9db649..5208f0ea 100644 --- a/debezium-server-iceberg-sink/src/test/java/io/debezium/server/iceberg/IcebergChangeConsumerUpsertDeleteDeletesTest.java +++ b/debezium-server-iceberg-sink/src/test/java/io/debezium/server/iceberg/IcebergChangeConsumerUpsertDeleteDeletesTest.java @@ -11,7 +11,7 @@ import io.debezium.server.iceberg.testresources.BaseSparkTest; import io.debezium.server.iceberg.testresources.S3Minio; import io.debezium.server.iceberg.testresources.TestUtil; -import io.quarkus.test.common.QuarkusTestResource; +import io.quarkus.test.common.WithTestResource; import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.QuarkusTestProfile; import io.quarkus.test.junit.TestProfile; @@ -31,7 +31,7 @@ * @author Ismail Simsek */ @QuarkusTest -@QuarkusTestResource(value = S3Minio.class, restrictToAnnotatedClass = true) +@WithTestResource(value = S3Minio.class) @TestProfile(IcebergChangeConsumerUpsertDeleteDeletesTest.TestProfile.class) public class IcebergChangeConsumerUpsertDeleteDeletesTest extends BaseSparkTest { diff --git a/debezium-server-iceberg-sink/src/test/java/io/debezium/server/iceberg/IcebergChangeConsumerUpsertTest.java b/debezium-server-iceberg-sink/src/test/java/io/debezium/server/iceberg/IcebergChangeConsumerUpsertTest.java index 3e6ced79..439dc2df 100644 --- a/debezium-server-iceberg-sink/src/test/java/io/debezium/server/iceberg/IcebergChangeConsumerUpsertTest.java +++ b/debezium-server-iceberg-sink/src/test/java/io/debezium/server/iceberg/IcebergChangeConsumerUpsertTest.java @@ -8,11 +8,20 @@ package io.debezium.server.iceberg; -import io.debezium.server.iceberg.testresources.*; -import io.quarkus.test.common.QuarkusTestResource; +import io.debezium.server.iceberg.testresources.BaseSparkTest; +import io.debezium.server.iceberg.testresources.S3Minio; +import io.debezium.server.iceberg.testresources.SourcePostgresqlDB; +import io.debezium.server.iceberg.testresources.TestUtil; +import io.quarkus.test.common.WithTestResource; import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.QuarkusTestProfile; import io.quarkus.test.junit.TestProfile; +import jakarta.inject.Inject; +import org.apache.spark.sql.Dataset; +import org.apache.spark.sql.Row; +import org.awaitility.Awaitility; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.sql.SQLException; import java.time.Duration; @@ -21,20 +30,13 @@ import java.util.List; import java.util.Map; -import jakarta.inject.Inject; -import org.apache.spark.sql.Dataset; -import org.apache.spark.sql.Row; -import org.awaitility.Awaitility; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; - /** * * @author Ismail Simsek */ @QuarkusTest -@QuarkusTestResource(value = S3Minio.class, restrictToAnnotatedClass = true) -@QuarkusTestResource(value = SourcePostgresqlDB.class, restrictToAnnotatedClass = true) +@WithTestResource(value = S3Minio.class) +@WithTestResource(value = SourcePostgresqlDB.class) @TestProfile(IcebergChangeConsumerUpsertTest.TestProfile.class) public class IcebergChangeConsumerUpsertTest extends BaseSparkTest { diff --git a/debezium-server-iceberg-sink/src/test/java/io/debezium/server/iceberg/IcebergEventsChangeConsumerTest.java b/debezium-server-iceberg-sink/src/test/java/io/debezium/server/iceberg/IcebergEventsChangeConsumerTest.java index 1d167c3b..23127594 100644 --- a/debezium-server-iceberg-sink/src/test/java/io/debezium/server/iceberg/IcebergEventsChangeConsumerTest.java +++ b/debezium-server-iceberg-sink/src/test/java/io/debezium/server/iceberg/IcebergEventsChangeConsumerTest.java @@ -11,16 +11,10 @@ import io.debezium.server.iceberg.testresources.BaseSparkTest; import io.debezium.server.iceberg.testresources.S3Minio; import io.debezium.server.iceberg.testresources.SourceMysqlDB; -import io.debezium.server.iceberg.testresources.SourcePostgresqlDB; -import io.quarkus.test.common.QuarkusTestResource; +import io.quarkus.test.common.WithTestResource; import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.QuarkusTestProfile; import io.quarkus.test.junit.TestProfile; - -import java.time.Duration; -import java.util.HashMap; -import java.util.Map; - import org.apache.spark.sql.Dataset; import org.apache.spark.sql.Row; import org.awaitility.Awaitility; @@ -28,13 +22,17 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; +import java.time.Duration; +import java.util.HashMap; +import java.util.Map; + /** * * @author Ismail Simsek */ @QuarkusTest -@QuarkusTestResource(value = S3Minio.class, restrictToAnnotatedClass = true) -@QuarkusTestResource(value = SourceMysqlDB.class, restrictToAnnotatedClass = true) +@WithTestResource(value = S3Minio.class) +@WithTestResource(value = SourceMysqlDB.class) @TestProfile(IcebergEventsChangeConsumerTest.TestProfile.class) public class IcebergEventsChangeConsumerTest extends BaseSparkTest { @ConfigProperty(name = "debezium.sink.type") diff --git a/debezium-server-iceberg-sink/src/test/java/io/debezium/server/iceberg/batchsizewait/MaxBatchSizeWaitTest.java b/debezium-server-iceberg-sink/src/test/java/io/debezium/server/iceberg/batchsizewait/MaxBatchSizeWaitTest.java index 958689ff..a64e245b 100644 --- a/debezium-server-iceberg-sink/src/test/java/io/debezium/server/iceberg/batchsizewait/MaxBatchSizeWaitTest.java +++ b/debezium-server-iceberg-sink/src/test/java/io/debezium/server/iceberg/batchsizewait/MaxBatchSizeWaitTest.java @@ -11,15 +11,10 @@ import io.debezium.server.iceberg.testresources.BaseSparkTest; import io.debezium.server.iceberg.testresources.S3Minio; import io.debezium.server.iceberg.testresources.SourcePostgresqlDB; -import io.quarkus.test.common.QuarkusTestResource; +import io.quarkus.test.common.WithTestResource; import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.QuarkusTestProfile; import io.quarkus.test.junit.TestProfile; - -import java.time.Duration; -import java.util.HashMap; -import java.util.Map; - import jakarta.inject.Inject; import org.apache.spark.sql.Dataset; import org.apache.spark.sql.Row; @@ -27,10 +22,14 @@ import org.eclipse.microprofile.config.inject.ConfigProperty; import org.junit.jupiter.api.Test; +import java.time.Duration; +import java.util.HashMap; +import java.util.Map; + @QuarkusTest @TestProfile(MaxBatchSizeWaitTest.TestProfile.class) -@QuarkusTestResource(value = SourcePostgresqlDB.class, restrictToAnnotatedClass = true) -@QuarkusTestResource(value = S3Minio.class, restrictToAnnotatedClass = true) +@WithTestResource(value = SourcePostgresqlDB.class) +@WithTestResource(value = S3Minio.class) class MaxBatchSizeWaitTest extends BaseSparkTest { @Inject MaxBatchSizeWait waitBatchSize; diff --git a/debezium-server-iceberg-sink/src/test/java/io/debezium/server/iceberg/history/IcebergSchemaHistoryTest.java b/debezium-server-iceberg-sink/src/test/java/io/debezium/server/iceberg/history/IcebergSchemaHistoryTest.java index f5a61f99..eaa01644 100644 --- a/debezium-server-iceberg-sink/src/test/java/io/debezium/server/iceberg/history/IcebergSchemaHistoryTest.java +++ b/debezium-server-iceberg-sink/src/test/java/io/debezium/server/iceberg/history/IcebergSchemaHistoryTest.java @@ -8,24 +8,23 @@ package io.debezium.server.iceberg.history; +import com.google.common.collect.Lists; import io.debezium.server.iceberg.testresources.BaseTest; import io.debezium.server.iceberg.testresources.S3Minio; import io.debezium.server.iceberg.testresources.SourceMysqlDB; -import io.quarkus.test.common.QuarkusTestResource; +import io.quarkus.test.common.WithTestResource; import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.QuarkusTestProfile; import io.quarkus.test.junit.TestProfile; - -import java.time.Duration; -import java.util.HashMap; -import java.util.Map; - -import com.google.common.collect.Lists; import org.apache.iceberg.catalog.TableIdentifier; import org.awaitility.Awaitility; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; +import java.time.Duration; +import java.util.HashMap; +import java.util.Map; + /** * Integration test that verifies basic reading from PostgreSQL database and writing to iceberg destination. * @@ -33,8 +32,8 @@ */ @QuarkusTest @Disabled // @TODO remove spark with antlr4 version -@QuarkusTestResource(value = S3Minio.class, restrictToAnnotatedClass = true) -@QuarkusTestResource(value = SourceMysqlDB.class, restrictToAnnotatedClass = true) +@WithTestResource(value = S3Minio.class) +@WithTestResource(value = SourceMysqlDB.class) @TestProfile(IcebergSchemaHistoryTest.TestProfile.class) public class IcebergSchemaHistoryTest extends BaseTest { @Test diff --git a/debezium-server-iceberg-sink/src/test/java/io/debezium/server/iceberg/offset/IcebergOffsetBackingStoreTest.java b/debezium-server-iceberg-sink/src/test/java/io/debezium/server/iceberg/offset/IcebergOffsetBackingStoreTest.java index fb9fbce6..da86197b 100644 --- a/debezium-server-iceberg-sink/src/test/java/io/debezium/server/iceberg/offset/IcebergOffsetBackingStoreTest.java +++ b/debezium-server-iceberg-sink/src/test/java/io/debezium/server/iceberg/offset/IcebergOffsetBackingStoreTest.java @@ -8,18 +8,11 @@ package io.debezium.server.iceberg.offset; +import com.google.common.collect.Lists; import io.debezium.server.iceberg.testresources.BaseTest; import io.debezium.server.iceberg.testresources.S3Minio; -import io.quarkus.test.common.QuarkusTestResource; +import io.quarkus.test.common.WithTestResource; import io.quarkus.test.junit.QuarkusTest; - -import java.nio.ByteBuffer; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; - -import com.google.common.collect.Lists; import org.apache.iceberg.catalog.TableIdentifier; import org.apache.iceberg.data.Record; import org.apache.iceberg.io.CloseableIterable; @@ -31,13 +24,19 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; +import java.nio.ByteBuffer; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; + import static io.debezium.server.iceberg.TestConfigSource.CATALOG_TABLE_NAMESPACE; import static io.debezium.server.iceberg.offset.IcebergOffsetBackingStore.fromByteBuffer; import static io.debezium.server.iceberg.offset.IcebergOffsetBackingStore.toByteBuffer; import static org.junit.jupiter.api.Assertions.assertEquals; @QuarkusTest -@QuarkusTestResource(value = S3Minio.class, restrictToAnnotatedClass = true) +@WithTestResource(value = S3Minio.class) public class IcebergOffsetBackingStoreTest extends BaseTest { private static final Map firstSet = new HashMap<>(); diff --git a/debezium-server-iceberg-sink/src/test/java/io/debezium/server/iceberg/tableoperator/IcebergTableOperatorTest.java b/debezium-server-iceberg-sink/src/test/java/io/debezium/server/iceberg/tableoperator/IcebergTableOperatorTest.java index d628faf5..1c33bdcf 100644 --- a/debezium-server-iceberg-sink/src/test/java/io/debezium/server/iceberg/tableoperator/IcebergTableOperatorTest.java +++ b/debezium-server-iceberg-sink/src/test/java/io/debezium/server/iceberg/tableoperator/IcebergTableOperatorTest.java @@ -9,12 +9,12 @@ package io.debezium.server.iceberg.tableoperator; import io.debezium.DebeziumException; -import io.debezium.server.iceberg.RecordConverter; import io.debezium.server.iceberg.IcebergUtil; +import io.debezium.server.iceberg.RecordConverter; import io.debezium.server.iceberg.testresources.BaseSparkTest; import io.debezium.server.iceberg.testresources.IcebergChangeEventBuilder; import io.debezium.server.iceberg.testresources.S3Minio; -import io.quarkus.test.common.QuarkusTestResource; +import io.quarkus.test.common.WithTestResource; import io.quarkus.test.junit.QuarkusTest; import jakarta.inject.Inject; import org.apache.iceberg.Table; @@ -38,7 +38,7 @@ * @author Ismail Simsek */ @QuarkusTest -@QuarkusTestResource(value = S3Minio.class, restrictToAnnotatedClass = true) +@WithTestResource(value = S3Minio.class) class IcebergTableOperatorTest extends BaseSparkTest { static String testTable = "inventory.test_table_operator";