From 6ce0c32711fcb6d2a8a165a2794aafb8f5895493 Mon Sep 17 00:00:00 2001 From: Yevhen Sukhomud Date: Fri, 1 Jul 2022 17:39:53 +0700 Subject: [PATCH] 13538 Fix integration tests destination-scylla Mac OS (#14308) * 13538 Fix integration tests destination-scylla Mac OS --- .../integrations/destination/scylla/ScyllaConfig.java | 2 +- .../destination/scylla/ScyllaCqlProviderTest.java | 5 +++-- .../scylla/ScyllaDestinationAcceptanceTest.java | 9 +++------ .../destination/scylla/ScyllaDestinationTest.java | 5 +++-- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/airbyte-integrations/connectors/destination-scylla/src/main/java/io/airbyte/integrations/destination/scylla/ScyllaConfig.java b/airbyte-integrations/connectors/destination-scylla/src/main/java/io/airbyte/integrations/destination/scylla/ScyllaConfig.java index 801401a00141..4bfe7f3ef37b 100644 --- a/airbyte-integrations/connectors/destination-scylla/src/main/java/io/airbyte/integrations/destination/scylla/ScyllaConfig.java +++ b/airbyte-integrations/connectors/destination-scylla/src/main/java/io/airbyte/integrations/destination/scylla/ScyllaConfig.java @@ -35,7 +35,7 @@ public ScyllaConfig(JsonNode jsonNode) { this.username = jsonNode.get("username").asText(); this.password = jsonNode.get("password").asText(); this.address = jsonNode.get("address").asText(); - this.port = jsonNode.get("port").asInt(9042); + this.port = jsonNode.get("port").asInt(); this.replication = jsonNode.get("replication").asInt(1); } diff --git a/airbyte-integrations/connectors/destination-scylla/src/test-integration/java/io/airbyte/integrations/destination/scylla/ScyllaCqlProviderTest.java b/airbyte-integrations/connectors/destination-scylla/src/test-integration/java/io/airbyte/integrations/destination/scylla/ScyllaCqlProviderTest.java index 55b026d5c503..6de22afba9b1 100644 --- a/airbyte-integrations/connectors/destination-scylla/src/test-integration/java/io/airbyte/integrations/destination/scylla/ScyllaCqlProviderTest.java +++ b/airbyte-integrations/connectors/destination-scylla/src/test-integration/java/io/airbyte/integrations/destination/scylla/ScyllaCqlProviderTest.java @@ -9,6 +9,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import com.datastax.driver.core.exceptions.InvalidQueryException; +import io.airbyte.integrations.util.HostPortResolver; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -29,8 +30,8 @@ class ScyllaCqlProviderTest { void setup() { var scyllaContainer = ScyllaContainerInitializr.initContainer(); var scyllaConfig = TestDataFactory.scyllaConfig( - scyllaContainer.getHost(), - scyllaContainer.getFirstMappedPort()); + HostPortResolver.resolveHost(scyllaContainer), + HostPortResolver.resolvePort(scyllaContainer)); this.scyllaCqlProvider = new ScyllaCqlProvider(scyllaConfig); this.nameTransformer = new ScyllaNameTransformer(scyllaConfig); this.scyllaCqlProvider.createKeyspaceIfNotExists(SCYLLA_KEYSPACE); diff --git a/airbyte-integrations/connectors/destination-scylla/src/test-integration/java/io/airbyte/integrations/destination/scylla/ScyllaDestinationAcceptanceTest.java b/airbyte-integrations/connectors/destination-scylla/src/test-integration/java/io/airbyte/integrations/destination/scylla/ScyllaDestinationAcceptanceTest.java index 95479b3bb44f..76f0099ec9a2 100644 --- a/airbyte-integrations/connectors/destination-scylla/src/test-integration/java/io/airbyte/integrations/destination/scylla/ScyllaDestinationAcceptanceTest.java +++ b/airbyte-integrations/connectors/destination-scylla/src/test-integration/java/io/airbyte/integrations/destination/scylla/ScyllaDestinationAcceptanceTest.java @@ -10,17 +10,14 @@ import io.airbyte.integrations.standardtest.destination.DestinationAcceptanceTest; import io.airbyte.integrations.standardtest.destination.comparator.AdvancedTestDataComparator; import io.airbyte.integrations.standardtest.destination.comparator.TestDataComparator; +import io.airbyte.integrations.util.HostPortResolver; import java.util.Comparator; import java.util.List; import java.util.stream.Collectors; import org.junit.jupiter.api.BeforeAll; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; class ScyllaDestinationAcceptanceTest extends DestinationAcceptanceTest { - private static final Logger LOGGER = LoggerFactory.getLogger(ScyllaDestinationAcceptanceTest.class); - private JsonNode configJson; private ScyllaCqlProvider scyllaCqlProvider; @@ -42,8 +39,8 @@ static void initContainer() { @Override protected void setup(TestDestinationEnv testEnv) { configJson = TestDataFactory.jsonConfig( - scyllaContainer.getHost(), - scyllaContainer.getFirstMappedPort()); + HostPortResolver.resolveHost(scyllaContainer), + HostPortResolver.resolvePort(scyllaContainer)); var scyllaConfig = new ScyllaConfig(configJson); this.scyllaCqlProvider = new ScyllaCqlProvider(scyllaConfig); this.nameTransformer = new ScyllaNameTransformer(scyllaConfig); diff --git a/airbyte-integrations/connectors/destination-scylla/src/test-integration/java/io/airbyte/integrations/destination/scylla/ScyllaDestinationTest.java b/airbyte-integrations/connectors/destination-scylla/src/test-integration/java/io/airbyte/integrations/destination/scylla/ScyllaDestinationTest.java index 21171a22bfeb..5e76cbad1bf2 100644 --- a/airbyte-integrations/connectors/destination-scylla/src/test-integration/java/io/airbyte/integrations/destination/scylla/ScyllaDestinationTest.java +++ b/airbyte-integrations/connectors/destination-scylla/src/test-integration/java/io/airbyte/integrations/destination/scylla/ScyllaDestinationTest.java @@ -7,6 +7,7 @@ import static org.assertj.core.api.Assertions.assertThat; import io.airbyte.integrations.destination.scylla.ScyllaContainerInitializr.ScyllaContainer; +import io.airbyte.integrations.util.HostPortResolver; import io.airbyte.protocol.models.AirbyteConnectionStatus; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -29,8 +30,8 @@ void setup() { void testCheckWithStatusSucceeded() { var jsonConfiguration = TestDataFactory.jsonConfig( - scyllaContainer.getHost(), - scyllaContainer.getFirstMappedPort()); + HostPortResolver.resolveHost(scyllaContainer), + HostPortResolver.resolvePort(scyllaContainer)); var connectionStatus = scyllaDestination.check(jsonConfiguration);