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

[weld-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2009-10-30 09:18:12 -0400 (Fri, 30 Oct 2009)
New Revision: 4443

Modified:
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/ProcessObserverMethodEventTest.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/ProcessObserverMethodObserver.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/definitionError/ProcessObserverMethodObserver.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/exception/ProcessObserverMethodObserver.java
Log:
WELD-217, part 2

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/ProcessObserverMethodEventTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/ProcessObserverMethodEventTest.java	2009-10-30 13:16:38 UTC (rev 4442)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/ProcessObserverMethodEventTest.java	2009-10-30 13:18:12 UTC (rev 4443)
@@ -41,7 +41,6 @@
 public class ProcessObserverMethodEventTest extends AbstractJSR299Test
 {
    @Test
-   // Event resolution seems to be broken here
    @SpecAssertion(section = "11.5.9", id = "aaa")
    public void testProcessObserverMethodEventsSent()
    {

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/ProcessObserverMethodObserver.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/ProcessObserverMethodObserver.java	2009-10-30 13:16:38 UTC (rev 4442)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/ProcessObserverMethodObserver.java	2009-10-30 13:18:12 UTC (rev 4443)
@@ -15,7 +15,7 @@
    private static AnnotatedMethod<?>   annotatedMethod;
    private static ObserverMethod<?> observerMethod;
    
-   public void observeObserverMethodForEventA(@Observes ProcessObserverMethod<EventAObserver, EventA> event)
+   public void observeObserverMethodForEventA(@Observes ProcessObserverMethod<EventA, EventAObserver> event)
    {
       eventTypes.add(event.getObserverMethod().getObservedType());
       annotatedMethod = event.getAnnotatedMethod();

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/definitionError/ProcessObserverMethodObserver.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/definitionError/ProcessObserverMethodObserver.java	2009-10-30 13:16:38 UTC (rev 4442)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/definitionError/ProcessObserverMethodObserver.java	2009-10-30 13:18:12 UTC (rev 4443)
@@ -7,7 +7,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/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/exception/ProcessObserverMethodObserver.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/exception/ProcessObserverMethodObserver.java	2009-10-30 13:16:38 UTC (rev 4442)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/observer/broken/exception/ProcessObserverMethodObserver.java	2009-10-30 13:18:12 UTC (rev 4443)
@@ -6,7 +6,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");
    }