svn commit: r1644042 - in /sling/trunk/testing/mocks/sling-mock: pom.xml src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractSlingCrudResourceResolverTest.java

[sseifert]

Author: sseifert
Date: Tue Dec  9 13:09:54 2014
New Revision: 1644042

URL: http://svn.apache.org/r1644042
Log:
SLING-4229 add test cases for deep path access support in sling-mock as well

Modified:
    sling/trunk/testing/mocks/sling-mock/pom.xml
    
sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractSlingCrudResourceResolverTest.java

Modified: sling/trunk/testing/mocks/sling-mock/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/pom.xml?rev=1644042&r1=1644041&r2=1644042&view=diff
==============================================================================
--- sling/trunk/testing/mocks/sling-mock/pom.xml (original)
+++ sling/trunk/testing/mocks/sling-mock/pom.xml Tue Dec  9 13:09:54 2014
@@ -61,7 +61,7 @@
         <dependency>
             <groupId>org.apache.sling</groupId>
             
<artifactId>org.apache.sling.testing.resourceresolver-mock</artifactId>
-            <version>1.0.0</version>
+            <version>1.0.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 

Modified: 
sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractSlingCrudResourceResolverTest.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractSlingCrudResourceResolverTest.java?rev=1644042&r1=1644041&r2=1644042&view=diff
==============================================================================
--- 
sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractSlingCrudResourceResolverTest.java
 (original)
+++ 
sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractSlingCrudResourceResolverTest.java
 Tue Dec  9 13:09:54 2014
@@ -45,6 +45,7 @@ import org.junit.Before;
 import org.junit.Test;
 
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
 
 /**
  * Implements simple write and read resource and values test. Sling CRUD API is
@@ -90,7 +91,9 @@ public abstract class AbstractSlingCrudR
         props.put("binaryProp", new ByteArrayInputStream(BINARY_VALUE));
         Resource node1 = this.resourceResolver.create(rootNode, "node1", 
props);
 
-        this.resourceResolver.create(node1, "node11", ValueMap.EMPTY);
+        resourceResolver.create(node1, "node11", ImmutableMap.<String, 
Object>builder()
+                .put("stringProp11", STRING_VALUE)
+                .build());
         this.resourceResolver.create(node1, "node12", ValueMap.EMPTY);
 
         this.resourceResolver.commit();
@@ -136,6 +139,21 @@ public abstract class AbstractSlingCrudR
     }
 
     @Test
+    public void testSimpleProperties_DeepPathAccess() throws IOException {
+        Resource resource1 = resourceResolver.getResource(testRoot.getPath());
+        assertNotNull(resource1);
+        assertEquals(testRoot.getName(), resource1.getName());
+
+        ValueMap props = ResourceUtil.getValueMap(resource1);
+        assertEquals(STRING_VALUE, props.get("node1/stringProp", 
String.class));
+        assertArrayEquals(STRING_ARRAY_VALUE, 
props.get("node1/stringArrayProp", String[].class));
+        assertEquals((Integer) INTEGER_VALUE, props.get("node1/integerProp", 
Integer.class));
+        assertEquals(DOUBLE_VALUE, props.get("node1/doubleProp", 
Double.class), 0.0001);
+        assertEquals(BOOLEAN_VALUE, props.get("node1/booleanProp", 
Boolean.class));
+        assertEquals(STRING_VALUE, props.get("node1/node11/stringProp11", 
String.class));
+    }
+    
+    @Test
     public void testDateProperty() throws IOException {
         Resource resource1 = 
this.resourceResolver.getResource(getTestRootResource().getPath() + "/node1");
         ValueMap props = ResourceUtil.getValueMap(resource1);