svn commit: r1489020 - in /sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl: ResourceResolverImplTest.java ResourceResolverMangleNamespacesTest.java helper/SortedProviderListTest.java

[mykee]

Author: mykee
Date: Mon Jun  3 15:01:39 2013
New Revision: 1489020

URL: http://svn.apache.org/r1489020
Log:
SLING-2875 / making the tests running again

Modified:
    
sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/ResourceResolverImplTest.java
    
sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/ResourceResolverMangleNamespacesTest.java
    
sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/helper/SortedProviderListTest.java

Modified: 
sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/ResourceResolverImplTest.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/ResourceResolverImplTest.java?rev=1489020&r1=1489019&r2=1489020&view=diff
==============================================================================
--- 
sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/ResourceResolverImplTest.java
 (original)
+++ 
sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/ResourceResolverImplTest.java
 Mon Jun  3 15:01:39 2013
@@ -54,11 +54,11 @@ public class ResourceResolverImplTest {
 
     @Before public void setup() {
         resFac = new ResourceResolverFactoryImpl(new 
ResourceResolverFactoryActivator());
-        resResolver = new ResourceResolverImpl(resFac, new 
ResourceResolverContext(false, null));
+        resResolver = new ResourceResolverImpl(resFac, new 
ResourceResolverContext(false, null, null));
     }
 
     @Test public void testClose() throws Exception {
-        final ResourceResolver rr = new ResourceResolverImpl(resFac, new 
ResourceResolverContext(false, null));
+        final ResourceResolver rr = new ResourceResolverImpl(resFac, new 
ResourceResolverContext(false, null, null));
         assertTrue(rr.isLive());
         rr.close();
         assertFalse(rr.isLive());
@@ -355,7 +355,7 @@ public class ResourceResolverImplTest {
                     }
 
                 },
-                new ResourceResolverContext(false, null));
+                new ResourceResolverContext(false, null, null));
         resolvers.add(resolver);
 
         // the resources to test
@@ -391,7 +391,7 @@ public class ResourceResolverImplTest {
                     }
 
                 },
-                new ResourceResolverContext(false, null));
+                new ResourceResolverContext(false, null, null));
         resolvers.add(resolver);
         final Resource r = new SyntheticResource(resolver, "/a", "a:b") {
             @Override

Modified: 
sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/ResourceResolverMangleNamespacesTest.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/ResourceResolverMangleNamespacesTest.java?rev=1489020&r1=1489019&r2=1489020&view=diff
==============================================================================
--- 
sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/ResourceResolverMangleNamespacesTest.java
 (original)
+++ 
sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/ResourceResolverMangleNamespacesTest.java
 Mon Jun  3 15:01:39 2013
@@ -77,7 +77,7 @@ public class ResourceResolverMangleNames
             }
         };
         
-        rr = new ResourceResolverImpl(fac, new ResourceResolverContext(false, 
null));
+        rr = new ResourceResolverImpl(fac, new ResourceResolverContext(false, 
null, null));
     }
     
     @Test 

Modified: 
sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/helper/SortedProviderListTest.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/helper/SortedProviderListTest.java?rev=1489020&r1=1489019&r2=1489020&view=diff
==============================================================================
--- 
sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/helper/SortedProviderListTest.java
 (original)
+++ 
sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/helper/SortedProviderListTest.java
 Mon Jun  3 15:01:39 2013
@@ -99,7 +99,7 @@ public class SortedProviderListTest {
         final AdaptableResourceProviderImpl rp3 = new 
AdaptableResourceProviderImpl(new String[] {"/hello"}, 3L);
         final ResourceProviderImpl rp4 = new ResourceProviderImpl(new String[] 
{"/you"}, 4L);
 
-        final ResourceResolverContext ctx = new ResourceResolverContext(false, 
null);
+        final ResourceResolverContext ctx = new ResourceResolverContext(false, 
null, null);
 
         final SortedProviderList<Adaptable> spl = new 
SortedProviderList<Adaptable>(Adaptable.class);
         check(spl, ctx);
@@ -131,7 +131,7 @@ public class SortedProviderListTest {
         final AdaptableResourceProviderImpl rp4 = new 
AdaptableResourceProviderImpl(new String[] {"/a/a"}, 4L);
         final AdaptableResourceProviderImpl rp5 = new 
AdaptableResourceProviderImpl(new String[] {"/all/or/nothing"}, 5L);
 
-        final ResourceResolverContext ctx = new ResourceResolverContext(false, 
null);
+        final ResourceResolverContext ctx = new ResourceResolverContext(false, 
null, null);
 
         final SortedProviderList<Adaptable> spl = new 
SortedProviderList<Adaptable>(Adaptable.class);
         check(spl, ctx);