summaryrefslogtreecommitdiff
path: root/src/main/java/org/mockito/internal/matchers/text/ValuePrinter.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/org/mockito/internal/matchers/text/ValuePrinter.java')
-rw-r--r--src/main/java/org/mockito/internal/matchers/text/ValuePrinter.java19
1 files changed, 17 insertions, 2 deletions
diff --git a/src/main/java/org/mockito/internal/matchers/text/ValuePrinter.java b/src/main/java/org/mockito/internal/matchers/text/ValuePrinter.java
index f741cbc..6f5882f 100644
--- a/src/main/java/org/mockito/internal/matchers/text/ValuePrinter.java
+++ b/src/main/java/org/mockito/internal/matchers/text/ValuePrinter.java
@@ -4,6 +4,7 @@
*/
package org.mockito.internal.matchers.text;
+import java.lang.reflect.Array;
import java.util.Iterator;
import java.util.Map;
@@ -21,7 +22,7 @@ public class ValuePrinter {
* Prints given value so that it is neatly readable by humans.
* Handles explosive toString() implementations.
*/
- public static String print(Object value) {
+ public static String print(final Object value) {
if (value == null) {
return "null";
}
@@ -50,7 +51,21 @@ public class ValuePrinter {
return printMap((Map<?, ?>) value);
}
if (value.getClass().isArray()) {
- return printValues("[", ", ", "]", new ArrayIterator(value));
+ return printValues("[", ", ", "]", new Iterator<Object>() {
+ private int currentIndex = 0;
+
+ public boolean hasNext() {
+ return currentIndex < Array.getLength(value);
+ }
+
+ public Object next() {
+ return Array.get(value, currentIndex++);
+ }
+
+ public void remove() {
+ throw new UnsupportedOperationException("cannot remove items from an array");
+ }
+ });
}
if (value instanceof FormattedText) {
return (((FormattedText) value).getText());