Fixed newly broken event test.

git-svn-id: http://anonsvn.jboss.org/repos/weld/ri/trunk@756 1c488680-804c-0410-94cd-c6b725194a0e
weld · Jan 4, 2009 · 1a61565 · 1a61565
1 parent 4e65e68
commit 1a61565
Show file tree

Hide file tree

Showing 3 changed files with 126 additions and 136 deletions.
diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java b/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java
@@ -205,13 +205,6 @@ protected void createBean(AbstractClassBean<?> bean, Set<AbstractBean<?, ?>> bea
          beans.add(producerFieldBean);
          log.info("Web Bean: " + producerFieldBean);
       }
-      for (AnnotatedMethod<Object> initializerMethod : bean.getInitializerMethods())
-      {
-         for (AnnotatedParameter<Object> parameter : initializerMethod.getAnnotatedParameters(Fires.class))
-         {
-            registerEvent(parameter, beans);
-         }
-      }
       for (AnnotatedItem injectionPoint : bean.getInjectionPoints())
       {
          if ( injectionPoint.isAnnotationPresent(Fires.class) )  

diff --git a/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventBusTest.java b/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventBusTest.java
@@ -715,7 +715,7 @@ public void testObservableAnnotationOnParameterOfProducerMethod()
       }
    }
 
-   @Test(groups = { "events", "broken" })
+   @Test(groups = { "events" })
    @SpecAssertion(section = "8.6")
    public void testObservableAnnotationOnParameterOfInitializerMethod()
    {
@@ -859,130 +859,130 @@ public void testObservableAnnotationOnInjectionPointWithTypeVariabledTypeParamet
       }
    }
 
-//   @Test(groups = { "stub", "events" })
-//   @SpecAssertion(section = "8.6")
-//   public void testImplicitObserverBeanMatchesAPITypeOfInectionPoint()
-//   {
-//      assert false;
-//   }
-//
-//   @Test(groups = { "stub", "events" })
-//   @SpecAssertion(section = "8.6")
-//   public void testImplicitObserverBeanMatchesBindingAnnotationsOfInjectionPoint()
-//   {
-//      assert false;
-//   }
-//
-//   @Test(groups = { "stub", "events" })
-//   @SpecAssertion(section = "8.6")
-//   public void testImplicitObserverBeanHasStandardDeploymentType()
-//   {
-//      assert false;
-//   }
-//
-//   @Test(groups = { "stub", "events" })
-//   @SpecAssertion(section = "8.6")
-//   public void testImplicitObserverBeanHasDependentScope()
-//   {
-//      assert false;
-//   }
-//
-//   @Test(groups = { "stub", "events" })
-//   @SpecAssertion(section = "8.6")
-//   public void testFireMethodCallsManagerFireWithEventObject()
-//   {
-//      assert false;
-//   }
-//
-//   @Test(groups = { "stub", "events" })
-//   @SpecAssertion(section = "8.6")
-//   public void testFireMethodCallsManagerFireWithBindingAnnotationsExceptObservable()
-//   {
-//      assert false;
-//   }
-//
-//   @Test(groups = { "stub", "events" })
-//   @SpecAssertion(section = "8.6")
-//   public void testFireMethodCallsManagerFireWithAllBindingAnnotationInstances()
-//   {
-//      assert false;
-//   }
-//
-//   @Test(groups = { "stub", "events" })
-//   @SpecAssertion(section = "8.6")
-//   public void testObserveMethodCallsManagerAddObserverWithObserverObject()
-//   {
-//      assert false;
-//   }
-//
-//   @Test(groups = { "stub", "events" })
-//   @SpecAssertion(section = "8.6")
-//   public void testObserveMethodCallsManagerAddObserverWithAllBindingAnnotationsExceptObservable()
-//   {
-//      assert false;
-//   }
-//
-//   @Test(groups = { "stub", "events" })
-//   @SpecAssertion(section = "8.6")
-//   public void testObserveMethodCallsManagerAddObserverWithAllBindingAnnotationInstance()
-//   {
-//      assert false;
-//   }
-//
-//   @Test(groups = { "stub", "events" })
-//   @SpecAssertion(section = "8.7")
-//   public void testEventObjectContainsTypeVariablesWhenResolvingFails()
-//   {
-//      assert false;
-//   }
-//
-//   @Test(groups = { "stub", "events" })
-//   @SpecAssertion(section = "8.7")
-//   public void testEventObjectContainsWildcardsWhenResolvingFails()
-//   {
-//      assert false;
-//   }
-//
-//   @Test(groups = { "stub", "events" })
-//   @SpecAssertion(section = "8.7")
-//   public void testDuplicateBindingTypesWhenResolvingFails()
-//   {
-//      assert false;
-//   }
-//
-//   @Test(groups = { "stub", "events" })
-//   @SpecAssertion(section = "8.7")
-//   public void testNonBindingTypeAnnotationWhenResolvingFails()
-//   {
-//      assert false;
-//   }
-//
-//   @Test(groups = { "stub", "events" })
-//   @SpecAssertion(section = "8.7")
-//   public void testResolvingChecksEventType()
-//   {
-//      assert false;
-//   }
-//
-//   @Test(groups = { "stub", "events" })
-//   @SpecAssertion(section = "8.7")
-//   public void testResolvingChecksTypeParameters()
-//   {
-//      assert false;
-//   }
-//
-//   @Test(groups = { "stub", "events" })
-//   @SpecAssertion(section = "8.7")
-//   public void testResolvingChecksBindingTypes()
-//   {
-//      assert false;
-//   }
-//
-//   @Test(groups = { "stub", "events" })
-//   @SpecAssertion(section = "8.7")
-//   public void testResolvingChecksBindingTypeMembers()
-//   {
-//      assert false;
-//   }
+   @Test(groups = { "stub", "events" })
+   @SpecAssertion(section = "8.6")
+   public void testImplicitObserverBeanMatchesAPITypeOfInectionPoint()
+   {
+      assert false;
+   }
+
+   @Test(groups = { "stub", "events" })
+   @SpecAssertion(section = "8.6")
+   public void testImplicitObserverBeanMatchesBindingAnnotationsOfInjectionPoint()
+   {
+      assert false;
+   }
+
+   @Test(groups = { "stub", "events" })
+   @SpecAssertion(section = "8.6")
+   public void testImplicitObserverBeanHasStandardDeploymentType()
+   {
+      assert false;
+   }
+
+   @Test(groups = { "stub", "events" })
+   @SpecAssertion(section = "8.6")
+   public void testImplicitObserverBeanHasDependentScope()
+   {
+      assert false;
+   }
+
+   @Test(groups = { "stub", "events" })
+   @SpecAssertion(section = "8.6")
+   public void testFireMethodCallsManagerFireWithEventObject()
+   {
+      assert false;
+   }
+
+   @Test(groups = { "stub", "events" })
+   @SpecAssertion(section = "8.6")
+   public void testFireMethodCallsManagerFireWithBindingAnnotationsExceptObservable()
+   {
+      assert false;
+   }
+
+   @Test(groups = { "stub", "events" })
+   @SpecAssertion(section = "8.6")
+   public void testFireMethodCallsManagerFireWithAllBindingAnnotationInstances()
+   {
+      assert false;
+   }
+
+   @Test(groups = { "stub", "events" })
+   @SpecAssertion(section = "8.6")
+   public void testObserveMethodCallsManagerAddObserverWithObserverObject()
+   {
+      assert false;
+   }
+
+   @Test(groups = { "stub", "events" })
+   @SpecAssertion(section = "8.6")
+   public void testObserveMethodCallsManagerAddObserverWithAllBindingAnnotationsExceptObservable()
+   {
+      assert false;
+   }
+
+   @Test(groups = { "stub", "events" })
+   @SpecAssertion(section = "8.6")
+   public void testObserveMethodCallsManagerAddObserverWithAllBindingAnnotationInstance()
+   {
+      assert false;
+   }
+
+   @Test(groups = { "stub", "events" })
+   @SpecAssertion(section = "8.7")
+   public void testEventObjectContainsTypeVariablesWhenResolvingFails()
+   {
+      assert false;
+   }
+
+   @Test(groups = { "stub", "events" })
+   @SpecAssertion(section = "8.7")
+   public void testEventObjectContainsWildcardsWhenResolvingFails()
+   {
+      assert false;
+   }
+
+   @Test(groups = { "stub", "events" })
+   @SpecAssertion(section = "8.7")
+   public void testDuplicateBindingTypesWhenResolvingFails()
+   {
+      assert false;
+   }
+
+   @Test(groups = { "stub", "events" })
+   @SpecAssertion(section = "8.7")
+   public void testNonBindingTypeAnnotationWhenResolvingFails()
+   {
+      assert false;
+   }
+
+   @Test(groups = { "stub", "events" })
+   @SpecAssertion(section = "8.7")
+   public void testResolvingChecksEventType()
+   {
+      assert false;
+   }
+
+   @Test(groups = { "stub", "events" })
+   @SpecAssertion(section = "8.7")
+   public void testResolvingChecksTypeParameters()
+   {
+      assert false;
+   }
+
+   @Test(groups = { "stub", "events" })
+   @SpecAssertion(section = "8.7")
+   public void testResolvingChecksBindingTypes()
+   {
+      assert false;
+   }
+
+   @Test(groups = { "stub", "events" })
+   @SpecAssertion(section = "8.7")
+   public void testResolvingChecksBindingTypeMembers()
+   {
+      assert false;
+   }
 
 }
diff --git a/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/OrangeCheekedWaxbill.java b/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/OrangeCheekedWaxbill.java
@@ -3,11 +3,8 @@
 import javax.webbeans.Event;
 import javax.webbeans.Initializer;
 import javax.webbeans.Fires;
-import javax.webbeans.RequestScoped;
-
 import org.jboss.webbeans.test.beans.StarFinch.Mess;
 
-@RequestScoped
 public class OrangeCheekedWaxbill
 {