sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From romb...@apache.org
Subject [sling-org-apache-sling-testing-hamcrest] 18/21: SLING-6429 Hamcrest Matchers: nicer message display when array comparison fails
Date Wed, 18 Oct 2017 23:28:39 GMT
This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-hamcrest.git

commit ab4e397158d28a13297f0d0054b37b1b104ecf7c
Author: Stefan Seifert <sseifert@apache.org>
AuthorDate: Fri Dec 23 14:45:43 2016 +0000

    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
---
 .../matchers/ResourcePropertiesMatcher.java        | 43 +++++++++++++++++++++-
 1 file changed, 41 insertions(+), 2 deletions(-)

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 @@ package org.apache.sling.hamcrest.matchers;
 
 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 @@ public class ResourcePropertiesMatcher extends TypeSafeMatcher<Resource>
{
 
     @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 @@ public class ResourcePropertiesMatcher extends TypeSafeMatcher<Resource>
{
             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

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <commits@sling.apache.org>.

Mime
View raw message