svn commit: r1562760 - in /sling/trunk/testing/resourceresolver-mock: pom.xml src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolver.java src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolverFactory.java

[cz...@apache.org]

Author: cziegeler
Date: Thu Jan 30 10:10:06 2014
New Revision: 1562760

URL: http://svn.apache.org/r1562760
Log:
SLING-3354 : Search paths are returned in wrong order

Modified:
    sling/trunk/testing/resourceresolver-mock/pom.xml
    sling/trunk/testing/resourceresolver-mock/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolver.java
    sling/trunk/testing/resourceresolver-mock/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolverFactory.java

Modified: sling/trunk/testing/resourceresolver-mock/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/testing/resourceresolver-mock/pom.xml?rev=1562760&r1=1562759&r2=1562760&view=diff
==============================================================================
--- sling/trunk/testing/resourceresolver-mock/pom.xml (original)
+++ sling/trunk/testing/resourceresolver-mock/pom.xml Thu Jan 30 10:10:06 2014
@@ -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>

Modified: sling/trunk/testing/resourceresolver-mock/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolver.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/resourceresolver-mock/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolver.java?rev=1562760&r1=1562759&r2=1562760&view=diff
==============================================================================
--- sling/trunk/testing/resourceresolver-mock/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolver.java (original)
+++ sling/trunk/testing/resourceresolver-mock/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolver.java Thu Jan 30 10:10:06 2014
@@ -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 implem
 
     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 implem
 
     @Override
     public String[] getSearchPath() {
-        return new String[] {"/libs", "/apps"};
+        return new String[] {"/apps", "/libs"};
     }
 
     @Override
@@ -322,4 +323,9 @@ public class MockResourceResolver implem
     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();
+    }
 }

Modified: sling/trunk/testing/resourceresolver-mock/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolverFactory.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/resourceresolver-mock/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolverFactory.java?rev=1562760&r1=1562759&r2=1562760&view=diff
==============================================================================
--- sling/trunk/testing/resourceresolver-mock/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolverFactory.java (original)
+++ sling/trunk/testing/resourceresolver-mock/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolverFactory.java Thu Jan 30 10:10:06 2014
@@ -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
         return new MockResourceResolver(this.eventAdmin, resources);
     }
 
+    @Override
+    public ResourceResolver getServiceResourceResolver(
+            Map<String, Object> authenticationInfo) throws LoginException {
+        return new MockResourceResolver(this.eventAdmin, resources);
+    }
 }