SLING-6429 Hamcrest Matchers: nicer message display when array comparison fails
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1775842 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/sling/hamcrest/matchers/ResourcePropertiesMatcher.java b/src/main/java/org/apache/sling/hamcrest/matchers/ResourcePropertiesMatcher.java
index e467be1..0344d08 100644
--- a/src/main/java/org/apache/sling/hamcrest/matchers/ResourcePropertiesMatcher.java
+++ b/src/main/java/org/apache/sling/hamcrest/matchers/ResourcePropertiesMatcher.java
@@ -18,6 +18,8 @@
import java.lang.reflect.Array;
import java.util.Map;
+import java.util.SortedMap;
+import java.util.TreeMap;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ValueMap;
@@ -38,7 +40,8 @@
@Override
public void describeTo(Description description) {
- description.appendText("Resource with properties ").appendValueList("[", ",", "]", expectedProps.entrySet());
+ description.appendText("Resource with properties ")
+ .appendValueList("[", ",", "]", convertArraysToStrings(expectedProps).entrySet());
}
@Override
@@ -95,7 +98,43 @@
mismatchDescription.appendText("was Resource which does not expose a value map via adaptTo(ValueMap.class)");
return;
}
- mismatchDescription.appendText("was Resource with properties ").appendValueList("[", ",", "]", actualProperties.entrySet()).appendText(" (resource: ").appendValue(item).appendText(")");
+ mismatchDescription.appendText("was Resource with properties ")
+ .appendValueList("[", ",", "]", convertArraysToStrings(actualProperties).entrySet())
+ .appendText(" (resource: ")
+ .appendValue(item)
+ .appendText(")");
+ }
+
+ /**
+ * Convert arrays to string representation to get better message if comparison fails.
+ * @param props Properties
+ * @return Properties with array values converted to strings
+ */
+ private Map<String,Object> convertArraysToStrings(Map<String,Object> props) {
+ SortedMap<String,Object> transformedProps = new TreeMap<String,Object>();
+ for (Map.Entry<String, Object> entry : props.entrySet()) {
+ Object value = entry.getValue();
+ if (value != null && value.getClass().isArray()) {
+ StringBuilder sb = new StringBuilder();
+ sb.append("[");
+ for (int i=0; i<Array.getLength(value); i++) {
+ if (i > 0) {
+ sb.append(",");
+ }
+ Object item = Array.get(value, i);
+ if (item == null) {
+ sb.append("null");
+ }
+ else {
+ sb.append(item.toString());
+ }
+ }
+ sb.append("]");
+ value = sb.toString();
+ }
+ transformedProps.put(entry.getKey(), value);
+ }
+ return transformedProps;
}
}
\ No newline at end of file
