From 43dac07d5b04107a9965609e3550ada4df7b1fc9 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Wed, 6 Jul 2022 14:41:24 +1200
Subject: [PATCH] #2740 - Bump ebean-test-containers to 6.2

---
 .../test/config/platform/RedisSetup.java      |  8 +-
 .../test/config/platform/DockerHostTest.java  | 87 -------------------
 2 files changed, 3 insertions(+), 92 deletions(-)
 delete mode 100644 ebean-test/src/test/java/io/ebean/test/config/platform/DockerHostTest.java

diff --git a/ebean-test/src/main/java/io/ebean/test/config/platform/RedisSetup.java b/ebean-test/src/main/java/io/ebean/test/config/platform/RedisSetup.java
index 0fd933d26..5dc46ade5 100644
--- a/ebean-test/src/main/java/io/ebean/test/config/platform/RedisSetup.java
+++ b/ebean-test/src/main/java/io/ebean/test/config/platform/RedisSetup.java
@@ -1,5 +1,6 @@
 package io.ebean.test.config.platform;
 
+import io.ebean.test.containers.DockerHost;
 import io.ebean.test.containers.RedisContainer;
 
 import java.util.Properties;
@@ -10,11 +11,8 @@ class RedisSetup {
     String version = properties.getProperty("ebean.test.redis");
     version = properties.getProperty("ebean.test.redis.version", version);
     if (version != null) {
-      DockerHost dockerHost = new DockerHost();
-      if (dockerHost.runningInDocker()) {
-        String host = dockerHost.dockerHost(properties.getProperty("ebean.test.dockerHost"));
-        properties.setProperty("redis.host",  host);
-      }
+      String host = properties.getProperty("ebean.test.dockerHost", DockerHost.host());
+      properties.setProperty("redis.host",  host);
       RedisContainer.builder(version)
         .properties(properties)
         .build()
diff --git a/ebean-test/src/test/java/io/ebean/test/config/platform/DockerHostTest.java b/ebean-test/src/test/java/io/ebean/test/config/platform/DockerHostTest.java
deleted file mode 100644
index 0be8a5d43..000000000
--- a/ebean-test/src/test/java/io/ebean/test/config/platform/DockerHostTest.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package io.ebean.test.config.platform;
-
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-class DockerHostTest {
-
-  @Test
-  void runningInDocker_when_false_alwaysUseLocalhost() {
-    DockerHost dockerHost = new DockerHost();
-    assertFalse(dockerHost.runningInDocker());
-    assertEquals("localhost", dockerHost.dockerHost("foo"));
-  }
-
-  @Test
-  void runningInDocker_when_true_useExplicit() {
-    TDDockerHost dockerHost = new TDDockerHost();
-    assertTrue(dockerHost.runningInDocker());
-
-    assertEquals("my-host", dockerHost.dockerHost("my-host"));
-  }
-
-  @Disabled
-  @Test
-  void runningInDocker_when_trueAndLinux_useDefault() {
-    TDDockerHost dockerHost = new TDDockerHost();
-    assertTrue(dockerHost.runningInDocker());
-
-    assertEquals("172.17.0.1", dockerHost.dockerHost(null));
-  }
-
-  @Test
-  void runningInDocker_when_windowsDefault() {
-    TDDockerHost dockerHost = new TDDockerHost();
-    assertTrue(dockerHost.runningInDocker());
-
-    String origName = System.getProperty("os.name");
-    System.setProperty("os.name", "win");
-    try {
-      assertEquals("host.docker.internal",dockerHost.defaultDockerHost());
-      assertEquals("host.docker.internal", dockerHost.dockerHost(null));
-    } finally {
-      System.setProperty("os.name", origName);
-    }
-  }
-
-  @Test
-  void runningInDocker_when_macDefault() {
-    TDDockerHost dockerHost = new TDDockerHost();
-    assertTrue(dockerHost.runningInDocker());
-
-    String origName = System.getProperty("os.name");
-    System.setProperty("os.name", "mac");
-    try {
-      assertEquals("host.docker.internal",dockerHost.defaultDockerHost());
-      assertEquals("host.docker.internal", dockerHost.dockerHost(null));
-    } finally {
-      System.setProperty("os.name", origName);
-    }
-  }
-
-
-  @Test
-  void runningInDocker_when_linuxDefault() {
-    TDDockerHost dockerHost = new TDDockerHost();
-    assertTrue(dockerHost.runningInDocker());
-
-    String origName = System.getProperty("os.name");
-    System.setProperty("os.name", "linux");
-    try {
-      assertEquals("172.17.0.1",dockerHost.defaultDockerHost());
-      assertEquals("172.17.0.1", dockerHost.dockerHost(null));
-    } finally {
-      System.setProperty("os.name", origName);
-    }
-  }
-
-  static class TDDockerHost extends DockerHost {
-
-    @Override
-    boolean initInDocker() {
-      return true;
-    }
-  }
-}