Revert "Fix unit test failures on Windows"

aroskuski · aroskuski · commit 5c62e47e9e77 · 2022-02-04T22:15:36.000-05:00
This reverts commit 0446591.
diff --git a/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java b/docker-java/src/test/java/com/github/dockerjava/core/DefaultDockerClientConfigTest.java
@@ -5,7 +5,6 @@
 import com.github.dockerjava.api.model.AuthConfigurations;
 import com.google.common.io.Resources;
 import org.apache.commons.lang3.SerializationUtils;
-import org.apache.commons.lang3.SystemUtils;
 import org.junit.Test;
 
 import java.io.File;
@@ -98,11 +97,8 @@ public void emptyHost() {
 
         DefaultDockerClientConfig config = buildConfig(env, new Properties());
 
-        String expectedDefaultHost = SystemUtils.IS_OS_WINDOWS ? DefaultDockerClientConfig.WINDOWS_DEFAULT_DOCKER_HOST
-            : DefaultDockerClientConfig.DEFAULT_DOCKER_HOST;
-
         assertEquals(
-            expectedDefaultHost,
+            DefaultDockerClientConfig.DEFAULT_DOCKER_HOST,
             config.getDockerHost().toString()
         );
     }
@@ -123,9 +119,7 @@ public void defaults() throws Exception {
         DefaultDockerClientConfig config = buildConfig(Collections.<String, String> emptyMap(), systemProperties);
 
         // then the cert path is as expected
-        URI expectedDefaultURI = SystemUtils.IS_OS_WINDOWS ? URI.create(DefaultDockerClientConfig.WINDOWS_DEFAULT_DOCKER_HOST)
-            : URI.create(DefaultDockerClientConfig.DEFAULT_DOCKER_HOST);
-        assertEquals(config.getDockerHost(), expectedDefaultURI);
+        assertEquals(config.getDockerHost(), URI.create("unix:///var/run/docker.sock"));
         assertEquals(config.getRegistryUsername(), "someUserName");
         assertEquals(config.getRegistryUrl(), AuthConfig.DEFAULT_SERVER_ADDRESS);
         assertEquals(config.getApiVersion(), RemoteApiVersion.unknown());
diff --git a/docker-java/src/test/java/com/github/dockerjava/core/util/CompressArchiveUtilTest.java b/docker-java/src/test/java/com/github/dockerjava/core/util/CompressArchiveUtilTest.java
@@ -2,7 +2,6 @@
 
 import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
 import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
-import org.apache.commons.lang3.SystemUtils;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
@@ -23,7 +22,6 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assume.assumeFalse;
 
 public class CompressArchiveUtilTest {
 
@@ -71,7 +69,6 @@ public void tarWithExecutableFileAsInput() throws Exception {
 
     @Test
     public void tarWithSymbolicLinkFileAsInput() throws IOException {
-        assumeSymbolicLinksAreUnrestrictedByDefault();
         Path archiveSourceFile = tempFolder.getRoot().toPath().resolve("symlinkFile");
         Path linkTargetFile = tempFolder.newFile("link-target").toPath();
         Files.createSymbolicLink(archiveSourceFile, linkTargetFile);
@@ -142,7 +139,6 @@ public void tarWithfolderAsInputAndNestedExecutableFile() throws Exception {
 
     @Test
     public void tarWithfolderAsInputAndNestedSymbolicLinkFile() throws Exception {
-        assumeSymbolicLinksAreUnrestrictedByDefault();
         Path archiveSourceDir = tempFolder.newFolder("archive-source").toPath();
         Path linkTargetFile = tempFolder.newFile("link-target").toPath();
         Path symlinkFile = archiveSourceDir.resolve("symlinkFile");
@@ -164,7 +160,6 @@ public void tarWithfolderAsInputAndNestedSymbolicLinkFile() throws Exception {
 
     @Test
     public void tarWithfolderAsInputAndNestedSymbolicLinkDir() throws Exception {
-        assumeSymbolicLinksAreUnrestrictedByDefault();
         Path archiveSourceDir = tempFolder.newFolder("archive-source").toPath();
         Path linkTargetDir = tempFolder.newFolder("link-target").toPath();
         Path symlinkFile = archiveSourceDir.resolve("symlinkFile");
@@ -209,7 +204,6 @@ public void archiveTARFilesWithExecutableFile() throws Exception {
 
     @Test
     public void archiveTARFilesWithSymbolicLinkFile() throws Exception {
-        assumeSymbolicLinksAreUnrestrictedByDefault();
         Path linkTargetFile = tempFolder.newFile("link-target").toPath();
         Path symlinkFile = tempFolder.getRoot().toPath().resolve("symlinkFile");
         Files.createSymbolicLink(symlinkFile, linkTargetFile);
@@ -221,7 +215,6 @@ public void archiveTARFilesWithSymbolicLinkFile() throws Exception {
 
     @Test
     public void archiveTARFilesWithSymbolicLinkDir() throws Exception {
-        assumeSymbolicLinksAreUnrestrictedByDefault();
         Path linkTargetDir = tempFolder.newFolder("link-target").toPath();
         Path symlinkFile = tempFolder.getRoot().toPath().resolve("symlinkFile");
         Files.createSymbolicLink(symlinkFile, linkTargetDir);
@@ -324,8 +317,4 @@ private static int getNumberOfEntryInArchive(File tarArchive) throws IOException
         }
         return numberOfEntries;
     }
-
-    private static void assumeSymbolicLinksAreUnrestrictedByDefault(){
-        assumeFalse(SystemUtils.IS_OS_WINDOWS);
-    }
 }
