Inject MyTaskWithTransaction to use Managed TX

* Fix up latch ordering
* Remove Thread.sleep
* Add beans.xml, WF issue?

Author: aslakknutsen

concurrency/managedexecutor/src/main/java/org/javaee7/concurrency/managedexecutor/MyTaskWithTransaction.java

@@ -69,8 +69,14 @@ public void setId(int id) {
     @Override
     @Transactional
     public void run() {
+        // a Call to a TX Scoped bean should fail if outside a tx
+        try {
+           TestStatus.foundTransactionScopedBean = bean.isInTx();
+        }
+        catch(Exception e) {
+           e.printStackTrace();
+        }
         TestStatus.latch.countDown();
-        TestStatus.foundTransactionScopedBean = Objects.hashCode(bean) != 0;
     }
 
 }

concurrency/managedexecutor/src/main/java/org/javaee7/concurrency/managedexecutor/MyTransactionScopedBean.java

@@ -1,8 +1,16 @@
 package org.javaee7.concurrency.managedexecutor;
 
+import java.io.Serializable;
+
 /**
  * @author Arun Gupta
  */
 @javax.transaction.TransactionScoped
-public class MyTransactionScopedBean {
+public class MyTransactionScopedBean implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    public boolean isInTx() {
+       return true;
+    }
 }

concurrency/managedexecutor/src/test/java/org/javaee7/concurrency/managedexecutor/ExecutorInjectTest.java

@@ -14,13 +14,17 @@
 import javax.annotation.Resource;
 import javax.ejb.EJB;
 import javax.enterprise.concurrent.ManagedExecutorService;
+import javax.inject.Inject;
 
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.EmptyAsset;
 import org.jboss.shrinkwrap.api.asset.FileAsset;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
+
 import static org.junit.Assert.assertTrue;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -46,6 +50,7 @@ public class ExecutorInjectTest {
     Callable<Product> callableTask;
     Runnable runnableTask;
     MyTaskWithListener taskWithListener;
+    @Inject // Inject so we have a managed bean to handle the TX
     MyTaskWithTransaction taskWithTransaction;
     Collection<Callable<Product>> callableTasks = new ArrayList<>();
 
@@ -60,16 +65,17 @@ public static WebArchive createDeployment() {
                         TestStatus.class,
                         MyTaskWithListener.class,
                         MyTaskWithTransaction.class,
+                        MyTransactionScopedBean.class,
                         TestBean.class).
-                setWebXML(new FileAsset(new File("src/main/webapp/WEB-INF/web.xml")));
+                setWebXML(new FileAsset(new File("src/main/webapp/WEB-INF/web.xml"))).
+                addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml"); // Adding beans.xml shouldn't be required? WildFly Beta1
     }
 
     @Before
     public void setup() {
         callableTask = new MyCallableTask(1);
         runnableTask = new MyRunnableTask();
         taskWithListener = new MyTaskWithListener(1);
-        taskWithTransaction = new MyTaskWithTransaction();
         for (int i = 0; i < 5; i++) {
             callableTasks.add(new MyCallableTask(i));
         }
@@ -172,7 +178,6 @@ public void testInvokeAnyWithCallableFromWebXML() throws Exception {
     public void testSubmitWithListener() throws Exception {
         TestStatus.latch = new CountDownLatch(1);
         defaultExecutor.submit(taskWithListener);
-        Thread.sleep(2000);
         assertTrue(TestStatus.latch.await(2000, TimeUnit.MILLISECONDS));
     }