You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by kw...@apache.org on 2015/05/29 11:40:59 UTC
svn commit: r1682404 - in
/sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl:
injector/ injectors/
Author: kwin
Date: Fri May 29 09:40:58 2015
New Revision: 1682404
URL: http://svn.apache.org/r1682404
Log:
SLING-4737 fix some warnings in test classes due to new JSR 305 annotations
Modified:
sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/injector/CustomAnnotationInjector.java
sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/injector/SimpleInjector.java
sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/injectors/BindingsInjectorTest.java
sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/injectors/RequestAttributeInjectorTest.java
sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/injectors/ResourceResolverInjectorTest.java
sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/injectors/SelfInjectorTest.java
sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/injectors/SlingObjectInjectorRequestTest.java
sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/injectors/SlingObjectInjectorResourceResolverTest.java
sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/injectors/SlingObjectInjectorResourceTest.java
sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/injectors/ValueMapInjectorTest.java
Modified: sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/injector/CustomAnnotationInjector.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/injector/CustomAnnotationInjector.java?rev=1682404&r1=1682403&r2=1682404&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/injector/CustomAnnotationInjector.java (original)
+++ sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/injector/CustomAnnotationInjector.java Fri May 29 09:40:58 2015
@@ -19,6 +19,8 @@ package org.apache.sling.models.impl.inj
import java.lang.reflect.AnnotatedElement;
import java.lang.reflect.Type;
+import javax.annotation.Nonnull;
+
import org.apache.sling.models.spi.DisposalCallbackRegistry;
import org.apache.sling.models.spi.Injector;
import org.apache.sling.models.spi.injectorspecific.AbstractInjectAnnotationProcessor;
@@ -29,13 +31,13 @@ import org.apache.sling.models.spi.injec
public class CustomAnnotationInjector implements Injector, InjectAnnotationProcessorFactory {
@Override
- public String getName() {
+ public @Nonnull String getName() {
return "with-annotation";
}
@Override
- public Object getValue(Object adaptable, String name, Type declaredType, AnnotatedElement element,
- DisposalCallbackRegistry callbackRegistry) {
+ public Object getValue(@Nonnull Object adaptable, String name, @Nonnull Type declaredType, @Nonnull AnnotatedElement element,
+ @Nonnull DisposalCallbackRegistry callbackRegistry) {
if (name.equals("customString")) {
return "custom value";
} else {
Modified: sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/injector/SimpleInjector.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/injector/SimpleInjector.java?rev=1682404&r1=1682403&r2=1682404&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/injector/SimpleInjector.java (original)
+++ sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/injector/SimpleInjector.java Fri May 29 09:40:58 2015
@@ -19,19 +19,21 @@ package org.apache.sling.models.impl.inj
import java.lang.reflect.AnnotatedElement;
import java.lang.reflect.Type;
+import javax.annotation.Nonnull;
+
import org.apache.sling.models.spi.DisposalCallbackRegistry;
import org.apache.sling.models.spi.Injector;
public class SimpleInjector implements Injector {
@Override
- public String getName() {
+ public @Nonnull String getName() {
return "test";
}
@Override
- public Object getValue(Object adaptable, String name, Type declaredType, AnnotatedElement element,
- DisposalCallbackRegistry callbackRegistry) {
+ public Object getValue(@Nonnull Object adaptable, String name, @Nonnull Type declaredType, @Nonnull AnnotatedElement element,
+ @Nonnull DisposalCallbackRegistry callbackRegistry) {
if (name.equals("testString") && declaredType.equals(String.class)) {
return "test string";
} else {
Modified: sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/injectors/BindingsInjectorTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/injectors/BindingsInjectorTest.java?rev=1682404&r1=1682403&r2=1682404&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/injectors/BindingsInjectorTest.java (original)
+++ sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/injectors/BindingsInjectorTest.java Fri May 29 09:40:58 2015
@@ -21,10 +21,13 @@ package org.apache.sling.models.impl.inj
import static org.junit.Assert.*;
import static org.mockito.Mockito.*;
+import java.lang.reflect.AnnotatedElement;
+
import javax.servlet.ServletRequest;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.scripting.SlingBindings;
+import org.apache.sling.models.spi.DisposalCallbackRegistry;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -40,6 +43,10 @@ public class BindingsInjectorTest {
private ServletRequest request;
@Mock
private SlingBindings bindings;
+ @Mock
+ private AnnotatedElement element;
+ @Mock
+ private DisposalCallbackRegistry registry;
private static final String STRING_PARAM = "param1";
private static final String INTEGER_PARAM = "param2";
@@ -58,32 +65,32 @@ public class BindingsInjectorTest {
@Test
public void testStringParam() {
- Object result = injector.getValue(request, STRING_PARAM, String.class, null, null);
+ Object result = injector.getValue(request, STRING_PARAM, String.class, element, registry);
assertEquals(STRING_VALUE, result);
}
@Test
public void testIntegerParam() {
- Object result = injector.getValue(request, INTEGER_PARAM, Integer.class, null, null);
+ Object result = injector.getValue(request, INTEGER_PARAM, Integer.class, element, registry);
assertEquals(INTEGER_VALUE, result);
}
@Test
public void testClassInstance() {
- Object result = injector.getValue(request, CLASS_PARAM, ResourceResolver.class, null, null);
+ Object result = injector.getValue(request, CLASS_PARAM, ResourceResolver.class, element, registry);
assertSame(CLASS_INSTANCE, result);
}
@Test
public void testNonRequestAdaptable() {
- Object result = injector.getValue(mock(ResourceResolver.class), STRING_PARAM, String.class, null, null);
+ Object result = injector.getValue(mock(ResourceResolver.class), STRING_PARAM, String.class, element, registry);
assertNull(result);
}
@Test
public void testRequestThatDoesNotContainBindings() {
when(request.getAttribute(SlingBindings.class.getName())).thenReturn(null);
- Object result = injector.getValue(request, STRING_PARAM, String.class, null, null);
+ Object result = injector.getValue(request, STRING_PARAM, String.class, element, registry);
assertNull(result);
}
Modified: sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/injectors/RequestAttributeInjectorTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/injectors/RequestAttributeInjectorTest.java?rev=1682404&r1=1682403&r2=1682404&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/injectors/RequestAttributeInjectorTest.java (original)
+++ sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/injectors/RequestAttributeInjectorTest.java Fri May 29 09:40:58 2015
@@ -21,9 +21,12 @@ package org.apache.sling.models.impl.inj
import static org.junit.Assert.*;
import static org.mockito.Mockito.*;
+import java.lang.reflect.AnnotatedElement;
+
import javax.servlet.ServletRequest;
import org.apache.sling.api.resource.ResourceResolver;
+import org.apache.sling.models.spi.DisposalCallbackRegistry;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -37,6 +40,10 @@ public class RequestAttributeInjectorTes
@Mock
private ServletRequest request;
+ @Mock
+ private AnnotatedElement element;
+ @Mock
+ private DisposalCallbackRegistry registry;
private static final String STRING_PARAM = "param1";
private static final String INTEGER_PARAM = "param2";
@@ -54,25 +61,25 @@ public class RequestAttributeInjectorTes
@Test
public void testStringParam() {
- Object result = injector.getValue(request, STRING_PARAM, String.class, null, null);
+ Object result = injector.getValue(request, STRING_PARAM, String.class, element, registry);
assertEquals(STRING_VALUE, result);
}
@Test
public void testIntegerParam() {
- Object result = injector.getValue(request, INTEGER_PARAM, Integer.class, null, null);
+ Object result = injector.getValue(request, INTEGER_PARAM, Integer.class, element, registry);
assertEquals(INTEGER_VALUE, result);
}
@Test
public void testClassInstance() {
- Object result = injector.getValue(request, CLASS_PARAM, ResourceResolver.class, null, null);
+ Object result = injector.getValue(request, CLASS_PARAM, ResourceResolver.class, element, registry);
assertSame(CLASS_INSTANCE, result);
}
@Test
public void testNonRequestAdaptable() {
- Object result = injector.getValue(mock(ResourceResolver.class), STRING_PARAM, String.class, null, null);
+ Object result = injector.getValue(mock(ResourceResolver.class), STRING_PARAM, String.class, element, registry);
assertNull(result);
}
}
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=1682404&r1=1682403&r2=1682404&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 Fri May 29 09:40:58 2015
@@ -21,20 +21,33 @@ package org.apache.sling.models.impl.inj
import static org.junit.Assert.*;
import static org.mockito.Mockito.*;
+import java.lang.reflect.AnnotatedElement;
+
import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.SlingHttpServletResponse;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
+import org.apache.sling.models.spi.DisposalCallbackRegistry;
import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
/**
* 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.
+ *
*/
+@RunWith(MockitoJUnitRunner.class)
public class ResourceResolverInjectorTest {
private SlingObjectInjector injector = new SlingObjectInjector();
+
+ @Mock
+ private AnnotatedElement element;
+ @Mock
+ private DisposalCallbackRegistry registry;
@Test
public void testFromResource() {
@@ -42,7 +55,7 @@ public class ResourceResolverInjectorTes
ResourceResolver resourceResolver = mock(ResourceResolver.class);
when(resource.getResourceResolver()).thenReturn(resourceResolver);
- Object result = injector.getValue(resource, "resourceResolver", ResourceResolver.class, null, null);
+ Object result = injector.getValue(resource, "resourceResolver", ResourceResolver.class, element, registry);
assertEquals(resourceResolver, result);
}
@@ -52,7 +65,7 @@ public class ResourceResolverInjectorTes
ResourceResolver resourceResolver = mock(ResourceResolver.class);
when(request.getResourceResolver()).thenReturn(resourceResolver);
- Object result = injector.getValue(request, "resourceResolver", ResourceResolver.class, null, null);
+ Object result = injector.getValue(request, "resourceResolver", ResourceResolver.class, element, registry);
assertEquals(resourceResolver, result);
}
@@ -60,7 +73,7 @@ public class ResourceResolverInjectorTes
public void testFromSomethingElse() {
SlingHttpServletResponse response = mock(SlingHttpServletResponse.class);
- Object result = injector.getValue(response, "resourceResolver", ResourceResolver.class, null, null);
+ Object result = injector.getValue(response, "resourceResolver", ResourceResolver.class, element, registry);
assertNull(result);
}
Modified: sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/injectors/SelfInjectorTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/injectors/SelfInjectorTest.java?rev=1682404&r1=1682403&r2=1682404&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/injectors/SelfInjectorTest.java (original)
+++ sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/injectors/SelfInjectorTest.java Fri May 29 09:40:58 2015
@@ -32,6 +32,7 @@ import org.apache.sling.models.annotatio
import org.apache.sling.models.annotations.Model;
import org.apache.sling.models.annotations.injectorspecific.Self;
import org.apache.sling.models.impl.model.ConstructorParameter;
+import org.apache.sling.models.spi.DisposalCallbackRegistry;
import org.apache.sling.models.spi.injectorspecific.StaticInjectAnnotationProcessorFactory;
import org.junit.Before;
import org.junit.Test;
@@ -52,6 +53,9 @@ public class SelfInjectorTest {
@Mock
private Model modelAnnotation;
+
+ @Mock
+ private DisposalCallbackRegistry registry;
private ConstructorParameter firstConstructorParameter;
private ConstructorParameter secondConstructorParameter;
@@ -67,44 +71,44 @@ public class SelfInjectorTest {
@Test
public void testMatchingClass() {
- assertSame(request, injector.getValue(request, "notRelevant", SlingHttpServletRequest.class, firstConstructorParameter.getAnnotatedElement(), null));
- assertNull(injector.getValue(request, "notRelevant", SlingHttpServletRequest.class, secondConstructorParameter.getAnnotatedElement(), null));
- assertNull(injector.getValue(request, "notRelevant", SlingHttpServletRequest.class, annotatedElement, null));
+ assertSame(request, injector.getValue(request, "notRelevant", SlingHttpServletRequest.class, firstConstructorParameter.getAnnotatedElement(), registry));
+ assertNull(injector.getValue(request, "notRelevant", SlingHttpServletRequest.class, secondConstructorParameter.getAnnotatedElement(), registry));
+ assertNull(injector.getValue(request, "notRelevant", SlingHttpServletRequest.class, annotatedElement, registry));
}
@Test
public void testMatchingSubClass() {
- assertSame(request, injector.getValue(request, "notRelevant", HttpServletRequest.class, firstConstructorParameter.getAnnotatedElement(), null));
- assertNull(injector.getValue(request, "notRelevant", HttpServletRequest.class, secondConstructorParameter.getAnnotatedElement(), null));
- assertNull(injector.getValue(request, "notRelevant", HttpServletRequest.class, annotatedElement, null));
+ assertSame(request, injector.getValue(request, "notRelevant", HttpServletRequest.class, firstConstructorParameter.getAnnotatedElement(), registry));
+ assertNull(injector.getValue(request, "notRelevant", HttpServletRequest.class, secondConstructorParameter.getAnnotatedElement(), registry));
+ assertNull(injector.getValue(request, "notRelevant", HttpServletRequest.class, annotatedElement, registry));
}
@Test
public void testNotMatchingClass() {
- assertNull(injector.getValue(request, "notRelevant", ResourceResolver.class, firstConstructorParameter.getAnnotatedElement(), null));
- assertNull(injector.getValue(request, "notRelevant", ResourceResolver.class, secondConstructorParameter.getAnnotatedElement(), null));
- assertNull(injector.getValue(request, "notRelevant", ResourceResolver.class, annotatedElement, null));
+ assertNull(injector.getValue(request, "notRelevant", ResourceResolver.class, firstConstructorParameter.getAnnotatedElement(), registry));
+ assertNull(injector.getValue(request, "notRelevant", ResourceResolver.class, secondConstructorParameter.getAnnotatedElement(), registry));
+ assertNull(injector.getValue(request, "notRelevant", ResourceResolver.class, annotatedElement, registry));
}
@Test
public void testWithNullName() {
- assertSame(request, injector.getValue(request, null, SlingHttpServletRequest.class, firstConstructorParameter.getAnnotatedElement(), null));
- assertNull(injector.getValue(request, null, SlingHttpServletRequest.class, secondConstructorParameter.getAnnotatedElement(), null));
- assertNull(injector.getValue(request, null, SlingHttpServletRequest.class, annotatedElement, null));
+ assertSame(request, injector.getValue(request, null, SlingHttpServletRequest.class, firstConstructorParameter.getAnnotatedElement(), registry));
+ assertNull(injector.getValue(request, null, SlingHttpServletRequest.class, secondConstructorParameter.getAnnotatedElement(), registry));
+ assertNull(injector.getValue(request, null, SlingHttpServletRequest.class, annotatedElement, registry));
}
@Test
public void testMatchingClassWithSelfAnnotation() {
when(annotatedElement.isAnnotationPresent(Self.class)).thenReturn(true);
Object result = injector
- .getValue(request, "notRelevant", SlingHttpServletRequest.class, annotatedElement, null);
+ .getValue(request, "notRelevant", SlingHttpServletRequest.class, annotatedElement, registry);
assertSame(request, result);
}
@Test
public void testNotMatchingClassWithSelfAnnotation() {
when(annotatedElement.isAnnotationPresent(Self.class)).thenReturn(true);
- Object result = injector.getValue(request, "notRelevant", ResourceResolver.class, annotatedElement, null);
+ Object result = injector.getValue(request, "notRelevant", ResourceResolver.class, annotatedElement, registry);
assertSame(request, result);
}
Modified: sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/injectors/SlingObjectInjectorRequestTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/injectors/SlingObjectInjectorRequestTest.java?rev=1682404&r1=1682403&r2=1682404&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/injectors/SlingObjectInjectorRequestTest.java (original)
+++ sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/injectors/SlingObjectInjectorRequestTest.java Fri May 29 09:40:58 2015
@@ -33,6 +33,7 @@ import org.apache.sling.api.resource.Res
import org.apache.sling.api.scripting.SlingBindings;
import org.apache.sling.api.scripting.SlingScriptHelper;
import org.apache.sling.models.annotations.injectorspecific.SlingObject;
+import org.apache.sling.models.spi.DisposalCallbackRegistry;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -56,6 +57,8 @@ public class SlingObjectInjectorRequestT
private ResourceResolver resourceResolver;
@Mock
private Resource resource;
+ @Mock
+ private DisposalCallbackRegistry registry;
@Before
public void setUp() {
@@ -69,50 +72,50 @@ public class SlingObjectInjectorRequestT
@Test
public void testResourceResolver() {
- Object result = this.injector.getValue(this.request, null, ResourceResolver.class, this.annotatedElement, null);
+ Object result = this.injector.getValue(this.request, null, ResourceResolver.class, this.annotatedElement, registry);
assertSame(this.resourceResolver, result);
}
@Test
public void testResource() {
- Object result = this.injector.getValue(this.request, null, Resource.class, this.annotatedElement, null);
+ Object result = this.injector.getValue(this.request, null, Resource.class, this.annotatedElement, registry);
assertNull(result);
when(annotatedElement.isAnnotationPresent(SlingObject.class)).thenReturn(true);
- result = this.injector.getValue(this.request, null, Resource.class, this.annotatedElement, null);
+ result = this.injector.getValue(this.request, null, Resource.class, this.annotatedElement, registry);
assertSame(resource, result);
}
@Test
public void testRequest() {
Object result = this.injector.getValue(this.request, null, SlingHttpServletRequest.class,
- this.annotatedElement, null);
+ this.annotatedElement, registry);
assertSame(this.request, result);
- result = this.injector.getValue(this.request, null, HttpServletRequest.class, this.annotatedElement, null);
+ result = this.injector.getValue(this.request, null, HttpServletRequest.class, this.annotatedElement, registry);
assertSame(this.request, result);
}
@Test
public void testResponse() {
Object result = this.injector.getValue(this.request, null, SlingHttpServletResponse.class,
- this.annotatedElement, null);
+ this.annotatedElement, registry);
assertSame(this.response, result);
- result = this.injector.getValue(this.request, null, HttpServletResponse.class, this.annotatedElement, null);
+ result = this.injector.getValue(this.request, null, HttpServletResponse.class, this.annotatedElement, registry);
assertSame(this.response, result);
}
@Test
public void testScriptHelper() {
Object result = this.injector
- .getValue(this.request, null, SlingScriptHelper.class, this.annotatedElement, null);
+ .getValue(this.request, null, SlingScriptHelper.class, this.annotatedElement, registry);
assertSame(this.scriptHelper, result);
}
@Test
public void testInvalid() {
- Object result = this.injector.getValue(this, null, SlingScriptHelper.class, this.annotatedElement, null);
+ Object result = this.injector.getValue(this, null, SlingScriptHelper.class, this.annotatedElement, registry);
assertNull(result);
}
Modified: sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/injectors/SlingObjectInjectorResourceResolverTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/injectors/SlingObjectInjectorResourceResolverTest.java?rev=1682404&r1=1682403&r2=1682404&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/injectors/SlingObjectInjectorResourceResolverTest.java (original)
+++ sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/injectors/SlingObjectInjectorResourceResolverTest.java Fri May 29 09:40:58 2015
@@ -27,6 +27,7 @@ import org.apache.sling.api.SlingHttpSer
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.scripting.SlingScriptHelper;
+import org.apache.sling.models.spi.DisposalCallbackRegistry;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
@@ -41,45 +42,47 @@ public class SlingObjectInjectorResource
private AnnotatedElement annotatedElement;
@Mock
private ResourceResolver resourceResolver;
+ @Mock
+ private DisposalCallbackRegistry registry;
@Test
public void testResourceResolver() {
Object result = this.injector.getValue(this.resourceResolver, null, ResourceResolver.class,
- this.annotatedElement, null);
+ this.annotatedElement, registry);
assertSame(this.resourceResolver, result);
}
@Test
public void testResource() {
Object result = this.injector
- .getValue(this.resourceResolver, null, Resource.class, this.annotatedElement, null);
+ .getValue(this.resourceResolver, null, Resource.class, this.annotatedElement, registry);
assertNull(result);
}
@Test
public void testRequest() {
Object result = this.injector.getValue(this.resourceResolver, null, SlingHttpServletResponse.class,
- this.annotatedElement, null);
+ this.annotatedElement, registry);
assertNull(result);
}
@Test
public void testResponse() {
Object result = this.injector.getValue(this.resourceResolver, null, SlingHttpServletResponse.class,
- this.annotatedElement, null);
+ this.annotatedElement, registry);
assertNull(result);
}
@Test
public void testScriptHelper() {
Object result = this.injector.getValue(this.resourceResolver, null, SlingScriptHelper.class,
- this.annotatedElement, null);
+ this.annotatedElement, registry);
assertNull(result);
}
@Test
public void testInvalid() {
- Object result = this.injector.getValue(this, null, SlingScriptHelper.class, this.annotatedElement, null);
+ Object result = this.injector.getValue(this, null, SlingScriptHelper.class, this.annotatedElement, registry);
assertNull(result);
}
Modified: sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/injectors/SlingObjectInjectorResourceTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/injectors/SlingObjectInjectorResourceTest.java?rev=1682404&r1=1682403&r2=1682404&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/injectors/SlingObjectInjectorResourceTest.java (original)
+++ sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/injectors/SlingObjectInjectorResourceTest.java Fri May 29 09:40:58 2015
@@ -29,6 +29,7 @@ import org.apache.sling.api.resource.Res
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.scripting.SlingScriptHelper;
import org.apache.sling.models.annotations.injectorspecific.SlingObject;
+import org.apache.sling.models.spi.DisposalCallbackRegistry;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -49,6 +50,9 @@ public class SlingObjectInjectorResource
@Mock
private Resource resource;
+ @Mock
+ private DisposalCallbackRegistry registry;
+
@Before
public void setUp() {
when(this.resource.getResourceResolver()).thenReturn(this.resourceResolver);
@@ -57,44 +61,44 @@ public class SlingObjectInjectorResource
@Test
public void testResourceResolver() {
Object result = this.injector
- .getValue(this.resource, null, ResourceResolver.class, this.annotatedElement, null);
+ .getValue(this.resource, null, ResourceResolver.class, this.annotatedElement, registry);
assertSame(this.resourceResolver, result);
}
@Test
public void testResource() {
- Object result = this.injector.getValue(this.resource, null, Resource.class, this.annotatedElement, null);
+ Object result = this.injector.getValue(this.resource, null, Resource.class, this.annotatedElement, registry);
assertNull(result);
when(annotatedElement.isAnnotationPresent(SlingObject.class)).thenReturn(true);
- result = this.injector.getValue(this.resource, null, Resource.class, this.annotatedElement, null);
+ result = this.injector.getValue(this.resource, null, Resource.class, this.annotatedElement, registry);
assertSame(resource, result);
}
@Test
public void testRequest() {
Object result = this.injector.getValue(this.resource, null, SlingHttpServletResponse.class,
- this.annotatedElement, null);
+ this.annotatedElement, registry);
assertNull(result);
}
@Test
public void testResponse() {
Object result = this.injector.getValue(this.resource, null, SlingHttpServletResponse.class,
- this.annotatedElement, null);
+ this.annotatedElement, registry);
assertNull(result);
}
@Test
public void testScriptHelper() {
Object result = this.injector.getValue(this.resource, null, SlingScriptHelper.class, this.annotatedElement,
- null);
+ registry);
assertNull(result);
}
@Test
public void testInvalid() {
- Object result = this.injector.getValue(this, null, SlingScriptHelper.class, this.annotatedElement, null);
+ Object result = this.injector.getValue(this, null, SlingScriptHelper.class, this.annotatedElement, registry);
assertNull(result);
}
Modified: sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/injectors/ValueMapInjectorTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/injectors/ValueMapInjectorTest.java?rev=1682404&r1=1682403&r2=1682404&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/injectors/ValueMapInjectorTest.java (original)
+++ sling/trunk/bundles/extensions/models/impl/src/test/java/org/apache/sling/models/impl/injectors/ValueMapInjectorTest.java Fri May 29 09:40:58 2015
@@ -21,9 +21,12 @@ package org.apache.sling.models.impl.inj
import static org.junit.Assert.*;
import static org.mockito.Mockito.*;
+import java.lang.reflect.AnnotatedElement;
+
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.resource.ValueMap;
+import org.apache.sling.models.spi.DisposalCallbackRegistry;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -37,6 +40,10 @@ public class ValueMapInjectorTest {
@Mock
private ValueMap valueMap;
+ @Mock
+ private AnnotatedElement element;
+ @Mock
+ private DisposalCallbackRegistry registry;
private static final String STRING_PARAM = "param1";
private static final String INTEGER_PARAM = "param2";
@@ -54,31 +61,31 @@ public class ValueMapInjectorTest {
@Test
public void testStringParam() {
- Object result = injector.getValue(valueMap, STRING_PARAM, String.class, null, null);
+ Object result = injector.getValue(valueMap, STRING_PARAM, String.class, element, registry);
assertEquals(STRING_VALUE, result);
}
@Test
public void testIntegerParam() {
- Object result = injector.getValue(valueMap, INTEGER_PARAM, Integer.class, null, null);
+ Object result = injector.getValue(valueMap, INTEGER_PARAM, Integer.class, element, registry);
assertEquals(INTEGER_VALUE, result);
}
@Test
public void testClassInstance() {
- Object result = injector.getValue(valueMap, CLASS_PARAM, ResourceResolver.class, null, null);
+ Object result = injector.getValue(valueMap, CLASS_PARAM, ResourceResolver.class, element, registry);
assertSame(CLASS_INSTANCE, result);
}
@Test
public void testNonMatchingClassInstance() {
- Object result = injector.getValue(valueMap, CLASS_PARAM, Resource.class, null, null);
+ Object result = injector.getValue(valueMap, CLASS_PARAM, Resource.class, element, registry);
assertNull(result);
}
@Test
public void testNonValueMapAdaptable() {
- Object result = injector.getValue(mock(ResourceResolver.class), STRING_PARAM, String.class, null, null);
+ Object result = injector.getValue(mock(ResourceResolver.class), STRING_PARAM, String.class, element, registry);
assertNull(result);
}