Skip to content

Commit f7b5d60

Browse files
authored
Improve testing code and dependencies (#80)
* Improve testing code * Improve testing code * Improve testing code
1 parent 226ef86 commit f7b5d60

File tree

9 files changed

+40
-29
lines changed

9 files changed

+40
-29
lines changed

debezium-server-bigquery-sinks/pom.xml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -86,18 +86,6 @@
8686
<version>4.2.0</version>
8787
<scope>test</scope>
8888
</dependency>
89-
<dependency>
90-
<groupId>io.debezium</groupId>
91-
<artifactId>debezium-core</artifactId>
92-
<type>test-jar</type>
93-
<scope>test</scope>
94-
</dependency>
95-
<dependency>
96-
<groupId>io.debezium</groupId>
97-
<artifactId>debezium-server-core</artifactId>
98-
<type>test-jar</type>
99-
<scope>test</scope>
100-
</dependency>
10189
<dependency>
10290
<groupId>org.testcontainers</groupId>
10391
<artifactId>testcontainers</artifactId>

debezium-server-bigquery-sinks/src/test/java/io/debezium/server/bigquery/BaseBigqueryTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import org.awaitility.Awaitility;
2222
import org.slf4j.Logger;
2323
import org.slf4j.LoggerFactory;
24-
import static io.debezium.server.bigquery.ConfigSource.*;
24+
import static io.debezium.server.bigquery.TestConfigSource.*;
2525

2626
/**
2727
*

debezium-server-bigquery-sinks/src/test/java/io/debezium/server/bigquery/BatchUtilTest.java

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@
99
package io.debezium.server.bigquery;
1010

1111
import io.debezium.serde.DebeziumSerdes;
12-
import io.debezium.util.Testing;
1312

13+
import java.io.IOException;
14+
import java.nio.file.Files;
15+
import java.nio.file.Path;
1416
import java.util.Collections;
1517

1618
import com.fasterxml.jackson.databind.JsonNode;
@@ -20,8 +22,11 @@
2022

2123
class BatchUtilTest {
2224

23-
final String serdeWithSchema = Testing.Files.readResourceAsString("json/serde-with-schema.json");
24-
final String unwrapWithSchema = Testing.Files.readResourceAsString("json/unwrap-with-schema.json");
25+
final String serdeWithSchema = Files.readString(Path.of("src/test/resources/json/serde-with-schema.json"));
26+
final String unwrapWithSchema = Files.readString(Path.of("src/test/resources/json/unwrap-with-schema.json"));
27+
28+
BatchUtilTest() throws IOException {
29+
}
2530

2631
@Test
2732
public void testValuePayloadWithSchemaAsJsonNode() {

debezium-server-bigquery-sinks/src/test/java/io/debezium/server/bigquery/ConfigSource.java renamed to debezium-server-bigquery-sinks/src/test/java/io/debezium/server/bigquery/TestConfigSource.java

Lines changed: 26 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,24 @@
88

99
package io.debezium.server.bigquery;
1010

11-
import io.debezium.server.TestConfigSource;
12-
11+
import java.util.HashMap;
1312
import java.util.List;
13+
import java.util.Map;
14+
import java.util.Set;
15+
16+
import org.eclipse.microprofile.config.spi.ConfigSource;
1417

15-
public class ConfigSource extends TestConfigSource {
18+
public class TestConfigSource implements ConfigSource {
1619
public static String BQ_LOCATION = "EU";
1720
// overriden by user src/test/resources/application.properties
1821
public static String BQ_PROJECT = "test";
1922
public static String BQ_DATASET = "stage";
2023
public static String BQ_CRED_FILE = ""; // "/path/to/application_credentials.json"
2124
public static List<String> TABLES = List.of("customers", "geom", "orders", "products", "products_on_hand",
2225
"test_data_types", "test_table");
26+
protected Map<String, String> config = new HashMap<>();
2327

24-
public ConfigSource() {
28+
public TestConfigSource() {
2529
config.put("debezium.sink.type", "bigquerybatch");
2630
config.put("debezium.source.include.schema.changes", "false");
2731
config.put("debezium.source.decimal.handling.mode", "double");
@@ -67,10 +71,24 @@ public ConfigSource() {
6771
config.put("quarkus.log.category.\"com.google.cloud.bigquery\".level", "INFO");
6872
}
6973

74+
75+
@Override
76+
public Map<String, String> getProperties() {
77+
return config;
78+
}
79+
80+
@Override
81+
public String getValue(String propertyName) {
82+
return config.get(propertyName);
83+
}
84+
85+
@Override
86+
public String getName() {
87+
return "test";
88+
}
89+
7090
@Override
71-
public int getOrdinal() {
72-
// Configuration property precedence is based on ordinal values and since we override the
73-
// properties in TestConfigSource, we should give this a higher priority.
74-
return super.getOrdinal() + 1;
91+
public Set<String> getPropertyNames() {
92+
return config.keySet();
7593
}
7694
}

debezium-server-bigquery-sinks/src/test/java/io/debezium/server/bigquery/history/BigquerySchemaHistoryTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import java.util.Map;
2424

2525
import org.junit.jupiter.api.*;
26-
import static io.debezium.server.bigquery.ConfigSource.*;
26+
import static io.debezium.server.bigquery.TestConfigSource.*;
2727

2828

2929
@Disabled

debezium-server-bigquery-sinks/src/test/java/io/debezium/server/bigquery/offset/BigqueryOffsetBackingStoreTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import org.junit.jupiter.api.BeforeAll;
2929
import org.junit.jupiter.api.Disabled;
3030
import org.junit.jupiter.api.Test;
31-
import static io.debezium.server.bigquery.ConfigSource.BQ_DATASET;
31+
import static io.debezium.server.bigquery.TestConfigSource.BQ_DATASET;
3232
import static org.junit.jupiter.api.Assertions.assertEquals;
3333

3434
@QuarkusTest

debezium-server-bigquery-sinks/src/test/java/io/debezium/server/bigquery/shared/SourceMysqlDB.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import org.slf4j.LoggerFactory;
2424
import org.testcontainers.containers.GenericContainer;
2525
import org.testcontainers.containers.wait.strategy.Wait;
26-
import static io.debezium.server.bigquery.ConfigSource.TABLES;
26+
import static io.debezium.server.bigquery.TestConfigSource.TABLES;
2727

2828
public class SourceMysqlDB implements QuarkusTestResourceLifecycleManager {
2929

debezium-server-bigquery-sinks/src/test/java/io/debezium/server/bigquery/shared/SourcePostgresqlDB.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import org.testcontainers.containers.GenericContainer;
2626
import org.testcontainers.containers.wait.strategy.Wait;
2727
import org.testcontainers.images.builder.ImageFromDockerfile;
28-
import static io.debezium.server.bigquery.ConfigSource.TABLES;
28+
import static io.debezium.server.bigquery.TestConfigSource.TABLES;
2929

3030
public class SourcePostgresqlDB implements QuarkusTestResourceLifecycleManager {
3131

debezium-server-bigquery-sinks/src/test/resources/META-INF/services/org.eclipse.microprofile.config.spi.ConfigSource

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
# */
77
#
88

9-
io.debezium.server.bigquery.ConfigSource
9+
io.debezium.server.bigquery.TestConfigSource

0 commit comments

Comments
 (0)