fix startContainerWithPortBindings test

Marcus Linke · Marcus Linke · commit 51075a42af02 · 2014-06-17T23:16:44.000+02:00
diff --git a/src/main/java/com/github/dockerjava/client/command/CreateContainerCmd.java b/src/main/java/com/github/dockerjava/client/command/CreateContainerCmd.java
@@ -73,6 +73,16 @@ public CreateContainerCmd withName(String name) {
 		return this;
 	}
 	
+	public CreateContainerCmd withExposedPorts(String... exposedPorts) {
+		Preconditions.checkNotNull(exposedPorts, "exposedPorts was not specified");
+		HashMap<String,String> ports = new HashMap<String,String>();
+		for(String exposedPort: exposedPorts) {
+			ports.put(exposedPort, "");
+		}
+		this.containerCreateConfig.withExposedPorts(ports);
+		return this;
+	}
+	
 	protected ContainerCreateResponse impl() {
 		MultivaluedMap<String, String> params = new MultivaluedMapImpl();
 		if (name != null) {
diff --git a/src/main/java/com/github/dockerjava/client/model/CreateContainerConfig.java b/src/main/java/com/github/dockerjava/client/model/CreateContainerConfig.java
@@ -65,6 +65,12 @@ public class CreateContainerConfig {
     public Map<String, ?> getExposedPorts() {
         return exposedPorts;
     }
+    
+    public CreateContainerConfig withExposedPorts(Map<String, ?> exposedPorts) {
+        this.exposedPorts = exposedPorts;
+        return this;
+    }
+
 
     public boolean isDisableNetwork() {
         return disableNetwork;
diff --git a/src/test/java/com/github/dockerjava/client/command/StartContainerCmdTest.java b/src/test/java/com/github/dockerjava/client/command/StartContainerCmdTest.java
@@ -10,6 +10,7 @@
 import static org.hamcrest.Matchers.startsWith;
 
 import java.lang.reflect.Method;
+import java.util.HashMap;
 
 import org.testng.ITestResult;
 import org.testng.annotations.AfterMethod;
@@ -86,7 +87,7 @@ public void startContainerWithPortBindings() throws DockerException {
 		
 		ContainerCreateResponse container = dockerClient
 				.createContainerCmd("busybox")
-				.withCmd(new String[] { "true" }).exec();
+				.withCmd("true").withExposedPorts("22/tcp").exec();
 
 		LOG.info("Created container {}", container.toString());
 
@@ -103,9 +104,12 @@ public void startContainerWithPortBindings() throws DockerException {
 
 		containerInspectResponse = dockerClient.inspectContainerCmd(container
 				.getId()).exec();
+		
+		assertThat(containerInspectResponse.getConfig().getExposedPorts().keySet(),
+				contains("22/tcp"));
 
 		assertThat(containerInspectResponse.getHostConfig().getPortBindings().getAllPorts(),
-				contains(new Ports.Port("tcp", "22", "", "11022")));
+				contains(new Ports.Port("tcp", "22", "0.0.0.0", "11022")));
 		
 		tmpContainers.add(container.getId());
 	}
