From 2677723aefcf9dfca1f2c2cb8b76ed7bcacb4f44 Mon Sep 17 00:00:00 2001 From: Derek Moore Date: Thu, 3 Jun 2021 11:51:45 -0500 Subject: [PATCH] DBZ-3546 remove duplicate integration test, test both modes with 1 test Signed-off-by: Derek Moore --- .../io/debezium/server/pravega/PravegaIT.java | 2 - .../debezium/server/pravega/PravegaTxnIT.java | 95 ------------------- 2 files changed, 97 deletions(-) delete mode 100644 debezium-server/debezium-server-pravega/src/test/java/io/debezium/server/pravega/PravegaTxnIT.java diff --git a/debezium-server/debezium-server-pravega/src/test/java/io/debezium/server/pravega/PravegaIT.java b/debezium-server/debezium-server-pravega/src/test/java/io/debezium/server/pravega/PravegaIT.java index 378daf17b..02eb17684 100644 --- a/debezium-server/debezium-server-pravega/src/test/java/io/debezium/server/pravega/PravegaIT.java +++ b/debezium-server/debezium-server-pravega/src/test/java/io/debezium/server/pravega/PravegaIT.java @@ -14,7 +14,6 @@ import org.awaitility.Awaitility; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.condition.EnabledIfSystemProperty; import io.debezium.server.TestConfigSource; import io.debezium.server.events.ConnectorCompletedEvent; @@ -35,7 +34,6 @@ @QuarkusTest @QuarkusTestResource(PostgresTestResourceLifecycleManager.class) @QuarkusTestResource(PravegaTestResource.class) -@EnabledIfSystemProperty(named = "debezium.sink.pravega.transaction", matches = "false") public class PravegaIT { private static final int MESSAGE_COUNT = 4; diff --git a/debezium-server/debezium-server-pravega/src/test/java/io/debezium/server/pravega/PravegaTxnIT.java b/debezium-server/debezium-server-pravega/src/test/java/io/debezium/server/pravega/PravegaTxnIT.java deleted file mode 100644 index e956d004a..000000000 --- a/debezium-server/debezium-server-pravega/src/test/java/io/debezium/server/pravega/PravegaTxnIT.java +++ /dev/null @@ -1,95 +0,0 @@ -/* - * Copyright Debezium Authors. - * - * Licensed under the Apache Software License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0 - */ -package io.debezium.server.pravega; - -import java.io.IOException; -import java.net.URI; -import java.time.Duration; -import java.util.ArrayList; -import java.util.List; - -import javax.enterprise.event.Observes; - -import org.awaitility.Awaitility; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.condition.EnabledIfSystemProperty; - -import io.debezium.server.TestConfigSource; -import io.debezium.server.events.ConnectorCompletedEvent; -import io.debezium.server.events.ConnectorStartedEvent; -import io.debezium.testing.testcontainers.PostgresTestResourceLifecycleManager; -import io.debezium.util.Testing; -import io.pravega.client.ClientConfig; -import io.pravega.client.EventStreamClientFactory; -import io.pravega.client.admin.ReaderGroupManager; -import io.pravega.client.stream.EventStreamReader; -import io.pravega.client.stream.ReaderConfig; -import io.pravega.client.stream.ReaderGroupConfig; -import io.pravega.client.stream.Stream; -import io.pravega.client.stream.impl.UTF8StringSerializer; -import io.quarkus.test.common.QuarkusTestResource; -import io.quarkus.test.junit.QuarkusTest; - -@QuarkusTest -@QuarkusTestResource(PostgresTestResourceLifecycleManager.class) -@QuarkusTestResource(PravegaTestResource.class) -@EnabledIfSystemProperty(named = "debezium.sink.pravega.transaction", matches = "true") -public class PravegaTxnIT { - - private static final int MESSAGE_COUNT = 4; - protected static final String STREAM_NAME = "testc.inventory.customers"; - - static EventStreamReader reader; - - { - Testing.Files.delete(TestConfigSource.OFFSET_STORE_PATH); - Testing.Files.createTestingFile(TestConfigSource.OFFSET_STORE_PATH); - } - - void setupDependencies(@Observes ConnectorStartedEvent event) throws IOException { - Testing.Print.enable(); - } - - void connectorCompleted(@Observes ConnectorCompletedEvent event) throws Exception { - if (!event.isSuccess()) { - throw new RuntimeException(event.getError().get()); - } - } - - /** - * Creates a reader where scope name, stream name and reader group name are STREAM_NAME. - * Consumes 4 events using the reader. - */ - @Test - public void testPravega() { - URI controllerURI = URI.create(PravegaTestResource.getControllerUri()); - ClientConfig clientConfig = ClientConfig.builder() - .controllerURI(controllerURI) - .build(); - ReaderGroupConfig readerGroupConfig = ReaderGroupConfig.builder() - .stream(Stream.of(STREAM_NAME, STREAM_NAME)) - .disableAutomaticCheckpoints() - .build(); - - try (final ReaderGroupManager readerGroupManager = ReaderGroupManager.withScope(STREAM_NAME, clientConfig)) { - readerGroupManager.createReaderGroup(STREAM_NAME, readerGroupConfig); - } - - ReaderConfig readerConfig = ReaderConfig.builder().build(); - reader = EventStreamClientFactory.withScope(STREAM_NAME, clientConfig) - .createReader("0", STREAM_NAME, new UTF8StringSerializer(), readerConfig); - - final List records = new ArrayList<>(); - Awaitility.await().atMost(Duration.ofSeconds(TestConfigSource.waitForSeconds())).until(() -> { - String event; - if ((event = reader.readNextEvent(2000).getEvent()) != null) { - records.add(event); - } - return records.size() >= MESSAGE_COUNT; - }); - } - -}