Skip to content

Commit 8e6631d

Browse files
committed
Renamed LocalDocker to UnixDocker and RemoteDocker to TcpDocker.
1 parent 2e2a9a0 commit 8e6631d

File tree

5 files changed

+4
-8
lines changed

5 files changed

+4
-8
lines changed

src/test/java/com/amihaiemil/docker/LocalUnixDockerITCase.java renamed to src/test/java/com/amihaiemil/docker/LocalDockerITCase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
* @version $Id$
4444
* @since 0.0.1
4545
*/
46-
public final class LocalUnixDockerITCase {
46+
public final class LocalDockerITCase {
4747

4848
/**
4949
* LocalUnixDocker can ping the Docker Engine.

src/test/java/com/amihaiemil/docker/LocalUnixDockerTestCase.java renamed to src/test/java/com/amihaiemil/docker/LocalDockerTestCase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
* @version $Id$
4040
* @since 0.0.1
4141
*/
42-
public final class LocalUnixDockerTestCase {
42+
public final class LocalDockerTestCase {
4343

4444
/**
4545
* LocalUnixDocker can be instantiated.

src/test/java/com/amihaiemil/docker/RemoteTcpDockerTestCase.java renamed to src/test/java/com/amihaiemil/docker/RemoteDockerTestCase.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,18 +37,14 @@
3737
import org.mockito.Mockito;
3838

3939
/**
40-
<<<<<<< HEAD:src/test/java/com/amihaiemil/docker/RemoteDockerTestCase.java
41-
* Unit tests for {@link TcpDocker}.
42-
=======
43-
* Unit tests for {@link RemoteTcpDocker}.
44-
>>>>>>> e464b1a151c7ee5bb102fd9e5034724e7458b29d:src/test/java/com/amihaiemil/docker/RemoteTcpDockerTestCase.java
40+
* Unit tests for {@link RemoteDocker}.
4541
* @author George Aristy ([email protected])
4642
* @version $Id$
4743
* @since 0.0.1
4844
* @checkstyle MethodName (500 lines)
4945
*/
5046

51-
public final class RemoteTcpDockerTestCase {
47+
public final class RemoteDockerTestCase {
5248

5349
/**
5450
* Ping must be TRUE if response is OK.

0 commit comments

Comments
 (0)