[weld-commits] Weld SVN: r7059 - in cdi-tck/branches/1.0/impl/src/main: java/org/jboss/jsr299/tck/tests/extensions/observer/broken/definitionError and 2 other directories.

[weld-commits at lists.jboss.org]

Author: petemuir
Date: 2010-10-30 15:11:36 -0400 (Sat, 30 Oct 2010)
New Revision: 7059

Modified:
   cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/ProcessObserverMethodObserver.java
   cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/definitionError/ProcessObserverMethodObserver.java
   cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/exception/ProcessObserverMethodObserver.java
   cdi-tck/branches/1.0/impl/src/main/resources/tck-tests.xml
Log:
CDITCK-174

Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/ProcessObserverMethodObserver.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/ProcessObserverMethodObserver.java	2010-10-30 19:05:39 UTC (rev 7058)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/ProcessObserverMethodObserver.java	2010-10-30 19:11:36 UTC (rev 7059)
@@ -38,7 +38,7 @@
       observerMethod = null;
    }
    
-   public void observeObserverMethodForEventA(@Observes ProcessObserverMethod<EventA, EventAObserver> event)
+   public void observeObserverMethodForEventA(@Observes ProcessObserverMethod<EventAObserver, EventA> event)
    {
       eventTypes.add(event.getObserverMethod().getObservedType());
       annotatedMethod = event.getAnnotatedMethod();

Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/definitionError/ProcessObserverMethodObserver.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/definitionError/ProcessObserverMethodObserver.java	2010-10-30 19:05:39 UTC (rev 7058)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/definitionError/ProcessObserverMethodObserver.java	2010-10-30 19:11:36 UTC (rev 7059)
@@ -23,7 +23,7 @@
 class ProcessObserverMethodObserver implements Extension
 {
 
-   public void observeObserverMethodForEventB(@Observes ProcessObserverMethod<EventB, ?> event)
+   public void observeObserverMethodForEventB(@Observes ProcessObserverMethod<?, EventB> event)
    {
       event.addDefinitionError(new RuntimeException("Definition error for EventB"));
    }

Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/exception/ProcessObserverMethodObserver.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/exception/ProcessObserverMethodObserver.java	2010-10-30 19:05:39 UTC (rev 7058)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/exception/ProcessObserverMethodObserver.java	2010-10-30 19:11:36 UTC (rev 7059)
@@ -22,7 +22,7 @@
 
 class ProcessObserverMethodObserver implements Extension
 {
-   public void observeObserverMethodForEventC(@Observes ProcessObserverMethod<EventC, ?> event)
+   public void observeObserverMethodForEventC(@Observes ProcessObserverMethod<?, EventC> event)
    {
       throw new RuntimeException("Definition error for EventC");
    }

Modified: cdi-tck/branches/1.0/impl/src/main/resources/tck-tests.xml
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/resources/tck-tests.xml	2010-10-30 19:05:39 UTC (rev 7058)
+++ cdi-tck/branches/1.0/impl/src/main/resources/tck-tests.xml	2010-10-30 19:11:36 UTC (rev 7059)
@@ -30,25 +30,6 @@
             </methods>
          </class>
          
-         <!-- CDITCK-174 -->
-         <class name="org.jboss.jsr299.tck.tests.extensions.observer.ProcessObserverMethodEventTest">
-            <methods>
-               <exclude name="testGetAnnotatedMethod" />
-               <exclude name="testGetObserverMethod" />
-               <exclude name="testProcessObserverMethodEventsSent" />
-            </methods>
-         </class>
-         <class name="org.jboss.jsr299.tck.tests.extensions.observer.broken.definitionError.ProcessObserverMethodErrorTest">
-            <methods>
-               <exclude name="testAddDefinitionError" />
-            </methods>
-         </class>
-         <class name="org.jboss.jsr299.tck.tests.extensions.observer.broken.exception.ProcessObserverMethodExceptionTest">
-            <methods>
-               <exclude name="testExceptionIsDefinitionError" />
-            </methods>
-         </class>
-         
          <!-- CDITCK-176 -->
          <class name="org.jboss.jsr299.tck.tests.context.passivating.broken.decoratorWithNonPassivatingBeanConstructor.DecoratorWithNonPassivatingBeanConstructorTest">
             <methods>