Fix tests

KostyaSha · KostyaSha · commit c42f3dc3e3df · 2016-06-29T23:03:14.000+03:00
diff --git a/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java
@@ -34,6 +34,7 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
@@ -45,7 +46,9 @@
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.hasItem;
 import static org.hamcrest.Matchers.hasItemInArray;
+import static org.hamcrest.Matchers.hasSize;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.isEmptyString;
 import static org.hamcrest.Matchers.not;
@@ -191,21 +194,24 @@ public void createContainerWithVolumesFrom() throws DockerException {
 
     @Test
     public void createContainerWithEnv() throws Exception {
+        final String testVariable = "VARIABLE=success";
 
-        CreateContainerResponse container = dockerClient.createContainerCmd(BUSYBOX_IMAGE).withEnv("VARIABLE=success")
-                .withCmd("env").exec();
+        CreateContainerResponse container = dockerClient.createContainerCmd(BUSYBOX_IMAGE)
+                .withEnv(testVariable)
+                .withCmd("env")
+                .exec();
 
         LOG.info("Created container {}", container.toString());
 
         assertThat(container.getId(), not(isEmptyString()));
 
         InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
 
-        assertThat(Arrays.asList(inspectContainerResponse.getConfig().getEnv()), containsInAnyOrder("VARIABLE=success"));
+        assertThat(Arrays.asList(inspectContainerResponse.getConfig().getEnv()), hasItem("VARIABLE=success"));
 
         dockerClient.startContainerCmd(container.getId()).exec();
 
-        assertThat(containerLog(container.getId()), containsString("VARIABLE=success"));
+        assertThat(containerLog(container.getId()), containsString(testVariable));
     }
 
     @Test
diff --git a/src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java
@@ -43,6 +43,7 @@
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.hasItem;
 import static org.hamcrest.Matchers.hasItemInArray;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.isEmptyString;
@@ -189,8 +190,9 @@ public void createContainerWithVolumesFrom() throws DockerException {
 
     @Test
     public void createContainerWithEnv() throws Exception {
+        final String testVariable = "VARIABLE=success";
 
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withEnv("VARIABLE=success")
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withEnv(testVariable)
                 .withCmd("env").exec();
 
         LOG.info("Created container {}", container.toString());
@@ -199,11 +201,11 @@ public void createContainerWithEnv() throws Exception {
 
         InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
 
-        assertThat(Arrays.asList(inspectContainerResponse.getConfig().getEnv()), containsInAnyOrder("VARIABLE=success"));
+        assertThat(Arrays.asList(inspectContainerResponse.getConfig().getEnv()), hasItem(testVariable));
 
         dockerClient.startContainerCmd(container.getId()).exec();
 
-        assertThat(containerLog(container.getId()), containsString("VARIABLE=success"));
+        assertThat(containerLog(container.getId()), containsString(testVariable));
     }
 
     @Test
