Merge PR hamcrest#63 - A detailed description for iterable values

npryce · npryce · commit fc0710f96ccb · 2014-12-23T16:57:15.000Z
diff --git a/hamcrest-core/src/main/java/org/hamcrest/BaseDescription.java b/hamcrest-core/src/main/java/org/hamcrest/BaseDescription.java
@@ -49,6 +49,8 @@ public Description appendValue(Object value) {
             append("F>");
         } else if (value.getClass().isArray()) {
             appendValueList("[",", ","]", new ArrayIterator(value));
+        } else if (value instanceof Iterable) {
+            appendValueList("<[",", ","]>", ((Iterable) value).iterator());
         } else {
             append('<');
             append(descriptionOf(value));
@@ -66,8 +68,9 @@ private String descriptionOf(Object value) {
         }
     }
 
+    @SafeVarargs
     @Override
-    public <T> Description appendValueList(String start, String separator, String end, T... values) {
+    public final <T> Description appendValueList(String start, String separator, String end, T... values) {
         return appendValueList(start, separator, end, Arrays.asList(values));
     }
     
diff --git a/hamcrest-core/src/test/java/org/hamcrest/BaseDescriptionTest.java b/hamcrest-core/src/test/java/org/hamcrest/BaseDescriptionTest.java
@@ -2,6 +2,9 @@
 
 import org.junit.Test;
 
+import java.util.Arrays;
+import java.util.Iterator;
+
 import static org.junit.Assert.assertEquals;
 
 public final class BaseDescriptionTest {
@@ -14,63 +17,75 @@ public final class BaseDescriptionTest {
         }
     };
 
-    @Test public void 
+    @Test public void
     describesAppendedNullValue() {
         baseDescription.appendValue(null);
         assertEquals("null", result.toString());
     }
 
-    @Test public void 
+    @Test public void
     quotesAppendedStringValue() {
         baseDescription.appendValue("foo");
         assertEquals("\"foo\"", result.toString());
     }
 
-    @Test public void 
+    @Test public void
     quotesAppendedCharacterValue() {
         baseDescription.appendValue('f');
         assertEquals("\"f\"", result.toString());
     }
 
-    @Test public void 
+    @Test public void
     bracketsAppendedShortValue() {
         baseDescription.appendValue(Short.valueOf("2"));
         assertEquals("<2s>", result.toString());
     }
 
-    @Test public void 
+    @Test public void
     bracketsAppendedLongValue() {
         baseDescription.appendValue(Long.valueOf("2"));
         assertEquals("<2L>", result.toString());
     }
 
-    @Test public void 
+    @Test public void
     bracketsAppendedFloatValue() {
         baseDescription.appendValue(Float.valueOf("1.2"));
         assertEquals("<1.2F>", result.toString());
     }
 
-    @Test public void 
+    @Test public void
     describesAppendedArrayValue() {
         baseDescription.appendValue(new String[] {"2", "3"});
         assertEquals("[\"2\", \"3\"]", result.toString());
     }
 
-    @Test public void 
+    @Test
+    public void
+    describesAppendedIterableValue() {
+        baseDescription.appendValue(new Iterable<String>() {
+            @Override
+            public Iterator<String> iterator() {
+                return Arrays.asList("2", "3").iterator();
+            }
+        });
+        assertEquals("<[\"2\", \"3\"]>", result.toString());
+    }
+
+    @Test public void
     bracketsAppendedObjectValue() {
         final Object value = new Object();
         baseDescription.appendValue(value);
         assertEquals("<" + value.toString() + ">", result.toString());
     }
-    
-    @Test public void 
+
+    @Test public void
     safelyDescribesAppendedValueOfObjectWhoseToStringThrowsAnException() {
         final Object value = new Object() {
             @Override public String toString() {
                 throw new UnsupportedOperationException();
             }
         };
-        
+
         final String expected = value.getClass().getName() + "@" + Integer.toHexString(value.hashCode());
         baseDescription.appendValue(value);
         assertEquals("<" + expected + ">", result.toString());
diff --git a/hamcrest-library/src/test/java/org/hamcrest/collection/IsEmptyCollectionTest.java b/hamcrest-library/src/test/java/org/hamcrest/collection/IsEmptyCollectionTest.java
@@ -22,7 +22,7 @@ public void testMatchesAnEmptyCollection() {
     }
 
     public void testDoesNotMatchACollectionWithAnItem() {
-        assertMismatchDescription("<[one, three]>", is(createMatcher()), collectionOfValues());
+        assertMismatchDescription("<[\"one\", \"three\"]>", is(createMatcher()), collectionOfValues());
     }
 
     public void testHasAReadableDescription() {

Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,8 @@ public Description appendValue(Object value) {`
`49`	`49`	`append("F>");`
`50`	`50`	`} else if (value.getClass().isArray()) {`
`51`	`51`	`appendValueList("[",", ","]", new ArrayIterator(value));`
	`52`	`+ } else if (value instanceof Iterable) {`
	`53`	`+ appendValueList("<[",", ","]>", ((Iterable) value).iterator());`
`52`	`54`	`} else {`
`53`	`55`	`append('<');`
`54`	`56`	`append(descriptionOf(value));`
`@@ -66,8 +68,9 @@ private String descriptionOf(Object value) {`
`66`	`68`	`}`
`67`	`69`	`}`
`68`	`70`
	`71`	`+ @SafeVarargs`
`69`	`72`	`@Override`
`70`		`- public <T> Description appendValueList(String start, String separator, String end, T... values) {`
	`73`	`+ public final <T> Description appendValueList(String start, String separator, String end, T... values) {`
`71`	`74`	`return appendValueList(start, separator, end, Arrays.asList(values));`
`72`	`75`	`}`
`73`	`76`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public void testMatchesAnEmptyCollection() {`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`public void testDoesNotMatchACollectionWithAnItem() {`
`25`		`- assertMismatchDescription("<[one, three]>", is(createMatcher()), collectionOfValues());`
	`25`	`+ assertMismatchDescription("<[\"one\", \"three\"]>", is(createMatcher()), collectionOfValues());`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`public void testHasAReadableDescription() {`