[webbeans-commits] Webbeans SVN: r2948 - in tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests: context/request and 4 other directories.
webbeans-commits at lists.jboss.org
webbeans-commits at lists.jboss.org
Wed Jul 1 15:45:09 EDT 2009
Author: dallen6
Date: 2009-07-01 15:45:07 -0400 (Wed, 01 Jul 2009)
New Revision: 2948
Removed:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/standalone/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/standalone/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/AsynchronousObserver.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer7/
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer8/AsynchronousBeforeCompletionObserverTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer8/Terrier.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/DogTrainer.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/Pomeranian.java
Log:
Upgraded tests based on latest event API changes for latest specification
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/AsynchronousObserver.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/AsynchronousObserver.java 2009-07-01 19:43:15 UTC (rev 2947)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/AsynchronousObserver.java 2009-07-01 19:45:07 UTC (rev 2948)
@@ -1,29 +0,0 @@
-package org.jboss.jsr299.tck.tests.event;
-
-import javax.enterprise.event.Notify;
-import javax.enterprise.event.Observes;
-
-public class AsynchronousObserver
-{
- private static Thread threadObservingEvent = null;
-
- public void observes(@Observes(notifyObserver = Notify.ASYNCHRONOUSLY) Boolean event)
- {
- threadObservingEvent = Thread.currentThread();
- }
-
- public void observes(@Observes(notifyObserver = Notify.ASYNCHRONOUSLY) Character event)
- {
- throw new RuntimeException("RE1");
- }
-
- public static Thread getThreadObservingEvent()
- {
- return threadObservingEvent;
- }
-
- public static void setThreadObservingEvent(Thread threadObservingEvent)
- {
- AsynchronousObserver.threadObservingEvent = threadObservingEvent;
- }
-}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java 2009-07-01 19:43:15 UTC (rev 2947)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java 2009-07-01 19:45:07 UTC (rev 2948)
@@ -324,27 +324,6 @@
}
@Test(groups = { "events" })
- @SpecAssertions({
- @SpecAssertion(section = "10.6.1", id = "c"),
- @SpecAssertion(section = "10.6.1", id = "g"),
- @SpecAssertion(section = "10.5.6", id = "a")
- })
- public void testAsynchronousObserverIsAsynchronous() throws Exception
- {
- new RunInDependentContext()
- {
- @Override
- protected void execute() throws Exception
- {
- getCurrentManager().fireEvent(new Boolean(true));
- Thread.sleep(200);
- assert !AsynchronousObserver.getThreadObservingEvent().equals(Thread.currentThread());
- }
-
- }.run();
- }
-
- @Test(groups = { "events" })
@SpecAssertion(section = "10.6.1", id = "aa")
public void testObserverMethodRegistration()
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer8/AsynchronousBeforeCompletionObserverTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer8/AsynchronousBeforeCompletionObserverTest.java 2009-07-01 19:43:15 UTC (rev 2947)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer8/AsynchronousBeforeCompletionObserverTest.java 2009-07-01 19:45:07 UTC (rev 2948)
@@ -35,8 +35,9 @@
@ExpectedDeploymentException(DefinitionError.class)
public class AsynchronousBeforeCompletionObserverTest extends AbstractJSR299Test
{
- @Test(groups = { "events" })
- @SpecAssertion(section = "10.5.6", id = "b")
+// @Test(groups = { "events" })
+// @SpecAssertion(section = "10.5.6", id = "b")
+// Asynchronous events are not specified now
public void testAsynchronousObserverAsBeforeCompletionObserverFails()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer8/Terrier.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer8/Terrier.java 2009-07-01 19:43:15 UTC (rev 2947)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer8/Terrier.java 2009-07-01 19:45:07 UTC (rev 2948)
@@ -1,12 +1,12 @@
package org.jboss.jsr299.tck.tests.event.broken.observer8;
-import javax.enterprise.event.BeforeTransactionCompletion;
-import javax.enterprise.event.Notify;
+import static javax.enterprise.event.TransactionPhase.BEFORE_COMPLETION;
+
import javax.enterprise.event.Observes;
class Terrier
{
- public void observer(@Observes(notifyObserver = Notify.ASYNCHRONOUSLY) @BeforeTransactionCompletion String event)
+ public void observer(@Observes(during=BEFORE_COMPLETION) String event)
{
}
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/DogTrainer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/DogTrainer.java 2009-07-01 19:43:15 UTC (rev 2947)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/DogTrainer.java 2009-07-01 19:45:07 UTC (rev 2948)
@@ -1,12 +1,12 @@
package org.jboss.jsr299.tck.tests.event.transactionalObservers;
import static javax.ejb.TransactionManagementType.BEAN;
+import static javax.enterprise.event.TransactionPhase.BEFORE_COMPLETION;
import javax.annotation.Resource;
import javax.ejb.EJBException;
import javax.ejb.Stateless;
import javax.ejb.TransactionManagement;
-import javax.enterprise.event.BeforeTransactionCompletion;
import javax.enterprise.event.Observes;
import javax.transaction.UserTransaction;
@@ -17,7 +17,7 @@
@Resource
private UserTransaction userTransaction;
- public void train(@Observes @BeforeTransactionCompletion DisobedientDog dog)
+ public void train(@Observes(during=BEFORE_COMPLETION) DisobedientDog dog)
{
try
{
@@ -29,7 +29,7 @@
}
}
- public void trainNewTricks(@Observes @BeforeTransactionCompletion ShowDog dog)
+ public void trainNewTricks(@Observes(during=BEFORE_COMPLETION) ShowDog dog)
{
try
{
@@ -42,7 +42,7 @@
}
}
- public void trainCompanion(@Observes @BeforeTransactionCompletion SmallDog dog)
+ public void trainCompanion(@Observes(during=BEFORE_COMPLETION) SmallDog dog)
{
try
{
@@ -54,7 +54,7 @@
}
}
- public void trainSightSeeing(@Observes @BeforeTransactionCompletion LargeDog dog)
+ public void trainSightSeeing(@Observes(during=BEFORE_COMPLETION) LargeDog dog)
{
try
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/Pomeranian.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/Pomeranian.java 2009-07-01 19:43:15 UTC (rev 2947)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/Pomeranian.java 2009-07-01 19:45:07 UTC (rev 2948)
@@ -1,6 +1,10 @@
package org.jboss.jsr299.tck.tests.event.transactionalObservers;
import static javax.ejb.TransactionManagementType.BEAN;
+import static javax.enterprise.event.TransactionPhase.AFTER_COMPLETION;
+import static javax.enterprise.event.TransactionPhase.AFTER_FAILURE;
+import static javax.enterprise.event.TransactionPhase.AFTER_SUCCESS;
+import static javax.enterprise.event.TransactionPhase.BEFORE_COMPLETION;
import static javax.transaction.Status.STATUS_NO_TRANSACTION;
import java.math.BigInteger;
@@ -13,10 +17,6 @@
import javax.ejb.Stateful;
import javax.ejb.TransactionManagement;
import javax.enterprise.context.SessionScoped;
-import javax.enterprise.event.AfterTransactionCompletion;
-import javax.enterprise.event.AfterTransactionFailure;
-import javax.enterprise.event.AfterTransactionSuccess;
-import javax.enterprise.event.BeforeTransactionCompletion;
import javax.enterprise.event.Observes;
import javax.enterprise.inject.Named;
import javax.transaction.SystemException;
@@ -46,7 +46,7 @@
*
* @param someEvent
*/
- public void observeStringEvent(@Observes @AfterTransactionCompletion String someEvent)
+ public void observeStringEvent(@Observes(during=AFTER_COMPLETION) String someEvent)
{
try
{
@@ -67,7 +67,7 @@
*
* @param event
*/
- public void observeIntegerEvent(@Observes @AfterTransactionSuccess Integer event)
+ public void observeIntegerEvent(@Observes(during=AFTER_SUCCESS) Integer event)
{
try
{
@@ -88,7 +88,7 @@
*
* @param event
*/
- public void observeFloatEvent(@Observes @AfterTransactionFailure Float event)
+ public void observeFloatEvent(@Observes(during=AFTER_FAILURE) Float event)
{
try
{
@@ -126,7 +126,7 @@
}
}
- public void observeExceptionEvent(@Observes @BeforeTransactionCompletion RuntimeException event)
+ public void observeExceptionEvent(@Observes(during=BEFORE_COMPLETION) RuntimeException event)
{
try
{
More information about the weld-commits
mailing list