[weld-commits] Weld SVN: r4464 - in cdi-tck/trunk/impl/src/main: java/org/jboss/jsr299/tck/tests/event/observer/transactional and 9 other directories.

weld-commits at lists.jboss.org weld-commits at lists.jboss.org
Fri Oct 30 12:38:50 EDT 2009


Author: norman.richards at jboss.com
Date: 2009-10-30 12:38:50 -0400 (Fri, 30 Oct 2009)
New Revision: 4464

Added:
   cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidLifecycleInterceptor/
   cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidLifecycleInterceptor/beans.xml
Modified:
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/bindingTypes/Wild.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/transactional/TransactionalObserversTest.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeMembersTest.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/typeWithParameters/CheckTypeParametersWhenResolvingObserversTest.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/Atomic.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/broken/invalidBindingAnnotations/FooStereotype.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidLifecycleInterceptor/InvalidLifecycleInterceptorTest.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorOrder/AnotherInterceptor.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/multipleBindings/Deadly.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/multipleBindings/Fast.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/multipleBindings/MultipleInterceptorBindingsTest.java
Log:
minor test cleanup

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/bindingTypes/Wild.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/bindingTypes/Wild.java	2009-10-30 14:58:49 UTC (rev 4463)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/bindingTypes/Wild.java	2009-10-30 16:38:50 UTC (rev 4464)
@@ -1,9 +1,7 @@
 package org.jboss.jsr299.tck.tests.event.bindingTypes;
 
 import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 import java.lang.annotation.Documented;
@@ -12,7 +10,7 @@
 
 import javax.inject.Qualifier;
 
- at Target( { FIELD, PARAMETER, METHOD, TYPE } )
+ at Target( { FIELD, PARAMETER} )
 @Retention(RUNTIME)
 @Documented
 @Qualifier

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/transactional/TransactionalObserversTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/transactional/TransactionalObserversTest.java	2009-10-30 14:58:49 UTC (rev 4463)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/transactional/TransactionalObserversTest.java	2009-10-30 16:38:50 UTC (rev 4464)
@@ -17,11 +17,8 @@
 
 package org.jboss.jsr299.tck.tests.event.observer.transactional;
 
-import java.lang.annotation.Annotation;
 import java.math.BigInteger;
 
-import javax.enterprise.util.AnnotationLiteral;
-
 import org.jboss.jsr299.tck.AbstractJSR299Test;
 import org.jboss.test.audit.annotations.SpecAssertion;
 import org.jboss.test.audit.annotations.SpecAssertions;
@@ -44,10 +41,6 @@
 @SpecVersion(spec="cdi", version="20091018")
 public class TransactionalObserversTest extends AbstractJSR299Test
 {
-
-   private static final Annotation TAME_LITERAL = new AnnotationLiteral<Tame>()
-   {
-   };
    private PomeranianInterface dog = null;
    
    @Override

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeMembersTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeMembersTest.java	2009-10-30 14:58:49 UTC (rev 4463)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeMembersTest.java	2009-10-30 16:38:50 UTC (rev 4464)
@@ -46,5 +46,7 @@
    {
       assert getCurrentManager().resolveObserverMethods(new AnEventType(), new BindingTypeCBinding("first-observer")).size() == 1;
       assert getCurrentManager().resolveObserverMethods(new AnEventType(), new BindingTypeCBinding("second-observer")).size() == 1;
+      assert getCurrentManager().resolveObserverMethods(new AnEventType(), new BindingTypeCBinding("third-observer")).size() == 0;
+
    }
 }

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/typeWithParameters/CheckTypeParametersWhenResolvingObserversTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/typeWithParameters/CheckTypeParametersWhenResolvingObserversTest.java	2009-10-30 14:58:49 UTC (rev 4463)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/typeWithParameters/CheckTypeParametersWhenResolvingObserversTest.java	2009-10-30 16:38:50 UTC (rev 4464)
@@ -58,6 +58,7 @@
    public void testResolvingChecksTypeParameters()
    {
       assert getCurrentManager().resolveObserverMethods(new StringList()).size() == 1;
+      assert getCurrentManager().resolveObserverMethods(new IntegerList()).size() == 1;
       assert getCurrentManager().resolveObserverMethods(new CharacterList()).size() == 0;
    }
    

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/Atomic.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/Atomic.java	2009-10-30 14:58:49 UTC (rev 4463)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/Atomic.java	2009-10-30 16:38:50 UTC (rev 4464)
@@ -1,8 +1,6 @@
 package org.jboss.jsr299.tck.tests.interceptors.definition;
 
-import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 

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-30 14:58:49 UTC (rev 4463)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/MissileInterceptor.java	2009-10-30 16:38:50 UTC (rev 4464)
@@ -9,6 +9,7 @@
 {
    public static boolean intercepted = false;
    
+   
    @AroundInvoke public Object alwaysReturnThis(InvocationContext ctx) throws Exception
    {
       intercepted = true;

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidBindingAnnotations/FooStereotype.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidBindingAnnotations/FooStereotype.java	2009-10-30 14:58:49 UTC (rev 4463)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidBindingAnnotations/FooStereotype.java	2009-10-30 16:38:50 UTC (rev 4464)
@@ -2,7 +2,6 @@
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidLifecycleInterceptor/InvalidLifecycleInterceptorTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidLifecycleInterceptor/InvalidLifecycleInterceptorTest.java	2009-10-30 14:58:49 UTC (rev 4463)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidLifecycleInterceptor/InvalidLifecycleInterceptorTest.java	2009-10-30 16:38:50 UTC (rev 4464)
@@ -6,17 +6,19 @@
 import org.jboss.test.audit.annotations.SpecVersion;
 import org.jboss.testharness.impl.packaging.Artifact;
 import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
+import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
 import org.testng.annotations.Test;
 
 @Artifact
 @ExpectedDeploymentException(DeploymentError.class)
 @SpecVersion(spec="cdi", version="20091018")
+ at BeansXml("beans.xml")
 public class InvalidLifecycleInterceptorTest extends AbstractJSR299Test
 {
    @Test(groups = "ri-broken")
    @SpecAssertion(section = "9.2", id = "d")
    public void testLifecycleInterceptorWithInvalidBindingNotOk()
    {
-      assert false;
+       assert false;
    }
 }

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorOrder/AnotherInterceptor.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorOrder/AnotherInterceptor.java	2009-10-30 14:58:49 UTC (rev 4463)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorOrder/AnotherInterceptor.java	2009-10-30 16:38:50 UTC (rev 4464)
@@ -1,7 +1,6 @@
 package org.jboss.jsr299.tck.tests.interceptors.definition.interceptorOrder;
 
 import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptor;
 import javax.interceptor.InvocationContext;
 
 class AnotherInterceptor

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/multipleBindings/Deadly.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/multipleBindings/Deadly.java	2009-10-30 14:58:49 UTC (rev 4463)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/multipleBindings/Deadly.java	2009-10-30 16:38:50 UTC (rev 4464)
@@ -1,8 +1,6 @@
 package org.jboss.jsr299.tck.tests.interceptors.definition.multipleBindings;
 
-import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
@@ -10,7 +8,6 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.Qualifier;
 import javax.interceptor.InterceptorBinding;
 
 @Target( { TYPE, METHOD})

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/multipleBindings/Fast.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/multipleBindings/Fast.java	2009-10-30 14:58:49 UTC (rev 4463)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/multipleBindings/Fast.java	2009-10-30 16:38:50 UTC (rev 4464)
@@ -1,8 +1,6 @@
 package org.jboss.jsr299.tck.tests.interceptors.definition.multipleBindings;
 
-import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
@@ -10,7 +8,6 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.inject.Qualifier;
 import javax.interceptor.InterceptorBinding;
 
 @Target( { TYPE, METHOD})

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/multipleBindings/MultipleInterceptorBindingsTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/multipleBindings/MultipleInterceptorBindingsTest.java	2009-10-30 14:58:49 UTC (rev 4463)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/multipleBindings/MultipleInterceptorBindingsTest.java	2009-10-30 16:38:50 UTC (rev 4464)
@@ -1,7 +1,5 @@
 package org.jboss.jsr299.tck.tests.interceptors.definition.multipleBindings;
 
-import javax.enterprise.util.AnnotationLiteral;
-
 import org.jboss.jsr299.tck.AbstractJSR299Test;
 import org.jboss.test.audit.annotations.SpecAssertion;
 import org.jboss.test.audit.annotations.SpecAssertions;

Added: cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidLifecycleInterceptor/beans.xml
===================================================================
--- cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidLifecycleInterceptor/beans.xml	                        (rev 0)
+++ cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/broken/invalidLifecycleInterceptor/beans.xml	2009-10-30 16:38:50 UTC (rev 4464)
@@ -0,0 +1,5 @@
+<beans> 
+  <interceptors>
+    <class>org.jboss.jsr299.tck.tests.interceptors.definition.broken.invalidLifecycleInterceptor.TransactionalInterceptor</class>
+  </interceptors>
+</beans>



More information about the weld-commits mailing list