[sling-org-apache-sling-testing-jcr-mock] 14/27: SLING-4695 - MockNode.getProperties() does not contain jcr:primaryType

[ro...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to annotated tag org.apache.sling.testing.jcr-mock-1.1.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-jcr-mock.git

commit a5f42542c68e06c06d8d0a4225fa2c56bbd411cc
Author: Julian Sedding <js...@apache.org>
AuthorDate: Wed May 6 12:53:07 2015 +0000

    SLING-4695 - MockNode.getProperties() does not contain jcr:primaryType
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/jcr-mock@1677979 13f79535-47bb-0310-9956-ffa450edef68
---
 .../apache/sling/testing/mock/jcr/MockNodeTest.java   | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/test/java/org/apache/sling/testing/mock/jcr/MockNodeTest.java b/src/test/java/org/apache/sling/testing/mock/jcr/MockNodeTest.java
index bf5f0d3..70f1a63 100644
--- a/src/test/java/org/apache/sling/testing/mock/jcr/MockNodeTest.java
+++ b/src/test/java/org/apache/sling/testing/mock/jcr/MockNodeTest.java
@@ -37,6 +37,9 @@ import org.apache.jackrabbit.JcrConstants;
 import org.junit.Before;
 import org.junit.Test;
 
+import java.util.HashMap;
+import java.util.Map;
+
 public class MockNodeTest {
 
     private Session session;
@@ -77,11 +80,12 @@ public class MockNodeTest {
     @Test
     public void testGetProperties() throws RepositoryException {
         PropertyIterator properties = this.node1.getProperties();
-        assertEquals(1, properties.getSize());
-        assertEquals(this.prop1, properties.next());
+        Map<String, Property> props = propertiesToMap(properties);
+        assertEquals(2, properties.getSize());
+        assertEquals(this.prop1, props.get("prop1"));
 
         assertTrue(this.node1.hasProperties());
-        assertFalse(this.node11.hasProperties());
+        assertTrue(this.node11.hasProperties());
 
         properties = this.node1.getProperties("^prop.*$");
         assertEquals(1, properties.getSize());
@@ -91,6 +95,15 @@ public class MockNodeTest {
         assertEquals(0, properties.getSize());
     }
 
+    private Map<String, Property> propertiesToMap(PropertyIterator properties) throws RepositoryException {
+        final HashMap<String, Property> props = new HashMap<String, Property>();
+        while (properties.hasNext()) {
+            final Property property = properties.nextProperty();
+            props.put(property.getName(), property);
+        }
+        return props;
+    }
+
     @Test
     public void testPrimaryType() throws RepositoryException {
         assertEquals("nt:unstructured", this.node1.getPrimaryNodeType().getName());

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