13538 Fix integration tests destination-scylla Mac OS (#14308)

* 13538 Fix integration tests destination-scylla Mac OS
airbytehq · Jul 1, 2022 · 6ce0c32 · 6ce0c32
1 parent 98d087b
commit 6ce0c32
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git a/...ination-scylla/src/main/java/io/airbyte/integrations/destination/scylla/ScyllaConfig.java b/...ination-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/...st-integration/java/io/airbyte/integrations/destination/scylla/ScyllaCqlProviderTest.java b/...st-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/...tion/java/io/airbyte/integrations/destination/scylla/ScyllaDestinationAcceptanceTest.java b/...tion/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/...st-integration/java/io/airbyte/integrations/destination/scylla/ScyllaDestinationTest.java b/...st-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);