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=1639323&r1=1639322&r2=1639323&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 Thu Nov 13 13:51:33 2014 @@ -21,6 +21,7 @@ package org.apache.sling.models.impl.inj import static org.junit.Assert.*; import static org.mockito.Mockito.*; +import java.lang.annotation.Annotation; import java.lang.reflect.AnnotatedElement; import javax.servlet.http.HttpServletRequest; @@ -28,7 +29,8 @@ import javax.servlet.http.HttpServletReq import org.apache.sling.api.SlingHttpServletRequest; import org.apache.sling.api.resource.ResourceResolver; import org.apache.sling.models.annotations.injectorspecific.Self; -import org.apache.sling.models.impl.ConstructorParameter; +import org.apache.sling.models.impl.model.ConstructorParameter; +import org.apache.sling.models.spi.injectorspecific.StaticInjectAnnotationProcessorFactory; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -46,43 +48,42 @@ public class SelfInjectorTest { @Mock private AnnotatedElement annotatedElement; - @Mock private ConstructorParameter firstConstructorParameter; - - @Mock private ConstructorParameter secondConstructorParameter; @Before public void setup() { - when(firstConstructorParameter.getParameterIndex()).thenReturn(0); - when(secondConstructorParameter.getParameterIndex()).thenReturn(1); + firstConstructorParameter = new ConstructorParameter(new Annotation[0], Object.class, Object.class, true, 0, + new StaticInjectAnnotationProcessorFactory[0]); + secondConstructorParameter = new ConstructorParameter(new Annotation[0], Object.class, Object.class, true, 1, + new StaticInjectAnnotationProcessorFactory[0]); } @Test public void testMatchingClass() { - assertSame(request, injector.getValue(request, "notRelevant", SlingHttpServletRequest.class, firstConstructorParameter, null)); - assertNull(injector.getValue(request, "notRelevant", SlingHttpServletRequest.class, secondConstructorParameter, null)); + 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)); } @Test public void testMatchingSubClass() { - assertSame(request, injector.getValue(request, "notRelevant", HttpServletRequest.class, firstConstructorParameter, null)); - assertNull(injector.getValue(request, "notRelevant", HttpServletRequest.class, secondConstructorParameter, null)); + 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)); } @Test public void testNotMatchingClass() { - assertNull(injector.getValue(request, "notRelevant", ResourceResolver.class, firstConstructorParameter, null)); - assertNull(injector.getValue(request, "notRelevant", ResourceResolver.class, secondConstructorParameter, null)); + 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)); } @Test public void testWithNullName() { - assertSame(request, injector.getValue(request, null, SlingHttpServletRequest.class, firstConstructorParameter, null)); - assertNull(injector.getValue(request, null, SlingHttpServletRequest.class, secondConstructorParameter, null)); + 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)); }
Modified: sling/trunk/bundles/extensions/models/integration-tests/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/models/integration-tests/pom.xml?rev=1639323&r1=1639322&r2=1639323&view=diff ============================================================================== --- sling/trunk/bundles/extensions/models/integration-tests/pom.xml (original) +++ sling/trunk/bundles/extensions/models/integration-tests/pom.xml Thu Nov 13 13:51:33 2014 @@ -73,6 +73,9 @@ <!-- Options for the VM that executes our runnable jar --> <jar.executor.vm.options>-Xmx512m</jar.executor.vm.options> + <!-- Alternative with JVM debug port + <jar.executor.vm.options>-Xmx512m -Xdebug -Xrunjdwp:server=y,transport=dt_socket,address=38080,suspend=n</jar.executor.vm.options> + --> <!-- Change this to use longer or shorter timeouts for testing --> <sling.testing.timeout.multiplier>1.0</sling.testing.timeout.multiplier> @@ -316,7 +319,7 @@ <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.launchpad</artifactId> <classifier>standalone</classifier> - <version>7</version> + <version>8-SNAPSHOT</version> </dependency> <dependency> <groupId>org.slf4j</groupId>