svn commit: r1677979 - /sling/trunk/testing/mocks/jcr-mock/src/test/java/org/apache/sling/testing/mock/jcr/MockNodeTest.java

[js...@apache.org]

Author: jsedding
Date: Wed May  6 12:53:07 2015
New Revision: 1677979

URL: http://svn.apache.org/r1677979
Log:
SLING-4695 - MockNode.getProperties() does not contain jcr:primaryType

Modified:
    sling/trunk/testing/mocks/jcr-mock/src/test/java/org/apache/sling/testing/mock/jcr/MockNodeTest.java

Modified: sling/trunk/testing/mocks/jcr-mock/src/test/java/org/apache/sling/testing/mock/jcr/MockNodeTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/jcr-mock/src/test/java/org/apache/sling/testing/mock/jcr/MockNodeTest.java?rev=1677979&r1=1677978&r2=1677979&view=diff
==============================================================================
--- sling/trunk/testing/mocks/jcr-mock/src/test/java/org/apache/sling/testing/mock/jcr/MockNodeTest.java (original)
+++ sling/trunk/testing/mocks/jcr-mock/src/test/java/org/apache/sling/testing/mock/jcr/MockNodeTest.java Wed May  6 12:53:07 2015
@@ -37,6 +37,9 @@ import org.apache.jackrabbit.JcrConstant
 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());