docker-java · marcuslinke · Oct 21, 2014 · Oct 20, 2014 · Oct 20, 2014
diff --git a/README.md b/README.md
@@ -16,9 +16,15 @@ Developer forum for [docker-java](https://groups.google.com/forum/?hl=de#!forum/
 * Maven 3.0.5
 * Docker daemon running
 
-Maven may run tests during build process but tests are disabled by default. The tests are using a localhost instance of Docker, make sure that you have Docker running for tests to work. To run the tests you have to provide your https://www.docker.io/account/login/ information:
+The Maven build includes integration tests which are using a localhost instance of Docker and require manual setup. Make sure you have a local Docker daemon running and then provide your https://registry.hub.docker.com/account/login/ information via system properties:
 
-    $ mvn clean install -DskipTests=false -Ddocker.io.username=... -Ddocker.io.password=... -Ddocker.io.email=...
+    $ mvn clean install -Ddocker.io.username=... -Ddocker.io.password=... -Ddocker.io.email=...
+
+_If your Docker server is remote, add its URL like this: `-Ddocker.io.url=http://...:2375`._
+
+If you do not have access to a Docker server or just want to execute the build quickly, you can run the build without the integration tests:
+
+    $ mvn clean install -DskipITs
 
 By default Docker server is using UNIX sockets for communication with the Docker client, however docker-java
 client uses TCP/IP to connect to the Docker server, so you will need to make sure that your Docker server is

diff --git a/pom.xml b/pom.xml
@@ -40,9 +40,8 @@
 	</developers>
 
 	<properties>
-		<skipTests>true</skipTests>
-
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<jdk.debug>true</jdk.debug>
 		<jdk.optimize>false</jdk.optimize>
 		<jdk.source>1.6</jdk.source>
@@ -76,7 +75,8 @@
 		<maven-jar-plugin.version>2.2</maven-jar-plugin.version>
 		<maven-compiler-plugin.version>2.3.1</maven-compiler-plugin.version>
 		<maven-release-plugin.version>2.3.1</maven-release-plugin.version>
-		<maven-surefire-plugin.version>2.8.1</maven-surefire-plugin.version>
+		<maven-surefire-plugin.version>2.17</maven-surefire-plugin.version>
+		<maven-failsafe-plugin.version>2.17</maven-failsafe-plugin.version>
 		<cobertura-maven-plugin.version>2.5.1</cobertura-maven-plugin.version>
 		<maven-antrun-plugin.version>1.7</maven-antrun-plugin.version>
 	</properties>
@@ -255,16 +255,6 @@
 					</executions>
 				</plugin>
 
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-surefire-plugin</artifactId>
-					<version>${maven-surefire-plugin.version}</version>
-					<configuration>
-						<skipTests>${skipTests}</skipTests>
-					</configuration>
-				</plugin>
-
-
 				<plugin>
 					<groupId>org.codehaus.mojo</groupId>
 					<artifactId>cobertura-maven-plugin</artifactId>
@@ -329,6 +319,35 @@
 					<goals>deploy nexus-staging:release</goals>
 				</configuration>
 			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>${maven-surefire-plugin.version}</version>
+				<configuration>
+					<excludedGroups>integration</excludedGroups>
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-failsafe-plugin</artifactId>
+				<version>${maven-failsafe-plugin.version}</version>
+				<executions>
+					<execution>
+						<goals>
+							<goal>integration-test</goal>
+							<goal>verify</goal>
+						</goals>
+						<configuration>
+							<groups>integration</groups>
+							<includes>
+ 								<include>**/*Test.java</include>
+							</includes>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 

diff --git a/src/test/java/com/github/dockerjava/client/DockerClientTest.java b/src/test/java/com/github/dockerjava/client/DockerClientTest.java
@@ -22,6 +22,7 @@
  *
  * @author Konstantin Pelykh (kpelykh@gmail.com)
  */
+@Test(groups = "integration")
 public class DockerClientTest extends AbstractDockerClientTest {
 	public static final Logger LOG = LoggerFactory
 			.getLogger(DockerClientTest.class);

diff --git a/src/test/java/com/github/dockerjava/core/command/AuthCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/AuthCmdImplTest.java
@@ -16,6 +16,7 @@
 import com.github.dockerjava.core.DockerClientBuilder;
 import com.github.dockerjava.core.DockerClientConfig;
 
+@Test(groups = "integration")
 public class AuthCmdImplTest extends AbstractDockerClientTest {
 
 	@BeforeTest

diff --git a/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/BuildImageCmdImplTest.java
@@ -28,6 +28,7 @@
 import com.github.dockerjava.api.command.InspectImageResponse;
 import com.github.dockerjava.client.AbstractDockerClientTest;
 
+@Test(groups = "integration")
 public class BuildImageCmdImplTest extends AbstractDockerClientTest {
 
 	@BeforeTest

diff --git a/src/test/java/com/github/dockerjava/core/command/CommitCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CommitCmdImplTest.java
@@ -22,6 +22,7 @@
 import com.github.dockerjava.api.command.InspectImageResponse;
 import com.github.dockerjava.client.AbstractDockerClientTest;
 
+@Test(groups = "integration")
 public class CommitCmdImplTest extends AbstractDockerClientTest {
 
 	@BeforeTest

diff --git a/src/test/java/com/github/dockerjava/core/command/ContainerDiffCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/ContainerDiffCmdImplTest.java
@@ -23,6 +23,7 @@
 import com.github.dockerjava.api.model.ChangeLog;
 import com.github.dockerjava.client.AbstractDockerClientTest;
 
+@Test(groups = "integration")
 public class ContainerDiffCmdImplTest extends AbstractDockerClientTest {
 
 	@BeforeTest

diff --git a/src/test/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImplTest.java
@@ -13,6 +13,7 @@
 import static org.hamcrest.Matchers.*;
 import static org.hamcrest.MatcherAssert.assertThat;
 
+@Test(groups = "integration")
 public class CopyFileFromContainerCmdImplTest extends AbstractDockerClientTest {
 
     @BeforeTest

diff --git a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
@@ -21,6 +21,7 @@
 import com.github.dockerjava.api.model.Volume;
 import com.github.dockerjava.client.AbstractDockerClientTest;
 
+@Test(groups = "integration")
 public class CreateContainerCmdImplTest extends AbstractDockerClientTest {
 
 	@BeforeTest

diff --git a/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java
@@ -20,6 +20,7 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.TimeUnit;
 
+@Test(groups = "integration")
 public class EventsCmdImplTest extends AbstractDockerClientTest {
 
     private static int KNOWN_NUM_EVENTS = 4;

diff --git a/src/test/java/com/github/dockerjava/core/command/InfoCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/InfoCmdImplTest.java
@@ -18,6 +18,7 @@
 import static org.hamcrest.Matchers.isEmptyOrNullString;
 import static org.hamcrest.Matchers.not;
 
+@Test(groups = "integration")
 public class InfoCmdImplTest extends AbstractDockerClientTest {
 
 	@BeforeTest

diff --git a/src/test/java/com/github/dockerjava/core/command/KillContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/KillContainerCmdImplTest.java
@@ -23,6 +23,7 @@
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.client.AbstractDockerClientTest;
 
+@Test(groups = "integration")
 public class KillContainerCmdImplTest extends AbstractDockerClientTest {
 
 	public static final Logger LOG = LoggerFactory

diff --git a/src/test/java/com/github/dockerjava/core/command/ListContainersCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/ListContainersCmdImplTest.java
@@ -28,6 +28,7 @@
 import com.github.dockerjava.api.model.Container;
 import com.github.dockerjava.client.AbstractDockerClientTest;
 
+@Test(groups = "integration")
 public class ListContainersCmdImplTest extends AbstractDockerClientTest {
 
 	@BeforeTest

diff --git a/src/test/java/com/github/dockerjava/core/command/ListImagesCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/ListImagesCmdImplTest.java
@@ -18,6 +18,7 @@
 import com.github.dockerjava.api.model.Info;
 import com.github.dockerjava.client.AbstractDockerClientTest;
 
+@Test(groups = "integration")
 public class ListImagesCmdImplTest extends AbstractDockerClientTest {
 
 	@BeforeTest

diff --git a/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/LogContainerCmdImplTest.java
@@ -21,6 +21,7 @@
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.client.AbstractDockerClientTest;
 
+@Test(groups = "integration")
 public class LogContainerCmdImplTest extends AbstractDockerClientTest {
 
 	@BeforeTest

diff --git a/src/test/java/com/github/dockerjava/core/command/PullImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/PullImageCmdImplTest.java
@@ -22,6 +22,7 @@
 import com.github.dockerjava.api.model.Info;
 import com.github.dockerjava.client.AbstractDockerClientTest;
 
+@Test(groups = "integration")
 public class PullImageCmdImplTest extends AbstractDockerClientTest {
 
 	@BeforeTest

diff --git a/src/test/java/com/github/dockerjava/core/command/PushImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/PushImageCmdImplTest.java
@@ -20,6 +20,7 @@
 import com.github.dockerjava.api.command.CreateContainerResponse;
 import com.github.dockerjava.client.AbstractDockerClientTest;
 
+@Test(groups = "integration")
 public class PushImageCmdImplTest extends AbstractDockerClientTest {
 
 	public static final Logger LOG = LoggerFactory

diff --git a/src/test/java/com/github/dockerjava/core/command/RemoveContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/RemoveContainerCmdImplTest.java
@@ -25,6 +25,7 @@
 import com.github.dockerjava.api.model.Container;
 import com.github.dockerjava.client.AbstractDockerClientTest;
 
+@Test(groups = "integration")
 public class RemoveContainerCmdImplTest extends AbstractDockerClientTest {
 
 	public static final Logger LOG = LoggerFactory

diff --git a/src/test/java/com/github/dockerjava/core/command/RemoveImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/RemoveImageCmdImplTest.java
@@ -26,6 +26,7 @@
 import com.github.dockerjava.api.model.Container;
 import com.github.dockerjava.client.AbstractDockerClientTest;
 
+@Test(groups = "integration")
 public class RemoveImageCmdImplTest extends AbstractDockerClientTest {
 
 	public static final Logger LOG = LoggerFactory

diff --git a/src/test/java/com/github/dockerjava/core/command/RestartContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/RestartContainerCmdImplTest.java
@@ -21,6 +21,7 @@
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.client.AbstractDockerClientTest;
 
+@Test(groups = "integration")
 public class RestartContainerCmdImplTest extends AbstractDockerClientTest {
 
 	@BeforeTest

diff --git a/src/test/java/com/github/dockerjava/core/command/SearchImagesCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/SearchImagesCmdImplTest.java
@@ -22,6 +22,7 @@
 import com.github.dockerjava.api.model.SearchItem;
 import com.github.dockerjava.client.AbstractDockerClientTest;
 
+@Test(groups = "integration")
 public class SearchImagesCmdImplTest extends AbstractDockerClientTest {
 
 	@BeforeTest

diff --git a/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
@@ -28,7 +28,7 @@
 
 import com.github.dockerjava.client.AbstractDockerClientTest;
 
-
+@Test(groups = "integration")
 public class StartContainerCmdImplTest extends AbstractDockerClientTest {
 
 	@BeforeTest

diff --git a/src/test/java/com/github/dockerjava/core/command/StopContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/StopContainerCmdImplTest.java
@@ -23,6 +23,7 @@
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.client.AbstractDockerClientTest;
 
+@Test(groups = "integration")
 public class StopContainerCmdImplTest extends AbstractDockerClientTest {
 
 	public static final Logger LOG = LoggerFactory

diff --git a/src/test/java/com/github/dockerjava/core/command/TagImageCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/TagImageCmdImplTest.java
@@ -16,6 +16,7 @@
 import com.github.dockerjava.api.NotFoundException;
 import com.github.dockerjava.client.AbstractDockerClientTest;
 
+@Test(groups = "integration")
 public class TagImageCmdImplTest extends AbstractDockerClientTest {
 
 	public static final Logger LOG = LoggerFactory

diff --git a/src/test/java/com/github/dockerjava/core/command/VersionCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/VersionCmdImplTest.java
@@ -14,6 +14,7 @@
 import com.github.dockerjava.api.model.Version;
 import com.github.dockerjava.client.AbstractDockerClientTest;
 
+@Test(groups = "integration")
 public class VersionCmdImplTest extends AbstractDockerClientTest {
 
 	@BeforeTest

diff --git a/src/test/java/com/github/dockerjava/core/command/WaitContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/WaitContainerCmdImplTest.java
@@ -21,6 +21,7 @@
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import com.github.dockerjava.client.AbstractDockerClientTest;
 
+@Test(groups = "integration")
 public class WaitContainerCmdImplTest extends AbstractDockerClientTest {
 
 	@BeforeTest