[webbeans-commits] Webbeans SVN: r553 - in ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test: ejb/invalid and 1 other directories.

Author: dallen6 Date: 2008-12-18 15:35:15 -0500 (Thu, 18 Dec 2008) New Revision: 553 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/ejb/invalid/TibetanTerrier.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/valid/Pomeranian.java Log: Fixed tests related to EJB web beans. 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 2008-12-18 19:48:16 UTC (rev 552) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventBusTest.java 2008-12-18 20:35:15 UTC (rev 553) @@ -328,7 +328,7 @@ webBeansBootstrap.boot(new MockWebBeanDiscovery(Pomeranian.class)); List<Bean<?>> beans = manager.getBeans(); assert beans.size() == 1 + MockManagerImpl.BUILT_IN_BEANS; - Set<Observer<MockManagerImpl>> observers = manager.resolveObservers(manager, new InitializedBinding()); + Set<Observer<String>> observers = manager.resolveObservers("An event"); assert observers.size() == 2; } @@ -339,7 +339,7 @@ webBeansBootstrap.boot(new MockWebBeanDiscovery(TibetanTerrier.class)); List<Bean<?>> beans = manager.getBeans(); assert beans.size() == 1 + MockManagerImpl.BUILT_IN_BEANS; - Set<Observer<MockManagerImpl>> observers = manager.resolveObservers(manager, new InitializedBinding()); + Set<Observer<String>> observers = manager.resolveObservers("An event"); assert observers.size() == 1; } @@ -383,7 +383,7 @@ // Resolve registered observers with an event containing no binding types Set<Observer<String>> resolvedObservers = manager.resolveObservers("A new event"); assert !resolvedObservers.isEmpty(); - assert resolvedObservers.size() == 1; + assert resolvedObservers.size() == 2; } @Test(groups = { "events" }, expectedExceptions = { DefinitionException.class }) @@ -818,130 +818,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/ejb/invalid/TibetanTerrier.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/invalid/TibetanTerrier.java 2008-12-18 19:48:16 UTC (rev 552) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/invalid/TibetanTerrier.java 2008-12-18 20:35:15 UTC (rev 553) @@ -2,13 +2,11 @@ import javax.ejb.Stateless; import javax.webbeans.Observes; -import javax.webbeans.manager.Initialized; -import javax.webbeans.manager.Manager; @Stateless public class TibetanTerrier implements Terrier { - public void observeInitialized(@Observes @Initialized Manager manager) + public void observeInitialized(@Observes String someEvent) { } } Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/valid/Pomeranian.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/valid/Pomeranian.java 2008-12-18 19:48:16 UTC (rev 552) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/valid/Pomeranian.java 2008-12-18 20:35:15 UTC (rev 553) @@ -3,8 +3,6 @@ import javax.ejb.Stateful; import javax.webbeans.Named; import javax.webbeans.Observes; -import javax.webbeans.manager.Initialized; -import javax.webbeans.manager.Manager; import org.jboss.webbeans.test.annotations.Tame; @@ -15,16 +13,12 @@ { public static Thread notificationThread; - public void observeInitialized(@Observes @Initialized Manager manager) - { - } - public void observeSimpleEvent(@Observes String someEvent) { notificationThread = Thread.currentThread(); } - public static void staticallyObserveInitialized(@Observes @Initialized Manager manager) + public static void staticallyObserveEvent(@Observes String someEvent) { } }