[weld-commits] Weld SVN: r4024 - in cdi-tck/trunk/impl/src/main: java/org/jboss/jsr299/tck/tests/interceptors/definition and 1 other directories.
weld-commits at lists.jboss.org
weld-commits at lists.jboss.org
Tue Oct 13 23:28:06 EDT 2009
Author: marius.bogoevici
Date: 2009-10-13 23:28:06 -0400 (Tue, 13 Oct 2009)
New Revision: 4024
Added:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/NotEnabledAtomicInterceptor.java
Modified:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/BeanManagerTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/AtomicInterceptor.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/FileLogger.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/InterceptorDefinitionTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/MissileInterceptor.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/NetworkLogger.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/SecureTransaction.java
cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/beans.xml
Log:
Fixing InterceptorDefinitionTest and enabling tests.
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/BeanManagerTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/BeanManagerTest.java 2009-10-13 23:26:59 UTC (rev 4023)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/BeanManagerTest.java 2009-10-14 03:28:06 UTC (rev 4024)
@@ -42,6 +42,7 @@
import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.InjectionPoint;
import javax.enterprise.inject.spi.PassivationCapable;
+import javax.enterprise.inject.spi.InterceptionType;
import javax.enterprise.inject.stereotype.Stereotype;
import javax.inject.Qualifier;
@@ -142,7 +143,7 @@
assert !getCurrentManager().isStereotype(Transactional.class);
}
- @Test(groups = {"ri-broken", "rewrite"})
+ @Test(groups="rewrite")
// WBRI-59
// Should also check a custom interceptor binding type
@SpecAssertion(section = "11.3.13", id = "ad")
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/AtomicInterceptor.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/AtomicInterceptor.java 2009-10-13 23:26:59 UTC (rev 4023)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/AtomicInterceptor.java 2009-10-14 03:28:06 UTC (rev 4024)
@@ -11,6 +11,7 @@
@AroundInvoke public Object alwaysReturnThis(InvocationContext ctx) throws Exception
{
+ intercepted = true;
return ctx.proceed();
}
}
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/FileLogger.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/FileLogger.java 2009-10-13 23:26:59 UTC (rev 4023)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/FileLogger.java 2009-10-14 03:28:06 UTC (rev 4024)
@@ -7,8 +7,11 @@
@Logged @Interceptor
class FileLogger
{
+ public static boolean intercepted = false;
+
@AroundInvoke public Object alwaysReturnThis(InvocationContext ctx) throws Exception
{
+ intercepted = true;
return ctx.proceed();
}
}
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/InterceptorDefinitionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/InterceptorDefinitionTest.java 2009-10-13 23:26:59 UTC (rev 4023)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/InterceptorDefinitionTest.java 2009-10-14 03:28:06 UTC (rev 4024)
@@ -20,15 +20,14 @@
import java.lang.annotation.Annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Target;
-import java.lang.reflect.AnnotatedElement;
import java.lang.reflect.Type;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import java.util.ArrayList;
import javax.enterprise.inject.AnnotationLiteral;
-import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.InterceptionType;
import javax.enterprise.inject.spi.Interceptor;
@@ -37,6 +36,8 @@
import org.jboss.test.audit.annotations.SpecAssertions;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
+
import org.testng.annotations.Test;
/**
@@ -44,23 +45,24 @@
* their execution.
*
* @author David Allen
- *
+ * @author Marius Bogoevici
*/
@Artifact
- at SpecVersion(spec="cdi", version="PFD2")
+ at SpecVersion(spec = "cdi", version = "PFD2")
+ at BeansXml("beans.xml")
public class InterceptorDefinitionTest extends AbstractJSR299Test
{
- @Test(groups = "ri-broken")
+ @Test
@SpecAssertions({
- @SpecAssertion(section = "11.1.2", id = "a")
+ @SpecAssertion(section = "11.1.2", id = "a")
})
// WBRI-59
public void testInterceptorsImplementInterceptorInterface()
{
boolean interfaceFound = false;
- for (Type type : getInterfacesImplemented(getBeans(TransactionalInterceptor.class).iterator().next().getClass()))
+ for (Type type : getInterfacesImplemented(getTransactionalInterceptor().getClass()))
{
- if (type.equals(Interceptor.class))
+ if (type instanceof ParameterizedTypeImpl && ((ParameterizedTypeImpl)type).getRawType().equals(Interceptor.class))
{
interfaceFound = true;
break;
@@ -68,35 +70,28 @@
}
assert interfaceFound;
}
-
- private Set<Type> getInterfacesImplemented(Class<?> clazz)
- {
- Set<Type> interfaces = new HashSet<Type>();
- interfaces.addAll(new HierarchyDiscovery(clazz).getFlattenedTypes());
- return interfaces;
- }
-
- @Test(groups = "ri-broken")
+
+ @Test
@SpecAssertions({
- @SpecAssertion(section = "11.1.2", id = "b")
+ @SpecAssertion(section = "11.1.2", id = "b")
})
// WBRI-59
public void testInterceptorBindingTypes()
{
- Interceptor<?> interceptorBean = (Interceptor<?>) getBeans(TransactionalInterceptor.class).iterator().next();
+ Interceptor<?> interceptorBean = getTransactionalInterceptor();
assert interceptorBean.getInterceptorBindingTypes().size() == 1;
- assert interceptorBean.getInterceptorBindingTypes().contains(Transactional.class);
+ assert interceptorBean.getInterceptorBindingTypes().contains(new AnnotationLiteral<Transactional>(){});
}
- @Test(groups = "ri-broken")
+ @Test
@SpecAssertions({
- @SpecAssertion(section = "11.1.2", id = "c"),
- @SpecAssertion(section = "11.1.2", id = "e")
+ @SpecAssertion(section = "11.1.2", id = "c"),
+ @SpecAssertion(section = "11.1.2", id = "e")
})
// WBRI-59
public void testInterceptionType()
{
- Interceptor<?> interceptorBean = (Interceptor<?>) getBeans(TransactionalInterceptor.class).iterator().next();
+ Interceptor<?> interceptorBean = getTransactionalInterceptor();
assert interceptorBean.intercepts(InterceptionType.AROUND_INVOKE);
assert !interceptorBean.intercepts(InterceptionType.POST_ACTIVATE);
assert !interceptorBean.intercepts(InterceptionType.POST_CONSTRUCT);
@@ -104,24 +99,61 @@
assert !interceptorBean.intercepts(InterceptionType.PRE_PASSIVATE);
}
- @Test(groups = "ri-broken")
+ @Test
@SpecAssertion(section = "11.1.2", id = "f")
// WBRI-59
public void testInstanceOfInterceptorForEveryEnabledInterceptor()
{
- assert !getBeans(TransactionalInterceptor.class).isEmpty();
- assert !getBeans(SecureInterceptor.class).isEmpty();
+ List<AnnotationLiteral<?>> annotationLiterals = Arrays.<AnnotationLiteral<?>>asList(
+ new AnnotationLiteral<Transactional>(){},
+ new AnnotationLiteral<Secure>(){},
+ new AnnotationLiteral<MissileBinding>(){},
+ new AnnotationLiteral<Logged>(){});
+
+ List<Class<?>> interceptorClasses = new ArrayList<Class<?>>(Arrays.<Class<?>>asList(
+ AtomicInterceptor.class,
+ MissileInterceptor.class,
+ SecureInterceptor.class,
+ TransactionalInterceptor.class,
+ NetworkLogger.class,
+ FileLogger.class,
+ NotEnabledAtomicInterceptor.class
+ ));
+
+ for (AnnotationLiteral<?> annotationLiteral: annotationLiterals)
+ {
+ List<Interceptor<?>> interceptors = getCurrentManager().resolveInterceptors(InterceptionType.AROUND_INVOKE, annotationLiteral);
+ for (Interceptor<?> interceptor: interceptors)
+ {
+ interceptorClasses.remove(interceptor.getBeanClass());
+ }
+ }
+
+ List<Interceptor<?>> interceptors = getCurrentManager().resolveInterceptors(InterceptionType.AROUND_INVOKE,
+ new AnnotationLiteral<Atomic>(){},
+ new AnnotationLiteral<MissileBinding>(){});
+ for (Interceptor<?> interceptor : interceptors)
+ {
+ interceptorClasses.remove(interceptor.getBeanClass());
+ }
+
+ assert interceptorClasses.size() == 1;
+ assert interceptorClasses.get(0).equals(NotEnabledAtomicInterceptor.class);
}
- @Test(groups = "ri-broken")
+ @Test
@SpecAssertions({
- @SpecAssertion(section = "11.3.12", id = "a")
+ @SpecAssertion(section = "11.3.12", id = "a")
})
// WBRI-59
public void testResolveInterceptorsReturnsOrderedList()
{
- Annotation transactionalBinding = new AnnotationLiteral<Transactional>() {};
- Annotation secureBinding = new AnnotationLiteral<Secure>() {};
+ Annotation transactionalBinding = new AnnotationLiteral<Transactional>()
+ {
+ };
+ Annotation secureBinding = new AnnotationLiteral<Secure>()
+ {
+ };
List<Interceptor<?>> interceptors = getCurrentManager().resolveInterceptors(
InterceptionType.AROUND_INVOKE,
transactionalBinding,
@@ -129,126 +161,158 @@
);
assert interceptors.size() == 2;
assert interceptors.get(0).getInterceptorBindingTypes().size() == 1;
- assert interceptors.get(0).getInterceptorBindingTypes().contains(transactionalBinding);
+ assert interceptors.get(0).getInterceptorBindingTypes().contains(secureBinding);
assert interceptors.get(1).getInterceptorBindingTypes().size() == 1;
- assert interceptors.get(1).getInterceptorBindingTypes().contains(secureBinding);
+ assert interceptors.get(1).getInterceptorBindingTypes().contains(transactionalBinding);
}
-
- @Test(groups = "ri-broken")
+
+ @Test(groups = "ri-broken", expectedExceptions = {IllegalArgumentException.class})
@SpecAssertions({
- @SpecAssertion(section = "11.3.12", id = "b")
+ @SpecAssertion(section = "11.3.12", id = "b")
})
// WBRI-59
public void testSameBindingTypesToResolveInterceptorsFails()
{
- Annotation transactionalBinding = new AnnotationLiteral<Transactional>() {};
+ Annotation transactionalBinding = new AnnotationLiteral<Transactional>()
+ {
+ };
getCurrentManager().resolveInterceptors(InterceptionType.AROUND_INVOKE, transactionalBinding, transactionalBinding);
}
-
- @Test(groups = "ri-broken")
+
+ @Test(groups = "ri-broken", expectedExceptions = {IllegalArgumentException.class})
@SpecAssertions({
- @SpecAssertion(section = "11.3.12", id = "c")
+ @SpecAssertion(section = "11.3.12", id = "c")
})
// WBRI-59
public void testNoBindingTypesToResolveInterceptorsFails()
{
getCurrentManager().resolveInterceptors(InterceptionType.AROUND_INVOKE);
}
-
- @Test(groups = "ri-broken")
+
+ @Test(groups = "ri-broken", expectedExceptions = {IllegalArgumentException.class})
@SpecAssertions({
- @SpecAssertion(section = "11.3.12", id = "d")
+ @SpecAssertion(section = "11.3.12", id = "d")
})
// WBRI-59
public void testNonBindingTypeToResolveInterceptorsFails()
{
- Annotation nonBinding = new AnnotationLiteral<NonBindingType>() {};
+ Annotation nonBinding = new AnnotationLiteral<NonBindingType>()
+ {
+ };
getCurrentManager().resolveInterceptors(InterceptionType.AROUND_INVOKE, nonBinding);
}
-
- @Test(groups = "ri-broken")
+
+ @Test
@SpecAssertions({
- @SpecAssertion(section = "7.2", id = "a"),
- @SpecAssertion(section = "9.2", id = "a"),
- @SpecAssertion(section = "12.3", id = "kb")
+ @SpecAssertion(section = "7.2", id = "a"),
+ @SpecAssertion(section = "9.2", id = "a"),
+ @SpecAssertion(section = "12.3", id = "kb")
})
public void testManagedBeanIsIntercepted()
{
MissileInterceptor.intercepted = false;
-
+
Missile missile = getInstanceByType(Missile.class);
missile.fire();
-
+
assert MissileInterceptor.intercepted;
}
-
+
@Test
@SpecAssertion(section = "7.2", id = "a1")
public void testInitializerMethodsNotIntercepted()
{
MissileInterceptor.intercepted = false;
-
+
getInstanceByType(Missile.class);
-
+
assert !MissileInterceptor.intercepted;
}
-
- @Test(groups = "ri-broken")
+
+ @Test (groups = "ri-broken")
@SpecAssertion(section = "7.2", id = "ia")
public void testProducerMethodsAreIntercepted()
{
MissileInterceptor.intercepted = false;
-
+
getInstanceByType(Wheat.class);
-
+
assert MissileInterceptor.intercepted;
}
-
- @Test(groups = "ri-broken")
+
+ @Test
@SpecAssertions({
- @SpecAssertion(section = "9.1", id = "a"),
- @SpecAssertion(section = "9.1", id = "b"),
- @SpecAssertion(section = "9.1", id = "c"),
- @SpecAssertion(section = "9.3", id = "a")
+ @SpecAssertion(section = "9.1", id = "a"),
+ @SpecAssertion(section = "9.1", id = "b"),
+ @SpecAssertion(section = "9.1", id = "c"),
+ @SpecAssertion(section = "9.3", id = "a")
})
public void testInterceptorBindingAnnotation()
- {
- Interceptor<?> interceptorBean = (Interceptor<?>) getBeans(FileLogger.class).iterator().next();
+ {
+ Interceptor<?> interceptorBean = getLoggedInterceptors().iterator().next();
assert interceptorBean.getInterceptorBindingTypes().size() == 1;
- assert interceptorBean.getInterceptorBindingTypes().contains(Logged.class);
+ assert interceptorBean.getInterceptorBindingTypes().contains(new AnnotationLiteral<Logged>(){});
- Target target = ((AnnotatedElement) interceptorBean.getInterceptorBindingTypes().iterator().next()).getAnnotation(Target.class);
+ Target target = (interceptorBean.getInterceptorBindingTypes().iterator().next()).annotationType().getAnnotation(Target.class);
List<ElementType> elements = Arrays.asList(target.value());
assert elements.contains(ElementType.TYPE);
- assert elements.contains(ElementType.METHOD);
+ assert elements.contains(ElementType.METHOD);
}
-
- @Test(groups = "ri-broken")
+
+ @Test
@SpecAssertions({
- @SpecAssertion(section = "9.1.2", id = "a"),
- @SpecAssertion(section = "9.1.2", id = "b"),
- @SpecAssertion(section = "2.7.1.2", id = "b")
+ @SpecAssertion(section = "9.1.2", id = "a"),
+ @SpecAssertion(section = "9.1.2", id = "b"),
+ @SpecAssertion(section = "2.7.1.2", id = "b")
})
public void testStereotypeInterceptorBindings()
- {
- Bean<SecureTransaction> bean = getBeans(SecureTransaction.class).iterator().next();
- assert bean.getQualifiers().contains(Logged.class);
+ {
+ FileLogger.intercepted = false;
+ NetworkLogger.intercepted = false;
+
+ SecureTransaction secureTransaction = getInstanceByType(SecureTransaction.class);
+ secureTransaction.transact();
+
+ assert FileLogger.intercepted;
+ assert NetworkLogger.intercepted;
}
-
- @Test(groups = "ri-broken")
+
+ @Test (groups = "ri-broken")
@SpecAssertions({
- @SpecAssertion(section = "9.1.1", id = "a"),
- @SpecAssertion(section = "9.1.1", id = "b")
+ @SpecAssertion(section = "9.1.1", id = "a"),
+ @SpecAssertion(section = "9.1.1", id = "b")
})
public void testInterceptorBindingsCanDeclareOtherInterceptorBindings()
{
AtomicInterceptor.intercepted = false;
MissileInterceptor.intercepted = false;
-
+
AtomicFoo foo = getInstanceByType(AtomicFoo.class);
foo.doAction();
-
+
assert AtomicInterceptor.intercepted;
assert MissileInterceptor.intercepted;
}
+
+ private Interceptor<?> getTransactionalInterceptor()
+ {
+ return getCurrentManager().resolveInterceptors(InterceptionType.AROUND_INVOKE, new AnnotationLiteral<Transactional>()
+ {
+ }).iterator().next();
+ }
+
+ private List<Interceptor<?>> getLoggedInterceptors()
+ {
+ return getCurrentManager().resolveInterceptors(InterceptionType.AROUND_INVOKE, new AnnotationLiteral<Logged>()
+ {
+ });
+ }
+
+ private Set<Type> getInterfacesImplemented(Class<?> clazz)
+ {
+ Set<Type> interfaces = new HashSet<Type>();
+ interfaces.addAll(new HierarchyDiscovery(clazz).getFlattenedTypes());
+ return interfaces;
+ }
+
}
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/MissileInterceptor.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/MissileInterceptor.java 2009-10-13 23:26:59 UTC (rev 4023)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/MissileInterceptor.java 2009-10-14 03:28:06 UTC (rev 4024)
@@ -4,7 +4,7 @@
import javax.interceptor.Interceptor;
import javax.interceptor.InvocationContext;
- at Interceptor
+ at Interceptor @MissileBinding
class MissileInterceptor
{
public static boolean intercepted = false;
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/NetworkLogger.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/NetworkLogger.java 2009-10-13 23:26:59 UTC (rev 4023)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/NetworkLogger.java 2009-10-14 03:28:06 UTC (rev 4024)
@@ -7,8 +7,11 @@
@Logged @Interceptor
class NetworkLogger
{
+ public static boolean intercepted = false;
+
@AroundInvoke public Object alwaysReturnThis(InvocationContext ctx) throws Exception
{
+ intercepted = true;
return ctx.proceed();
}
}
Copied: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/NotEnabledAtomicInterceptor.java (from rev 4022, cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/AtomicInterceptor.java)
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/NotEnabledAtomicInterceptor.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/NotEnabledAtomicInterceptor.java 2009-10-14 03:28:06 UTC (rev 4024)
@@ -0,0 +1,17 @@
+package org.jboss.jsr299.tck.tests.interceptors.definition;
+
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.Interceptor;
+import javax.interceptor.InvocationContext;
+
+ at Atomic @Interceptor
+class NotEnabledAtomicInterceptor
+{
+ public static boolean intercepted = false;
+
+ @AroundInvoke public Object alwaysReturnThis(InvocationContext ctx) throws Exception
+ {
+ intercepted = true;
+ return ctx.proceed();
+ }
+}
\ No newline at end of file
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/SecureTransaction.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/SecureTransaction.java 2009-10-13 23:26:59 UTC (rev 4023)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/SecureTransaction.java 2009-10-14 03:28:06 UTC (rev 4024)
@@ -3,5 +3,5 @@
@Loggable
class SecureTransaction
{
-
+ public void transact() {}
}
Modified: cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/beans.xml
===================================================================
--- cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/beans.xml 2009-10-13 23:26:59 UTC (rev 4023)
+++ cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/beans.xml 2009-10-14 03:28:06 UTC (rev 4024)
@@ -4,5 +4,7 @@
<class>org.jboss.jsr299.tck.tests.interceptors.definition.MissileInterceptor</class>
<class>org.jboss.jsr299.tck.tests.interceptors.definition.SecureInterceptor</class>
<class>org.jboss.jsr299.tck.tests.interceptors.definition.TransactionalInterceptor</class>
+ <class>org.jboss.jsr299.tck.tests.interceptors.definition.FileLogger</class>
+ <class>org.jboss.jsr299.tck.tests.interceptors.definition.NetworkLogger</class>
</interceptors>
</beans>
More information about the weld-commits
mailing list