Test for StartContainerCmd.withVolumesFrom()

albers · albers · commit f592918fd861 · 2014-12-17T17:35:30.000+01:00
diff --git a/src/main/java/com/github/dockerjava/api/model/VolumeBind.java b/src/main/java/com/github/dockerjava/api/model/VolumeBind.java
@@ -16,4 +16,9 @@ public String getContainerPath() {
     public String getHostPath() {
         return hostPath;
     }
+
+    @Override
+    public String toString() {
+        return hostPath + ":" + containerPath;
+    }
 }
diff --git a/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java b/src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java
@@ -1,10 +1,18 @@
 package com.github.dockerjava.client;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.contains;
+
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.DockerException;
+import com.github.dockerjava.api.command.InspectContainerResponse;
+import com.github.dockerjava.api.model.Volume;
+import com.github.dockerjava.api.model.VolumeBind;
 import com.github.dockerjava.core.DockerClientBuilder;
 import com.github.dockerjava.core.DockerClientConfig;
 import com.github.dockerjava.core.TestDockerCmdExecFactory;
+import com.google.common.base.Joiner;
+
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.io.LineIterator;
 import org.slf4j.Logger;
@@ -18,6 +26,8 @@
 import java.lang.reflect.Method;
 import java.net.DatagramSocket;
 import java.net.ServerSocket;
+import java.util.ArrayList;
+import java.util.List;
 
 public abstract class AbstractDockerClientTest extends Assert {
 
@@ -158,4 +168,20 @@ public static boolean available(int port) {
 		return false;
 	}
 
+	/**
+	 * Asserts that {@link InspectContainerResponse#getVolumes()} (<code>.Volumes</code>)
+	 * has {@link VolumeBind}s for the given {@link Volume}s
+	 */
+	public static void assertContainerHasVolumes(InspectContainerResponse inspectContainerResponse, 
+			Volume ... expectedVolumes) {
+		VolumeBind[] volumeBinds = inspectContainerResponse.getVolumes();
+		LOG.info("Inspect .Volumes = [{}]", Joiner.on(", ").join(volumeBinds));
+	
+		List<Volume> volumes = new ArrayList<Volume>();
+		for (VolumeBind bind : volumeBinds) {
+			volumes.add(new Volume(bind.getContainerPath()));
+		}
+		assertThat(volumes, contains(expectedVolumes));
+	}
+
 }
diff --git a/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/StartContainerCmdImplTest.java
@@ -84,18 +84,49 @@ public void startContainerWithVolumes() throws DockerException {
 		inspectContainerResponse = dockerClient.inspectContainerCmd(container
 				.getId()).exec();
 
-        VolumeBind[] volumeBinds = inspectContainerResponse.getVolumes();
-        List<String> volumes = new ArrayList<String>();
-        for(VolumeBind bind :volumeBinds){
-            volumes.add(bind.getContainerPath());
-        }
-        assertThat(volumes,	contains(volume1.getPath(), volume2.getPath()));
+		assertContainerHasVolumes(inspectContainerResponse, volume1, volume2);
 
 		assertThat(Arrays.asList(inspectContainerResponse.getVolumesRW()),
 				contains(volume1, volume2));
 
 	}
 
+	@Test
+	public void startContainerWithVolumesFrom() throws DockerException {
+
+		Volume volume1 = new Volume("/opt/webapp1");
+		Volume volume2 = new Volume("/opt/webapp2");
+
+		String container1Name = UUID.randomUUID().toString();
+		
+		CreateContainerResponse container1 = dockerClient
+				.createContainerCmd("busybox").withCmd("sleep", "9999")
+				.withName(container1Name).exec();
+		LOG.info("Created container1 {}", container1.toString());
+
+		dockerClient.startContainerCmd(container1.getId()).withBinds(
+				new Bind("/src/webapp1", volume1), new Bind("/src/webapp2", volume2)).exec();
+		LOG.info("Started container1 {}", container1.toString());
+
+		InspectContainerResponse inspectContainerResponse1 = dockerClient.inspectContainerCmd(
+				container1.getId()).exec();
+
+		assertContainerHasVolumes(inspectContainerResponse1, volume1, volume2);
+
+
+		CreateContainerResponse container2 = dockerClient
+				.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
+		LOG.info("Created container2 {}", container2.toString());
+
+		dockerClient.startContainerCmd(container2.getId()).withVolumesFrom(container1Name).exec();
+		LOG.info("Started container2 {}", container2.toString());
+
+		InspectContainerResponse inspectContainerResponse2 = dockerClient
+				.inspectContainerCmd(container2.getId()).exec();
+
+		assertContainerHasVolumes(inspectContainerResponse2, volume1, volume2);
+	}
+
 	@Test
 	public void startContainerWithDns() throws DockerException {
 

Original file line number	Diff line number	Diff line change
`@@ -16,4 +16,9 @@ public String getContainerPath() {`
`16`	`16`	`public String getHostPath() {`
`17`	`17`	`return hostPath;`
`18`	`18`	`}`
	`19`	`+`
	`20`	`+ @Override`
	`21`	`+ public String toString() {`
	`22`	`+ return hostPath + ":" + containerPath;`
	`23`	`+ }`
`19`	`24`	`}`