svn commit: r1618221 - /sling/trunk/testing/resourceresolver-mock/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolver.java

[cziegeler]

Author: cziegeler
Date: Fri Aug 15 16:18:33 2014
New Revision: 1618221

URL: http://svn.apache.org/r1618221
Log:
SLING-3847 : MockResourceResolver: resource order is not preserved in 
listChildren method. Apply patch from Stefan Seifert

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

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=1618221&r1=1618220&r2=1618221&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
 Fri Aug 15 16:18:33 2014
@@ -31,13 +31,14 @@ import java.util.Set;
 import javax.servlet.http.HttpServletRequest;
 
 import org.apache.sling.api.SlingConstants;
+import org.apache.sling.api.adapter.SlingAdaptable;
 import org.apache.sling.api.resource.LoginException;
 import org.apache.sling.api.resource.PersistenceException;
 import org.apache.sling.api.resource.Resource;
 import org.apache.sling.api.resource.ResourceResolver;
 import org.osgi.service.event.Event;
 
-public class MockResourceResolver implements ResourceResolver {
+public class MockResourceResolver extends SlingAdaptable implements 
ResourceResolver {
 
     private final Map<String, Map<String, Object>> resources;
 
@@ -54,11 +55,6 @@ public class MockResourceResolver implem
     }
 
     @Override
-    public <AdapterType> AdapterType adaptTo(Class<AdapterType> type) {
-        return null;
-    }
-
-    @Override
     public Resource resolve(final HttpServletRequest request, final String 
absPath) {
         return this.getResource(absPath);
     }