Renamed LocalDocker to UnixDocker and RemoteDocker to TcpDocker.

amihaiemil · Mar 20, 2020 · 8e6631d · 8e6631d
1 parent 2e2a9a0
commit 8e6631d
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 8 deletions.
diff --git a/...om/amihaiemil/docker/LocalUnixDocker.java → ...va/com/amihaiemil/docker/LocalDocker.java b/...om/amihaiemil/docker/LocalUnixDocker.java → ...va/com/amihaiemil/docker/LocalDocker.java
diff --git a/...om/amihaiemil/docker/RemoteTcpDocker.java → ...a/com/amihaiemil/docker/RemoteDocker.java b/...om/amihaiemil/docker/RemoteTcpDocker.java → ...a/com/amihaiemil/docker/RemoteDocker.java
diff --git a/...haiemil/docker/LocalUnixDockerITCase.java → .../amihaiemil/docker/LocalDockerITCase.java b/...haiemil/docker/LocalUnixDockerITCase.java → .../amihaiemil/docker/LocalDockerITCase.java
@@ -43,7 +43,7 @@
  * @version $Id$
  * @since 0.0.1
  */
-public final class LocalUnixDockerITCase {
+public final class LocalDockerITCase {
 
     /**
      * LocalUnixDocker can ping the Docker Engine.

diff --git a/...iemil/docker/LocalUnixDockerTestCase.java → ...mihaiemil/docker/LocalDockerTestCase.java b/...iemil/docker/LocalUnixDockerTestCase.java → ...mihaiemil/docker/LocalDockerTestCase.java
@@ -39,7 +39,7 @@
  * @version $Id$
  * @since 0.0.1
  */
-public final class LocalUnixDockerTestCase {
+public final class LocalDockerTestCase {
 
     /**
      * LocalUnixDocker can be instantiated.

diff --git a/...iemil/docker/RemoteTcpDockerTestCase.java → ...ihaiemil/docker/RemoteDockerTestCase.java b/...iemil/docker/RemoteTcpDockerTestCase.java → ...ihaiemil/docker/RemoteDockerTestCase.java
@@ -37,18 +37,14 @@
 import org.mockito.Mockito;
 
 /**
-<<<<<<< HEAD:src/test/java/com/amihaiemil/docker/RemoteDockerTestCase.java
- * Unit tests for {@link TcpDocker}.
-=======
- * Unit tests for {@link RemoteTcpDocker}.
->>>>>>> e464b1a151c7ee5bb102fd9e5034724e7458b29d:src/test/java/com/amihaiemil/docker/RemoteTcpDockerTestCase.java
+ * Unit tests for {@link RemoteDocker}.
  * @author George Aristy (george.aristy@gmail.com)
  * @version $Id$
  * @since 0.0.1
  * @checkstyle MethodName (500 lines)
  */
 
-public final class RemoteTcpDockerTestCase {
+public final class RemoteDockerTestCase {
 
     /**
      * Ping must be TRUE if response is OK.