Skip to content
This repository was archived by the owner on Jul 27, 2023. It is now read-only.

Fix breaking test and upgrade TestContainers for M1 support #472

Open
dlabey wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix breaking test and upgrade TestContainers for M1 support #472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dfcc8fa
Using UUID.randomUUID().toString instead of createAutoDeregisterServi…
Jan 24, 2023
6819c25
Upgrading TestContainers to 1.17.6 for M1 support and fixing compiler…
Jan 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<okhttp.version>4.9.0</okhttp.version>
<slf4j.version>1.7.30</slf4j.version>
<logback.version>1.2.3</logback.version>
<testcontainers.version>1.15.1</testcontainers.version>
<testcontainers.version>1.17.6</testcontainers.version>
</properties>
<distributionManagement>
<snapshotRepository>
Expand Down Expand Up @@ -260,7 +260,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<release>${java.version}</release>
<source>${java.version}</source>
<target>${java.version}</target>
</configuration>
</plugin>
<plugin>
Expand Down
37 changes: 24 additions & 13 deletions src/itest/java/com/orbitz/consul/CatalogITest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,9 @@
package com.orbitz.consul;

import com.orbitz.consul.async.ConsulResponseCallback;
import com.orbitz.consul.model.ConsulResponse;
import com.orbitz.consul.model.catalog.*;
import com.orbitz.consul.model.health.ImmutableService;
import com.orbitz.consul.model.health.Node;
import com.orbitz.consul.model.health.Service;
import com.orbitz.consul.model.health.ServiceHealth;
import com.orbitz.consul.option.ImmutableQueryOptions;
import com.orbitz.consul.option.QueryOptions;
import org.junit.Ignore;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;

import java.math.BigInteger;
import java.net.UnknownHostException;
Expand All @@ -24,7 +17,25 @@
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;

import static org.junit.Assert.*;
import org.junit.Ignore;
import org.junit.Test;

import com.orbitz.consul.async.ConsulResponseCallback;
import com.orbitz.consul.model.ConsulResponse;
import com.orbitz.consul.model.catalog.CatalogDeregistration;
import com.orbitz.consul.model.catalog.CatalogNode;
import com.orbitz.consul.model.catalog.CatalogRegistration;
import com.orbitz.consul.model.catalog.CatalogService;
import com.orbitz.consul.model.catalog.ImmutableCatalogDeregistration;
import com.orbitz.consul.model.catalog.ImmutableCatalogRegistration;
import com.orbitz.consul.model.catalog.ImmutableCatalogService;
import com.orbitz.consul.model.catalog.ImmutableServiceWeights;
import com.orbitz.consul.model.health.ImmutableService;
import com.orbitz.consul.model.health.Node;
import com.orbitz.consul.model.health.Service;
import com.orbitz.consul.model.health.ServiceHealth;
import com.orbitz.consul.option.ImmutableQueryOptions;
import com.orbitz.consul.option.QueryOptions;

public class CatalogITest extends BaseIntegrationTest {

Expand Down Expand Up @@ -284,7 +295,7 @@ public void shouldGetNodeInCallback() throws ExecutionException, InterruptedExce

String nodeName = "node";
String serviceName = UUID.randomUUID().toString();
String serviceId = createAutoDeregisterServiceId();
String serviceId = UUID.randomUUID().toString();
String catalogId = UUID.randomUUID().toString();

CatalogRegistration registration = ImmutableCatalogRegistration.builder()
Expand Down