svn commit: r1679239 - in /sling/trunk/testing/mocks/sling-mock/src: main/java/org/apache/sling/testing/mock/sling/MockJcrResourceResolverFactory.java test/java/org/apache/sling/testing/mock/sling/jcrmock/resource/FindResourcesTest.java

[ss...@apache.org]

Author: sseifert
Date: Wed May 13 16:52:33 2015
New Revision: 1679239

URL: http://svn.apache.org/r1679239
Log:
SLING-4654 Support ResourceResolver.findResources with JCR_MOCK

Added:
    sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/jcrmock/resource/FindResourcesTest.java   (with props)
Modified:
    sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/MockJcrResourceResolverFactory.java

Modified: sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/MockJcrResourceResolverFactory.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/MockJcrResourceResolverFactory.java?rev=1679239&r1=1679238&r2=1679239&view=diff
==============================================================================
--- sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/MockJcrResourceResolverFactory.java (original)
+++ sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/MockJcrResourceResolverFactory.java Wed May 13 16:52:33 2015
@@ -24,7 +24,10 @@ import java.util.HashMap;
 import java.util.Hashtable;
 import java.util.Map;
 
+import javax.jcr.query.Query;
+
 import org.apache.sling.api.resource.LoginException;
+import org.apache.sling.api.resource.QueriableResourceProvider;
 import org.apache.sling.api.resource.ResourceProvider;
 import org.apache.sling.api.resource.ResourceResolver;
 import org.apache.sling.api.resource.ResourceResolverFactory;
@@ -56,6 +59,7 @@ class MockJcrResourceResolverFactory imp
         this.bundleContext = bundleContext;
     }
 
+    @SuppressWarnings("deprecation")
     private ResourceResolver getResourceResolverInternal(Map<String, Object> authenticationInfo, boolean isAdmin) throws LoginException {
         Dictionary<String, Object> resourceProviderFactoryFactoryProps = new Hashtable<String, Object>();
         resourceProviderFactoryFactoryProps.put(Constants.SERVICE_VENDOR, "sling-mock");
@@ -85,6 +89,7 @@ class MockJcrResourceResolverFactory imp
 
         Dictionary<Object, Object> resourceProviderProps = new Hashtable<Object, Object>();
         resourceProviderProps.put(ResourceProvider.ROOTS, new String[] { "/" });
+        resourceProviderProps.put(QueriableResourceProvider.LANGUAGES, new String[] { Query.XPATH, Query.SQL, Query.JCR_SQL2 });
 
         // setup real sling resource resolver implementation for use in mocked context
         MockResourceResolverFactoryActivator activator = new MockResourceResolverFactoryActivator();

Added: sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/jcrmock/resource/FindResourcesTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/jcrmock/resource/FindResourcesTest.java?rev=1679239&view=auto
==============================================================================
--- sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/jcrmock/resource/FindResourcesTest.java (added)
+++ sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/jcrmock/resource/FindResourcesTest.java Wed May 13 16:52:33 2015
@@ -0,0 +1,68 @@
+/*
+ * 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.mock.sling.jcrmock.resource;
+
+import java.util.Collections;
+import java.util.Iterator;
+
+import javax.jcr.Node;
+import javax.jcr.Session;
+import javax.jcr.query.Query;
+
+import org.apache.sling.api.resource.Resource;
+import org.apache.sling.testing.mock.jcr.MockJcr;
+import org.apache.sling.testing.mock.sling.ResourceResolverType;
+import org.apache.sling.testing.mock.sling.junit.SlingContext;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+import com.google.common.collect.ImmutableMap;
+
+public class FindResourcesTest {
+
+	@Rule
+	public SlingContext context = new SlingContext(ResourceResolverType.JCR_MOCK);
+
+	@Before
+	public void setUp() {
+		Resource resource = context.create().resource(
+				"test",
+				ImmutableMap.<String, Object> builder().put("prop1", "value1")
+						.put("prop2", "value2").build());
+		Node node = resource.adaptTo(Node.class);
+		Session session = context.resourceResolver().adaptTo(Session.class);
+		
+		MockJcr.setQueryResult(session, Collections.singletonList(node));
+	}
+
+	@Test
+    @SuppressWarnings("deprecation")
+	public void testFindResources() {
+		Resource resource = context.resourceResolver().getResource("/test");
+		Assert.assertNotNull("Resource with name 'test' should be there", resource);
+		
+        Iterator<Resource> result = context.resourceResolver().findResources("/test", Query.XPATH);
+		Assert.assertTrue("At least one result expected", result.hasNext());
+		Assert.assertEquals("/test", result.next().getPath());
+		Assert.assertFalse("At most one result expected", result.hasNext());
+	}
+
+}

Propchange: sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/jcrmock/resource/FindResourcesTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/jcrmock/resource/FindResourcesTest.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Wed May 13 16:52:33 2015
@@ -0,0 +1 @@
+LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Author

Propchange: sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/jcrmock/resource/FindResourcesTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain