svn commit: r1670023 - in /sling/trunk/testing/mocks/resourceresolver-mock/src: main/java/org/apache/sling/testing/resourceresolver/MockResourceResolverFactory.java test/java/org/apache/sling/testing/resourceresolver/RootResourceTypeTest.java

[rombert]

Author: rombert
Date: Mon Mar 30 09:22:01 2015
New Revision: 1670023

URL: http://svn.apache.org/r1670023
Log:
SLING-4500: make sure that root has a primary type

This closes #72

Submitted By: Santiago Garcia Pimentel

Added:
    
sling/trunk/testing/mocks/resourceresolver-mock/src/test/java/org/apache/sling/testing/resourceresolver/RootResourceTypeTest.java
Modified:
    
sling/trunk/testing/mocks/resourceresolver-mock/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolverFactory.java

Modified: 
sling/trunk/testing/mocks/resourceresolver-mock/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolverFactory.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/resourceresolver-mock/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolverFactory.java?rev=1670023&r1=1670022&r2=1670023&view=diff
==============================================================================
--- 
sling/trunk/testing/mocks/resourceresolver-mock/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolverFactory.java
 (original)
+++ 
sling/trunk/testing/mocks/resourceresolver-mock/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolverFactory.java
 Mon Mar 30 09:22:01 2015
@@ -28,10 +28,13 @@ import org.apache.sling.api.resource.Res
 import org.apache.sling.api.resource.ResourceResolverFactory;
 import org.osgi.service.event.EventAdmin;
 
+
 /**
  * Simple resource resolver factory
  */
 public class MockResourceResolverFactory implements ResourceResolverFactory {
+    
+    private static final String ROOT_PRIMARY_TYPE="rep:root";
 
     /** We use a linked hash map to preserve creation order. */
     private final Map<String, Map<String, Object>> resources = new 
LinkedHashMap<String, Map<String, Object>>();
@@ -59,7 +62,9 @@ public class MockResourceResolverFactory
      */
     public MockResourceResolverFactory(final 
MockResourceResolverFactoryOptions options) {
         this.options = options;
-        resources.put("/", new HashMap<String, Object>());
+        Map<String, Object> props= new HashMap<String,Object>();
+        props.put(MockResource.JCR_PRIMARYTYPE, ROOT_PRIMARY_TYPE);
+        resources.put("/", props);
     }
 
     @Override

Added: 
sling/trunk/testing/mocks/resourceresolver-mock/src/test/java/org/apache/sling/testing/resourceresolver/RootResourceTypeTest.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/resourceresolver-mock/src/test/java/org/apache/sling/testing/resourceresolver/RootResourceTypeTest.java?rev=1670023&view=auto
==============================================================================
--- 
sling/trunk/testing/mocks/resourceresolver-mock/src/test/java/org/apache/sling/testing/resourceresolver/RootResourceTypeTest.java
 (added)
+++ 
sling/trunk/testing/mocks/resourceresolver-mock/src/test/java/org/apache/sling/testing/resourceresolver/RootResourceTypeTest.java
 Mon Mar 30 09:22:01 2015
@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.sling.testing.resourceresolver;
+
+import java.io.IOException;
+
+import org.apache.sling.api.resource.LoginException;
+import org.apache.sling.api.resource.Resource;
+import org.apache.sling.api.resource.ResourceResolver;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+
+public class RootResourceTypeTest {
+
+
+    private ResourceResolver resourceResolver;
+
+    @Before
+    public final void setUp() throws IOException, LoginException {
+        resourceResolver = new 
MockResourceResolverFactory().getResourceResolver(null);       
+    }
+
+    
+    @Test
+    public void testIsResourceResolver() {
+        Resource root= resourceResolver.getResource("/");
+        Assert.assertTrue(root.isResourceType("rep:root"));
+    }
+
+}