[webbeans-commits] Webbeans SVN: r1684 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer1.
by webbeans-commits＠lists.jboss.org
Author: dallen6
Date: 2009-02-24 12:29:06 -0500 (Tue, 24 Feb 2009)
New Revision: 1684
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer1/EJBObserverMethodNotBusinessMethodTest.java
Log:
Changed broken test to work with our mock ejb discovery
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer1/EJBObserverMethodNotBusinessMethodTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer1/EJBObserverMethodNotBusinessMethodTest.java 2009-02-24 16:46:05 UTC (rev 1683)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer1/EJBObserverMethodNotBusinessMethodTest.java 2009-02-24 17:29:06 UTC (rev 1684)
@@ -36,7 +36,7 @@
@ExpectedDeploymentException(DefinitionException.class)
public class EJBObserverMethodNotBusinessMethodTest extends AbstractDeclarativeTest
{
- @Test(groups = { "events", "ri-broken" })
+ @Test(groups = { "events" })
@SpecAssertion(section = "7.5", id = "d")
public void testObserverMethodOnEnterpriseBeanNotBusinessMethodOrStaticFails()
{
17 years, 1 month
- 1
- 0
[webbeans-commits] Webbeans SVN: r1683 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer1.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-02-24 11:46:05 -0500 (Tue, 24 Feb 2009)
New Revision: 1683
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer1/Terrier.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer1/TibetanTerrier.java
Log:
Fix test
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer1/Terrier.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer1/Terrier.java 2009-02-24 16:08:15 UTC (rev 1682)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer1/Terrier.java 2009-02-24 16:46:05 UTC (rev 1683)
@@ -1,5 +1,8 @@
package org.jboss.jsr299.tck.unit.event.broken.observer1;
+import javax.ejb.Local;
+
+@Local
public interface Terrier
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer1/TibetanTerrier.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer1/TibetanTerrier.java 2009-02-24 16:08:15 UTC (rev 1682)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer1/TibetanTerrier.java 2009-02-24 16:46:05 UTC (rev 1683)
@@ -1,12 +1,10 @@
package org.jboss.jsr299.tck.unit.event.broken.observer1;
-import javax.ejb.Local;
import javax.ejb.Stateless;
import javax.event.Observes;
@Stateless
-(a)Local(Terrier.class)
class TibetanTerrier implements Terrier
{
public void observeInitialized(@Observes String someEvent)
17 years, 1 month
- 1
- 0
[webbeans-commits] Webbeans SVN: r1682 - in tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken: event2 and 13 other directories.
by webbeans-commits＠lists.jboss.org
Author: dallen6
Date: 2009-02-24 11:08:15 -0500 (Tue, 24 Feb 2009)
New Revision: 1682
Removed:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event1/Role.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event1/RoleBinding.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer11/TameAnnotationLiteral.java
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event1/FiresOnNonEventTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event2/FiresOnEventWithoutTypeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event3/FiresOnEventWithWildcardTypeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event4/FiresOnEventWithTypeVariableTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer1/EJBObserverMethodNotBusinessMethodTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer10/ObserverExceptionRethrown.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer11/CheckedExceptionWrappedTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer2/ObserverMethodWithTwoEventParametersTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer3/ObserverMethodAndWildcardedEventTypeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer4/ObserverMethodAnnotatedProducesTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer5/ObserverMethodAnnotatedInitialzerTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer6/ObserverMethodAnnotatedDisposesTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer7/TransactionalObserverMethodOnlyOnePhaseTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer8/AsynchronousBeforeCompletionObserverTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer9/AsynchronousConditionalObserverTest.java
Log:
Fixed the event tests which were failing from the last checkin
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event1/FiresOnNonEventTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event1/FiresOnNonEventTest.java 2009-02-24 15:07:48 UTC (rev 1681)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event1/FiresOnNonEventTest.java 2009-02-24 16:08:15 UTC (rev 1682)
@@ -36,10 +36,11 @@
@ExpectedDeploymentException(DefinitionException.class)
public class FiresOnNonEventTest extends AbstractDeclarativeTest
{
- @Test(groups = { "events" }, expectedExceptions = { DefinitionException.class })
+ @Test(groups = { "events" })
@SpecAssertion(section = "7.6", id = "j")
public void testFiresAnnotationOnNonEventTypeInjectionPointFails() throws Exception
{
+ assert false;
}
}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event1/Role.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event1/Role.java 2009-02-24 15:07:48 UTC (rev 1681)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event1/Role.java 2009-02-24 16:08:15 UTC (rev 1682)
@@ -1,14 +0,0 @@
-package org.jboss.jsr299.tck.unit.event.broken.event1;
-
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Retention;
-
-import javax.inject.BindingType;
-
-@BindingType
-@Retention(RUNTIME)
-@interface Role
-{
- String value();
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event1/RoleBinding.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event1/RoleBinding.java 2009-02-24 15:07:48 UTC (rev 1681)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event1/RoleBinding.java 2009-02-24 16:08:15 UTC (rev 1682)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.unit.event.broken.event1;
-
-import javax.inject.AnnotationLiteral;
-
-
-class RoleBinding extends AnnotationLiteral<Role> implements Role
-{
- private String value = null;
-
- public RoleBinding(String value)
- {
- this.value = value;
- }
-
- public String value()
- {
- return value;
- }
-
-}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event2/FiresOnEventWithoutTypeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event2/FiresOnEventWithoutTypeTest.java 2009-02-24 15:07:48 UTC (rev 1681)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event2/FiresOnEventWithoutTypeTest.java 2009-02-24 16:08:15 UTC (rev 1682)
@@ -36,10 +36,11 @@
@ExpectedDeploymentException(DefinitionException.class)
public class FiresOnEventWithoutTypeTest extends AbstractDeclarativeTest
{
- @Test(groups = { "events" }, expectedExceptions = { DefinitionException.class })
+ @Test(groups = { "events" })
@SpecAssertion(section = "7.6", id = "k")
public void testFiresAnnotationOnInjectionPointWithoutTypeParameterFails()
{
+ assert false;
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event3/FiresOnEventWithWildcardTypeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event3/FiresOnEventWithWildcardTypeTest.java 2009-02-24 15:07:48 UTC (rev 1681)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event3/FiresOnEventWithWildcardTypeTest.java 2009-02-24 16:08:15 UTC (rev 1682)
@@ -36,10 +36,11 @@
@ExpectedDeploymentException(DefinitionException.class)
public class FiresOnEventWithWildcardTypeTest extends AbstractDeclarativeTest
{
- @Test(groups = { "events" }, expectedExceptions = { DefinitionException.class })
+ @Test(groups = { "events" })
@SpecAssertion(section = "7.6", id = "m")
public void testFiresAnnotationOnInjectionPointWithWildcardedTypeParameterFails()
{
+ assert false;
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event4/FiresOnEventWithTypeVariableTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event4/FiresOnEventWithTypeVariableTest.java 2009-02-24 15:07:48 UTC (rev 1681)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event4/FiresOnEventWithTypeVariableTest.java 2009-02-24 16:08:15 UTC (rev 1682)
@@ -36,9 +36,10 @@
@ExpectedDeploymentException(DefinitionException.class)
public class FiresOnEventWithTypeVariableTest extends AbstractDeclarativeTest
{
- @Test(groups = { "events" }, expectedExceptions = { DefinitionException.class })
+ @Test(groups = { "events" })
@SpecAssertion(section = "7.6", id = "l")
public void testFiresAnnotationOnInjectionPointWithTypeVariabledTypeParameterFails()
{
+ assert false;
}
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer1/EJBObserverMethodNotBusinessMethodTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer1/EJBObserverMethodNotBusinessMethodTest.java 2009-02-24 15:07:48 UTC (rev 1681)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer1/EJBObserverMethodNotBusinessMethodTest.java 2009-02-24 16:08:15 UTC (rev 1682)
@@ -36,9 +36,10 @@
@ExpectedDeploymentException(DefinitionException.class)
public class EJBObserverMethodNotBusinessMethodTest extends AbstractDeclarativeTest
{
- @Test(groups = { "events" }, expectedExceptions = DefinitionException.class)
+ @Test(groups = { "events", "ri-broken" })
@SpecAssertion(section = "7.5", id = "d")
public void testObserverMethodOnEnterpriseBeanNotBusinessMethodOrStaticFails()
{
+ assert false;
}
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer10/ObserverExceptionRethrown.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer10/ObserverExceptionRethrown.java 2009-02-24 15:07:48 UTC (rev 1681)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer10/ObserverExceptionRethrown.java 2009-02-24 16:08:15 UTC (rev 1682)
@@ -20,7 +20,6 @@
import org.hibernate.tck.annotations.SpecAssertion;
import org.jboss.jsr299.tck.AbstractDeclarativeTest;
import org.jboss.jsr299.tck.impl.packaging.Artifact;
-import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException;
import org.testng.annotations.Test;
/**
@@ -31,7 +30,6 @@
*
*/
@Artifact
-(a)ExpectedDeploymentException(TeaCupPomeranian.OversizedException.class)
public class ObserverExceptionRethrown extends AbstractDeclarativeTest
{
@Test(groups = { "events" }, expectedExceptions = { TeaCupPomeranian.OversizedException.class })
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer11/CheckedExceptionWrappedTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer11/CheckedExceptionWrappedTest.java 2009-02-24 15:07:48 UTC (rev 1681)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer11/CheckedExceptionWrappedTest.java 2009-02-24 16:08:15 UTC (rev 1682)
@@ -22,7 +22,6 @@
import org.hibernate.tck.annotations.SpecAssertion;
import org.jboss.jsr299.tck.AbstractDeclarativeTest;
import org.jboss.jsr299.tck.impl.packaging.Artifact;
-import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException;
import org.testng.annotations.Test;
/**
@@ -33,7 +32,6 @@
*
*/
@Artifact
-(a)ExpectedDeploymentException(ObserverException.class)
public class CheckedExceptionWrappedTest extends AbstractDeclarativeTest
{
@Test(groups = { "events" }, expectedExceptions = { ObserverException.class })
@@ -41,5 +39,6 @@
public void testNonTransactionalObserverThrowsCheckedExceptionIsWrappedAndRethrown()
{
getCurrentManager().fireEvent(new Integer(1));
+ assert false;
}
}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer11/TameAnnotationLiteral.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer11/TameAnnotationLiteral.java 2009-02-24 15:07:48 UTC (rev 1681)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer11/TameAnnotationLiteral.java 2009-02-24 16:08:15 UTC (rev 1682)
@@ -1,8 +0,0 @@
-package org.jboss.jsr299.tck.unit.event.broken.observer11;
-
-import javax.inject.AnnotationLiteral;
-
-class TameAnnotationLiteral extends AnnotationLiteral<Tame> implements Tame
-{
-
-}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer2/ObserverMethodWithTwoEventParametersTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer2/ObserverMethodWithTwoEventParametersTest.java 2009-02-24 15:07:48 UTC (rev 1681)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer2/ObserverMethodWithTwoEventParametersTest.java 2009-02-24 16:08:15 UTC (rev 1682)
@@ -13,10 +13,11 @@
@ExpectedDeploymentException(DefinitionException.class)
public class ObserverMethodWithTwoEventParametersTest extends AbstractDeclarativeTest
{
- @Test(groups = { "events" }, expectedExceptions = { DefinitionException.class })
+ @Test(groups = { "events" })
@SpecAssertions( { @SpecAssertion(section = "7.5.1", id = "a"), @SpecAssertion(section = "7.5.2", id = "b") })
public void testObserverMethodMustHaveOnlyOneEventParameter()
{
+ assert false;
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer3/ObserverMethodAndWildcardedEventTypeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer3/ObserverMethodAndWildcardedEventTypeTest.java 2009-02-24 15:07:48 UTC (rev 1681)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer3/ObserverMethodAndWildcardedEventTypeTest.java 2009-02-24 16:08:15 UTC (rev 1682)
@@ -36,10 +36,11 @@
@ExpectedDeploymentException(DefinitionException.class)
public class ObserverMethodAndWildcardedEventTypeTest extends AbstractDeclarativeTest
{
- @Test(groups = { "events" }, expectedExceptions = { DefinitionException.class })
+ @Test(groups = { "events" })
@SpecAssertion(section = "7.5.1", id = "c")
public void testObserverMethodCannotObserveParameterizedEvents()
{
+ assert false;
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer4/ObserverMethodAnnotatedProducesTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer4/ObserverMethodAnnotatedProducesTest.java 2009-02-24 15:07:48 UTC (rev 1681)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer4/ObserverMethodAnnotatedProducesTest.java 2009-02-24 16:08:15 UTC (rev 1682)
@@ -35,9 +35,10 @@
@ExpectedDeploymentException(DefinitionException.class)
public class ObserverMethodAnnotatedProducesTest extends AbstractDeclarativeTest
{
- @Test(groups = { "events" }, expectedExceptions = { DefinitionException.class })
+ @Test(groups = { "events" })
@SpecAssertion(section = "7.5.2", id = "c")
public void testObserverMethodAnnotatedProducesFails()
{
+ assert false;
}
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer5/ObserverMethodAnnotatedInitialzerTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer5/ObserverMethodAnnotatedInitialzerTest.java 2009-02-24 15:07:48 UTC (rev 1681)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer5/ObserverMethodAnnotatedInitialzerTest.java 2009-02-24 16:08:15 UTC (rev 1682)
@@ -36,9 +36,10 @@
@ExpectedDeploymentException(DefinitionException.class)
public class ObserverMethodAnnotatedInitialzerTest extends AbstractDeclarativeTest
{
- @Test(groups = { "events" }, expectedExceptions = { DefinitionException.class })
+ @Test(groups = { "events" })
@SpecAssertion(section = "7.5.2", id = "d")
public void testObserverMethodAnnotatedInitializerFails()
{
+ assert false;
}
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer6/ObserverMethodAnnotatedDisposesTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer6/ObserverMethodAnnotatedDisposesTest.java 2009-02-24 15:07:48 UTC (rev 1681)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer6/ObserverMethodAnnotatedDisposesTest.java 2009-02-24 16:08:15 UTC (rev 1682)
@@ -36,9 +36,10 @@
@ExpectedDeploymentException(DefinitionException.class)
public class ObserverMethodAnnotatedDisposesTest extends AbstractDeclarativeTest
{
- @Test(groups = { "events" }, expectedExceptions = { DefinitionException.class })
+ @Test(groups = { "events" })
@SpecAssertion(section = "7.5.2", id = "e")
public void testObserverMethodWithDisposesParamFails()
{
+ assert false;
}
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer7/TransactionalObserverMethodOnlyOnePhaseTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer7/TransactionalObserverMethodOnlyOnePhaseTest.java 2009-02-24 15:07:48 UTC (rev 1681)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer7/TransactionalObserverMethodOnlyOnePhaseTest.java 2009-02-24 16:08:15 UTC (rev 1682)
@@ -36,10 +36,11 @@
@ExpectedDeploymentException(DefinitionException.class)
public class TransactionalObserverMethodOnlyOnePhaseTest extends AbstractDeclarativeTest
{
- @Test(groups = { "events" }, expectedExceptions = { DefinitionException.class })
+ @Test(groups = { "events" })
@SpecAssertion(section = "7.5.6", id = "k")
public void testTransactionalObserverCanOnlyObserveSinglePhase()
{
+ assert false;
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer8/AsynchronousBeforeCompletionObserverTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer8/AsynchronousBeforeCompletionObserverTest.java 2009-02-24 15:07:48 UTC (rev 1681)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer8/AsynchronousBeforeCompletionObserverTest.java 2009-02-24 16:08:15 UTC (rev 1682)
@@ -36,9 +36,10 @@
@ExpectedDeploymentException(DefinitionException.class)
public class AsynchronousBeforeCompletionObserverTest extends AbstractDeclarativeTest
{
- @Test(groups = { "events", "broken" }, expectedExceptions = DefinitionException.class)
+ @Test(groups = { "events", "broken" })
@SpecAssertion(section = "7.5.7", id = "c")
public void testAsynchronousObserverAsBeforeCompletionObserverFails()
{
+ assert false;
}
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer9/AsynchronousConditionalObserverTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer9/AsynchronousConditionalObserverTest.java 2009-02-24 15:07:48 UTC (rev 1681)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer9/AsynchronousConditionalObserverTest.java 2009-02-24 16:08:15 UTC (rev 1682)
@@ -36,9 +36,10 @@
@ExpectedDeploymentException(DefinitionException.class)
public class AsynchronousConditionalObserverTest extends AbstractDeclarativeTest
{
- @Test(groups = { "events", "broken" }, expectedExceptions = DefinitionException.class)
+ @Test(groups = { "events", "broken" })
@SpecAssertion(section = "7.5.7", id = "c")
public void testAsynchronousObserverAsConditionalObserverFails()
{
+ assert false;
}
}
17 years, 1 month
- 1
- 0
[webbeans-commits] Webbeans SVN: r1681 - ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans.
by webbeans-commits＠lists.jboss.org
Author: dallen6
Date: 2009-02-24 10:07:48 -0500 (Tue, 24 Feb 2009)
New Revision: 1681
Modified:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/BeanValidator.java
Log:
Removed some code from earlier check-in that was not supposed to be checked in.
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/BeanValidator.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/BeanValidator.java 2009-02-24 14:32:02 UTC (rev 1680)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/BeanValidator.java 2009-02-24 15:07:48 UTC (rev 1681)
@@ -18,9 +18,7 @@
import java.lang.annotation.Annotation;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Comparator;
-import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -39,7 +37,6 @@
import org.jboss.webbeans.bean.AbstractProducerBean;
import org.jboss.webbeans.bean.NewEnterpriseBean;
import org.jboss.webbeans.bean.NewSimpleBean;
-import org.jboss.webbeans.bean.ProducerMethodBean;
import org.jboss.webbeans.bean.RIBean;
import org.jboss.webbeans.introspector.AnnotatedField;
import org.jboss.webbeans.metadata.MetaDataCache;
@@ -104,17 +101,6 @@
{
throw new NullableDependencyException("The injection point " + injectionPoint + " has nullable dependencies");
}
- if (bean instanceof ProducerMethodBean)
- {
- if (resolvedBean instanceof AbstractProducerBean)
- {
- AbstractProducerBean producerBean = (AbstractProducerBean) resolvedBean;
- if (producerBean.isDependent() && !Reflections.isSerializable(producerBean.getType()))
- {
- throw new IllegalProductException("Cannot inject @Depedent non-serializable type into " + injectionPoint);
- }
- }
- }
if (MetaDataCache.instance().getScopeModel(bean.getScopeType()).isPassivating())
{
if (resolvedBean instanceof AbstractProducerBean)
17 years, 1 month
- 1
- 0
[webbeans-commits] Webbeans SVN: r1680 - ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans and 21 other directories.
by webbeans-commits＠lists.jboss.org
Author: dallen6
Date: 2009-02-24 09:32:02 -0500 (Tue, 24 Feb 2009)
New Revision: 1680
Added:
ri/trunk/webbeans-api/src/main/java/javax/event/Asynchronously.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/UnusedEventType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event1/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event1/CommonWaxbill_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event1/FiresOnNonEventTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event1/Role.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event1/RoleBinding.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event2/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event2/BlackRumpedWaxbill_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event2/FiresOnEventWithoutTypeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event3/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event3/FiresOnEventWithWildcardTypeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event3/GoldbreastWaxbill_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event4/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event4/FiresOnEventWithTypeVariableTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event4/JavaSparrow_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer1/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer1/EJBObserverMethodNotBusinessMethodTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer1/Terrier.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer1/TibetanTerrier.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer10/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer10/ObserverExceptionRethrown.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer10/Tame.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer10/TameAnnotationLiteral.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer10/TeaCupPomeranian.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer11/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer11/CheckedExceptionWrappedTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer11/Tame.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer11/TameAnnotationLiteral.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer11/TeaCupPomeranian.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer2/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer2/Boxer.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer2/ObserverMethodWithTwoEventParametersTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer2/YorkshireTerrier_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer3/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer3/BostonTerrier.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer3/ObserverMethodAndWildcardedEventTypeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer4/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer4/BorderTerrier.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer4/ObserverMethodAnnotatedProducesTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer5/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer5/AustralianTerrier.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer5/ObserverMethodAnnotatedInitialzerTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer6/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer6/FoxTerrier.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer6/ObserverMethodAnnotatedDisposesTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer7/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer7/TooManyPhases_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer7/TransactionalObserverMethodOnlyOnePhaseTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer8/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer8/AsynchronousBeforeCompletionObserverTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer8/Terrier.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer9/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer9/AsynchronousConditionalObserverTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer9/Terrier.java
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/event/
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/event/beans.xml
Removed:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/AustralianTerrier.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/BlackRumpedWaxbill_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/BorderTerrier.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/BostonTerrier.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/Boxer.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/CommonWaxbill_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/FoxTerrier.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/GoldbreastWaxbill_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/JavaSparrow_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/Terrier.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/TibetanTerrier.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/TooManyPhases_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/YorkshireTerrier_Broken.java
Modified:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/BeanValidator.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EventBean.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/AuroraFinch.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/EventTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/OrangeCheekedWaxbill.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/StarFinch.java
Log:
Event tests restructured for new framework; Asynchronous annotation added; refactored event bean registrations during deployment.
Added: ri/trunk/webbeans-api/src/main/java/javax/event/Asynchronously.java
===================================================================
--- ri/trunk/webbeans-api/src/main/java/javax/event/Asynchronously.java (rev 0)
+++ ri/trunk/webbeans-api/src/main/java/javax/event/Asynchronously.java 2009-02-24 14:32:02 UTC (rev 1680)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package javax.event;
+
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+/**
+ * Specifies that an observer method is to be notified asynchronously
+ * with respect to the firing of the event.
+ *
+ * @author Gavin King
+ * @author David Allen
+ *
+ */
+@Retention(RUNTIME)
+@Target(PARAMETER)
+public @interface Asynchronously
+{
+}
Property changes on: ri/trunk/webbeans-api/src/main/java/javax/event/Asynchronously.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/BeanValidator.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/BeanValidator.java 2009-02-24 14:21:03 UTC (rev 1679)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/BeanValidator.java 2009-02-24 14:32:02 UTC (rev 1680)
@@ -18,7 +18,9 @@
import java.lang.annotation.Annotation;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Comparator;
+import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -43,6 +45,7 @@
import org.jboss.webbeans.metadata.MetaDataCache;
import org.jboss.webbeans.util.Beans;
import org.jboss.webbeans.util.ListComparator;
+import org.jboss.webbeans.util.Names;
import org.jboss.webbeans.util.Proxies;
import org.jboss.webbeans.util.Reflections;
@@ -86,11 +89,11 @@
Set<?> resolvedBeans = manager.resolveByType(type, bindings);
if (resolvedBeans.isEmpty())
{
- throw new UnsatisfiedDependencyException("The injection point " + injectionPoint + " in " + bean + " has unsatisfied dependencies");
+ throw new UnsatisfiedDependencyException("The injection point " + injectionPoint + " with binding types " + Names.annotationsToString(injectionPoint.getBindings()) + " in " + bean + " has unsatisfied dependencies with binding types ");
}
if (resolvedBeans.size() > 1)
{
- throw new AmbiguousDependencyException("The injection point " + injectionPoint + " in " + bean + " has ambiguous dependencies");
+ throw new AmbiguousDependencyException("The injection point " + injectionPoint + " with binding types " + Names.annotationsToString(injectionPoint.getBindings()) + " in " + bean + " has ambiguous dependencies");
}
Bean<?> resolvedBean = (Bean<?>) resolvedBeans.iterator().next();
if (MetaDataCache.instance().getScopeModel(resolvedBean.getScopeType()).isNormal() && !Proxies.isTypeProxyable(type))
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java 2009-02-24 14:21:03 UTC (rev 1679)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java 2009-02-24 14:32:02 UTC (rev 1680)
@@ -91,7 +91,7 @@
// Logger
private LogProvider log = Logging.getLogProvider(AbstractBean.class);
// The binding types
- private Set<Annotation> bindings;
+ protected Set<Annotation> bindings;
// The name
protected String name;
// The scope type
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EventBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EventBean.java 2009-02-24 14:21:03 UTC (rev 1679)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EventBean.java 2009-02-24 14:32:02 UTC (rev 1680)
@@ -18,11 +18,15 @@
package org.jboss.webbeans.bean;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
+import java.util.Set;
import javax.context.CreationalContext;
import javax.event.Event;
import javax.inject.DefinitionException;
+import javax.inject.manager.InjectionPoint;
import org.jboss.webbeans.ManagerImpl;
import org.jboss.webbeans.context.DependentContext;
@@ -122,20 +126,21 @@
try
{
DependentContext.INSTANCE.setActive(true);
- Class<?> clazz;
- if (this.getAnnotatedItem() instanceof AnnotatedParameter)
+ //TODO Fix to use IP's manager rather than this bean's
+ InjectionPoint injectionPoint = this.getManager().getInjectionPoint();
+ Class<?> clazz = Object.class;
+ Type genericType = injectionPoint.getType().getClass().getGenericSuperclass();
+ if (genericType instanceof ParameterizedType )
{
- clazz = Object.class;
- }
- else
- {
- clazz = Class.class.cast(getAnnotatedItem().getActualTypeArguments()[0]);
+ ParameterizedType type = (ParameterizedType) genericType;
+ clazz = Class.class.cast(type.getActualTypeArguments()[0]);
}
+
// TODO should be able to move this up into annotated item?!
@SuppressWarnings("unchecked")
Class<T> eventType = (Class<T>) clazz;
- return new EventImpl<T>(eventType, manager, getAnnotatedItem().getBindingsAsArray());
+ return new EventImpl<T>(eventType, manager, injectionPoint.getBindings().toArray(new Annotation[0]));
}
finally
{
@@ -156,6 +161,17 @@
}
/**
+ * Adds additional bindings to this bean. All bindings must be
+ * finalized before the bean is registered with the manager.
+ *
+ * @param additionalBindings A set of additional bindings
+ */
+ public void addBindings(Set<Annotation> additionalBindings)
+ {
+ this.bindings.addAll(additionalBindings);
+ }
+
+ /**
* Returns a string representation
*
* @return The string representation
@@ -170,6 +186,6 @@
buffer.append(" API types = ").append(Names.typesToString(getTypes())).append(", binding types = " + Names.annotationsToString(getBindings()));
buffer.append("\n");
return buffer.toString();
- }
+ }
}
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java 2009-02-24 14:21:03 UTC (rev 1679)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java 2009-02-24 14:32:02 UTC (rev 1680)
@@ -47,6 +47,7 @@
private final Set<RIBean<?>> beans;
private final Set<AnnotatedClass<?>> deferredClasses;
private final ManagerImpl manager;
+ private EventBean<Object, Method> eventBean;
public BeanDeployer(ManagerImpl manager)
{
@@ -224,11 +225,19 @@
private void createEvent(AnnotatedItem<?, ?> injectionPoint)
{
- // TODO Fix this!
- @SuppressWarnings("unchecked")
- EventBean<Object, Method> bean = EventBean.of((AnnotatedItem) injectionPoint, manager);
- beans.add(bean);
- log.info("Web Bean: " + bean);
+ if (eventBean == null)
+ {
+ // TODO Fix this!
+ @SuppressWarnings("unchecked")
+ EventBean<Object, Method> bean = EventBean.of((AnnotatedItem) injectionPoint, manager);
+ beans.add(bean);
+ log.info("Web Bean: " + bean);
+ eventBean = bean;
+ }
+ else
+ {
+ eventBean.addBindings(injectionPoint.getBindings());
+ }
}
private void createInstance(AnnotatedItem<?, ?> injectionPoint)
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/AuroraFinch.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/AuroraFinch.java 2009-02-24 14:21:03 UTC (rev 1679)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/AuroraFinch.java 2009-02-24 14:32:02 UTC (rev 1680)
@@ -15,7 +15,7 @@
public AuroraFinch(@Fires Event<Mess> eventObject)
{
// Create a new mess and fire the event for it
- someMess = new Mess();
+ someMess = new Mess("smallMess");
eventObject.fire(someMess);
}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/AustralianTerrier.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/AustralianTerrier.java 2009-02-24 14:21:03 UTC (rev 1679)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/AustralianTerrier.java 2009-02-24 14:32:02 UTC (rev 1680)
@@ -1,16 +0,0 @@
-package org.jboss.jsr299.tck.unit.event;
-
-import javax.ejb.Stateless;
-import javax.event.Observes;
-import javax.inject.Initializer;
-import javax.inject.manager.Initialized;
-import javax.inject.manager.Manager;
-
-@Stateless
-class AustralianTerrier
-{
- @Initializer
- public void observeInitialized(@Observes @Initialized Manager manager)
- {
- }
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/BlackRumpedWaxbill_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/BlackRumpedWaxbill_Broken.java 2009-02-24 14:21:03 UTC (rev 1679)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/BlackRumpedWaxbill_Broken.java 2009-02-24 14:32:02 UTC (rev 1680)
@@ -1,16 +0,0 @@
-package org.jboss.jsr299.tck.unit.event;
-
-import javax.event.Event;
-import javax.event.Fires;
-
-class BlackRumpedWaxbill_Broken
-{
- @SuppressWarnings("unchecked")
- @Fires
- private Event simpleEvent;
-
- public void eliminateWarning()
- {
- assert simpleEvent != null;
- }
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/BorderTerrier.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/BorderTerrier.java 2009-02-24 14:21:03 UTC (rev 1679)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/BorderTerrier.java 2009-02-24 14:32:02 UTC (rev 1680)
@@ -1,17 +0,0 @@
-package org.jboss.jsr299.tck.unit.event;
-
-import javax.ejb.Stateless;
-import javax.event.Observes;
-import javax.inject.Produces;
-import javax.inject.manager.Initialized;
-import javax.inject.manager.Manager;
-
-@Stateless
-class BorderTerrier
-{
- @Produces
- public String observeInitialized(@Observes @Initialized Manager manager)
- {
- return "product";
- }
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/BostonTerrier.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/BostonTerrier.java 2009-02-24 14:21:03 UTC (rev 1679)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/BostonTerrier.java 2009-02-24 14:32:02 UTC (rev 1680)
@@ -1,14 +0,0 @@
-package org.jboss.jsr299.tck.unit.event;
-
-import java.util.List;
-
-import javax.ejb.Stateless;
-import javax.event.Observes;
-
-@Stateless
-class BostonTerrier
-{
- public void observesBadEvent(@Observes List<String> someArray)
- {
- }
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/Boxer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/Boxer.java 2009-02-24 14:21:03 UTC (rev 1679)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/Boxer.java 2009-02-24 14:32:02 UTC (rev 1680)
@@ -1,11 +0,0 @@
-package org.jboss.jsr299.tck.unit.event;
-
-import javax.context.ConversationScoped;
-import javax.ejb.Stateless;
-
-@Stateless
-@ConversationScoped
-class Boxer
-{
-
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/CommonWaxbill_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/CommonWaxbill_Broken.java 2009-02-24 14:21:03 UTC (rev 1679)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/CommonWaxbill_Broken.java 2009-02-24 14:32:02 UTC (rev 1680)
@@ -1,16 +0,0 @@
-package org.jboss.jsr299.tck.unit.event;
-
-import java.util.ArrayList;
-
-import javax.event.Fires;
-
-class CommonWaxbill_Broken
-{
- @Fires
- private ArrayList<String> simpleEvent;
-
- public void eliminateWarning()
- {
- assert simpleEvent != null;
- }
-}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/EventTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/EventTest.java 2009-02-24 14:21:03 UTC (rev 1679)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/EventTest.java 2009-02-24 14:32:02 UTC (rev 1680)
@@ -2,14 +2,11 @@
import java.lang.annotation.Annotation;
import java.util.ArrayList;
-import java.util.List;
import java.util.Set;
import javax.context.Dependent;
import javax.event.Event;
import javax.event.Observer;
-import javax.event.ObserverException;
-import javax.inject.DefinitionException;
import javax.inject.DuplicateBindingTypeException;
import javax.inject.Standard;
import javax.inject.TypeLiteral;
@@ -18,6 +15,8 @@
import org.hibernate.tck.annotations.SpecAssertion;
import org.hibernate.tck.annotations.SpecAssertions;
import org.jboss.jsr299.tck.AbstractDeclarativeTest;
+import org.jboss.jsr299.tck.impl.packaging.Artifact;
+import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml;
import org.testng.annotations.Test;
/**
@@ -28,18 +27,11 @@
*
* Spec version: Public Release Draft 2
*/
+@Artifact
+@BeansXml("beans.xml")
public class EventTest extends AbstractDeclarativeTest
{
- @Override
- protected List<Class<? extends Annotation>> getEnabledDeploymentTypes()
- {
- List<Class<? extends Annotation>> deploymentTypes = new ArrayList<Class<? extends Annotation>>();
- deploymentTypes.addAll(getStandardDeploymentTypes());
- deploymentTypes.add(AnotherDeploymentType.class);
- return deploymentTypes;
- }
-
public static class AnEventType
{
}
@@ -96,12 +88,11 @@
*
* @throws Exception
*/
- @Test(groups = { "events" })
- @SpecAssertion(section = "7.1", id = "unknown")
+ @Test(groups = { "events", "broken" })
+ @SpecAssertion(section = "7.1", id = "b")
public void testEventTypeIncludesAllSuperclassesAndInterfacesOfEventObject() throws Exception
{
// Fire a single complex type of event with many observers
- deployBeans(AllEventTypesObserver.class);
new RunInDependentContext()
{
@@ -116,76 +107,67 @@
}.run();
}
- /**
- * The Manager interface provides a method for firing events:
- */
- @Test(groups = { "events" })
- @SpecAssertion(section = "7.2", id = "unknown")
- public void testManagerFireEvent()
- {
- deployBeans();
- // First a simple event with no bindings is fired
- AnEventType anEvent = new AnEventType();
- getCurrentManager().fireEvent(anEvent);
-
- // Next an event with some event bindings is fired
- getCurrentManager().fireEvent(anEvent, new RoleBinding("Admin"));
- }
-
@Test(groups = { "events" }, expectedExceptions = { IllegalArgumentException.class })
@SpecAssertions( { @SpecAssertion(section = "7.1", id = "a"),
@SpecAssertion(section = "7.2", id = "b") })
public void testManagerFireEventWithEventTypeParametersFails()
{
- deployBeans();
ATemplatedEventType<String> anEvent = new ATemplatedEventType<String>();
getCurrentManager().fireEvent(anEvent);
}
@Test(groups = { "events" }, expectedExceptions = { IllegalArgumentException.class })
- @SpecAssertions( { @SpecAssertion(section = "7.1", id = "a"),
- @SpecAssertion(section = "7.2", id = "b") })
+ @SpecAssertions( { @SpecAssertion(section = "7.1", id = "b"), @SpecAssertion(section = "7.2", id = "c") })
public void testManagerFireEventWithEventTypeWildcardsFails()
{
- // Although the above test is really the same as with a wildcard, we will
- // test
- // it anyhow since the specification calls it out separately.
- deployBeans();
+ // Although the above test is really the same as with a wildcard,
+ // we will test it anyhow since the specification calls it out separately.
ATemplatedEventType<?> anEventOnAnyType = new ATemplatedEventType<String>();
getCurrentManager().fireEvent(anEventOnAnyType);
}
@Test(groups = { "events" }, expectedExceptions = { IllegalArgumentException.class })
- @SpecAssertions( { @SpecAssertion(section = "7.1", id = "c"),
- @SpecAssertion(section = "7.1", id = "d"),
- @SpecAssertion(section = "7.2", id = "b") })
+ @SpecAssertions( { @SpecAssertion(section = "7.2", id = "d") })
public void testManagerFireEventWithNonBindingAnnotationsFails()
{
// The specs are not exactly clear on what is supposed to happen here,
// but borrowing from Section 8.3, we'll expect the same behavior here
// for a consistent API.
// TODO Verify that fireEvent should fail on non-binding annotations
- deployBeans();
AnEventType anEvent = new AnEventType();
getCurrentManager().fireEvent(anEvent, new AnimalStereotypeAnnotationLiteral());
}
- @Test(groups = { "events" })
+ /**
+ * The Manager interface provides a method for firing events:
+ */
+ @Test(groups = { "events", "broken" })
+ @SpecAssertion(section = "7.2", id = "unknown")
+ public void testManagerFireEvent()
+ {
+ // First a simple event with no bindings is fired
+ AnEventType anEvent = new AnEventType();
+ getCurrentManager().fireEvent(anEvent);
+
+ // Next an event with some event bindings is fired
+ getCurrentManager().fireEvent(anEvent, new RoleBinding("Admin"));
+ }
+
+ @Test(groups = { "events", "broken" })
@SpecAssertion(section = "7.3", id = "b")
public void testManagerAddObserver()
{
- deployBeans();
- Observer<AnEventType> observer = new AnObserver();
+ Observer<AnEventType> observer1 = new AnObserver();
// First test with the Class<T> of the event type
- getCurrentManager().addObserver(observer, AnEventType.class);
+ getCurrentManager().addObserver(observer1, AnEventType.class);
Set<Observer<AnEventType>> resolvedObservers = getCurrentManager().resolveObservers(new AnEventType());
assert resolvedObservers.size() == 1;
- assert resolvedObservers.iterator().next() == observer;
+ assert resolvedObservers.iterator().next() == observer1;
// Now test with the TypeLiteral<T> of the event type
- observer = new AnObserver();
- getCurrentManager().addObserver(observer, new TypeLiteral<AnEventType>()
+ Observer<AnEventType> observer2 = new AnObserver();
+ getCurrentManager().addObserver(observer2, new TypeLiteral<AnEventType>()
{
});
resolvedObservers = getCurrentManager().resolveObservers(new AnEventType());
@@ -193,7 +175,7 @@
boolean foundObserver = false;
for (Observer<AnEventType> obs : resolvedObservers)
{
- if (obs == observer)
+ if (obs == observer2)
{
foundObserver = true;
break;
@@ -202,15 +184,15 @@
assert foundObserver;
// Try adding an observer with some binding types
- observer = new AnObserver();
+ Observer<AnEventType> observer3 = new AnObserver();
Annotation[] bindingTypes = new Annotation[] { new RoleBinding("Admin"), new RoleBinding("Manager") };
- getCurrentManager().addObserver(observer, AnEventType.class, bindingTypes);
+ getCurrentManager().addObserver(observer3, AnEventType.class, bindingTypes);
resolvedObservers = getCurrentManager().resolveObservers(new AnEventType(), bindingTypes);
assert resolvedObservers.size() == 3;
foundObserver = false;
for (Observer<AnEventType> obs : resolvedObservers)
{
- if (obs == observer)
+ if (obs == observer3)
{
foundObserver = true;
break;
@@ -219,11 +201,10 @@
assert foundObserver;
}
- @Test(groups = { "events" })
+ @Test(groups = { "events", "broken" })
@SpecAssertion(section = "7.3", id = "e")
public void testManagerRemoveObserver()
{
- deployBeans();
Observer<AnEventType> observer = new AnObserver();
// First test with the Class<T> of the event type
@@ -258,7 +239,6 @@
@SpecAssertion(section = "7.3", id = "g")
public void testMultipleInstancesOfSameBindingTypeWhenAddingObserverFails()
{
- deployBeans();
Observer<AnEventType> observer = new AnObserver();
getCurrentManager().addObserver(observer, AnEventType.class, new RoleBinding("Admin"), new TameAnnotationLiteral(), new TameAnnotationLiteral());
}
@@ -267,7 +247,6 @@
@SpecAssertion(section = "7.3", id = "h")
public void testNonBindingTypePassedToAddObserverFails()
{
- deployBeans();
Observer<AnEventType> observer = new AnObserver();
getCurrentManager().addObserver(observer, AnEventType.class, new AnimalStereotypeAnnotationLiteral());
}
@@ -276,7 +255,6 @@
@SpecAssertion(section = "7.3", id = "g")
public void testMultipleInstancesOfSameBindingTypeWhenRemovingObserverFails()
{
- deployBeans();
Observer<AnEventType> observer = new AnObserver();
getCurrentManager().addObserver(observer, AnEventType.class);
getCurrentManager().removeObserver(observer, AnEventType.class, new RoleBinding("Admin"), new TameAnnotationLiteral(), new TameAnnotationLiteral());
@@ -286,18 +264,15 @@
@SpecAssertion(section = "7.3", id = "h")
public void testNonBindingTypePassedToRemoveObserverFails()
{
- deployBeans();
Observer<AnEventType> observer = new AnObserver();
getCurrentManager().addObserver(observer, AnEventType.class);
getCurrentManager().removeObserver(observer, AnEventType.class, new AnimalStereotypeAnnotationLiteral());
}
- @Test(groups = { "events" })
- @SpecAssertions( { @SpecAssertion(section = "7.1", id = "e"),
- @SpecAssertion(section = "7.4", id = "b") })
+ @Test(groups = { "events", "broken" })
+ @SpecAssertions( { @SpecAssertion(section = "7.1", id = "e"), @SpecAssertion(section = "7.4", id = "b") })
public void testConsumerNotifiedWhenEventTypeAndAllBindingsMatch()
{
- deployBeans();
AnObserver observer1 = new AnObserver();
AnObserver observer2 = new AnObserver();
getCurrentManager().addObserver(observer1, AnEventType.class);
@@ -315,7 +290,6 @@
@SpecAssertion(section = "7.4", id = "c")
public void testObserverThrowsExceptionAbortsNotifications()
{
- deployBeans();
AnObserverWithException observer = new AnObserverWithException();
AnObserverWithException anotherObserver = new AnObserverWithException();
getCurrentManager().addObserver(anotherObserver, AnEventType.class);
@@ -339,12 +313,11 @@
assert observer.wasNotified ^ anotherObserver.wasNotified;
}
- @Test(groups = { "events" })
+ @Test(groups = { "events", "broken" })
@SpecAssertion(section = "7.5", id = "e")
public void testMultipleObserverMethodsOK()
{
// This bean has a couple observer methods
- deployBeans(TeaCupPomeranian.class);
Set<Bean<Object>> beans = getCurrentManager().resolveByType(Object.class);
assert beans.size() >= 2;
@@ -356,52 +329,19 @@
assert resolvedIntegerObservers.size() == 1;
}
- @Test(groups = { "events", "ejb" })
+ @Test(groups = { "events", "ejb", "broken" })
@SpecAssertion(section = "7.5", id = "d")
public void testObserverMethodOnEnterpriseBeanIsBusinessMethodOrStatic()
{
- deployBeans(Spitz.class);
Set<Observer<String>> observers = getCurrentManager().resolveObservers("An event");
assert observers.size() == 2;
}
- @Test(groups = { "events" }, expectedExceptions = DefinitionException.class)
- @SpecAssertion(section = "7.5", id = "d")
- public void testObserverMethodOnEnterpriseBeanNotBusinessMethodOrStaticFails()
- {
- deployBeans(TibetanTerrier.class);
- Set<Bean<Object>> beans = getCurrentManager().resolveByType(Object.class);
- assert beans.size() >= 2;
- @SuppressWarnings("unused")
- Set<Observer<String>> observers = getCurrentManager().resolveObservers("An event");
- }
-
- @Test(groups = { "events" }, expectedExceptions = { DefinitionException.class })
- @SpecAssertions( { @SpecAssertion(section = "7.5.1", id = "a"),
- @SpecAssertion(section = "7.5.2", id = "b") })
- public void testObserverMethodMustHaveOnlyOneEventParameter()
- {
- deployBeans(YorkshireTerrier_Broken.class);
-
- Set<Bean<Object>> beans = getCurrentManager().resolveByType(Object.class);
- assert beans != null;
- }
-
- @Test(groups = { "events" }, expectedExceptions = { DefinitionException.class })
- @SpecAssertion(section = "7.5.1", id = "c")
- public void testObserverMethodCannotObserveParameterizedEvents()
- {
- deployBeans(BostonTerrier.class);
- Set<Bean<Object>> beans = getCurrentManager().resolveByType(Object.class);
- assert beans != null;
- }
-
- @Test(groups = { "events" })
+ @Test(groups = { "events", "broken" })
@SpecAssertion(section = "7.5.1", id = "b")
public void testObserverMethodWithoutBindingTypesObservesEventsWithoutBindingTypes()
{
// This observer has no binding types specified
- deployBeans(Pomeranian.class);
Set<Bean<Object>> beans = getCurrentManager().resolveByType(Object.class);
assert beans.size() >= 2;
@@ -410,38 +350,10 @@
assert resolvedObservers.size() == 2;
}
- @Test(groups = { "events" }, expectedExceptions = { DefinitionException.class })
- @SpecAssertion(section = "7.5.2", id = "c")
- public void testObserverMethodAnnotatedProducesFails()
- {
- deployBeans(BorderTerrier.class);
- Set<Bean<Object>> beans = getCurrentManager().resolveByType(Object.class);
- assert beans != null;
- }
-
- @Test(groups = { "events" }, expectedExceptions = { DefinitionException.class })
- @SpecAssertion(section = "7.5.2", id = "d")
- public void testObserverMethodAnnotatedInitializerFails()
- {
- deployBeans(AustralianTerrier.class);
- Set<Bean<Object>> beans = getCurrentManager().resolveByType(Object.class);
- assert beans != null;
- }
-
- @Test(groups = { "events" }, expectedExceptions = { DefinitionException.class })
- @SpecAssertion(section = "7.5.2", id = "e")
- public void testObserverMethodWithDisposesParamFails()
- {
- deployBeans(FoxTerrier.class);
- Set<Bean<Object>> beans = getCurrentManager().resolveByType(Object.class);
- assert beans != null;
- }
-
- @Test(groups = { "events" })
+ @Test(groups = { "events", "broken" })
@SpecAssertion(section = "7.5.2", id = "g")
public void testObserverMethodMayHaveMultipleBindingTypes()
{
- deployBeans(BullTerrier.class);
Set<Bean<Object>> beans = getCurrentManager().resolveByType(Object.class);
assert beans != null;
// If we can resolve the observer with the two binding types,
@@ -477,48 +389,37 @@
* Manager.getInstanceToInject() to each of the other parameters.
*/
@Test(groups = { "events" })
- @SpecAssertions( { @SpecAssertion(section = "7.5.4", id = "a"),
- @SpecAssertion(section = "7.5.8", id = "unknown") })
+ @SpecAssertions( { @SpecAssertion(section = "7.5.4", id = "a"), @SpecAssertion(section = "7.5.8", id = "unknown") })
public void testObserverMethodReceivesInjectionsOnNonObservesParameters()
{
- deployBeans(BananaSpider.class);
Set<Bean<Object>> beans = getCurrentManager().resolveByType(Object.class);
assert beans != null;
}
- @Test(groups = { "events" })
+ @Test(groups = { "events", "broken" })
@SpecAssertion(section = "7.5.5", id = "a")
- public void testConditionalObserver()
+ public void testConditionalObserver() throws Exception
{
RecluseSpider.notified = false;
- deployBeans(RecluseSpider.class);
-
getCurrentManager().fireEvent("New string event");
// Should not be notified since bean is not instantiated yet
assert !RecluseSpider.notified;
// Now instantiate the bean and fire another event
- try
+ new RunInDependentContext()
{
- activateDependentContext();
- RecluseSpider bean = getCurrentManager().getInstanceByType(RecluseSpider.class);
- assert bean != null;
- bean.toString();
- getCurrentManager().fireEvent("Another event");
- assert RecluseSpider.notified;
- }
- finally
- {
- deactivateDependentContext();
- }
- }
+ @Override
+ protected void execute() throws Exception
+ {
+ RecluseSpider bean = getCurrentManager().getInstanceByType(RecluseSpider.class);
+ assert bean != null;
- @Test(groups = { "events" }, expectedExceptions = { DefinitionException.class })
- @SpecAssertion(section = "7.5.6", id = "k")
- public void testTransactionalObserverCanOnlyObserveSinglePhase()
- {
- deployBeans(TooManyPhases_Broken.class);
+ getCurrentManager().fireEvent("Another event");
+ assert RecluseSpider.notified;
+ }
+
+ }.run();
}
@Test(groups = { "stub", "events" })
@@ -542,26 +443,11 @@
assert false;
}
- @Test(groups = { "stub", "events" }, expectedExceptions = DefinitionException.class)
- @SpecAssertion(section = "7.5.7", id = "c")
- public void testAsynchronousObserverAsBeforeCompletionObserverFails()
- {
- assert false;
- }
-
- @Test(groups = { "stub", "events" }, expectedExceptions = DefinitionException.class)
- @SpecAssertion(section = "7.5.7", id = "c")
- public void testAsynchronousObserverAsConditionalObserverFails()
- {
- assert false;
- }
-
- @Test(groups = { "events" })
+ @Test(groups = { "events", "broken" })
@SpecAssertion(section = "7.5.8", id = "a")
public void testObserverMethodRegistration()
{
// This bean has two observer methods, one static and one non-static
- deployBeans(Pomeranian.class);
Set<Bean<Object>> beans = getCurrentManager().resolveByType(Object.class);
assert beans.size() >= 2;
@@ -581,15 +467,14 @@
@SpecAssertion(section = "7.5.8", id = "f")
public void testObserverMethodCalledImmediately()
{
-
+
assert false;
}
- @Test(groups = { "events" })
+ @Test(groups = { "events", "broken" })
@SpecAssertion(section = "7.5.8", id = "i")
public void testStaticObserverMethodInvoked()
{
- deployBeans(StaticObserver.class);
getCurrentManager().fireEvent(new Delivery());
assert StaticObserver.isDeliveryReceived();
}
@@ -597,18 +482,18 @@
/**
* Otherwise, if the observer method is non-static, the container must:
*
- * obtain the Bean object for the most specialized bean that specializes
- * the bean which declares the observer method, and then
+ * obtain the Bean object for the most specialized bean that specializes the
+ * bean which declares the observer method, and then
*
* obtain the context object by calling Manager.getContext(), passing the
* bean scope, then
*
- * obtain an instance of the bean by calling Context.get(), passing the
- * Bean instance representing the bean, together with a CreationalContext
- * unless this observer method is a conditional observer method, and then
+ * obtain an instance of the bean by calling Context.get(), passing the Bean
+ * instance representing the bean, together with a CreationalContext unless
+ * this observer method is a conditional observer method, and then
*
- * if the get() method returned a non-null value, invoke the observer
- * method on the returned instance
+ * if the get() method returned a non-null value, invoke the observer method
+ * on the returned instance
*/
@Test(groups = { "stub", "events" })
@SpecAssertion(section = "7.5.8", id = "j")
@@ -616,7 +501,7 @@
{
assert false;
}
-
+
/**
* Otherwise, if the observer method is non-static, the container must:
*
@@ -629,38 +514,17 @@
public void testObserverCalledOnMostSpecializedInstance()
{
Shop.deliveryObservedBy = null;
- deployBeans(FarmShop.class, Shop.class);
getCurrentManager().fireEvent(new Delivery());
assert Shop.deliveryObservedBy.equals(FarmShop.class.getName());
- }
+ }
- @Test(groups = { "stub", "events" }, expectedExceptions = { TeaCupPomeranian.OversizedException.class })
+ @Test(groups = { "stub", "events" })
@SpecAssertion(section = "7.5.8", id = "p")
- public void testAsynchronousObserverThrowsNonCheckedExceptionIsRethrown()
+ public void testAsynchronousObserverThrowsExceptionIsLogged()
{
assert false;
}
- @Test(groups = { "events" }, expectedExceptions = { TeaCupPomeranian.OversizedException.class })
- @SpecAssertion(section = "7.5.8", id = "q")
- public void testNonTransactionalObserverThrowsNonCheckedExceptionIsRethrown()
- {
- deployBeans(TeaCupPomeranian.class);
- Set<Bean<Object>> beans = getCurrentManager().resolveByType(Object.class);
- assert !beans.isEmpty();
- getCurrentManager().fireEvent("Another event");
- }
-
- @Test(groups = { "events" }, expectedExceptions = { ObserverException.class })
- @SpecAssertion(section = "7.5.8", id = "r")
- public void testNonTransactionalObserverThrowsCheckedExceptionIsWrappedAndRethrown()
- {
- deployBeans(TeaCupPomeranian.class);
- Set<Bean<Object>> beans = getCurrentManager().resolveByType(Object.class);
- assert !beans.isEmpty();
- getCurrentManager().fireEvent(new Integer(1));
- }
-
@Test(groups = { "stub", "events" })
@SpecAssertion(section = "7.5.9", id = "a")
public void testAsynchronousObserverMethodContexts()
@@ -670,282 +534,205 @@
@Test(groups = { "events" }, expectedExceptions = { DuplicateBindingTypeException.class })
@SpecAssertion(section = "7.6", id = "g")
- public void testDuplicateBindingsToFireFails()
+ public void testDuplicateBindingsToFireFails() throws Exception
{
- deployBeans(SweeWaxbill_Broken.class);
- try
+ new RunInDependentContext()
{
- activateDependentContext();
- SweeWaxbill_Broken bean = getCurrentManager().getInstanceByType(SweeWaxbill_Broken.class);
- bean.methodThatFiresEvent();
- }
- finally
- {
- deactivateDependentContext();
- }
+
+ @Override
+ protected void execute() throws Exception
+ {
+ SweeWaxbill_Broken bean = getCurrentManager().getInstanceByType(SweeWaxbill_Broken.class);
+ bean.methodThatFiresEvent();
+ }
+
+ }.run();
}
@Test(groups = { "events" }, expectedExceptions = { DuplicateBindingTypeException.class })
@SpecAssertion(section = "7.6", id = "g")
- public void testDuplicateBindingsToObservesFails()
+ public void testDuplicateBindingsToObservesFails() throws Exception
{
- deployBeans(SweeWaxbill_Broken.class);
- try
+ new RunInDependentContext()
{
- activateDependentContext();
- SweeWaxbill_Broken bean = getCurrentManager().getInstanceByType(SweeWaxbill_Broken.class);
- bean.methodThatRegistersObserver();
- }
- finally
- {
- deactivateDependentContext();
- }
+
+ @Override
+ protected void execute() throws Exception
+ {
+ SweeWaxbill_Broken bean = getCurrentManager().getInstanceByType(SweeWaxbill_Broken.class);
+ bean.methodThatRegistersObserver();
+ }
+
+ }.run();
}
@Test(groups = { "events" }, expectedExceptions = { IllegalArgumentException.class })
@SpecAssertion(section = "7.6", id = "h")
- public void testNonBindingTypePassedToFireFails()
+ public void testNonBindingTypePassedToFireFails() throws Exception
{
- deployBeans(OwlFinch_Broken.class);
- try
+ new RunInDependentContext()
{
- activateDependentContext();
- OwlFinch_Broken bean = getCurrentManager().getInstanceByType(OwlFinch_Broken.class);
- bean.methodThatFiresEvent();
- }
- finally
- {
- deactivateDependentContext();
- }
+
+ @Override
+ protected void execute() throws Exception
+ {
+ OwlFinch_Broken bean = getCurrentManager().getInstanceByType(OwlFinch_Broken.class);
+ bean.methodThatFiresEvent();
+ }
+
+ }.run();
}
@Test(groups = { "events" }, expectedExceptions = { IllegalArgumentException.class })
@SpecAssertion(section = "7.6", id = "h")
- public void testNonBindingTypePassedToObservesFails()
+ public void testNonBindingTypePassedToObservesFails() throws Exception
{
- deployBeans(OwlFinch_Broken.class);
- try
+ new RunInDependentContext()
{
- activateDependentContext();
- OwlFinch_Broken bean = getCurrentManager().getInstanceByType(OwlFinch_Broken.class);
- bean.methodThatRegistersObserver();
- }
- finally
- {
- deactivateDependentContext();
- }
+
+ @Override
+ protected void execute() throws Exception
+ {
+ OwlFinch_Broken bean = getCurrentManager().getInstanceByType(OwlFinch_Broken.class);
+ bean.methodThatRegistersObserver();
+ }
+
+ }.run();
}
- @Test(groups = { "events" })
+ @Test(groups = { "events", "broken" })
@SpecAssertion(section = "7.6", id = "i")
- public void testFiresAnnotationOnEventTypes()
+ public void testFiresAnnotationOnEventTypes() throws Exception
{
- deployBeans(BlueFacedParrotFinch.class);
- try
+ new RunInDependentContext()
{
- activateDependentContext();
- BlueFacedParrotFinch bean = getCurrentManager().getInstanceByType(BlueFacedParrotFinch.class);
- bean.methodThatRegistersObserver();
- Set<Observer<String>> observers = getCurrentManager().resolveObservers("String type event");
- assert observers.size() == 1;
- }
- finally
- {
- deactivateDependentContext();
- }
- deployBeans(StarFinch.class, FinchKeeper.class, BirdCage.class);
- try
- {
- activateDependentContext();
- StarFinch starFinch = getCurrentManager().getInstanceByType(StarFinch.class);
- FinchKeeper birdKeeper = getCurrentManager().getInstanceByType(FinchKeeper.class);
- BirdCage birdCage = getCurrentManager().getInstanceByType(BirdCage.class);
- assert starFinch != null;
- assert birdCage != null;
- assert birdCage.getSomeMess() != null;
- assert birdKeeper.isNewMessDetected();
- }
- finally
- {
- deactivateDependentContext();
- }
- deployBeans(OrangeCheekedWaxbill.class, FinchKeeper.class);
- try
- {
- activateDependentContext();
- OrangeCheekedWaxbill bird = getCurrentManager().getInstanceByType(OrangeCheekedWaxbill.class);
- FinchKeeper birdKeeper = getCurrentManager().getInstanceByType(FinchKeeper.class);
- assert bird != null;
- assert bird.getSomeMess() != null;
- assert birdKeeper.isNewMessDetected();
- }
- finally
- {
- deactivateDependentContext();
- }
- deployBeans(AuroraFinch.class, FinchKeeper.class);
- try
- {
- activateDependentContext();
- AuroraFinch bird = getCurrentManager().getInstanceByType(AuroraFinch.class);
- FinchKeeper birdKeeper = getCurrentManager().getInstanceByType(FinchKeeper.class);
- assert bird != null;
- assert birdKeeper.isNewMessDetected();
- }
- finally
- {
- deactivateDependentContext();
- }
- }
+ @Override
+ protected void execute() throws Exception
+ {
+ BlueFacedParrotFinch bean = getCurrentManager().getInstanceByType(BlueFacedParrotFinch.class);
+ bean.methodThatRegistersObserver();
- @Test(groups = { "events" }, expectedExceptions = { DefinitionException.class })
- @SpecAssertion(section = "7.6", id = "j")
- public void testFiresAnnotationOnNonEventTypeInjectionPointFails()
- {
- deployBeans(CommonWaxbill_Broken.class);
- try
+ Set<Observer<String>> observers = getCurrentManager().resolveObservers("String type event");
+ assert observers.size() == 1;
+ }
+
+ }.run();
+ new RunInDependentContext()
{
- activateDependentContext();
- CommonWaxbill_Broken bean = getCurrentManager().getInstanceByType(CommonWaxbill_Broken.class);
- assert bean != null;
- }
- finally
- {
- deactivateDependentContext();
- }
- }
- @Test(groups = { "events" }, expectedExceptions = { DefinitionException.class })
- @SpecAssertion(section = "7.6", id = "k")
- public void testFiresAnnotationOnInjectionPointWithoutTypeParameterFails()
- {
- deployBeans(BlackRumpedWaxbill_Broken.class);
- try
+ @Override
+ protected void execute() throws Exception
+ {
+ StarFinch starFinch = getCurrentManager().getInstanceByType(StarFinch.class);
+ FinchKeeper birdKeeper = getCurrentManager().getInstanceByType(FinchKeeper.class);
+ BirdCage birdCage = getCurrentManager().getInstanceByType(BirdCage.class);
+ assert starFinch != null;
+ assert birdCage != null;
+ assert birdCage.getSomeMess() != null;
+ assert birdKeeper.isNewMessDetected();
+ }
+
+ }.run();
+ new RunInDependentContext()
{
- activateDependentContext();
- BlackRumpedWaxbill_Broken bean = getCurrentManager().getInstanceByType(BlackRumpedWaxbill_Broken.class);
- assert bean != null;
- }
- finally
- {
- deactivateDependentContext();
- }
- }
- @Test(groups = { "events" }, expectedExceptions = { DefinitionException.class })
- @SpecAssertion(section = "7.6", id = "m")
- public void testFiresAnnotationOnInjectionPointWithWildcardedTypeParameterFails()
- {
- deployBeans(GoldbreastWaxbill_Broken.class);
- try
+ @Override
+ protected void execute() throws Exception
+ {
+ OrangeCheekedWaxbill bird = getCurrentManager().getInstanceByType(OrangeCheekedWaxbill.class);
+ FinchKeeper birdKeeper = getCurrentManager().getInstanceByType(FinchKeeper.class);
+ assert bird != null;
+ assert bird.getSomeMess() != null;
+ assert birdKeeper.isNewMessDetected();
+ }
+
+ }.run();
+ new RunInDependentContext()
{
- activateDependentContext();
- GoldbreastWaxbill_Broken bean = getCurrentManager().getInstanceByType(GoldbreastWaxbill_Broken.class);
- assert bean != null;
- }
- finally
- {
- deactivateDependentContext();
- }
- }
- @Test(groups = { "events" }, expectedExceptions = { DefinitionException.class })
- @SpecAssertion(section = "7.6", id = "l")
- public void testFiresAnnotationOnInjectionPointWithTypeVariabledTypeParameterFails()
- {
- deployBeans(JavaSparrow_Broken.class);
- try
- {
- activateDependentContext();
- JavaSparrow_Broken bean = getCurrentManager().getInstanceByType(JavaSparrow_Broken.class);
- assert bean != null;
- }
- finally
- {
- deactivateDependentContext();
- }
+ @Override
+ protected void execute() throws Exception
+ {
+ AuroraFinch bird = getCurrentManager().getInstanceByType(AuroraFinch.class);
+ FinchKeeper birdKeeper = getCurrentManager().getInstanceByType(FinchKeeper.class);
+ assert bird != null;
+ assert birdKeeper.isNewMessDetected();
+ }
+
+ }.run();
}
@Test(groups = { "events" })
@SpecAssertion(section = "7.6", id = "n")
- public void testImplicitEventBeanMatchesAPITypeOfInectionPoint()
+ public void testImplicitEventBeanMatchesAPITypeOfInectionPoint() throws Exception
{
- deployBeans(BlueFacedParrotFinch.class);
- try
+ new RunInDependentContext()
{
- activateDependentContext();
- BlueFacedParrotFinch bean = getCurrentManager().getInstanceByType(BlueFacedParrotFinch.class);
- assert bean != null;
- // Retrieve the implicit event bean from the manager only by its API
- // type
- Set<?> eventBeans = getCurrentManager().resolveByType(Event.class, new FiresBinding());
- assert !eventBeans.isEmpty();
- }
- finally
- {
- deactivateDependentContext();
- }
+
+ @Override
+ protected void execute() throws Exception
+ {
+ // Retrieve the implicit event bean from the manager only by
+ // its API type
+ Set<?> eventBeans = getCurrentManager().resolveByType(Event.class, new FiresBinding());
+ assert !eventBeans.isEmpty();
+ }
+
+ }.run();
}
@Test(groups = { "events" })
@SpecAssertion(section = "7.6", id = "n")
- public void testImplicitEventBeanMatchesBindingAnnotationsOfInjectionPoint()
+ public void testImplicitEventBeanMatchesBindingAnnotationsOfInjectionPoint() throws Exception
{
- deployBeans(OrangeCheekedWaxbill.class);
- try
+ new RunInDependentContext()
{
- activateDependentContext();
- OrangeCheekedWaxbill bean = getCurrentManager().getInstanceByType(OrangeCheekedWaxbill.class);
- assert bean != null;
- // Retrieve the implicit event bean from the manager by its binding
- // types
- Set<?> eventBeans = getCurrentManager().resolveByType(Event.class, new FiresBinding(), new TameAnnotationLiteral());
- assert !eventBeans.isEmpty();
- }
- finally
- {
- deactivateDependentContext();
- }
+
+ @Override
+ protected void execute() throws Exception
+ {
+ // Retrieve the implicit event bean from the manager
+ // by its binding types (uses OrangeCheekedWaxbill)
+ Set<?> eventBeans = getCurrentManager().resolveByType(Event.class, new FiresBinding(), new TameAnnotationLiteral());
+ assert !eventBeans.isEmpty();
+ }
+
+ }.run();
}
@Test(groups = { "events" })
@SpecAssertion(section = "7.6", id = "o")
- public void testImplicitEventBeanHasStandardDeploymentType()
+ public void testImplicitEventBeanHasStandardDeploymentType() throws Exception
{
- deployBeans(BlueFacedParrotFinch.class);
- try
+ new RunInDependentContext()
{
- activateDependentContext();
- BlueFacedParrotFinch bean = getCurrentManager().getInstanceByType(BlueFacedParrotFinch.class);
- assert bean != null;
- // Retrieve the implicit event bean from the manager only by its API
- // type
- Set<?> eventBeans = getCurrentManager().resolveByType(Event.class, new FiresBinding());
- assert eventBeans.size() == 1;
- Bean<?> eventBean = (Bean<?>) eventBeans.iterator().next();
- assert eventBean.getDeploymentType().equals(Standard.class);
- }
- finally
- {
- deactivateDependentContext();
- }
+
+ @Override
+ protected void execute() throws Exception
+ {
+ // Retrieve the implicit event bean from the manager
+ // only by its API type (uses BlueFacedParrotFinch)
+ Set<?> eventBeans = getCurrentManager().resolveByType(Event.class, new FiresBinding());
+ assert eventBeans.size() == 1;
+ Bean<?> eventBean = (Bean<?>) eventBeans.iterator().next();
+ assert eventBean.getDeploymentType().equals(Standard.class);
+ }
+
+ }.run();
}
@Test(groups = { "events" })
@SpecAssertion(section = "7.6", id = "p")
public void testImplicitEventBeanHasDependentScope() throws Exception
{
- deployBeans(BlueFacedParrotFinch.class);
new RunInDependentContext()
{
@Override
protected void execute() throws Exception
{
- BlueFacedParrotFinch bean = getCurrentManager().getInstanceByType(BlueFacedParrotFinch.class);
- assert bean != null;
- // Retrieve the implicit event bean from the manager only by its API
- // type
+ // Retrieve the implicit event bean from the manager only
+ // by its API type (uses BlueFacedParrotFinch)
Set<?> eventBeans = getCurrentManager().resolveByType(Event.class, new FiresBinding());
assert eventBeans.size() == 1;
Bean<?> eventBean = (Bean<?>) eventBeans.iterator().next();
@@ -958,16 +745,13 @@
@SpecAssertion(section = "7.6", id = "q")
public void testImplicitEventBeanHasNoName() throws Exception
{
- deployBeans(BlueFacedParrotFinch.class);
new RunInDependentContext()
{
@Override
protected void execute() throws Exception
{
- BlueFacedParrotFinch bean = getCurrentManager().getInstanceByType(BlueFacedParrotFinch.class);
- assert bean != null;
- // Retrieve the implicit event bean from the manager only by its API
- // type
+ // Retrieve the implicit event bean from the manager only
+ // by its API type (uses BlueFacedParrotFinch)
Set<?> eventBeans = getCurrentManager().resolveByType(Event.class, new FiresBinding());
assert eventBeans.size() == 1;
Bean<?> eventBean = (Bean<?>) eventBeans.iterator().next();
@@ -980,16 +764,13 @@
@SpecAssertion(section = "7.6", id = "r")
public void testImplicitEventBeanProvidedByContainer() throws Exception
{
- deployBeans(BlueFacedParrotFinch.class);
new RunInDependentContext()
{
@Override
protected void execute() throws Exception
{
- BlueFacedParrotFinch bean = getCurrentManager().getInstanceByType(BlueFacedParrotFinch.class);
- assert bean != null;
- // Retrieve the implicit event bean from the manager only by its API
- // type
+ // Retrieve the implicit event bean from the manager only
+ // by its API type (uses BlueFacedParrotFinch)
Set<?> eventBeans = getCurrentManager().resolveByType(Event.class, new FiresBinding());
assert eventBeans.size() == 1;
}
@@ -1049,9 +830,7 @@
private <E> void eventObjectContainsTypeVariables(ArrayList<E> eventToFire)
{
- deployBeans();
- @SuppressWarnings("unused")
- Set<?> resolvedObservers = getCurrentManager().resolveObservers(eventToFire);
+ getCurrentManager().resolveObservers(eventToFire);
}
@Test(groups = { "broken", "events" }, expectedExceptions = { IllegalArgumentException.class })
@@ -1063,29 +842,23 @@
private void eventObjectContainsWildcards(ArrayList<? extends Object> eventToFire)
{
- deployBeans();
- @SuppressWarnings("unused")
- // TODO There does not seem to be a way to get wildcarded types pass
- // through
- Set<?> resolvedObservers = getCurrentManager().resolveObservers(eventToFire);
+ // TODO There does not seem to be a way to get wildcarded types passed
+ getCurrentManager().resolveObservers(eventToFire);
}
@Test(groups = { "events" }, expectedExceptions = { DuplicateBindingTypeException.class })
@SpecAssertion(section = "7.7", id = "d")
public void testDuplicateBindingTypesWhenResolvingFails()
{
- deployBeans();
AnObserver observer = new AnObserver();
getCurrentManager().addObserver(observer, AnEventType.class, new BindingTypeABinding());
- @SuppressWarnings("unused")
- Set<Observer<AnEventType>> resolvedObservers = getCurrentManager().resolveObservers(new AnEventType(), new BindingTypeABinding(), new BindingTypeABinding());
+ getCurrentManager().resolveObservers(new AnEventType(), new BindingTypeABinding(), new BindingTypeABinding());
}
@Test(groups = { "events" }, expectedExceptions = { IllegalArgumentException.class })
@SpecAssertion(section = "7.7", id = "e")
public void testNonBindingTypeAnnotationWhenResolvingFails()
{
- deployBeans();
AnObserver observer = new AnObserver();
getCurrentManager().addObserver(observer, new TypeLiteral<AnEventType>()
{
@@ -1098,20 +871,18 @@
@SpecAssertion(section = "7.7", id = "f")
public void testResolvingChecksEventType()
{
- deployBeans();
Observer<AnEventType> observer = new AnObserver();
getCurrentManager().addObserver(observer, AnEventType.class);
Set<Observer<AnEventType>> resolvedObservers = getCurrentManager().resolveObservers(new AnEventType());
assert !resolvedObservers.isEmpty();
- Set<?> emptyObserverSet = getCurrentManager().resolveObservers("A string event");
- assert emptyObserverSet.isEmpty();
+ Set<?> emptyObserverSet = getCurrentManager().resolveObservers(new UnusedEventType("name"));
+ assert emptyObserverSet.size() == 1;
}
@Test(groups = { "broken", "events" })
@SpecAssertion(section = "7.7", id = "f")
public void testResolvingChecksTypeParameters()
{
- deployBeans();
AListObserver observer = new AListObserver();
AnotherListObserver anotherObserver = new AnotherListObserver();
getCurrentManager().addObserver(observer, new TypeLiteral<ArrayList<String>>()
@@ -1124,11 +895,10 @@
assert resolvedObservers.size() == 1;
}
- @Test(groups = { "events" })
+ @Test(groups = { "events", "broken" })
@SpecAssertion(section = "7.7", id = "g")
public void testResolvingChecksBindingTypes()
{
- deployBeans();
AnObserver observer = new AnObserver();
AnObserver anotherObserver = new AnObserver();
getCurrentManager().addObserver(observer, AnEventType.class, new BindingTypeABinding());
@@ -1137,11 +907,10 @@
assert resolvedObservers.size() == 1;
}
- @Test(groups = { "events" })
+ @Test(groups = { "events", "broken" })
@SpecAssertion(section = "7.7", id = "g")
public void testResolvingChecksBindingTypeMembers()
{
- deployBeans();
AnObserver observer = new AnObserver();
AnObserver anotherObserver = new AnObserver();
getCurrentManager().addObserver(observer, AnEventType.class, new BindingTypeCBinding("first-observer"));
@@ -1155,11 +924,10 @@
* producer, disposal and observer methods of the first bean are not
* inherited by the second bean.
*/
- @Test(groups = { "events", "inheritance" })
+ @Test(groups = { "events", "inheritance", "broken" })
@SpecAssertion(section = "4", id = "a")
public void testNonStaticObserverMethodNotInherited()
{
- deployBeans(LazyFarmer.class);
assert getCurrentManager().resolveObservers(new Egg()).isEmpty();
}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/FoxTerrier.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/FoxTerrier.java 2009-02-24 14:21:03 UTC (rev 1679)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/FoxTerrier.java 2009-02-24 14:32:02 UTC (rev 1680)
@@ -1,16 +0,0 @@
-package org.jboss.jsr299.tck.unit.event;
-
-import javax.ejb.Stateless;
-import javax.event.Observes;
-import javax.inject.Disposes;
-import javax.inject.manager.Initialized;
-import javax.inject.manager.Manager;
-
-@Stateless
-class FoxTerrier
-{
- public void observeInitialized(@Observes @Initialized Manager manager, @Disposes String badParam)
- {
- }
-
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/GoldbreastWaxbill_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/GoldbreastWaxbill_Broken.java 2009-02-24 14:21:03 UTC (rev 1679)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/GoldbreastWaxbill_Broken.java 2009-02-24 14:32:02 UTC (rev 1680)
@@ -1,15 +0,0 @@
-package org.jboss.jsr299.tck.unit.event;
-
-import javax.event.Event;
-import javax.event.Fires;
-
-class GoldbreastWaxbill_Broken
-{
- @Fires
- private Event<?> simpleEvent;
-
- public void eliminateWarning()
- {
- assert simpleEvent != null;
- }
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/JavaSparrow_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/JavaSparrow_Broken.java 2009-02-24 14:21:03 UTC (rev 1679)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/JavaSparrow_Broken.java 2009-02-24 14:32:02 UTC (rev 1680)
@@ -1,17 +0,0 @@
-package org.jboss.jsr299.tck.unit.event;
-
-import java.util.ArrayList;
-
-import javax.event.Event;
-import javax.event.Fires;
-
-class JavaSparrow_Broken
-{
- @Fires
- private Event<ArrayList<String>> simpleEvent;
-
- public void eliminateWarning()
- {
- assert simpleEvent != null;
- }
-}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/OrangeCheekedWaxbill.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/OrangeCheekedWaxbill.java 2009-02-24 14:21:03 UTC (rev 1679)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/OrangeCheekedWaxbill.java 2009-02-24 14:32:02 UTC (rev 1680)
@@ -20,7 +20,7 @@
public void theInitializerMethod(@Fires @Tame Event<Mess> eventObject)
{
// Create a new mess and fire the event for it
- someMess = new Mess();
+ someMess = new Mess("tameMess");
eventObject.fire(someMess);
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/StarFinch.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/StarFinch.java 2009-02-24 14:21:03 UTC (rev 1679)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/StarFinch.java 2009-02-24 14:32:02 UTC (rev 1680)
@@ -12,16 +12,20 @@
{
public static class Mess
{
+ public Mess(String name)
+ {
+
+ }
}
public StarFinch()
{
}
- @Produces
+ @Produces @AnotherDeploymentType
public Mess producerOfMesses(@Fires Event<Mess> messEvent)
{
- Mess newMess = new Mess();
+ Mess newMess = new Mess("bigMess");
messEvent.fire(newMess);
return newMess;
}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/Terrier.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/Terrier.java 2009-02-24 14:21:03 UTC (rev 1679)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/Terrier.java 2009-02-24 14:32:02 UTC (rev 1680)
@@ -1,9 +0,0 @@
-package org.jboss.jsr299.tck.unit.event;
-
-import javax.ejb.Local;
-
-@Local
-public interface Terrier
-{
-
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/TibetanTerrier.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/TibetanTerrier.java 2009-02-24 14:21:03 UTC (rev 1679)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/TibetanTerrier.java 2009-02-24 14:32:02 UTC (rev 1680)
@@ -1,12 +0,0 @@
-package org.jboss.jsr299.tck.unit.event;
-
-import javax.ejb.Stateless;
-import javax.event.Observes;
-
-@Stateless
-class TibetanTerrier implements Terrier
-{
- public void observeInitialized(@Observes String someEvent)
- {
- }
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/TooManyPhases_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/TooManyPhases_Broken.java 2009-02-24 14:21:03 UTC (rev 1679)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/TooManyPhases_Broken.java 2009-02-24 14:32:02 UTC (rev 1680)
@@ -1,37 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jboss.jsr299.tck.unit.event;
-
-import javax.event.AfterTransactionFailure;
-import javax.event.AfterTransactionSuccess;
-import javax.event.Observes;
-
-/**
- * The observer method defined here has too many transactional phases
- * specified.
- *
- * @author David Allen
- *
- */
-public class TooManyPhases_Broken
-{
- public void observeSomething(@Observes @AfterTransactionSuccess @AfterTransactionFailure String event)
- {
-
- }
-}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/UnusedEventType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/UnusedEventType.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/UnusedEventType.java 2009-02-24 14:32:02 UTC (rev 1680)
@@ -0,0 +1,9 @@
+package org.jboss.jsr299.tck.unit.event;
+
+class UnusedEventType
+{
+ public UnusedEventType(String name)
+ {
+
+ }
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/UnusedEventType.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/YorkshireTerrier_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/YorkshireTerrier_Broken.java 2009-02-24 14:21:03 UTC (rev 1679)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/YorkshireTerrier_Broken.java 2009-02-24 14:32:02 UTC (rev 1680)
@@ -1,12 +0,0 @@
-package org.jboss.jsr299.tck.unit.event;
-
-import javax.event.Observes;
-import javax.inject.manager.Initialized;
-import javax.inject.manager.Manager;
-
-class YorkshireTerrier_Broken
-{
- public void observeInitialized(@Observes @Initialized Manager manager, @Observes Boxer anotherDog)
- {
- }
-}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event1/CommonWaxbill_Broken.java (from rev 1612, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/CommonWaxbill_Broken.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event1/CommonWaxbill_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event1/CommonWaxbill_Broken.java 2009-02-24 14:32:02 UTC (rev 1680)
@@ -0,0 +1,11 @@
+package org.jboss.jsr299.tck.unit.event.broken.event1;
+
+import java.util.ArrayList;
+
+import javax.event.Fires;
+
+class CommonWaxbill_Broken
+{
+ @Fires
+ protected ArrayList<String> simpleEvent;
+}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event1/FiresOnNonEventTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event1/FiresOnNonEventTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event1/FiresOnNonEventTest.java 2009-02-24 14:32:02 UTC (rev 1680)
@@ -0,0 +1,45 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jboss.jsr299.tck.unit.event.broken.event1;
+
+import javax.inject.DefinitionException;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.jboss.jsr299.tck.AbstractDeclarativeTest;
+import org.jboss.jsr299.tck.impl.packaging.Artifact;
+import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException;
+import org.testng.annotations.Test;
+
+/**
+ * Tests the use of @Fires on an injection point that is
+ * not an Event type.
+ *
+ * @author David Allen
+ *
+ */
+@Artifact
+(a)ExpectedDeploymentException(DefinitionException.class)
+public class FiresOnNonEventTest extends AbstractDeclarativeTest
+{
+ @Test(groups = { "events" }, expectedExceptions = { DefinitionException.class })
+ @SpecAssertion(section = "7.6", id = "j")
+ public void testFiresAnnotationOnNonEventTypeInjectionPointFails() throws Exception
+ {
+ }
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event1/FiresOnNonEventTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event1/Role.java (from rev 1612, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/Role.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event1/Role.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event1/Role.java 2009-02-24 14:32:02 UTC (rev 1680)
@@ -0,0 +1,14 @@
+package org.jboss.jsr299.tck.unit.event.broken.event1;
+
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
+
+import javax.inject.BindingType;
+
+@BindingType
+@Retention(RUNTIME)
+@interface Role
+{
+ String value();
+}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event1/RoleBinding.java (from rev 1612, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/RoleBinding.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event1/RoleBinding.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event1/RoleBinding.java 2009-02-24 14:32:02 UTC (rev 1680)
@@ -0,0 +1,20 @@
+package org.jboss.jsr299.tck.unit.event.broken.event1;
+
+import javax.inject.AnnotationLiteral;
+
+
+class RoleBinding extends AnnotationLiteral<Role> implements Role
+{
+ private String value = null;
+
+ public RoleBinding(String value)
+ {
+ this.value = value;
+ }
+
+ public String value()
+ {
+ return value;
+ }
+
+}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event2/BlackRumpedWaxbill_Broken.java (from rev 1612, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/BlackRumpedWaxbill_Broken.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event2/BlackRumpedWaxbill_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event2/BlackRumpedWaxbill_Broken.java 2009-02-24 14:32:02 UTC (rev 1680)
@@ -0,0 +1,16 @@
+package org.jboss.jsr299.tck.unit.event.broken.event2;
+
+import javax.event.Event;
+import javax.event.Fires;
+
+class BlackRumpedWaxbill_Broken
+{
+ @SuppressWarnings("unchecked")
+ @Fires
+ private Event simpleEvent;
+
+ public void eliminateWarning()
+ {
+ assert simpleEvent != null;
+ }
+}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event2/FiresOnEventWithoutTypeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event2/FiresOnEventWithoutTypeTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event2/FiresOnEventWithoutTypeTest.java 2009-02-24 14:32:02 UTC (rev 1680)
@@ -0,0 +1,46 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jboss.jsr299.tck.unit.event.broken.event2;
+
+import javax.inject.DefinitionException;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.jboss.jsr299.tck.AbstractDeclarativeTest;
+import org.jboss.jsr299.tck.impl.packaging.Artifact;
+import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException;
+import org.testng.annotations.Test;
+
+/**
+ * Tests if the Event object on an injection point annotated
+ * @Fires has a type parameter for the actual type of event.
+ *
+ * @author David Allen
+ *
+ */
+@Artifact
+(a)ExpectedDeploymentException(DefinitionException.class)
+public class FiresOnEventWithoutTypeTest extends AbstractDeclarativeTest
+{
+ @Test(groups = { "events" }, expectedExceptions = { DefinitionException.class })
+ @SpecAssertion(section = "7.6", id = "k")
+ public void testFiresAnnotationOnInjectionPointWithoutTypeParameterFails()
+ {
+ }
+
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event2/FiresOnEventWithoutTypeTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event3/FiresOnEventWithWildcardTypeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event3/FiresOnEventWithWildcardTypeTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event3/FiresOnEventWithWildcardTypeTest.java 2009-02-24 14:32:02 UTC (rev 1680)
@@ -0,0 +1,46 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jboss.jsr299.tck.unit.event.broken.event3;
+
+import javax.inject.DefinitionException;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.jboss.jsr299.tck.AbstractDeclarativeTest;
+import org.jboss.jsr299.tck.impl.packaging.Artifact;
+import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException;
+import org.testng.annotations.Test;
+
+/**
+ * Tests an injection point for an Event object with a wildcard
+ * type parameter.
+ *
+ * @author David Allen
+ *
+ */
+@Artifact
+(a)ExpectedDeploymentException(DefinitionException.class)
+public class FiresOnEventWithWildcardTypeTest extends AbstractDeclarativeTest
+{
+ @Test(groups = { "events" }, expectedExceptions = { DefinitionException.class })
+ @SpecAssertion(section = "7.6", id = "m")
+ public void testFiresAnnotationOnInjectionPointWithWildcardedTypeParameterFails()
+ {
+ }
+
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event3/FiresOnEventWithWildcardTypeTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event3/GoldbreastWaxbill_Broken.java (from rev 1612, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/GoldbreastWaxbill_Broken.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event3/GoldbreastWaxbill_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event3/GoldbreastWaxbill_Broken.java 2009-02-24 14:32:02 UTC (rev 1680)
@@ -0,0 +1,15 @@
+package org.jboss.jsr299.tck.unit.event.broken.event3;
+
+import javax.event.Event;
+import javax.event.Fires;
+
+class GoldbreastWaxbill_Broken
+{
+ @Fires
+ private Event<?> simpleEvent;
+
+ public void eliminateWarning()
+ {
+ assert simpleEvent != null;
+ }
+}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event4/FiresOnEventWithTypeVariableTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event4/FiresOnEventWithTypeVariableTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event4/FiresOnEventWithTypeVariableTest.java 2009-02-24 14:32:02 UTC (rev 1680)
@@ -0,0 +1,44 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jboss.jsr299.tck.unit.event.broken.event4;
+
+import javax.inject.DefinitionException;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.jboss.jsr299.tck.AbstractDeclarativeTest;
+import org.jboss.jsr299.tck.impl.packaging.Artifact;
+import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException;
+import org.testng.annotations.Test;
+
+/**
+ * Tests an Event templated with a type variable and annotated
+ * with @Fires fails.
+ *
+ * @author David Allen
+ *
+ */
+@Artifact
+(a)ExpectedDeploymentException(DefinitionException.class)
+public class FiresOnEventWithTypeVariableTest extends AbstractDeclarativeTest
+{
+ @Test(groups = { "events" }, expectedExceptions = { DefinitionException.class })
+ @SpecAssertion(section = "7.6", id = "l")
+ public void testFiresAnnotationOnInjectionPointWithTypeVariabledTypeParameterFails()
+ {
+ }
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event4/FiresOnEventWithTypeVariableTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event4/JavaSparrow_Broken.java (from rev 1612, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/JavaSparrow_Broken.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event4/JavaSparrow_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/event4/JavaSparrow_Broken.java 2009-02-24 14:32:02 UTC (rev 1680)
@@ -0,0 +1,17 @@
+package org.jboss.jsr299.tck.unit.event.broken.event4;
+
+import java.util.ArrayList;
+
+import javax.event.Event;
+import javax.event.Fires;
+
+class JavaSparrow_Broken
+{
+ @Fires
+ private Event<ArrayList<String>> simpleEvent;
+
+ public void eliminateWarning()
+ {
+ assert simpleEvent != null;
+ }
+}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer1/EJBObserverMethodNotBusinessMethodTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer1/EJBObserverMethodNotBusinessMethodTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer1/EJBObserverMethodNotBusinessMethodTest.java 2009-02-24 14:32:02 UTC (rev 1680)
@@ -0,0 +1,44 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jboss.jsr299.tck.unit.event.broken.observer1;
+
+import javax.inject.DefinitionException;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.jboss.jsr299.tck.AbstractDeclarativeTest;
+import org.jboss.jsr299.tck.impl.packaging.Artifact;
+import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException;
+import org.testng.annotations.Test;
+
+/**
+ * Test an observer method on an EJB that is neither a business method
+ * nor a static method of the class.
+ *
+ * @author David Allen
+ *
+ */
+@Artifact
+(a)ExpectedDeploymentException(DefinitionException.class)
+public class EJBObserverMethodNotBusinessMethodTest extends AbstractDeclarativeTest
+{
+ @Test(groups = { "events" }, expectedExceptions = DefinitionException.class)
+ @SpecAssertion(section = "7.5", id = "d")
+ public void testObserverMethodOnEnterpriseBeanNotBusinessMethodOrStaticFails()
+ {
+ }
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer1/EJBObserverMethodNotBusinessMethodTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer1/Terrier.java (from rev 1612, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/Terrier.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer1/Terrier.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer1/Terrier.java 2009-02-24 14:32:02 UTC (rev 1680)
@@ -0,0 +1,6 @@
+package org.jboss.jsr299.tck.unit.event.broken.observer1;
+
+public interface Terrier
+{
+
+}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer1/TibetanTerrier.java (from rev 1612, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/TibetanTerrier.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer1/TibetanTerrier.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer1/TibetanTerrier.java 2009-02-24 14:32:02 UTC (rev 1680)
@@ -0,0 +1,15 @@
+package org.jboss.jsr299.tck.unit.event.broken.observer1;
+
+import javax.ejb.Local;
+import javax.ejb.Stateless;
+import javax.event.Observes;
+
+
+@Stateless
+(a)Local(Terrier.class)
+class TibetanTerrier implements Terrier
+{
+ public void observeInitialized(@Observes String someEvent)
+ {
+ }
+}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer10/ObserverExceptionRethrown.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer10/ObserverExceptionRethrown.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer10/ObserverExceptionRethrown.java 2009-02-24 14:32:02 UTC (rev 1680)
@@ -0,0 +1,45 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jboss.jsr299.tck.unit.event.broken.observer10;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.jboss.jsr299.tck.AbstractDeclarativeTest;
+import org.jboss.jsr299.tck.impl.packaging.Artifact;
+import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException;
+import org.testng.annotations.Test;
+
+/**
+ * Tests that an unchecked exception thrown from a non-transactional
+ * observer is rethrown.
+ *
+ * @author David Allen
+ *
+ */
+@Artifact
+(a)ExpectedDeploymentException(TeaCupPomeranian.OversizedException.class)
+public class ObserverExceptionRethrown extends AbstractDeclarativeTest
+{
+ @Test(groups = { "events" }, expectedExceptions = { TeaCupPomeranian.OversizedException.class })
+ @SpecAssertion(section = "7.5.8", id = "q")
+ public void testNonTransactionalObserverThrowsNonCheckedExceptionIsRethrown()
+ {
+ getCurrentManager().fireEvent("Another event");
+ }
+
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer10/ObserverExceptionRethrown.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer10/Tame.java (from rev 1612, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/Tame.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer10/Tame.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer10/Tame.java 2009-02-24 14:32:02 UTC (rev 1680)
@@ -0,0 +1,22 @@
+package org.jboss.jsr299.tck.unit.event.broken.observer10;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.BindingType;
+
+@Target( { TYPE, METHOD, PARAMETER, FIELD })
+@Retention(RUNTIME)
+@Documented
+@BindingType
+@interface Tame
+{
+
+}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer10/TameAnnotationLiteral.java (from rev 1612, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/TameAnnotationLiteral.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer10/TameAnnotationLiteral.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer10/TameAnnotationLiteral.java 2009-02-24 14:32:02 UTC (rev 1680)
@@ -0,0 +1,8 @@
+package org.jboss.jsr299.tck.unit.event.broken.observer10;
+
+import javax.inject.AnnotationLiteral;
+
+class TameAnnotationLiteral extends AnnotationLiteral<Tame> implements Tame
+{
+
+}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer10/TeaCupPomeranian.java (from rev 1612, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/TeaCupPomeranian.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer10/TeaCupPomeranian.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer10/TeaCupPomeranian.java 2009-02-24 14:32:02 UTC (rev 1680)
@@ -0,0 +1,30 @@
+package org.jboss.jsr299.tck.unit.event.broken.observer10;
+
+import javax.annotation.Named;
+import javax.event.Observes;
+
+@Tame
+@Named("Teddy")
+class TeaCupPomeranian
+{
+ public static class OversizedException extends RuntimeException
+ {
+ private static final long serialVersionUID = 1L;
+
+ }
+
+ public static class TooSmallException extends Exception
+ {
+ private static final long serialVersionUID = 1L;
+ }
+
+ public void observeSimpleEvent(@Observes String someEvent)
+ {
+ throw new OversizedException();
+ }
+
+ public void observeAnotherSimpleEvent(@Observes Integer someEvent) throws TooSmallException
+ {
+ throw new TooSmallException();
+ }
+}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer11/CheckedExceptionWrappedTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer11/CheckedExceptionWrappedTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer11/CheckedExceptionWrappedTest.java 2009-02-24 14:32:02 UTC (rev 1680)
@@ -0,0 +1,45 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jboss.jsr299.tck.unit.event.broken.observer11;
+
+import javax.event.ObserverException;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.jboss.jsr299.tck.AbstractDeclarativeTest;
+import org.jboss.jsr299.tck.impl.packaging.Artifact;
+import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException;
+import org.testng.annotations.Test;
+
+/**
+ * Tests that a checked exception thrown from a non-transactional
+ * observer is wrapped and thrown.
+ *
+ * @author David Allen
+ *
+ */
+@Artifact
+(a)ExpectedDeploymentException(ObserverException.class)
+public class CheckedExceptionWrappedTest extends AbstractDeclarativeTest
+{
+ @Test(groups = { "events" }, expectedExceptions = { ObserverException.class })
+ @SpecAssertion(section = "7.5.8", id = "r")
+ public void testNonTransactionalObserverThrowsCheckedExceptionIsWrappedAndRethrown()
+ {
+ getCurrentManager().fireEvent(new Integer(1));
+ }
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer11/CheckedExceptionWrappedTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer11/Tame.java (from rev 1612, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/Tame.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer11/Tame.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer11/Tame.java 2009-02-24 14:32:02 UTC (rev 1680)
@@ -0,0 +1,22 @@
+package org.jboss.jsr299.tck.unit.event.broken.observer11;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.BindingType;
+
+@Target( { TYPE, METHOD, PARAMETER, FIELD })
+@Retention(RUNTIME)
+@Documented
+@BindingType
+@interface Tame
+{
+
+}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer11/TameAnnotationLiteral.java (from rev 1612, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/TameAnnotationLiteral.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer11/TameAnnotationLiteral.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer11/TameAnnotationLiteral.java 2009-02-24 14:32:02 UTC (rev 1680)
@@ -0,0 +1,8 @@
+package org.jboss.jsr299.tck.unit.event.broken.observer11;
+
+import javax.inject.AnnotationLiteral;
+
+class TameAnnotationLiteral extends AnnotationLiteral<Tame> implements Tame
+{
+
+}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer11/TeaCupPomeranian.java (from rev 1612, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/TeaCupPomeranian.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer11/TeaCupPomeranian.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer11/TeaCupPomeranian.java 2009-02-24 14:32:02 UTC (rev 1680)
@@ -0,0 +1,30 @@
+package org.jboss.jsr299.tck.unit.event.broken.observer11;
+
+import javax.annotation.Named;
+import javax.event.Observes;
+
+@Tame
+@Named("Teddy")
+class TeaCupPomeranian
+{
+ public static class OversizedException extends RuntimeException
+ {
+ private static final long serialVersionUID = 1L;
+
+ }
+
+ public static class TooSmallException extends Exception
+ {
+ private static final long serialVersionUID = 1L;
+ }
+
+ public void observeSimpleEvent(@Observes String someEvent)
+ {
+ throw new OversizedException();
+ }
+
+ public void observeAnotherSimpleEvent(@Observes Integer someEvent) throws TooSmallException
+ {
+ throw new TooSmallException();
+ }
+}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer2/Boxer.java (from rev 1612, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/Boxer.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer2/Boxer.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer2/Boxer.java 2009-02-24 14:32:02 UTC (rev 1680)
@@ -0,0 +1,11 @@
+package org.jboss.jsr299.tck.unit.event.broken.observer2;
+
+import javax.context.ConversationScoped;
+import javax.ejb.Stateless;
+
+@Stateless
+@ConversationScoped
+class Boxer
+{
+
+}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer2/ObserverMethodWithTwoEventParametersTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer2/ObserverMethodWithTwoEventParametersTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer2/ObserverMethodWithTwoEventParametersTest.java 2009-02-24 14:32:02 UTC (rev 1680)
@@ -0,0 +1,23 @@
+package org.jboss.jsr299.tck.unit.event.broken.observer2;
+
+import javax.inject.DefinitionException;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertions;
+import org.jboss.jsr299.tck.AbstractDeclarativeTest;
+import org.jboss.jsr299.tck.impl.packaging.Artifact;
+import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException;
+import org.testng.annotations.Test;
+
+@Artifact
+(a)ExpectedDeploymentException(DefinitionException.class)
+public class ObserverMethodWithTwoEventParametersTest extends AbstractDeclarativeTest
+{
+ @Test(groups = { "events" }, expectedExceptions = { DefinitionException.class })
+ @SpecAssertions( { @SpecAssertion(section = "7.5.1", id = "a"), @SpecAssertion(section = "7.5.2", id = "b") })
+ public void testObserverMethodMustHaveOnlyOneEventParameter()
+ {
+ }
+
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer2/ObserverMethodWithTwoEventParametersTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer2/YorkshireTerrier_Broken.java (from rev 1612, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/YorkshireTerrier_Broken.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer2/YorkshireTerrier_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer2/YorkshireTerrier_Broken.java 2009-02-24 14:32:02 UTC (rev 1680)
@@ -0,0 +1,13 @@
+package org.jboss.jsr299.tck.unit.event.broken.observer2;
+
+import javax.event.Observes;
+import javax.inject.manager.Initialized;
+import javax.inject.manager.Manager;
+
+
+class YorkshireTerrier_Broken
+{
+ public void observeInitialized(@Observes @Initialized Manager manager, @Observes Boxer anotherDog)
+ {
+ }
+}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer3/BostonTerrier.java (from rev 1612, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/BostonTerrier.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer3/BostonTerrier.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer3/BostonTerrier.java 2009-02-24 14:32:02 UTC (rev 1680)
@@ -0,0 +1,12 @@
+package org.jboss.jsr299.tck.unit.event.broken.observer3;
+
+import java.util.List;
+
+import javax.event.Observes;
+
+class BostonTerrier
+{
+ public void observesBadEvent(@Observes List<String> someArray)
+ {
+ }
+}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer3/ObserverMethodAndWildcardedEventTypeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer3/ObserverMethodAndWildcardedEventTypeTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer3/ObserverMethodAndWildcardedEventTypeTest.java 2009-02-24 14:32:02 UTC (rev 1680)
@@ -0,0 +1,46 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jboss.jsr299.tck.unit.event.broken.observer3;
+
+import javax.inject.DefinitionException;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.jboss.jsr299.tck.AbstractDeclarativeTest;
+import org.jboss.jsr299.tck.impl.packaging.Artifact;
+import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException;
+import org.testng.annotations.Test;
+
+/**
+ * Tests an observer method defined to observe an event type which
+ * is generic and wildcarded.
+ *
+ * @author David Allen
+ *
+ */
+@Artifact
+(a)ExpectedDeploymentException(DefinitionException.class)
+public class ObserverMethodAndWildcardedEventTypeTest extends AbstractDeclarativeTest
+{
+ @Test(groups = { "events" }, expectedExceptions = { DefinitionException.class })
+ @SpecAssertion(section = "7.5.1", id = "c")
+ public void testObserverMethodCannotObserveParameterizedEvents()
+ {
+ }
+
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer3/ObserverMethodAndWildcardedEventTypeTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer4/BorderTerrier.java (from rev 1612, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/BorderTerrier.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer4/BorderTerrier.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer4/BorderTerrier.java 2009-02-24 14:32:02 UTC (rev 1680)
@@ -0,0 +1,15 @@
+package org.jboss.jsr299.tck.unit.event.broken.observer4;
+
+import javax.event.Observes;
+import javax.inject.Produces;
+import javax.inject.manager.Initialized;
+import javax.inject.manager.Manager;
+
+class BorderTerrier
+{
+ @Produces
+ public String observeInitialized(@Observes @Initialized Manager manager)
+ {
+ return "product";
+ }
+}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer4/ObserverMethodAnnotatedProducesTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer4/ObserverMethodAnnotatedProducesTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer4/ObserverMethodAnnotatedProducesTest.java 2009-02-24 14:32:02 UTC (rev 1680)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jboss.jsr299.tck.unit.event.broken.observer4;
+
+import javax.inject.DefinitionException;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.jboss.jsr299.tck.AbstractDeclarativeTest;
+import org.jboss.jsr299.tck.impl.packaging.Artifact;
+import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException;
+import org.testng.annotations.Test;
+
+/**
+ * Tests an observer method which is also annotated as a producer method.
+ *
+ * @author David Allen
+ *
+ */
+@Artifact
+(a)ExpectedDeploymentException(DefinitionException.class)
+public class ObserverMethodAnnotatedProducesTest extends AbstractDeclarativeTest
+{
+ @Test(groups = { "events" }, expectedExceptions = { DefinitionException.class })
+ @SpecAssertion(section = "7.5.2", id = "c")
+ public void testObserverMethodAnnotatedProducesFails()
+ {
+ }
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer4/ObserverMethodAnnotatedProducesTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer5/AustralianTerrier.java (from rev 1612, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/AustralianTerrier.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer5/AustralianTerrier.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer5/AustralianTerrier.java 2009-02-24 14:32:02 UTC (rev 1680)
@@ -0,0 +1,17 @@
+package org.jboss.jsr299.tck.unit.event.broken.observer5;
+
+import javax.event.Observes;
+import javax.inject.Initializer;
+import javax.inject.manager.Initialized;
+import javax.inject.manager.Manager;
+
+class AustralianTerrier
+{
+ /* (non-Javadoc)
+ * @see org.jboss.jsr299.tck.unit.event.broken.observer5.Terrier#observeInitialized(javax.inject.manager.Manager)
+ */
+ @Initializer
+ public void observeInitialized(@Observes @Initialized Manager manager)
+ {
+ }
+}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer5/ObserverMethodAnnotatedInitialzerTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer5/ObserverMethodAnnotatedInitialzerTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer5/ObserverMethodAnnotatedInitialzerTest.java 2009-02-24 14:32:02 UTC (rev 1680)
@@ -0,0 +1,44 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jboss.jsr299.tck.unit.event.broken.observer5;
+
+import javax.inject.DefinitionException;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.jboss.jsr299.tck.AbstractDeclarativeTest;
+import org.jboss.jsr299.tck.impl.packaging.Artifact;
+import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException;
+import org.testng.annotations.Test;
+
+/**
+ * Tests an observer method that is also annotated as an
+ * initializer method.
+ *
+ * @author David Allen
+ *
+ */
+@Artifact
+(a)ExpectedDeploymentException(DefinitionException.class)
+public class ObserverMethodAnnotatedInitialzerTest extends AbstractDeclarativeTest
+{
+ @Test(groups = { "events" }, expectedExceptions = { DefinitionException.class })
+ @SpecAssertion(section = "7.5.2", id = "d")
+ public void testObserverMethodAnnotatedInitializerFails()
+ {
+ }
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer5/ObserverMethodAnnotatedInitialzerTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer6/FoxTerrier.java (from rev 1612, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/FoxTerrier.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer6/FoxTerrier.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer6/FoxTerrier.java 2009-02-24 14:32:02 UTC (rev 1680)
@@ -0,0 +1,17 @@
+package org.jboss.jsr299.tck.unit.event.broken.observer6;
+
+import javax.event.Observes;
+import javax.inject.Disposes;
+import javax.inject.manager.Initialized;
+import javax.inject.manager.Manager;
+
+class FoxTerrier
+{
+ /* (non-Javadoc)
+ * @see org.jboss.jsr299.tck.unit.event.broken.observer6.Terrier#observeInitialized(javax.inject.manager.Manager, java.lang.String)
+ */
+ public void observeInitialized(@Observes @Initialized Manager manager, @Disposes String badParam)
+ {
+ }
+
+}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer6/ObserverMethodAnnotatedDisposesTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer6/ObserverMethodAnnotatedDisposesTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer6/ObserverMethodAnnotatedDisposesTest.java 2009-02-24 14:32:02 UTC (rev 1680)
@@ -0,0 +1,44 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jboss.jsr299.tck.unit.event.broken.observer6;
+
+import javax.inject.DefinitionException;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.jboss.jsr299.tck.AbstractDeclarativeTest;
+import org.jboss.jsr299.tck.impl.packaging.Artifact;
+import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException;
+import org.testng.annotations.Test;
+
+/**
+ * Tests an observer method that is also a disposes method
+ * for something else.
+ *
+ * @author David Allen
+ *
+ */
+@Artifact
+(a)ExpectedDeploymentException(DefinitionException.class)
+public class ObserverMethodAnnotatedDisposesTest extends AbstractDeclarativeTest
+{
+ @Test(groups = { "events" }, expectedExceptions = { DefinitionException.class })
+ @SpecAssertion(section = "7.5.2", id = "e")
+ public void testObserverMethodWithDisposesParamFails()
+ {
+ }
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer6/ObserverMethodAnnotatedDisposesTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer7/TooManyPhases_Broken.java (from rev 1612, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/TooManyPhases_Broken.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer7/TooManyPhases_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer7/TooManyPhases_Broken.java 2009-02-24 14:32:02 UTC (rev 1680)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jboss.jsr299.tck.unit.event.broken.observer7;
+
+import javax.event.AfterTransactionFailure;
+import javax.event.AfterTransactionSuccess;
+import javax.event.Observes;
+
+/**
+ * The observer method defined here has too many transactional phases
+ * specified.
+ *
+ * @author David Allen
+ *
+ */
+public class TooManyPhases_Broken
+{
+ public void observeSomething(@Observes @AfterTransactionSuccess @AfterTransactionFailure String event)
+ {
+
+ }
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer7/TooManyPhases_Broken.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer7/TransactionalObserverMethodOnlyOnePhaseTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer7/TransactionalObserverMethodOnlyOnePhaseTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer7/TransactionalObserverMethodOnlyOnePhaseTest.java 2009-02-24 14:32:02 UTC (rev 1680)
@@ -0,0 +1,46 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jboss.jsr299.tck.unit.event.broken.observer7;
+
+import javax.inject.DefinitionException;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.jboss.jsr299.tck.AbstractDeclarativeTest;
+import org.jboss.jsr299.tck.impl.packaging.Artifact;
+import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException;
+import org.testng.annotations.Test;
+
+/**
+ * Tests a transactional observer method with multiple
+ * phases specified.
+ *
+ * @author David Allen
+ *
+ */
+@Artifact
+(a)ExpectedDeploymentException(DefinitionException.class)
+public class TransactionalObserverMethodOnlyOnePhaseTest extends AbstractDeclarativeTest
+{
+ @Test(groups = { "events" }, expectedExceptions = { DefinitionException.class })
+ @SpecAssertion(section = "7.5.6", id = "k")
+ public void testTransactionalObserverCanOnlyObserveSinglePhase()
+ {
+ }
+
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer7/TransactionalObserverMethodOnlyOnePhaseTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer8/AsynchronousBeforeCompletionObserverTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer8/AsynchronousBeforeCompletionObserverTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer8/AsynchronousBeforeCompletionObserverTest.java 2009-02-24 14:32:02 UTC (rev 1680)
@@ -0,0 +1,44 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jboss.jsr299.tck.unit.event.broken.observer8;
+
+import javax.inject.DefinitionException;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.jboss.jsr299.tck.AbstractDeclarativeTest;
+import org.jboss.jsr299.tck.impl.packaging.Artifact;
+import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException;
+import org.testng.annotations.Test;
+
+/**
+ * Tests an asynchronous observer method that is also a
+ * transactional observer for the before completion phase.
+ *
+ * @author David Allen
+ *
+ */
+@Artifact
+(a)ExpectedDeploymentException(DefinitionException.class)
+public class AsynchronousBeforeCompletionObserverTest extends AbstractDeclarativeTest
+{
+ @Test(groups = { "events", "broken" }, expectedExceptions = DefinitionException.class)
+ @SpecAssertion(section = "7.5.7", id = "c")
+ public void testAsynchronousObserverAsBeforeCompletionObserverFails()
+ {
+ }
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer8/AsynchronousBeforeCompletionObserverTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer8/Terrier.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer8/Terrier.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer8/Terrier.java 2009-02-24 14:32:02 UTC (rev 1680)
@@ -0,0 +1,13 @@
+package org.jboss.jsr299.tck.unit.event.broken.observer8;
+
+import javax.event.Asynchronously;
+import javax.event.BeforeTransactionCompletion;
+import javax.event.Observes;
+
+class Terrier
+{
+ public void observer(@Observes @Asynchronously @BeforeTransactionCompletion String event)
+ {
+
+ }
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer8/Terrier.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer9/AsynchronousConditionalObserverTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer9/AsynchronousConditionalObserverTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer9/AsynchronousConditionalObserverTest.java 2009-02-24 14:32:02 UTC (rev 1680)
@@ -0,0 +1,44 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jboss.jsr299.tck.unit.event.broken.observer9;
+
+import javax.inject.DefinitionException;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.jboss.jsr299.tck.AbstractDeclarativeTest;
+import org.jboss.jsr299.tck.impl.packaging.Artifact;
+import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException;
+import org.testng.annotations.Test;
+
+/**
+ * Tests an observer method that is both conditional and
+ * asynchronous, which is not allowed.
+ *
+ * @author David Allen
+ *
+ */
+@Artifact
+(a)ExpectedDeploymentException(DefinitionException.class)
+public class AsynchronousConditionalObserverTest extends AbstractDeclarativeTest
+{
+ @Test(groups = { "events", "broken" }, expectedExceptions = DefinitionException.class)
+ @SpecAssertion(section = "7.5.7", id = "c")
+ public void testAsynchronousObserverAsConditionalObserverFails()
+ {
+ }
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer9/AsynchronousConditionalObserverTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer9/Terrier.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer9/Terrier.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer9/Terrier.java 2009-02-24 14:32:02 UTC (rev 1680)
@@ -0,0 +1,13 @@
+package org.jboss.jsr299.tck.unit.event.broken.observer9;
+
+import javax.event.Asynchronously;
+import javax.event.IfExists;
+import javax.event.Observes;
+
+class Terrier
+{
+ public void observer(@Observes @Asynchronously @IfExists String event)
+ {
+
+ }
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/broken/observer9/Terrier.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/event/beans.xml (from rev 1612, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/definition/deployment/custom/beans.xml)
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/event/beans.xml (rev 0)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/event/beans.xml 2009-02-24 14:32:02 UTC (rev 1680)
@@ -0,0 +1,8 @@
+<Beans xmlns="urn:java:ee"
+ xmlns:test="urn:java:org.jboss.jsr299.tck.unit.event">
+ <Deploy>
+ <Standard />
+ <Production />
+ <test:AnotherDeploymentType />
+ </Deploy>
+</Beans>
17 years, 1 month
- 1
- 0
[webbeans-commits] Webbeans SVN: r1679 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating.
by webbeans-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-02-24 09:21:03 -0500 (Tue, 24 Feb 2009)
New Revision: 1679
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/AnotherDeploymentType.java
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/CityProducer.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/PassivatingContextTest.java
Log:
minor
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/AnotherDeploymentType.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/AnotherDeploymentType.java 2009-02-24 14:21:03 UTC (rev 1679)
@@ -0,0 +1,20 @@
+package org.jboss.jsr299.tck.unit.context.passivating;
+
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.DeploymentType;
+
+@Target( { TYPE, METHOD })
+@Retention(RUNTIME)
+@Documented
+@DeploymentType
+@interface AnotherDeploymentType
+{
+
+}
\ No newline at end of file
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/CityProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/CityProducer.java 2009-02-24 14:18:36 UTC (rev 1678)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/CityProducer.java 2009-02-24 14:21:03 UTC (rev 1679)
@@ -3,6 +3,7 @@
import javax.context.Dependent;
import javax.inject.Produces;
+@AnotherDeploymentType
class CityProducer
{
@Produces @Dependent public Violation reference = new Violation();
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/PassivatingContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/PassivatingContextTest.java 2009-02-24 14:18:36 UTC (rev 1678)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/PassivatingContextTest.java 2009-02-24 14:21:03 UTC (rev 1679)
@@ -13,6 +13,7 @@
import org.hibernate.tck.annotations.SpecAssertions;
import org.jboss.jsr299.tck.AbstractDeclarativeTest;
import org.jboss.jsr299.tck.impl.packaging.Artifact;
+import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml;
import org.testng.annotations.Test;
/**
@@ -23,6 +24,7 @@
* Spec version: PRD2
*/
@Artifact
+@BeansXml("beans.xml")
public class PassivatingContextTest extends AbstractDeclarativeTest
{
@Test(groups = { "contexts", "passivation" })
17 years, 1 month
- 1
- 0
[webbeans-commits] Webbeans SVN: r1678 - in tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/context: passivating and 1 other directory.
by webbeans-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-02-24 09:18:36 -0500 (Tue, 24 Feb 2009)
New Revision: 1678
Added:
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/context/passivating/
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/context/passivating/beans.xml
Log:
added beans.xml for passivating tests
Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/context/passivating/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/context/passivating/beans.xml (rev 0)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/context/passivating/beans.xml 2009-02-24 14:18:36 UTC (rev 1678)
@@ -0,0 +1,8 @@
+<Beans xmlns="urn:java:ee"
+ xmlns:test="urn:java:org.jboss.jsr299.tck.unit.context.passivating">
+ <Deploy>
+ <Standard />
+ <Production />
+ <test:AnotherDeploymentType />
+ </Deploy>
+</Beans>
17 years, 1 month
- 1
- 0
[webbeans-commits] Webbeans SVN: r1677 - ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-02-24 07:41:34 -0500 (Tue, 24 Feb 2009)
New Revision: 1677
Modified:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/BeanValidator.java
Log:
better exception
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/BeanValidator.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/BeanValidator.java 2009-02-24 12:03:56 UTC (rev 1676)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/BeanValidator.java 2009-02-24 12:41:34 UTC (rev 1677)
@@ -86,11 +86,11 @@
Set<?> resolvedBeans = manager.resolveByType(type, bindings);
if (resolvedBeans.isEmpty())
{
- throw new UnsatisfiedDependencyException("The injection point " + injectionPoint + " has unsatisfied dependencies for type " + type + " and binding types " + bindings + " in " + bean);
+ throw new UnsatisfiedDependencyException("The injection point " + injectionPoint + " in " + bean + " has unsatisfied dependencies");
}
if (resolvedBeans.size() > 1)
{
- throw new AmbiguousDependencyException("The injection point " + injectionPoint + " has ambiguous dependencies for type " + type + " and binding types " + bindings + " in " + bean);
+ throw new AmbiguousDependencyException("The injection point " + injectionPoint + " in " + bean + " has ambiguous dependencies");
}
Bean<?> resolvedBean = (Bean<?>) resolvedBeans.iterator().next();
if (MetaDataCache.instance().getScopeModel(resolvedBean.getScopeType()).isNormal() && !Proxies.isTypeProxyable(type))
17 years, 1 month
- 1
- 0
[webbeans-commits] Webbeans SVN: r1676 - in tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating: broken3 and 3 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-02-24 07:03:56 -0500 (Tue, 24 Feb 2009)
New Revision: 1676
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken1/DependentInterceptorSerializableTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken3/DependentDecoratorSerializableTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken4/DependentInterceptorSerializableTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken5/DependentDecoratorSerializableTest.java
Removed:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken1/DependentInterceptorSerializable.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken3/DependentDecoratorSerializable.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken4/DependentInterceptorSerializable.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken5/DependentDecoratorSerializable.java
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken8/NonSerializableTest.java
Log:
naming
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken1/DependentInterceptorSerializable.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken1/DependentInterceptorSerializable.java 2009-02-24 11:54:27 UTC (rev 1675)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken1/DependentInterceptorSerializable.java 2009-02-24 12:03:56 UTC (rev 1676)
@@ -1,21 +0,0 @@
-package org.jboss.jsr299.tck.unit.context.passivating.broken1;
-
-import javax.inject.UnserializableDependencyException;
-
-import org.hibernate.tck.annotations.SpecAssertion;
-import org.jboss.jsr299.tck.AbstractDeclarativeTest;
-import org.jboss.jsr299.tck.impl.packaging.Artifact;
-import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException;
-import org.testng.annotations.Test;
-
-@Artifact
-(a)ExpectedDeploymentException(UnserializableDependencyException.class)
-public class DependentInterceptorSerializable extends AbstractDeclarativeTest
-{
- @Test(groups = { "contexts", "passivation", "stub" })
- @SpecAssertion(section = "8.4", id = "j")
- public void testDependentInterceptorsOfStatefulEnterpriseBeanMustBeSerializable()
- {
- assert false;
- }
-}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken1/DependentInterceptorSerializableTest.java (from rev 1674, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken1/DependentInterceptorSerializable.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken1/DependentInterceptorSerializableTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken1/DependentInterceptorSerializableTest.java 2009-02-24 12:03:56 UTC (rev 1676)
@@ -0,0 +1,21 @@
+package org.jboss.jsr299.tck.unit.context.passivating.broken1;
+
+import javax.inject.UnserializableDependencyException;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.jboss.jsr299.tck.AbstractDeclarativeTest;
+import org.jboss.jsr299.tck.impl.packaging.Artifact;
+import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException;
+import org.testng.annotations.Test;
+
+@Artifact
+(a)ExpectedDeploymentException(UnserializableDependencyException.class)
+public class DependentInterceptorSerializableTest extends AbstractDeclarativeTest
+{
+ @Test(groups = { "contexts", "passivation", "stub" })
+ @SpecAssertion(section = "8.4", id = "j")
+ public void testDependentInterceptorsOfStatefulEnterpriseBeanMustBeSerializable()
+ {
+ assert false;
+ }
+}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken3/DependentDecoratorSerializable.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken3/DependentDecoratorSerializable.java 2009-02-24 11:54:27 UTC (rev 1675)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken3/DependentDecoratorSerializable.java 2009-02-24 12:03:56 UTC (rev 1676)
@@ -1,21 +0,0 @@
-package org.jboss.jsr299.tck.unit.context.passivating.broken3;
-
-import javax.inject.UnserializableDependencyException;
-
-import org.hibernate.tck.annotations.SpecAssertion;
-import org.jboss.jsr299.tck.AbstractDeclarativeTest;
-import org.jboss.jsr299.tck.impl.packaging.Artifact;
-import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException;
-import org.testng.annotations.Test;
-
-@Artifact
-(a)ExpectedDeploymentException(UnserializableDependencyException.class)
-public class DependentDecoratorSerializable extends AbstractDeclarativeTest
-{
- @Test(groups = { "contexts", "passivation", "stub" })
- @SpecAssertion(section = "8.4", id = "j")
- public void testDependentDecoratorsOfStatefulEnterpriseBeanMustBeSerializable()
- {
- assert false;
- }
-}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken3/DependentDecoratorSerializableTest.java (from rev 1674, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken3/DependentDecoratorSerializable.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken3/DependentDecoratorSerializableTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken3/DependentDecoratorSerializableTest.java 2009-02-24 12:03:56 UTC (rev 1676)
@@ -0,0 +1,21 @@
+package org.jboss.jsr299.tck.unit.context.passivating.broken3;
+
+import javax.inject.UnserializableDependencyException;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.jboss.jsr299.tck.AbstractDeclarativeTest;
+import org.jboss.jsr299.tck.impl.packaging.Artifact;
+import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException;
+import org.testng.annotations.Test;
+
+@Artifact
+(a)ExpectedDeploymentException(UnserializableDependencyException.class)
+public class DependentDecoratorSerializableTest extends AbstractDeclarativeTest
+{
+ @Test(groups = { "contexts", "passivation", "stub" })
+ @SpecAssertion(section = "8.4", id = "j")
+ public void testDependentDecoratorsOfStatefulEnterpriseBeanMustBeSerializable()
+ {
+ assert false;
+ }
+}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken4/DependentInterceptorSerializable.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken4/DependentInterceptorSerializable.java 2009-02-24 11:54:27 UTC (rev 1675)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken4/DependentInterceptorSerializable.java 2009-02-24 12:03:56 UTC (rev 1676)
@@ -1,21 +0,0 @@
-package org.jboss.jsr299.tck.unit.context.passivating.broken4;
-
-import javax.inject.UnserializableDependencyException;
-
-import org.hibernate.tck.annotations.SpecAssertion;
-import org.jboss.jsr299.tck.AbstractDeclarativeTest;
-import org.jboss.jsr299.tck.impl.packaging.Artifact;
-import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException;
-import org.testng.annotations.Test;
-
-@Artifact
-(a)ExpectedDeploymentException(UnserializableDependencyException.class)
-public class DependentInterceptorSerializable extends AbstractDeclarativeTest
-{
- @Test(groups = { "contexts", "passivation", "stub" })
- @SpecAssertion(section = "8.4", id = "k")
- public void testDependentInterceptorsOfWebBeanWithPassivatingScopeMustBeSerializable()
- {
- assert false;
- }
-}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken4/DependentInterceptorSerializableTest.java (from rev 1674, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken4/DependentInterceptorSerializable.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken4/DependentInterceptorSerializableTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken4/DependentInterceptorSerializableTest.java 2009-02-24 12:03:56 UTC (rev 1676)
@@ -0,0 +1,21 @@
+package org.jboss.jsr299.tck.unit.context.passivating.broken4;
+
+import javax.inject.UnserializableDependencyException;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.jboss.jsr299.tck.AbstractDeclarativeTest;
+import org.jboss.jsr299.tck.impl.packaging.Artifact;
+import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException;
+import org.testng.annotations.Test;
+
+@Artifact
+(a)ExpectedDeploymentException(UnserializableDependencyException.class)
+public class DependentInterceptorSerializableTest extends AbstractDeclarativeTest
+{
+ @Test(groups = { "contexts", "passivation", "stub" })
+ @SpecAssertion(section = "8.4", id = "k")
+ public void testDependentInterceptorsOfWebBeanWithPassivatingScopeMustBeSerializable()
+ {
+ assert false;
+ }
+}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken5/DependentDecoratorSerializable.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken5/DependentDecoratorSerializable.java 2009-02-24 11:54:27 UTC (rev 1675)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken5/DependentDecoratorSerializable.java 2009-02-24 12:03:56 UTC (rev 1676)
@@ -1,20 +0,0 @@
-package org.jboss.jsr299.tck.unit.context.passivating.broken5;
-
-import javax.inject.UnserializableDependencyException;
-
-import org.hibernate.tck.annotations.SpecAssertion;
-import org.jboss.jsr299.tck.impl.packaging.Artifact;
-import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException;
-import org.testng.annotations.Test;
-
-@Artifact
-(a)ExpectedDeploymentException(UnserializableDependencyException.class)
-public class DependentDecoratorSerializable
-{
- @Test(groups = { "contexts", "passivation", "stub" })
- @SpecAssertion(section = "8.4", id = "k")
- public void testDependentDecoratorsOfWebBeansWithPassivatingScopeMustBeSerializable()
- {
- assert false;
- }
-}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken5/DependentDecoratorSerializableTest.java (from rev 1674, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken5/DependentDecoratorSerializable.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken5/DependentDecoratorSerializableTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken5/DependentDecoratorSerializableTest.java 2009-02-24 12:03:56 UTC (rev 1676)
@@ -0,0 +1,20 @@
+package org.jboss.jsr299.tck.unit.context.passivating.broken5;
+
+import javax.inject.UnserializableDependencyException;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.jboss.jsr299.tck.impl.packaging.Artifact;
+import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException;
+import org.testng.annotations.Test;
+
+@Artifact
+(a)ExpectedDeploymentException(UnserializableDependencyException.class)
+public class DependentDecoratorSerializableTest
+{
+ @Test(groups = { "contexts", "passivation", "stub" })
+ @SpecAssertion(section = "8.4", id = "k")
+ public void testDependentDecoratorsOfWebBeansWithPassivatingScopeMustBeSerializable()
+ {
+ assert false;
+ }
+}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken8/NonSerializableTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken8/NonSerializableTest.java 2009-02-24 11:54:27 UTC (rev 1675)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken8/NonSerializableTest.java 2009-02-24 12:03:56 UTC (rev 1676)
@@ -12,7 +12,7 @@
@ExpectedDeploymentException(UnserializableDependencyException.class)
public class NonSerializableTest extends AbstractDeclarativeTest
{
- @Test(groups = { "contexts", "passivation" }, expectedExceptions = UnserializableDependencyException.class)
+ @Test(groups = { "contexts", "passivation" })
@SpecAssertion(section = "8.4", id = "n")
public void testSimpleDependentWebBeanWithNonSerializableImplementationInjectedIntoInitializerParameterOfWebBeanWithPassivatingScopeFails()
{
17 years, 1 month
- 1
- 0
[webbeans-commits] Webbeans SVN: r1675 - in tck/trunk/impl/src/main/java/org/jboss/jsr299/tck: unit/context/passivating and 1 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-02-24 06:54:27 -0500 (Tue, 24 Feb 2009)
New Revision: 1675
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Loviisa_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken7/City.java
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactDescriptor.java
Log:
Fix build
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactDescriptor.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactDescriptor.java 2009-02-24 08:35:39 UTC (rev 1674)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactDescriptor.java 2009-02-24 11:54:27 UTC (rev 1675)
@@ -32,8 +32,6 @@
import org.apache.log4j.Logger;
import org.jboss.jsr299.tck.impl.util.Files;
-import com.sun.java_cup.internal.runtime.Scanner;
-
public class ArtifactDescriptor
{
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Loviisa_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Loviisa_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Loviisa_Broken.java 2009-02-24 11:54:27 UTC (rev 1675)
@@ -0,0 +1,21 @@
+package org.jboss.jsr299.tck.unit.context.passivating;
+
+import java.io.Serializable;
+
+import javax.context.SessionScoped;
+import javax.inject.Current;
+import javax.inject.Initializer;
+
+@SessionScoped
+class Loviisa_Broken extends City implements Serializable
+{
+ private static final long serialVersionUID = -2866858442948392508L;
+
+ public Loviisa_Broken() {
+ }
+
+ @Initializer
+ public Loviisa_Broken(@Current Violation reference) {
+
+ }
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Loviisa_Broken.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken7/City.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken7/City.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken7/City.java 2009-02-24 11:54:27 UTC (rev 1675)
@@ -0,0 +1,8 @@
+package org.jboss.jsr299.tck.unit.context.passivating.broken7;
+
+class City
+{
+ public void ping() {
+
+ }
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken7/City.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
17 years, 1 month
- 1
- 0