12:55 p.m.
Author: dallen6
Date: 2009-01-17 13:55:42 -0500 (Sat, 17 Jan 2009)
New Revision: 1042
Removed:
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/EuropeanGoldfinch.java
Modified:
ri/trunk/webbeans-api/src/main/java/javax/webbeans/AnnotationLiteral.java
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/EventBusTest.java
Log:
A few changes to ch. 8 tests with some new ones running now.
Modified: ri/trunk/webbeans-api/src/main/java/javax/webbeans/AnnotationLiteral.java
===================================================================
--- ri/trunk/webbeans-api/src/main/java/javax/webbeans/AnnotationLiteral.java 2009-01-17
17:24:16 UTC (rev 1041)
+++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/AnnotationLiteral.java 2009-01-17
18:55:42 UTC (rev 1042)
@@ -156,10 +156,7 @@
{
try
{
- if (!method.isAccessible())
- {
- method.setAccessible(true);
- }
+ method.setAccessible(true);
return method.invoke(instance);
}
catch (IllegalArgumentException e)
Deleted:
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/EuropeanGoldfinch.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/EuropeanGoldfinch.java 2009-01-17
17:24:16 UTC (rev 1041)
+++
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/EuropeanGoldfinch.java 2009-01-17
18:55:42 UTC (rev 1042)
@@ -1,30 +0,0 @@
-package org.jboss.webbeans.tck.tests.event;
-
-import javax.ejb.Remove;
-import javax.ejb.Stateful;
-import javax.webbeans.ConversationScoped;
-import javax.webbeans.Destructor;
-import javax.webbeans.Event;
-import javax.webbeans.Fires;
-
-import org.jboss.webbeans.tck.tests.event.StarFinch.Mess;
-
-@ConversationScoped @Stateful
-class EuropeanGoldfinch
-{
- private Mess someMess;
-
- public Mess getSomeMess()
- {
- return someMess;
- }
-
- @Destructor @Remove
- public void remove(@Fires Event<Mess> eventObject)
- {
- // Create a new mess and fire the event for it
- someMess = new Mess();
- eventObject.fire(someMess);
- }
-
-}
Modified:
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/EventBusTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/EventBusTest.java 2009-01-17
17:24:16 UTC (rev 1041)
+++
tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/EventBusTest.java 2009-01-17
18:55:42 UTC (rev 1042)
@@ -508,6 +508,7 @@
public void testObserverMethodRegistration()
{
// For now, this test is checking the registration of methods
+ //TODO Check the called test to make sure it is still valid here
testObserverMethodOnEnterpriseBeanIsBusinessMethodOrStatic();
}
@@ -626,7 +627,7 @@
@Test(groups = { "events" })
@SpecAssertion(section = "8.6")
- public void testObservableAnnotationOnField()
+ public void testFiresAnnotationOnEventTypes()
{
deployBeans(BlueFacedParrotFinch.class);
try
@@ -642,12 +643,6 @@
{
deactivateDependentContext();
}
- }
-
- @Test(groups = { "events" })
- @SpecAssertion(section = "8.6")
- public void testObservableAnnotationOnParameterOfProducerMethod()
- {
deployBeans(StarFinch.class, FinchKeeper.class, BirdCage.class);
try
{
@@ -664,12 +659,6 @@
{
deactivateDependentContext();
}
- }
-
- @Test(groups = { "events" })
- @SpecAssertion(section = "8.6")
- public void testObservableAnnotationOnParameterOfInitializerMethod()
- {
deployBeans(OrangeCheekedWaxbill.class, FinchKeeper.class);
try
{
@@ -684,41 +673,6 @@
{
deactivateDependentContext();
}
- }
-
- //TODO Implement once disposal methods are included
- @Test(groups = { "stub", "events" })
- @SpecAssertion(section = "8.6")
- public void testObservableAnnotationOnParameterOfDisposalMethod()
- {
- assert false;
- }
-
- //TODO Make sure this test works once EJBs are fully supported
- @Test(groups = { "broken", "events" })
- @SpecAssertion(section = "8.6")
- public void testObservableAnnotationOnParameterOfRemoveMethod()
- {
- deployBeans(EuropeanGoldfinch.class, FinchKeeper.class);
- try
- {
- activateDependentContext();
- EuropeanGoldfinch bird = manager.getInstanceByType(EuropeanGoldfinch.class);
- FinchKeeper birdKeeper = manager.getInstanceByType(FinchKeeper.class);
- assert bird != null;
-
- assert birdKeeper.isNewMessDetected();
- }
- finally
- {
- deactivateDependentContext();
- }
- }
-
- @Test(groups = { "events" })
- @SpecAssertion(section = "8.6")
- public void testObservableAnnotationOnParameterOfConstructor()
- {
deployBeans(AuroraFinch.class, FinchKeeper.class);
try
{
@@ -736,7 +690,7 @@
@Test(groups = { "events" }, expectedExceptions = {
DefinitionException.class })
@SpecAssertion(section = "8.6")
- public void testObservableAnnotationOnNonEventTypeInjectionPointFails()
+ public void testFiresAnnotationOnNonEventTypeInjectionPointFails()
{
deployBeans(CommonWaxbill_Broken.class);
try
@@ -753,7 +707,7 @@
@Test(groups = { "events" }, expectedExceptions = {
DefinitionException.class })
@SpecAssertion(section = "8.6")
- public void testObservableAnnotationOnInjectionPointWithoutTypeParameterFails()
+ public void testFiresAnnotationOnInjectionPointWithoutTypeParameterFails()
{
deployBeans(BlackRumpedWaxbill_Broken.class);
try
@@ -770,7 +724,7 @@
@Test(groups = { "events" }, expectedExceptions = {
DefinitionException.class })
@SpecAssertion(section = "8.6")
- public void
testObservableAnnotationOnInjectionPointWithWildcardedTypeParameterFails()
+ public void testFiresAnnotationOnInjectionPointWithWildcardedTypeParameterFails()
{
deployBeans(GoldbreastWaxbill_Broken.class);
try
@@ -787,7 +741,7 @@
@Test(groups = { "events" }, expectedExceptions = {
DefinitionException.class })
@SpecAssertion(section = "8.6")
- public void
testObservableAnnotationOnInjectionPointWithTypeVariabledTypeParameterFails()
+ public void testFiresAnnotationOnInjectionPointWithTypeVariabledTypeParameterFails()
{
deployBeans(JavaSparrow_Broken.class);
try