Author: dallen6 Date: 2009-01-04 14:15:14 -0500 (Sun, 04 Jan 2009) New Revision: 756 Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventBusTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/OrangeCheekedWaxbill.java Log: Fixed newly broken event test. Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java 2009-01-03 18:59:16 UTC (rev 755) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java 2009-01-04 19:15:14 UTC (rev 756) @@ -205,13 +205,6 @@ 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) ) Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventBusTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventBusTest.java 2009-01-03 18:59:16 UTC (rev 755) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventBusTest.java 2009-01-04 19:15:14 UTC (rev 756) @@ -715,7 +715,7 @@ } } - @Test(groups = { "events", "broken" }) + @Test(groups = { "events" }) @SpecAssertion(section = "8.6") public void testObservableAnnotationOnParameterOfInitializerMethod() { @@ -859,130 +859,130 @@ } } -// @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; + } + } Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/OrangeCheekedWaxbill.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/OrangeCheekedWaxbill.java 2009-01-03 18:59:16 UTC (rev 755) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/OrangeCheekedWaxbill.java 2009-01-04 19:15:14 UTC (rev 756) @@ -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 {