svn commit: r1677969 - in /sling/trunk/testing/mocks/jcr-mock/src: main/java/org/apache/sling/testing/mock/jcr/MockNode.java test/java/org/apache/sling/testing/mock/jcr/MockNodeTest.java

[js...@apache.org]

Author: jsedding
Date: Wed May  6 12:36:25 2015
New Revision: 1677969

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

Modified:
    sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockNode.java
    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/main/java/org/apache/sling/testing/mock/jcr/MockNode.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockNode.java?rev=1677969&r1=1677968&r2=1677969&view=diff
==============================================================================
--- sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockNode.java (original)
+++ sling/trunk/testing/mocks/jcr-mock/src/main/java/org/apache/sling/testing/mock/jcr/MockNode.java Wed May  6 12:36:25 2015
@@ -65,6 +65,7 @@ class MockNode extends AbstractItem impl
         ItemData itemData = ItemData.newNode(path, new MockNodeType(primaryNodeTypeName));
         Node node = new MockNode(itemData, getSession());
         getMockedSession().addItem(itemData);
+        node.setProperty(JcrConstants.JCR_PRIMARYTYPE, primaryNodeTypeName);
         
         // special handling for some node types
         if (StringUtils.equals(primaryNodeTypeName, JcrConstants.NT_FILE)) {

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=1677969&r1=1677968&r2=1677969&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:36:25 2015
@@ -22,6 +22,7 @@ import static org.junit.Assert.assertEqu
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import javax.jcr.ItemNotFoundException;
 import javax.jcr.Node;
@@ -31,6 +32,7 @@ import javax.jcr.PropertyIterator;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 
+import com.google.common.collect.Iterables;
 import org.apache.jackrabbit.JcrConstants;
 import org.junit.Before;
 import org.junit.Test;
@@ -90,6 +92,20 @@ public class MockNodeTest {
     }
 
     @Test
+    public void testPrimaryType() throws RepositoryException {
+        assertEquals("nt:unstructured", this.node1.getPrimaryNodeType().getName());
+        assertEquals("nt:unstructured", this.node1.getProperty("jcr:primaryType").getString());
+        final PropertyIterator properties = this.node1.getProperties();
+        while (properties.hasNext()) {
+            final Property property = properties.nextProperty();
+            if (JcrConstants.JCR_PRIMARYTYPE.equals(property.getName())) {
+                return;
+            }
+        }
+        fail("Properties did not include jcr:primaryType");
+    }
+
+    @Test
     public void testIsNode() {
         assertTrue(this.node1.isNode());
         assertFalse(this.prop1.isNode());