svn commit: r1654093 - in /sling/trunk/bundles/extensions/models/impl/src: main/java/org/apache/sling/models/impl/injectors/ResourceResolverInjector.java test/java/org/apache/sling/models/impl/injectors/ResourceResolverInjectorTest.java

[sseifert]

Author: sseifert
Date: Thu Jan 22 23:02:33 2015
New Revision: 1654093

URL: http://svn.apache.org/r1654093
Log:
SLING-4059 Sling Models: ResourceResolverInjector is obsolete

Removed:
    
sling/trunk/bundles/extensions/models/impl/src/main/java/org/apache/sling/models/impl/injectors/ResourceResolverInjector.java
Modified:
    
sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/injectors/ResourceResolverInjectorTest.java

Modified: 
sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/injectors/ResourceResolverInjectorTest.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/injectors/ResourceResolverInjectorTest.java?rev=1654093&r1=1654092&r2=1654093&view=diff
==============================================================================
--- 
sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/injectors/ResourceResolverInjectorTest.java
 (original)
+++ 
sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/injectors/ResourceResolverInjectorTest.java
 Thu Jan 22 23:02:33 2015
@@ -27,9 +27,14 @@ import org.apache.sling.api.resource.Res
 import org.apache.sling.api.resource.ResourceResolver;
 import org.junit.Test;
 
+/**
+ * This was a unit test for the ResourceResolverInjector which is now removed
+ * because it is obsolete due to the SlingObjectInjector.
+ * Leaving unit test to ensure the same behavior.
+ */
 public class ResourceResolverInjectorTest {
 
-    private ResourceResolverInjector injector = new ResourceResolverInjector();
+    private SlingObjectInjector injector = new SlingObjectInjector();
 
     @Test
     public void testFromResource() {
@@ -37,7 +42,7 @@ public class ResourceResolverInjectorTes
         ResourceResolver resourceResolver = mock(ResourceResolver.class);
         when(resource.getResourceResolver()).thenReturn(resourceResolver);
 
-        Object result = injector.getValue(resource, "resourceResolver", null, 
null, null);
+        Object result = injector.getValue(resource, "resourceResolver", 
ResourceResolver.class, null, null);
         assertEquals(resourceResolver, result);
     }
 
@@ -47,7 +52,7 @@ public class ResourceResolverInjectorTes
         ResourceResolver resourceResolver = mock(ResourceResolver.class);
         when(request.getResourceResolver()).thenReturn(resourceResolver);
 
-        Object result = injector.getValue(request, "resourceResolver", null, 
null, null);
+        Object result = injector.getValue(request, "resourceResolver", 
ResourceResolver.class, null, null);
         assertEquals(resourceResolver, result);
     }
 
@@ -55,7 +60,7 @@ public class ResourceResolverInjectorTes
     public void testFromSomethingElse() {
         SlingHttpServletResponse response = 
mock(SlingHttpServletResponse.class);
 
-        Object result = injector.getValue(response, "resourceResolver", null, 
null, null);
+        Object result = injector.getValue(response, "resourceResolver", 
ResourceResolver.class, null, null);
         assertNull(result);
     }