This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.testing.resourceresolver-mock-0.2.0 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-resourceresolver-mock.git
commit af4baf2de297efe4afba80d73fc910ba5f75f873 Author: Carsten Ziegeler <[email protected]> AuthorDate: Thu Jan 30 10:10:06 2014 +0000 SLING-3354 : Search paths are returned in wrong order git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/resourceresolver-mock@1562760 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 6 +++++- .../sling/testing/resourceresolver/MockResourceResolver.java | 10 ++++++++-- .../testing/resourceresolver/MockResourceResolverFactory.java | 8 +++++++- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index b22044d..dc36e49 100644 --- a/pom.xml +++ b/pom.xml @@ -35,6 +35,10 @@ Mock for the resource resolver / factory for easier testing. </description> + <properties> + <sling.java.version>6</sling.java.version> + </properties> + <scm> <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/testing/resourceresolver-mock</connection> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/testing/resourceresolver-mock</developerConnection> @@ -58,7 +62,7 @@ <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.api</artifactId> - <version>2.4.0</version> + <version>2.5.0</version> <scope>provided</scope> </dependency> <dependency> diff --git a/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolver.java b/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolver.java index 0414374..6dfe885 100644 --- a/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolver.java +++ b/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolver.java @@ -23,6 +23,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Set; @@ -41,7 +42,7 @@ public class MockResourceResolver implements ResourceResolver { private final Map<String, Map<String, Object>> resources; - private final Map<String, Map<String, Object>> temporaryResources = new HashMap<String, Map<String,Object>>(); + private final Map<String, Map<String, Object>> temporaryResources = new LinkedHashMap<String, Map<String,Object>>(); private final Set<String> deletedResources = new HashSet<String>(); @@ -129,7 +130,7 @@ public class MockResourceResolver implements ResourceResolver { @Override public String[] getSearchPath() { - return new String[] {"/libs", "/apps"}; + return new String[] {"/apps", "/libs"}; } @Override @@ -322,4 +323,9 @@ public class MockResourceResolver implements ResourceResolver { public void addChanged(final String path, final Map<String, Object> props) { this.temporaryResources.put(path, props); } + + @Override + public boolean hasChildren(Resource resource) { + return this.listChildren(resource).hasNext(); + } } diff --git a/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolverFactory.java b/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolverFactory.java index 9caf5ac..2e7980b 100644 --- a/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolverFactory.java +++ b/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolverFactory.java @@ -19,6 +19,7 @@ package org.apache.sling.testing.resourceresolver; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.Map; import org.apache.sling.api.resource.LoginException; @@ -28,7 +29,7 @@ import org.osgi.service.event.EventAdmin; public class MockResourceResolverFactory implements ResourceResolverFactory { - private final Map<String, Map<String, Object>> resources = new HashMap<String, Map<String, Object>>(); + private final Map<String, Map<String, Object>> resources = new LinkedHashMap<String, Map<String, Object>>(); private final EventAdmin eventAdmin; @@ -53,4 +54,9 @@ public class MockResourceResolverFactory implements ResourceResolverFactory { return new MockResourceResolver(this.eventAdmin, resources); } + @Override + public ResourceResolver getServiceResourceResolver( + Map<String, Object> authenticationInfo) throws LoginException { + return new MockResourceResolver(this.eventAdmin, resources); + } } -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
