Author: dallen6 Date: 2009-06-06 11:35:20 -0400 (Sat, 06 Jun 2009) New Revision: 2773 Removed: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/NonBindingTypesToRemoveObserverTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/NonBindingTypesToRemoveObserverTest.java Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/ActivitiesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/EventCurrentActivityTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/PassivatingContextTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/OwlFinch_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/SweeWaxbill.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/BlueFacedParrotFinch.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/ConsumerNotifiedForEventTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/DuplicateBindingsToAddObserverTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/DuplicateBindingsToRemoveObserverTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/ManagerAddObserverTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/NonBindingTypesToAddObserverTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/ObserverExceptionAbortsTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/DuplicateBindingsToRemoveObserverTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/ManagerRemoveObserverTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/DuplicateBindingTypesWhenResolvingTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeMembersTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/NonBindingTypesWhenResolvingTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/type/ChecksEventTypeWhenResolvingTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/type/ChecksTypeParametersWhenResolvingTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Kassel.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/KleinStadt.java Log: Changed signature of notify() to return boolean for event notification Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/ActivitiesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/ActivitiesTest.java 2009-06-06 15:33:07 UTC (rev 2772) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/ActivitiesTest.java 2009-06-06 15:35:20 UTC (rev 2773) @@ -285,9 +285,10 @@ Observer<NightTime> observer = new Observer<NightTime>() { - public void notify(NightTime event) + public boolean notify(NightTime event) { assert false; + return false; } }; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/EventCurrentActivityTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/EventCurrentActivityTest.java 2009-06-06 15:33:07 UTC (rev 2772) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/activities/current/EventCurrentActivityTest.java 2009-06-06 15:35:20 UTC (rev 2773) @@ -72,9 +72,10 @@ boolean observed = false; - public void notify(NightTime event) + public boolean notify(NightTime event) { observed = true; + return false; } public boolean isObserved() Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/PassivatingContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/PassivatingContextTest.java 2009-06-06 15:33:07 UTC (rev 2772) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/PassivatingContextTest.java 2009-06-06 15:35:20 UTC (rev 2773) @@ -84,7 +84,7 @@ * @throws ClassNotFoundException * @throws IOException */ - @Test(groups = { "contexts", "passivation", "incontainer-ri-broken" }) + @Test(groups = { "contexts", "passivation", "ri-broken" }) @SpecAssertion(section = "8.4", id = "j") public void testDependentEJBsAreSerializable() throws IOException, ClassNotFoundException { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java 2009-06-06 15:33:07 UTC (rev 2772) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java 2009-06-06 15:35:20 UTC (rev 2773) @@ -49,9 +49,10 @@ { public boolean wasNotified = false; - public void notify(AnEventType event) + public boolean notify(AnEventType event) { wasNotified = true; + return false; } } @@ -59,9 +60,10 @@ { public boolean wasNotified = false; - public void notify(ArrayList<String> event) + public boolean notify(ArrayList<String> event) { wasNotified = true; + return false; } } @@ -69,9 +71,10 @@ { public boolean wasNotified = false; - public void notify(ArrayList<Integer> event) + public boolean notify(ArrayList<Integer> event) { wasNotified = true; + return false; } } @@ -80,7 +83,7 @@ public boolean wasNotified = false; public RuntimeException theException = new RuntimeException("RE1"); - public void notify(AnEventType event) + public boolean notify(AnEventType event) { wasNotified = true; throw theException; @@ -190,8 +193,9 @@ { Observer<String> observer = new Observer<String>() { - public void notify(String event) + public boolean notify(String event) { + return false; } }; assert observer != null; @@ -208,8 +212,9 @@ { Observer<ArrayList<E>> observer = new Observer<ArrayList<E>>() { - public void notify(ArrayList<E> event) + public boolean notify(ArrayList<E> event) { + return false; } }; @@ -222,8 +227,9 @@ { Observer<ArrayList<?>> observer = new Observer<ArrayList<?>>() { - public void notify(ArrayList<?> event) + public boolean notify(ArrayList<?> event) { + return false; } }; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/OwlFinch_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/OwlFinch_Broken.java 2009-06-06 15:33:07 UTC (rev 2772) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/OwlFinch_Broken.java 2009-06-06 15:35:20 UTC (rev 2773) @@ -19,8 +19,9 @@ { simpleEvent.observe(new Observer<String>() { - public void notify(String event) + public boolean notify(String event) { + return false; } }, new AnimalStereotypeAnnotationLiteral()); } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/SweeWaxbill.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/SweeWaxbill.java 2009-06-06 15:33:07 UTC (rev 2772) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/SweeWaxbill.java 2009-06-06 15:35:20 UTC (rev 2773) @@ -20,8 +20,9 @@ simpleEvent.observe(new Observer<String>() { - public void notify(String event) + public boolean notify(String event) { + return false; } }, new RoleBinding("Admin")); } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/BlueFacedParrotFinch.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/BlueFacedParrotFinch.java 2009-06-06 15:33:07 UTC (rev 2772) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/fires1/BlueFacedParrotFinch.java 2009-06-06 15:35:20 UTC (rev 2773) @@ -23,8 +23,9 @@ { simpleEvent.observe(new Observer<Integer>() { - public void notify(Integer event) + public boolean notify(Integer event) { + return false; } }); } @@ -38,9 +39,10 @@ { simpleStringEvent.observe(new Observer<String>() { - public void notify(String event) + public boolean notify(String event) { BlueFacedParrotFinch.simpleStringEventObserved = true; + return false; } }); } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/ConsumerNotifiedForEventTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/ConsumerNotifiedForEventTest.java 2009-06-06 15:33:07 UTC (rev 2772) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/ConsumerNotifiedForEventTest.java 2009-06-06 15:35:20 UTC (rev 2773) @@ -21,9 +21,10 @@ { public boolean wasNotified = false; - public void notify(AnEventType event) + public boolean notify(AnEventType event) { wasNotified = true; + return false; } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/DuplicateBindingsToAddObserverTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/DuplicateBindingsToAddObserverTest.java 2009-06-06 15:33:07 UTC (rev 2772) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/DuplicateBindingsToAddObserverTest.java 2009-06-06 15:35:20 UTC (rev 2773) @@ -19,9 +19,10 @@ { public boolean wasNotified = false; - public void notify(AnEventType event) + public boolean notify(AnEventType event) { wasNotified = true; + return false; } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/DuplicateBindingsToRemoveObserverTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/DuplicateBindingsToRemoveObserverTest.java 2009-06-06 15:33:07 UTC (rev 2772) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/DuplicateBindingsToRemoveObserverTest.java 2009-06-06 15:35:20 UTC (rev 2773) @@ -16,9 +16,10 @@ { public boolean wasNotified = false; - public void notify(AnEventType event) + public boolean notify(AnEventType event) { wasNotified = true; + return false; } } /* Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/ManagerAddObserverTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/ManagerAddObserverTest.java 2009-06-06 15:33:07 UTC (rev 2772) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/ManagerAddObserverTest.java 2009-06-06 15:35:20 UTC (rev 2773) @@ -45,9 +45,10 @@ { public boolean wasNotified = false; - public void notify(AnEventType event) + public boolean notify(AnEventType event) { wasNotified = true; + return false; } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/NonBindingTypesToAddObserverTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/NonBindingTypesToAddObserverTest.java 2009-06-06 15:33:07 UTC (rev 2772) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/NonBindingTypesToAddObserverTest.java 2009-06-06 15:35:20 UTC (rev 2773) @@ -18,9 +18,10 @@ { public boolean wasNotified = false; - public void notify(AnEventType event) + public boolean notify(AnEventType event) { wasNotified = true; + return false; } } Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/NonBindingTypesToRemoveObserverTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/NonBindingTypesToRemoveObserverTest.java 2009-06-06 15:33:07 UTC (rev 2772) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/NonBindingTypesToRemoveObserverTest.java 2009-06-06 15:35:20 UTC (rev 2773) @@ -1,34 +0,0 @@ -package org.jboss.jsr299.tck.tests.event.register.observer1; - -import javax.event.Observer; - -import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.testharness.impl.packaging.Artifact; - -@Artifact -public class NonBindingTypesToRemoveObserverTest extends AbstractJSR299Test -{ - public static class AnEventType - { - } - - public static class AnObserver implements Observer<AnEventType> - { - public boolean wasNotified = false; - - public void notify(AnEventType event) - { - wasNotified = true; - } - } -/* - * No longer valid under new SPI - @Test(groups = { "events" }, expectedExceptions = { IllegalArgumentException.class }) - @SpecAssertion(section = "7.3", id = "m") - public void testNonBindingTypePassedToRemoveObserverFails() - { - Observer<AnEventType> observer = new AnObserver(); - getCurrentManager().removeObserver(observer); - } -*/ -} Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/ObserverExceptionAbortsTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/ObserverExceptionAbortsTest.java 2009-06-06 15:33:07 UTC (rev 2772) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer1/ObserverExceptionAbortsTest.java 2009-06-06 15:35:20 UTC (rev 2773) @@ -18,9 +18,10 @@ { public boolean wasNotified = false; - public void notify(AnEventType event) + public boolean notify(AnEventType event) { wasNotified = true; + return false; } } @@ -29,7 +30,7 @@ public boolean wasNotified = false; public RuntimeException theException = new RuntimeException("RE1"); - public void notify(AnEventType event) + public boolean notify(AnEventType event) { wasNotified = true; throw theException; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/DuplicateBindingsToRemoveObserverTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/DuplicateBindingsToRemoveObserverTest.java 2009-06-06 15:33:07 UTC (rev 2772) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/DuplicateBindingsToRemoveObserverTest.java 2009-06-06 15:35:20 UTC (rev 2773) @@ -16,9 +16,10 @@ { public boolean wasNotified = false; - public void notify(AnEventType event) + public boolean notify(AnEventType event) { wasNotified = true; + return false; } } /* Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/ManagerRemoveObserverTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/ManagerRemoveObserverTest.java 2009-06-06 15:33:07 UTC (rev 2772) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/ManagerRemoveObserverTest.java 2009-06-06 15:35:20 UTC (rev 2773) @@ -44,9 +44,10 @@ { public boolean wasNotified = false; - public void notify(AnEventType event) + public boolean notify(AnEventType event) { wasNotified = true; + return false; } } Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/NonBindingTypesToRemoveObserverTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/NonBindingTypesToRemoveObserverTest.java 2009-06-06 15:33:07 UTC (rev 2772) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/register/observer2/NonBindingTypesToRemoveObserverTest.java 2009-06-06 15:35:20 UTC (rev 2773) @@ -1,37 +0,0 @@ -package org.jboss.jsr299.tck.tests.event.register.observer2; - -import javax.event.Observer; - -import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.testharness.impl.packaging.Artifact; -import org.testng.annotations.Test; - -@Artifact -public class NonBindingTypesToRemoveObserverTest extends AbstractJSR299Test -{ - public static class AnEventType - { - } - - public static class AnObserver implements Observer<AnEventType> - { - public boolean wasNotified = false; - - public void notify(AnEventType event) - { - wasNotified = true; - } - } - - /* No longer valid under new SPI - @Test(groups = { "events" }, expectedExceptions = { IllegalArgumentException.class }) - @SpecAssertion(section = "7.3", id = "h") - public void testNonBindingTypePassedToRemoveObserverFails() - { - Observer<AnEventType> observer = new AnObserver(); - getCurrentManager().addObserver(observer); - getCurrentManager().removeObserver(observer); - } - */ -} Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/DuplicateBindingTypesWhenResolvingTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/DuplicateBindingTypesWhenResolvingTest.java 2009-06-06 15:33:07 UTC (rev 2772) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/DuplicateBindingTypesWhenResolvingTest.java 2009-06-06 15:35:20 UTC (rev 2773) @@ -19,9 +19,10 @@ { public boolean wasNotified = false; - public void notify(AnEventType event) + public boolean notify(AnEventType event) { wasNotified = true; + return false; } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeMembersTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeMembersTest.java 2009-06-06 15:33:07 UTC (rev 2772) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeMembersTest.java 2009-06-06 15:35:20 UTC (rev 2773) @@ -20,9 +20,10 @@ { public boolean wasNotified = false; - public void notify(AnEventType event) + public boolean notify(AnEventType event) { wasNotified = true; + return false; } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeTest.java 2009-06-06 15:33:07 UTC (rev 2772) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeTest.java 2009-06-06 15:35:20 UTC (rev 2773) @@ -20,9 +20,10 @@ { public boolean wasNotified = false; - public void notify(AnEventType event) + public boolean notify(AnEventType event) { wasNotified = true; + return false; } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/NonBindingTypesWhenResolvingTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/NonBindingTypesWhenResolvingTest.java 2009-06-06 15:33:07 UTC (rev 2772) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/NonBindingTypesWhenResolvingTest.java 2009-06-06 15:35:20 UTC (rev 2773) @@ -20,9 +20,10 @@ { public boolean wasNotified = false; - public void notify(AnEventType event) + public boolean notify(AnEventType event) { wasNotified = true; + return false; } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/type/ChecksEventTypeWhenResolvingTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/type/ChecksEventTypeWhenResolvingTest.java 2009-06-06 15:33:07 UTC (rev 2772) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/type/ChecksEventTypeWhenResolvingTest.java 2009-06-06 15:35:20 UTC (rev 2773) @@ -20,9 +20,10 @@ { public boolean wasNotified = false; - public void notify(AnEventType event) + public boolean notify(AnEventType event) { wasNotified = true; + return false; } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/type/ChecksTypeParametersWhenResolvingTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/type/ChecksTypeParametersWhenResolvingTest.java 2009-06-06 15:33:07 UTC (rev 2772) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/type/ChecksTypeParametersWhenResolvingTest.java 2009-06-06 15:35:20 UTC (rev 2773) @@ -29,9 +29,10 @@ { public boolean wasNotified = false; - public void notify(ArrayList<String> event) + public boolean notify(ArrayList<String> event) { wasNotified = true; + return false; } } @@ -39,9 +40,10 @@ { public boolean wasNotified = false; - public void notify(ArrayList<Integer> event) + public boolean notify(ArrayList<Integer> event) { wasNotified = true; + return false; } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java 2009-06-06 15:33:07 UTC (rev 2772) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java 2009-06-06 15:35:20 UTC (rev 2773) @@ -107,12 +107,13 @@ { KleinStadt stadtInstance = getInstanceByType(KleinStadt.class); assert stadtInstance != null : "Expected instance to be created by container"; + stadtInstance.setName("Kassel-Wilhelmshoehe"); stadtInstance.zustandVergessen(); // Now make sure that the container does not return this instance again KleinStadt newStadtInstance = getInstanceByType(KleinStadt.class); assert newStadtInstance != null : "Failed to get SFSB instance the second time"; - assert !newStadtInstance.equals(stadtInstance) : "The destroyed SFSB was not ignored"; + assert !"Kassel-Wilhelmshoehe".equals(newStadtInstance.getName()) : "The destroyed SFSB was not ignored"; } @Test(groups = { "enterpriseBeans", "lifecycle", "integration" }) @@ -123,7 +124,7 @@ assert stadtBean != null : "Expected a bean for stateful session bean Kassel"; NeueStadt stadtInstance = createBeanInstance(stadtBean); assert stadtInstance != null : "Expected instance to be created by container"; - + // Verify that the instance returned is a proxy by checking for all local interfaces Set<Class<?>> interfaces = new HashSet<Class<?>>(Arrays.asList(stadtInstance.getClass().getInterfaces())); assert interfaces.contains(NeueStadt.class); Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Kassel.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Kassel.java 2009-06-06 15:33:07 UTC (rev 2772) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Kassel.java 2009-06-06 15:35:20 UTC (rev 2773) @@ -2,22 +2,25 @@ import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; +import javax.ejb.EJB; import javax.ejb.Remove; import javax.ejb.Stateful; import javax.enterprise.context.RequestScoped; -import javax.enterprise.inject.Current; @Stateful @RequestScoped public class Kassel implements KleinStadt, SchoeneStadt { - @Current + private String name; + + @EJB private GrossStadt grossStadt; @PostConstruct public void begruendet() { grossStadt.kleinStadtCreated(); + name = "Kassel"; } @Remove @@ -33,4 +36,14 @@ public void ping() {} + public String getName() + { + return name; + } + + public void setName(String name) + { + this.name = name; + } + } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/KleinStadt.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/KleinStadt.java 2009-06-06 15:33:07 UTC (rev 2772) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/KleinStadt.java 2009-06-06 15:35:20 UTC (rev 2773) @@ -11,6 +11,7 @@ public void zustandVerloren(); - public void ping(); + public String getName(); + public void setName(String name); }