Fixed hamcrest problem with Iteratables

kpelykh · kpelykh · commit 5d6cb90d58f8 · 2013-06-28T19:17:01.000-07:00
diff --git a/src/test/java/com/kpelykh/docker/client/test/DockerClientTest.java b/src/test/java/com/kpelykh/docker/client/test/DockerClientTest.java
@@ -7,6 +7,7 @@
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.io.LineIterator;
 import org.apache.commons.lang.StringUtils;
+import org.hamcrest.Matcher;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testng.Assert;
@@ -124,10 +125,11 @@ public void testDockerInfo() throws DockerClientException {
 
     @Test
     public void testDockerSearch() throws DockerClientException {
-        List dockerSearch = dockerClient.search("busybox");
+        List<SearchItem> dockerSearch = dockerClient.search("busybox");
         LOG.info("Search returned" + dockerSearch.toString());
 
-        assertThat(dockerSearch, hasItem(hasField("name", equalTo("busybox"))));
+        Matcher matcher = hasItem(hasField("name", equalTo("busybox")));
+        assertThat(dockerSearch, matcher);
 
         assertThat(filter(hasField("name", is("busybox")), dockerSearch).size(), equalTo(1));
     }
@@ -176,7 +178,8 @@ public void testListContainers() throws DockerClientException {
 
         List containers2 = dockerClient.listContainers(true);
         assertThat(size + 1, is(equalTo(containers2.size())));
-        assertThat(containers2, hasItem(hasField("id", startsWith(container1.id))));
+        Matcher matcher = hasItem(hasField("id", startsWith(container1.id)));
+        assertThat(containers2, matcher);
 
         List<Container> filteredContainers = filter(hasField("id", startsWith(container1.id)), containers2);
         assertThat(filteredContainers.size(), is(equalTo(1)));
@@ -411,7 +414,8 @@ public void removeContainer() throws DockerClientException {
         dockerClient.removeContainer(container.id);
 
         List containers2 = dockerClient.listContainers(true);
-        assertThat(containers2, not(hasItem(hasField("id", startsWith(container.id)))));
+        Matcher matcher = not(hasItem(hasField("id", startsWith(container.id))));
+        assertThat(containers2, matcher);
 
     }
 
@@ -515,7 +519,8 @@ public void testRemoveImage() throws DockerClientException {
         dockerClient.removeImage(imageId);
 
         List containers = dockerClient.listContainers(true);
-        assertThat(containers, not(hasItem(hasField("id", startsWith(imageId)))));
+        Matcher matcher = not(hasItem(hasField("id", startsWith(imageId))));
+        assertThat(containers, matcher);
     }
 
 
