[2/2] deltaspike git commit: DELTASPIKE-1275

[ta...@apache.org]

DELTASPIKE-1275

Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/cdb86507
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/cdb86507
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/cdb86507

Branch: refs/heads/master
Commit: cdb86507f29fcae21ca8ccb65571cb7e5aeb49e8
Parents: 2564315
Author: Thomas Andraschko <ta...@apache.org>
Authored: Mon Jun 26 19:47:05 2017 +0200
Committer: Thomas Andraschko <ta...@apache.org>
Committed: Mon Jun 26 19:47:05 2017 +0200

----------------------------------------------------------------------
 ...yManagerInjectionUncatchedExceptionTest.java | 140 -------------------
 .../auto/UncatchedExceptionTest.java            | 140 +++++++++++++++++++
 ...gerInjectionUncatchedFlushExceptionTest.java | 140 -------------------
 .../flush/auto/UncatchedFlushExceptionTest.java | 140 +++++++++++++++++++
 ...iTransactionUncatchedFlushExceptionTest.java | 124 ----------------
 .../nested/UncatchedFlushExceptionTest.java     | 124 ++++++++++++++++
 ...dMultiTransactionUncatchedExceptionTest.java | 124 ----------------
 .../nested/UncatchedExceptionTest.java          | 124 ++++++++++++++++
 ...EntityManagerInjectionRollbackOnly1Test.java | 132 -----------------
 ...EntityManagerInjectionRollbackOnly2Test.java | 132 -----------------
 ...eEntityManagerInjectionRollbackOnlyTest.java | 132 -----------------
 .../auto/RollbackOnly1Test.java                 | 132 +++++++++++++++++
 .../auto/RollbackOnly2Test.java                 | 132 +++++++++++++++++
 .../auto/RollbackOnlyTest.java                  | 132 +++++++++++++++++
 14 files changed, 924 insertions(+), 924 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/cdb86507/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/auto/MultipleEntityManagerInjectionUncatchedExceptionTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/auto/MultipleEntityManagerInjectionUncatchedExceptionTest.java b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/auto/MultipleEntityManagerInjectionUncatchedExceptionTest.java
deleted file mode 100644
index 17a5a32..0000000
--- a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/auto/MultipleEntityManagerInjectionUncatchedExceptionTest.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.apache.deltaspike.test.jpa.api.transactional.exception.uncatched.multipleinjection.auto;
-
-import org.apache.deltaspike.core.api.projectstage.ProjectStage;
-import org.apache.deltaspike.core.util.ProjectStageProducer;
-import org.apache.deltaspike.jpa.impl.transaction.context.TransactionBeanStorage;
-import org.apache.deltaspike.jpa.impl.transaction.context.TransactionContextExtension;
-import org.apache.deltaspike.test.category.SeCategory;
-import org.apache.deltaspike.test.jpa.api.shared.TestEntityManager;
-import org.apache.deltaspike.test.jpa.api.shared.TestEntityTransaction;
-import org.apache.deltaspike.test.jpa.api.shared.TestException;
-import org.apache.deltaspike.test.util.ArchiveUtils;
-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.spec.JavaArchive;
-import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import javax.enterprise.inject.spi.Extension;
-import javax.inject.Inject;
-
-@RunWith(Arquillian.class)
-@Category(SeCategory.class)
-public class MultipleEntityManagerInjectionUncatchedExceptionTest
-{
-    @Inject
-    private MultiTransactionBean multiTransactionBean;
-
-    @Inject
-    private TestEntityManagerProducer entityManagerProducer;
-
-    @Deployment
-    public static WebArchive deploy()
-    {
-        JavaArchive testJar = ShrinkWrap.create(JavaArchive.class, "autoInjectionUncatchedExceptionTest.jar")
-                .addPackage(ArchiveUtils.SHARED_PACKAGE)
-                .addPackage(MultipleEntityManagerInjectionUncatchedExceptionTest.class.getPackage().getName())
-                .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
-
-        return ShrinkWrap.create(WebArchive.class)
-                .addAsLibraries(ArchiveUtils.getDeltaSpikeCoreAndJpaArchive())
-                .addAsLibraries(testJar)
-                .addAsServiceProvider(Extension.class, TransactionContextExtension.class)
-                .addAsWebInfResource(ArchiveUtils.getBeansXml(), "beans.xml");
-    }
-
-    @Before
-    public void init()
-    {
-        ProjectStageProducer.setProjectStage(ProjectStage.UnitTest);
-    }
-
-    @Test
-    public void autoInjectionUncatchedExceptionTest()
-    {
-        TestEntityManager defaultEntityManager = entityManagerProducer.getDefaultEntityManager();
-        TestEntityManager firstEntityManager = entityManagerProducer.getFirstEntityManager();
-        TestEntityManager secondEntityManager = entityManagerProducer.getSecondEntityManager();
-
-        Assert.assertNotNull(defaultEntityManager);
-        TestEntityTransaction defaultTransaction = (TestEntityTransaction) (defaultEntityManager).getTransaction();
-
-        Assert.assertEquals(false, defaultEntityManager.isFlushed());
-        Assert.assertEquals(false, defaultTransaction.isActive());
-        Assert.assertEquals(false, defaultTransaction.isStarted());
-        Assert.assertEquals(false, defaultTransaction.isCommitted());
-        Assert.assertEquals(false, defaultTransaction.isRolledBack());
-
-        Assert.assertNotNull(firstEntityManager);
-        TestEntityTransaction firstTransaction = (TestEntityTransaction) (firstEntityManager).getTransaction();
-
-        Assert.assertEquals(false, firstEntityManager.isFlushed());
-        Assert.assertEquals(false, firstTransaction.isActive());
-        Assert.assertEquals(false, firstTransaction.isStarted());
-        Assert.assertEquals(false, firstTransaction.isCommitted());
-        Assert.assertEquals(false, firstTransaction.isRolledBack());
-
-        Assert.assertNotNull(secondEntityManager);
-        TestEntityTransaction secondTransaction = (TestEntityTransaction) (secondEntityManager).getTransaction();
-
-        Assert.assertEquals(false, secondEntityManager.isFlushed());
-        Assert.assertEquals(false, secondTransaction.isActive());
-        Assert.assertEquals(false, secondTransaction.isStarted());
-        Assert.assertEquals(false, secondTransaction.isCommitted());
-        Assert.assertEquals(false, secondTransaction.isRolledBack());
-
-        try
-        {
-            multiTransactionBean.executeInTransaction();
-            Assert.fail(TestException.class.getName() + " expected!");
-        }
-        catch (TestException e)
-        {
-            //expected -> do nothing
-        }
-
-        Assert.assertEquals(false, defaultEntityManager.isFlushed());
-        Assert.assertEquals(false, defaultTransaction.isActive());
-        Assert.assertEquals(true, defaultTransaction.isStarted());
-        Assert.assertEquals(false, defaultTransaction.isCommitted());
-        Assert.assertEquals(true, defaultTransaction.isRolledBack());
-
-        Assert.assertEquals(false, firstEntityManager.isFlushed());
-        Assert.assertEquals(false, firstTransaction.isActive());
-        Assert.assertEquals(true, firstTransaction.isStarted());
-        Assert.assertEquals(false, firstTransaction.isCommitted());
-        Assert.assertEquals(true, firstTransaction.isRolledBack());
-
-        Assert.assertEquals(false, secondEntityManager.isFlushed());
-        Assert.assertEquals(false, secondTransaction.isActive());
-        Assert.assertEquals(true, secondTransaction.isStarted());
-        Assert.assertEquals(false, secondTransaction.isCommitted());
-        Assert.assertEquals(true, secondTransaction.isRolledBack());
-
-        Assert.assertEquals(false, TransactionBeanStorage.isOpen());
-    }
-}

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/cdb86507/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/auto/UncatchedExceptionTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/auto/UncatchedExceptionTest.java b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/auto/UncatchedExceptionTest.java
new file mode 100644
index 0000000..dcf5f42
--- /dev/null
+++ b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/auto/UncatchedExceptionTest.java
@@ -0,0 +1,140 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.apache.deltaspike.test.jpa.api.transactional.exception.uncatched.multipleinjection.auto;
+
+import org.apache.deltaspike.core.api.projectstage.ProjectStage;
+import org.apache.deltaspike.core.util.ProjectStageProducer;
+import org.apache.deltaspike.jpa.impl.transaction.context.TransactionBeanStorage;
+import org.apache.deltaspike.jpa.impl.transaction.context.TransactionContextExtension;
+import org.apache.deltaspike.test.category.SeCategory;
+import org.apache.deltaspike.test.jpa.api.shared.TestEntityManager;
+import org.apache.deltaspike.test.jpa.api.shared.TestEntityTransaction;
+import org.apache.deltaspike.test.jpa.api.shared.TestException;
+import org.apache.deltaspike.test.util.ArchiveUtils;
+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.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+
+import javax.enterprise.inject.spi.Extension;
+import javax.inject.Inject;
+
+@RunWith(Arquillian.class)
+@Category(SeCategory.class)
+public class UncatchedExceptionTest
+{
+    @Inject
+    private MultiTransactionBean multiTransactionBean;
+
+    @Inject
+    private TestEntityManagerProducer entityManagerProducer;
+
+    @Deployment
+    public static WebArchive deploy()
+    {
+        JavaArchive testJar = ShrinkWrap.create(JavaArchive.class, "autoInjectionUncatchedExceptionTest.jar")
+                .addPackage(ArchiveUtils.SHARED_PACKAGE)
+                .addPackage(UncatchedExceptionTest.class.getPackage().getName())
+                .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
+
+        return ShrinkWrap.create(WebArchive.class)
+                .addAsLibraries(ArchiveUtils.getDeltaSpikeCoreAndJpaArchive())
+                .addAsLibraries(testJar)
+                .addAsServiceProvider(Extension.class, TransactionContextExtension.class)
+                .addAsWebInfResource(ArchiveUtils.getBeansXml(), "beans.xml");
+    }
+
+    @Before
+    public void init()
+    {
+        ProjectStageProducer.setProjectStage(ProjectStage.UnitTest);
+    }
+
+    @Test
+    public void autoInjectionUncatchedExceptionTest()
+    {
+        TestEntityManager defaultEntityManager = entityManagerProducer.getDefaultEntityManager();
+        TestEntityManager firstEntityManager = entityManagerProducer.getFirstEntityManager();
+        TestEntityManager secondEntityManager = entityManagerProducer.getSecondEntityManager();
+
+        Assert.assertNotNull(defaultEntityManager);
+        TestEntityTransaction defaultTransaction = (TestEntityTransaction) (defaultEntityManager).getTransaction();
+
+        Assert.assertEquals(false, defaultEntityManager.isFlushed());
+        Assert.assertEquals(false, defaultTransaction.isActive());
+        Assert.assertEquals(false, defaultTransaction.isStarted());
+        Assert.assertEquals(false, defaultTransaction.isCommitted());
+        Assert.assertEquals(false, defaultTransaction.isRolledBack());
+
+        Assert.assertNotNull(firstEntityManager);
+        TestEntityTransaction firstTransaction = (TestEntityTransaction) (firstEntityManager).getTransaction();
+
+        Assert.assertEquals(false, firstEntityManager.isFlushed());
+        Assert.assertEquals(false, firstTransaction.isActive());
+        Assert.assertEquals(false, firstTransaction.isStarted());
+        Assert.assertEquals(false, firstTransaction.isCommitted());
+        Assert.assertEquals(false, firstTransaction.isRolledBack());
+
+        Assert.assertNotNull(secondEntityManager);
+        TestEntityTransaction secondTransaction = (TestEntityTransaction) (secondEntityManager).getTransaction();
+
+        Assert.assertEquals(false, secondEntityManager.isFlushed());
+        Assert.assertEquals(false, secondTransaction.isActive());
+        Assert.assertEquals(false, secondTransaction.isStarted());
+        Assert.assertEquals(false, secondTransaction.isCommitted());
+        Assert.assertEquals(false, secondTransaction.isRolledBack());
+
+        try
+        {
+            multiTransactionBean.executeInTransaction();
+            Assert.fail(TestException.class.getName() + " expected!");
+        }
+        catch (TestException e)
+        {
+            //expected -> do nothing
+        }
+
+        Assert.assertEquals(false, defaultEntityManager.isFlushed());
+        Assert.assertEquals(false, defaultTransaction.isActive());
+        Assert.assertEquals(true, defaultTransaction.isStarted());
+        Assert.assertEquals(false, defaultTransaction.isCommitted());
+        Assert.assertEquals(true, defaultTransaction.isRolledBack());
+
+        Assert.assertEquals(false, firstEntityManager.isFlushed());
+        Assert.assertEquals(false, firstTransaction.isActive());
+        Assert.assertEquals(true, firstTransaction.isStarted());
+        Assert.assertEquals(false, firstTransaction.isCommitted());
+        Assert.assertEquals(true, firstTransaction.isRolledBack());
+
+        Assert.assertEquals(false, secondEntityManager.isFlushed());
+        Assert.assertEquals(false, secondTransaction.isActive());
+        Assert.assertEquals(true, secondTransaction.isStarted());
+        Assert.assertEquals(false, secondTransaction.isCommitted());
+        Assert.assertEquals(true, secondTransaction.isRolledBack());
+
+        Assert.assertEquals(false, TransactionBeanStorage.isOpen());
+    }
+}

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/cdb86507/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/flush/auto/MultipleEntityManagerInjectionUncatchedFlushExceptionTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/flush/auto/MultipleEntityManagerInjectionUncatchedFlushExceptionTest.java b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/flush/auto/MultipleEntityManagerInjectionUncatchedFlushExceptionTest.java
deleted file mode 100644
index b701f4e..0000000
--- a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/flush/auto/MultipleEntityManagerInjectionUncatchedFlushExceptionTest.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.apache.deltaspike.test.jpa.api.transactional.exception.uncatched.multipleinjection.flush.auto;
-
-import org.apache.deltaspike.core.api.projectstage.ProjectStage;
-import org.apache.deltaspike.core.util.ProjectStageProducer;
-import org.apache.deltaspike.jpa.impl.transaction.context.TransactionBeanStorage;
-import org.apache.deltaspike.jpa.impl.transaction.context.TransactionContextExtension;
-import org.apache.deltaspike.test.category.SeCategory;
-import org.apache.deltaspike.test.jpa.api.shared.TestEntityManager;
-import org.apache.deltaspike.test.jpa.api.shared.TestEntityTransaction;
-import org.apache.deltaspike.test.jpa.api.shared.TestException;
-import org.apache.deltaspike.test.util.ArchiveUtils;
-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.spec.JavaArchive;
-import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import javax.enterprise.inject.spi.Extension;
-import javax.inject.Inject;
-
-@RunWith(Arquillian.class)
-@Category(SeCategory.class)
-public class MultipleEntityManagerInjectionUncatchedFlushExceptionTest
-{
-    @Inject
-    private MultiTransactionBean multiTransactionBean;
-
-    @Inject
-    private TestEntityManagerProducer entityManagerProducer;
-
-    @Deployment
-    public static WebArchive deploy()
-    {
-        JavaArchive testJar = ShrinkWrap.create(JavaArchive.class, "autoInjectionUncatchedFlushExceptionTest.jar")
-                .addPackage(ArchiveUtils.SHARED_PACKAGE)
-                .addPackage(MultipleEntityManagerInjectionUncatchedFlushExceptionTest.class.getPackage().getName())
-                .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
-
-        return ShrinkWrap.create(WebArchive.class)
-                .addAsLibraries(ArchiveUtils.getDeltaSpikeCoreAndJpaArchive())
-                .addAsLibraries(testJar)
-                .addAsServiceProvider(Extension.class, TransactionContextExtension.class)
-                .addAsWebInfResource(ArchiveUtils.getBeansXml(), "beans.xml");
-    }
-
-    @Before
-    public void init()
-    {
-        ProjectStageProducer.setProjectStage(ProjectStage.UnitTest);
-    }
-
-    @Test
-    public void autoInjectionUncatchedFlushExceptionTest()
-    {
-        TestEntityManager defaultEntityManager = entityManagerProducer.getDefaultEntityManager();
-        TestEntityManager firstEntityManager = entityManagerProducer.getFirstEntityManager();
-        TestEntityManager secondEntityManager = entityManagerProducer.getSecondEntityManager();
-
-        Assert.assertNotNull(defaultEntityManager);
-        TestEntityTransaction defaultTransaction = (TestEntityTransaction) (defaultEntityManager).getTransaction();
-
-        Assert.assertEquals(false, defaultEntityManager.isFlushed());
-        Assert.assertEquals(false, defaultTransaction.isActive());
-        Assert.assertEquals(false, defaultTransaction.isStarted());
-        Assert.assertEquals(false, defaultTransaction.isCommitted());
-        Assert.assertEquals(false, defaultTransaction.isRolledBack());
-
-        Assert.assertNotNull(firstEntityManager);
-        TestEntityTransaction firstTransaction = (TestEntityTransaction) (firstEntityManager).getTransaction();
-
-        Assert.assertEquals(false, firstEntityManager.isFlushed());
-        Assert.assertEquals(false, firstTransaction.isActive());
-        Assert.assertEquals(false, firstTransaction.isStarted());
-        Assert.assertEquals(false, firstTransaction.isCommitted());
-        Assert.assertEquals(false, firstTransaction.isRolledBack());
-
-        Assert.assertNotNull(secondEntityManager);
-        TestEntityTransaction secondTransaction = (TestEntityTransaction) (secondEntityManager).getTransaction();
-
-        Assert.assertEquals(false, secondEntityManager.isFlushed());
-        Assert.assertEquals(false, secondTransaction.isActive());
-        Assert.assertEquals(false, secondTransaction.isStarted());
-        Assert.assertEquals(false, secondTransaction.isCommitted());
-        Assert.assertEquals(false, secondTransaction.isRolledBack());
-
-        try
-        {
-            multiTransactionBean.executeInTransaction();
-            Assert.fail(TestException.class.getName() + " expected!");
-        }
-        catch (TestException e)
-        {
-            //expected -> do nothing
-        }
-
-        Assert.assertEquals(false, defaultEntityManager.isFlushed());
-        Assert.assertEquals(false, defaultTransaction.isActive());
-        Assert.assertEquals(true, defaultTransaction.isStarted());
-        Assert.assertEquals(false, defaultTransaction.isCommitted());
-        Assert.assertEquals(true, defaultTransaction.isRolledBack());
-
-        Assert.assertEquals(false, firstEntityManager.isFlushed());
-        Assert.assertEquals(false, firstTransaction.isActive());
-        Assert.assertEquals(true, firstTransaction.isStarted());
-        Assert.assertEquals(false, firstTransaction.isCommitted());
-        Assert.assertEquals(true, firstTransaction.isRolledBack());
-
-        Assert.assertEquals(false, secondEntityManager.isFlushed());
-        Assert.assertEquals(false, secondTransaction.isActive());
-        Assert.assertEquals(true, secondTransaction.isStarted());
-        Assert.assertEquals(false, secondTransaction.isCommitted());
-        Assert.assertEquals(true, secondTransaction.isRolledBack());
-
-        Assert.assertEquals(false, TransactionBeanStorage.isOpen());
-    }
-}

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/cdb86507/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/flush/auto/UncatchedFlushExceptionTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/flush/auto/UncatchedFlushExceptionTest.java b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/flush/auto/UncatchedFlushExceptionTest.java
new file mode 100644
index 0000000..d9de090
--- /dev/null
+++ b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/flush/auto/UncatchedFlushExceptionTest.java
@@ -0,0 +1,140 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.apache.deltaspike.test.jpa.api.transactional.exception.uncatched.multipleinjection.flush.auto;
+
+import org.apache.deltaspike.core.api.projectstage.ProjectStage;
+import org.apache.deltaspike.core.util.ProjectStageProducer;
+import org.apache.deltaspike.jpa.impl.transaction.context.TransactionBeanStorage;
+import org.apache.deltaspike.jpa.impl.transaction.context.TransactionContextExtension;
+import org.apache.deltaspike.test.category.SeCategory;
+import org.apache.deltaspike.test.jpa.api.shared.TestEntityManager;
+import org.apache.deltaspike.test.jpa.api.shared.TestEntityTransaction;
+import org.apache.deltaspike.test.jpa.api.shared.TestException;
+import org.apache.deltaspike.test.util.ArchiveUtils;
+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.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+
+import javax.enterprise.inject.spi.Extension;
+import javax.inject.Inject;
+
+@RunWith(Arquillian.class)
+@Category(SeCategory.class)
+public class UncatchedFlushExceptionTest
+{
+    @Inject
+    private MultiTransactionBean multiTransactionBean;
+
+    @Inject
+    private TestEntityManagerProducer entityManagerProducer;
+
+    @Deployment
+    public static WebArchive deploy()
+    {
+        JavaArchive testJar = ShrinkWrap.create(JavaArchive.class, "autoInjectionUncatchedFlushExceptionTest.jar")
+                .addPackage(ArchiveUtils.SHARED_PACKAGE)
+                .addPackage(UncatchedFlushExceptionTest.class.getPackage().getName())
+                .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
+
+        return ShrinkWrap.create(WebArchive.class)
+                .addAsLibraries(ArchiveUtils.getDeltaSpikeCoreAndJpaArchive())
+                .addAsLibraries(testJar)
+                .addAsServiceProvider(Extension.class, TransactionContextExtension.class)
+                .addAsWebInfResource(ArchiveUtils.getBeansXml(), "beans.xml");
+    }
+
+    @Before
+    public void init()
+    {
+        ProjectStageProducer.setProjectStage(ProjectStage.UnitTest);
+    }
+
+    @Test
+    public void autoInjectionUncatchedFlushExceptionTest()
+    {
+        TestEntityManager defaultEntityManager = entityManagerProducer.getDefaultEntityManager();
+        TestEntityManager firstEntityManager = entityManagerProducer.getFirstEntityManager();
+        TestEntityManager secondEntityManager = entityManagerProducer.getSecondEntityManager();
+
+        Assert.assertNotNull(defaultEntityManager);
+        TestEntityTransaction defaultTransaction = (TestEntityTransaction) (defaultEntityManager).getTransaction();
+
+        Assert.assertEquals(false, defaultEntityManager.isFlushed());
+        Assert.assertEquals(false, defaultTransaction.isActive());
+        Assert.assertEquals(false, defaultTransaction.isStarted());
+        Assert.assertEquals(false, defaultTransaction.isCommitted());
+        Assert.assertEquals(false, defaultTransaction.isRolledBack());
+
+        Assert.assertNotNull(firstEntityManager);
+        TestEntityTransaction firstTransaction = (TestEntityTransaction) (firstEntityManager).getTransaction();
+
+        Assert.assertEquals(false, firstEntityManager.isFlushed());
+        Assert.assertEquals(false, firstTransaction.isActive());
+        Assert.assertEquals(false, firstTransaction.isStarted());
+        Assert.assertEquals(false, firstTransaction.isCommitted());
+        Assert.assertEquals(false, firstTransaction.isRolledBack());
+
+        Assert.assertNotNull(secondEntityManager);
+        TestEntityTransaction secondTransaction = (TestEntityTransaction) (secondEntityManager).getTransaction();
+
+        Assert.assertEquals(false, secondEntityManager.isFlushed());
+        Assert.assertEquals(false, secondTransaction.isActive());
+        Assert.assertEquals(false, secondTransaction.isStarted());
+        Assert.assertEquals(false, secondTransaction.isCommitted());
+        Assert.assertEquals(false, secondTransaction.isRolledBack());
+
+        try
+        {
+            multiTransactionBean.executeInTransaction();
+            Assert.fail(TestException.class.getName() + " expected!");
+        }
+        catch (TestException e)
+        {
+            //expected -> do nothing
+        }
+
+        Assert.assertEquals(false, defaultEntityManager.isFlushed());
+        Assert.assertEquals(false, defaultTransaction.isActive());
+        Assert.assertEquals(true, defaultTransaction.isStarted());
+        Assert.assertEquals(false, defaultTransaction.isCommitted());
+        Assert.assertEquals(true, defaultTransaction.isRolledBack());
+
+        Assert.assertEquals(false, firstEntityManager.isFlushed());
+        Assert.assertEquals(false, firstTransaction.isActive());
+        Assert.assertEquals(true, firstTransaction.isStarted());
+        Assert.assertEquals(false, firstTransaction.isCommitted());
+        Assert.assertEquals(true, firstTransaction.isRolledBack());
+
+        Assert.assertEquals(false, secondEntityManager.isFlushed());
+        Assert.assertEquals(false, secondTransaction.isActive());
+        Assert.assertEquals(true, secondTransaction.isStarted());
+        Assert.assertEquals(false, secondTransaction.isCommitted());
+        Assert.assertEquals(true, secondTransaction.isRolledBack());
+
+        Assert.assertEquals(false, TransactionBeanStorage.isOpen());
+    }
+}

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/cdb86507/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/flush/nested/NestedMultiTransactionUncatchedFlushExceptionTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/flush/nested/NestedMultiTransactionUncatchedFlushExceptionTest.java b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/flush/nested/NestedMultiTransactionUncatchedFlushExceptionTest.java
deleted file mode 100644
index 234d40a..0000000
--- a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/flush/nested/NestedMultiTransactionUncatchedFlushExceptionTest.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.apache.deltaspike.test.jpa.api.transactional.exception.uncatched.multipleinjection.flush.nested;
-
-import org.apache.deltaspike.core.api.projectstage.ProjectStage;
-import org.apache.deltaspike.core.util.ProjectStageProducer;
-import org.apache.deltaspike.jpa.impl.transaction.context.TransactionBeanStorage;
-import org.apache.deltaspike.jpa.impl.transaction.context.TransactionContextExtension;
-import org.apache.deltaspike.test.category.SeCategory;
-import org.apache.deltaspike.test.jpa.api.shared.TestEntityManager;
-import org.apache.deltaspike.test.jpa.api.shared.TestEntityTransaction;
-import org.apache.deltaspike.test.jpa.api.shared.TestException;
-import org.apache.deltaspike.test.util.ArchiveUtils;
-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.spec.JavaArchive;
-import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import javax.enterprise.inject.spi.Extension;
-import javax.inject.Inject;
-
-@RunWith(Arquillian.class)
-@Category(SeCategory.class)
-public class NestedMultiTransactionUncatchedFlushExceptionTest
-{
-    @Inject
-    private FirstLevelTransactionBean firstLevelTransactionBean;
-
-    @Inject
-    private TestEntityManagerProducer entityManagerProducer;
-
-    @Deployment
-    public static WebArchive deploy()
-    {
-        JavaArchive testJar = ShrinkWrap.create(JavaArchive.class, "nestedMultiTransactionUncatchedFlushExceptionTest.jar")
-                .addPackage(ArchiveUtils.SHARED_PACKAGE)
-                .addPackage(NestedMultiTransactionUncatchedFlushExceptionTest.class.getPackage().getName())
-                .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
-
-        return ShrinkWrap.create(WebArchive.class)
-                .addAsLibraries(ArchiveUtils.getDeltaSpikeCoreAndJpaArchive())
-                .addAsLibraries(testJar)
-                .addAsServiceProvider(Extension.class, TransactionContextExtension.class)
-                .addAsWebInfResource(ArchiveUtils.getBeansXml(), "beans.xml");
-    }
-
-    @Before
-    public void init()
-    {
-        ProjectStageProducer.setProjectStage(ProjectStage.UnitTest);
-    }
-
-    @Test
-    public void nestedMultiTransactionUncatchedFlushExceptionTest()
-    {
-        TestEntityManager firstEntityManager = entityManagerProducer.getFirstEntityManager();
-        TestEntityManager secondEntityManager = entityManagerProducer.getSecondEntityManager();
-
-        Assert.assertNotNull(firstEntityManager);
-        TestEntityTransaction firstTransaction = (TestEntityTransaction) (firstEntityManager).getTransaction();
-
-        Assert.assertEquals(false, firstEntityManager.isFlushed());
-        Assert.assertEquals(false, firstTransaction.isActive());
-        Assert.assertEquals(false, firstTransaction.isStarted());
-        Assert.assertEquals(false, firstTransaction.isCommitted());
-        Assert.assertEquals(false, firstTransaction.isRolledBack());
-
-        Assert.assertNotNull(secondEntityManager);
-        TestEntityTransaction secondTransaction = (TestEntityTransaction) (secondEntityManager).getTransaction();
-
-        Assert.assertEquals(false, secondEntityManager.isFlushed());
-        Assert.assertEquals(false, secondTransaction.isActive());
-        Assert.assertEquals(false, secondTransaction.isStarted());
-        Assert.assertEquals(false, secondTransaction.isCommitted());
-        Assert.assertEquals(false, secondTransaction.isRolledBack());
-
-        try
-        {
-            firstLevelTransactionBean.executeInTransaction();
-            Assert.fail(TestException.class.getName() + " expected!");
-        }
-        catch (TestException e)
-        {
-            //expected -> do nothing
-        }
-
-        Assert.assertEquals(false, firstEntityManager.isFlushed());
-        Assert.assertEquals(false, firstTransaction.isActive());
-        Assert.assertEquals(true, firstTransaction.isStarted());
-        Assert.assertEquals(false, firstTransaction.isCommitted());
-        Assert.assertEquals(true, firstTransaction.isRolledBack());
-
-        Assert.assertEquals(false, secondEntityManager.isFlushed());
-        Assert.assertEquals(false, secondTransaction.isActive());
-        Assert.assertEquals(true, secondTransaction.isStarted());
-        Assert.assertEquals(false, secondTransaction.isCommitted());
-        Assert.assertEquals(true, secondTransaction.isRolledBack());
-
-        Assert.assertEquals(false, TransactionBeanStorage.isOpen());
-    }
-}

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/cdb86507/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/flush/nested/UncatchedFlushExceptionTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/flush/nested/UncatchedFlushExceptionTest.java b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/flush/nested/UncatchedFlushExceptionTest.java
new file mode 100644
index 0000000..f0bee44
--- /dev/null
+++ b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/flush/nested/UncatchedFlushExceptionTest.java
@@ -0,0 +1,124 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.apache.deltaspike.test.jpa.api.transactional.exception.uncatched.multipleinjection.flush.nested;
+
+import org.apache.deltaspike.core.api.projectstage.ProjectStage;
+import org.apache.deltaspike.core.util.ProjectStageProducer;
+import org.apache.deltaspike.jpa.impl.transaction.context.TransactionBeanStorage;
+import org.apache.deltaspike.jpa.impl.transaction.context.TransactionContextExtension;
+import org.apache.deltaspike.test.category.SeCategory;
+import org.apache.deltaspike.test.jpa.api.shared.TestEntityManager;
+import org.apache.deltaspike.test.jpa.api.shared.TestEntityTransaction;
+import org.apache.deltaspike.test.jpa.api.shared.TestException;
+import org.apache.deltaspike.test.util.ArchiveUtils;
+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.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+
+import javax.enterprise.inject.spi.Extension;
+import javax.inject.Inject;
+
+@RunWith(Arquillian.class)
+@Category(SeCategory.class)
+public class UncatchedFlushExceptionTest
+{
+    @Inject
+    private FirstLevelTransactionBean firstLevelTransactionBean;
+
+    @Inject
+    private TestEntityManagerProducer entityManagerProducer;
+
+    @Deployment
+    public static WebArchive deploy()
+    {
+        JavaArchive testJar = ShrinkWrap.create(JavaArchive.class, "nestedMultiTransactionUncatchedFlushExceptionTest.jar")
+                .addPackage(ArchiveUtils.SHARED_PACKAGE)
+                .addPackage(UncatchedFlushExceptionTest.class.getPackage().getName())
+                .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
+
+        return ShrinkWrap.create(WebArchive.class)
+                .addAsLibraries(ArchiveUtils.getDeltaSpikeCoreAndJpaArchive())
+                .addAsLibraries(testJar)
+                .addAsServiceProvider(Extension.class, TransactionContextExtension.class)
+                .addAsWebInfResource(ArchiveUtils.getBeansXml(), "beans.xml");
+    }
+
+    @Before
+    public void init()
+    {
+        ProjectStageProducer.setProjectStage(ProjectStage.UnitTest);
+    }
+
+    @Test
+    public void nestedMultiTransactionUncatchedFlushExceptionTest()
+    {
+        TestEntityManager firstEntityManager = entityManagerProducer.getFirstEntityManager();
+        TestEntityManager secondEntityManager = entityManagerProducer.getSecondEntityManager();
+
+        Assert.assertNotNull(firstEntityManager);
+        TestEntityTransaction firstTransaction = (TestEntityTransaction) (firstEntityManager).getTransaction();
+
+        Assert.assertEquals(false, firstEntityManager.isFlushed());
+        Assert.assertEquals(false, firstTransaction.isActive());
+        Assert.assertEquals(false, firstTransaction.isStarted());
+        Assert.assertEquals(false, firstTransaction.isCommitted());
+        Assert.assertEquals(false, firstTransaction.isRolledBack());
+
+        Assert.assertNotNull(secondEntityManager);
+        TestEntityTransaction secondTransaction = (TestEntityTransaction) (secondEntityManager).getTransaction();
+
+        Assert.assertEquals(false, secondEntityManager.isFlushed());
+        Assert.assertEquals(false, secondTransaction.isActive());
+        Assert.assertEquals(false, secondTransaction.isStarted());
+        Assert.assertEquals(false, secondTransaction.isCommitted());
+        Assert.assertEquals(false, secondTransaction.isRolledBack());
+
+        try
+        {
+            firstLevelTransactionBean.executeInTransaction();
+            Assert.fail(TestException.class.getName() + " expected!");
+        }
+        catch (TestException e)
+        {
+            //expected -> do nothing
+        }
+
+        Assert.assertEquals(false, firstEntityManager.isFlushed());
+        Assert.assertEquals(false, firstTransaction.isActive());
+        Assert.assertEquals(true, firstTransaction.isStarted());
+        Assert.assertEquals(false, firstTransaction.isCommitted());
+        Assert.assertEquals(true, firstTransaction.isRolledBack());
+
+        Assert.assertEquals(false, secondEntityManager.isFlushed());
+        Assert.assertEquals(false, secondTransaction.isActive());
+        Assert.assertEquals(true, secondTransaction.isStarted());
+        Assert.assertEquals(false, secondTransaction.isCommitted());
+        Assert.assertEquals(true, secondTransaction.isRolledBack());
+
+        Assert.assertEquals(false, TransactionBeanStorage.isOpen());
+    }
+}

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/cdb86507/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/nested/NestedMultiTransactionUncatchedExceptionTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/nested/NestedMultiTransactionUncatchedExceptionTest.java b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/nested/NestedMultiTransactionUncatchedExceptionTest.java
deleted file mode 100644
index dc85b69..0000000
--- a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/nested/NestedMultiTransactionUncatchedExceptionTest.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.apache.deltaspike.test.jpa.api.transactional.exception.uncatched.multipleinjection.nested;
-
-import org.apache.deltaspike.core.api.projectstage.ProjectStage;
-import org.apache.deltaspike.core.util.ProjectStageProducer;
-import org.apache.deltaspike.jpa.impl.transaction.context.TransactionBeanStorage;
-import org.apache.deltaspike.jpa.impl.transaction.context.TransactionContextExtension;
-import org.apache.deltaspike.test.category.SeCategory;
-import org.apache.deltaspike.test.jpa.api.shared.TestEntityManager;
-import org.apache.deltaspike.test.jpa.api.shared.TestEntityTransaction;
-import org.apache.deltaspike.test.jpa.api.shared.TestException;
-import org.apache.deltaspike.test.util.ArchiveUtils;
-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.spec.JavaArchive;
-import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import javax.enterprise.inject.spi.Extension;
-import javax.inject.Inject;
-
-@RunWith(Arquillian.class)
-@Category(SeCategory.class)
-public class NestedMultiTransactionUncatchedExceptionTest
-{
-    @Inject
-    private FirstLevelTransactionBean firstLevelTransactionBean;
-
-    @Inject
-    private TestEntityManagerProducer entityManagerProducer;
-
-    @Deployment
-    public static WebArchive deploy()
-    {
-        JavaArchive testJar = ShrinkWrap.create(JavaArchive.class, "nestedMultiTransactionUncatchedExceptionTest.jar")
-                .addPackage(ArchiveUtils.SHARED_PACKAGE)
-                .addPackage(NestedMultiTransactionUncatchedExceptionTest.class.getPackage().getName())
-                .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
-
-        return ShrinkWrap.create(WebArchive.class)
-                .addAsLibraries(ArchiveUtils.getDeltaSpikeCoreAndJpaArchive())
-                .addAsLibraries(testJar)
-                .addAsServiceProvider(Extension.class, TransactionContextExtension.class)
-                .addAsWebInfResource(ArchiveUtils.getBeansXml(), "beans.xml");
-    }
-
-    @Before
-    public void init()
-    {
-        ProjectStageProducer.setProjectStage(ProjectStage.UnitTest);
-    }
-
-    @Test
-    public void nestedMultiTransactionUncatchedExceptionTest()
-    {
-        TestEntityManager firstEntityManager = entityManagerProducer.getFirstEntityManager();
-        TestEntityManager secondEntityManager = entityManagerProducer.getSecondEntityManager();
-
-        Assert.assertNotNull(firstEntityManager);
-        TestEntityTransaction firstTransaction = (TestEntityTransaction) (firstEntityManager).getTransaction();
-
-        Assert.assertEquals(false, firstEntityManager.isFlushed());
-        Assert.assertEquals(false, firstTransaction.isActive());
-        Assert.assertEquals(false, firstTransaction.isStarted());
-        Assert.assertEquals(false, firstTransaction.isCommitted());
-        Assert.assertEquals(false, firstTransaction.isRolledBack());
-
-        Assert.assertNotNull(secondEntityManager);
-        TestEntityTransaction secondTransaction = (TestEntityTransaction) (secondEntityManager).getTransaction();
-
-        Assert.assertEquals(false, secondEntityManager.isFlushed());
-        Assert.assertEquals(false, secondTransaction.isActive());
-        Assert.assertEquals(false, secondTransaction.isStarted());
-        Assert.assertEquals(false, secondTransaction.isCommitted());
-        Assert.assertEquals(false, secondTransaction.isRolledBack());
-
-        try
-        {
-            firstLevelTransactionBean.executeInTransaction();
-            Assert.fail(TestException.class.getName() + " expected!");
-        }
-        catch (TestException e)
-        {
-            //expected -> do nothing
-        }
-
-        Assert.assertEquals(false, firstEntityManager.isFlushed());
-        Assert.assertEquals(false, firstTransaction.isActive());
-        Assert.assertEquals(true, firstTransaction.isStarted());
-        Assert.assertEquals(false, firstTransaction.isCommitted());
-        Assert.assertEquals(true, firstTransaction.isRolledBack());
-
-        Assert.assertEquals(false, secondEntityManager.isFlushed());
-        Assert.assertEquals(false, secondTransaction.isActive());
-        Assert.assertEquals(true, secondTransaction.isStarted());
-        Assert.assertEquals(false, secondTransaction.isCommitted());
-        Assert.assertEquals(true, secondTransaction.isRolledBack());
-
-        Assert.assertEquals(false, TransactionBeanStorage.isOpen());
-    }
-}

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/cdb86507/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/nested/UncatchedExceptionTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/nested/UncatchedExceptionTest.java b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/nested/UncatchedExceptionTest.java
new file mode 100644
index 0000000..cfd885e
--- /dev/null
+++ b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/exception/uncatched/multipleinjection/nested/UncatchedExceptionTest.java
@@ -0,0 +1,124 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.apache.deltaspike.test.jpa.api.transactional.exception.uncatched.multipleinjection.nested;
+
+import org.apache.deltaspike.core.api.projectstage.ProjectStage;
+import org.apache.deltaspike.core.util.ProjectStageProducer;
+import org.apache.deltaspike.jpa.impl.transaction.context.TransactionBeanStorage;
+import org.apache.deltaspike.jpa.impl.transaction.context.TransactionContextExtension;
+import org.apache.deltaspike.test.category.SeCategory;
+import org.apache.deltaspike.test.jpa.api.shared.TestEntityManager;
+import org.apache.deltaspike.test.jpa.api.shared.TestEntityTransaction;
+import org.apache.deltaspike.test.jpa.api.shared.TestException;
+import org.apache.deltaspike.test.util.ArchiveUtils;
+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.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+
+import javax.enterprise.inject.spi.Extension;
+import javax.inject.Inject;
+
+@RunWith(Arquillian.class)
+@Category(SeCategory.class)
+public class UncatchedExceptionTest
+{
+    @Inject
+    private FirstLevelTransactionBean firstLevelTransactionBean;
+
+    @Inject
+    private TestEntityManagerProducer entityManagerProducer;
+
+    @Deployment
+    public static WebArchive deploy()
+    {
+        JavaArchive testJar = ShrinkWrap.create(JavaArchive.class, "nestedMultiTransactionUncatchedExceptionTest.jar")
+                .addPackage(ArchiveUtils.SHARED_PACKAGE)
+                .addPackage(UncatchedExceptionTest.class.getPackage().getName())
+                .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
+
+        return ShrinkWrap.create(WebArchive.class)
+                .addAsLibraries(ArchiveUtils.getDeltaSpikeCoreAndJpaArchive())
+                .addAsLibraries(testJar)
+                .addAsServiceProvider(Extension.class, TransactionContextExtension.class)
+                .addAsWebInfResource(ArchiveUtils.getBeansXml(), "beans.xml");
+    }
+
+    @Before
+    public void init()
+    {
+        ProjectStageProducer.setProjectStage(ProjectStage.UnitTest);
+    }
+
+    @Test
+    public void nestedMultiTransactionUncatchedExceptionTest()
+    {
+        TestEntityManager firstEntityManager = entityManagerProducer.getFirstEntityManager();
+        TestEntityManager secondEntityManager = entityManagerProducer.getSecondEntityManager();
+
+        Assert.assertNotNull(firstEntityManager);
+        TestEntityTransaction firstTransaction = (TestEntityTransaction) (firstEntityManager).getTransaction();
+
+        Assert.assertEquals(false, firstEntityManager.isFlushed());
+        Assert.assertEquals(false, firstTransaction.isActive());
+        Assert.assertEquals(false, firstTransaction.isStarted());
+        Assert.assertEquals(false, firstTransaction.isCommitted());
+        Assert.assertEquals(false, firstTransaction.isRolledBack());
+
+        Assert.assertNotNull(secondEntityManager);
+        TestEntityTransaction secondTransaction = (TestEntityTransaction) (secondEntityManager).getTransaction();
+
+        Assert.assertEquals(false, secondEntityManager.isFlushed());
+        Assert.assertEquals(false, secondTransaction.isActive());
+        Assert.assertEquals(false, secondTransaction.isStarted());
+        Assert.assertEquals(false, secondTransaction.isCommitted());
+        Assert.assertEquals(false, secondTransaction.isRolledBack());
+
+        try
+        {
+            firstLevelTransactionBean.executeInTransaction();
+            Assert.fail(TestException.class.getName() + " expected!");
+        }
+        catch (TestException e)
+        {
+            //expected -> do nothing
+        }
+
+        Assert.assertEquals(false, firstEntityManager.isFlushed());
+        Assert.assertEquals(false, firstTransaction.isActive());
+        Assert.assertEquals(true, firstTransaction.isStarted());
+        Assert.assertEquals(false, firstTransaction.isCommitted());
+        Assert.assertEquals(true, firstTransaction.isRolledBack());
+
+        Assert.assertEquals(false, secondEntityManager.isFlushed());
+        Assert.assertEquals(false, secondTransaction.isActive());
+        Assert.assertEquals(true, secondTransaction.isStarted());
+        Assert.assertEquals(false, secondTransaction.isCommitted());
+        Assert.assertEquals(true, secondTransaction.isRolledBack());
+
+        Assert.assertEquals(false, TransactionBeanStorage.isOpen());
+    }
+}

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/cdb86507/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/getRollbackOnly/multipleinjection/auto/MultipleEntityManagerInjectionRollbackOnly1Test.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/getRollbackOnly/multipleinjection/auto/MultipleEntityManagerInjectionRollbackOnly1Test.java b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/getRollbackOnly/multipleinjection/auto/MultipleEntityManagerInjectionRollbackOnly1Test.java
deleted file mode 100644
index 0795606..0000000
--- a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/getRollbackOnly/multipleinjection/auto/MultipleEntityManagerInjectionRollbackOnly1Test.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.apache.deltaspike.test.jpa.api.transactional.getRollbackOnly.multipleinjection.auto;
-
-import org.apache.deltaspike.core.api.projectstage.ProjectStage;
-import org.apache.deltaspike.core.util.ProjectStageProducer;
-import org.apache.deltaspike.jpa.impl.transaction.context.TransactionBeanStorage;
-import org.apache.deltaspike.jpa.impl.transaction.context.TransactionContextExtension;
-import org.apache.deltaspike.test.category.SeCategory;
-import org.apache.deltaspike.test.jpa.api.shared.TestEntityManager;
-import org.apache.deltaspike.test.jpa.api.shared.TestEntityTransaction;
-import org.apache.deltaspike.test.util.ArchiveUtils;
-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.spec.JavaArchive;
-import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import javax.enterprise.inject.spi.Extension;
-import javax.inject.Inject;
-
-//different classes needed due to arquillian restriction
-@RunWith(Arquillian.class)
-@Category(SeCategory.class)
-public class MultipleEntityManagerInjectionRollbackOnly1Test
-{
-    @Inject
-    private MultiTransactionBean multiTransactionBean;
-
-    @Inject
-    private TestEntityManagerProducer entityManagerProducer;
-
-    @Deployment
-    public static WebArchive deploy()
-    {
-        JavaArchive testJar = ShrinkWrap.create(JavaArchive.class, "autoInjectionRollbackOnly1Test.jar")
-                .addPackage(ArchiveUtils.SHARED_PACKAGE)
-                .addPackage(MultipleEntityManagerInjectionRollbackOnly1Test.class.getPackage().getName())
-                .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
-
-        return ShrinkWrap.create(WebArchive.class)
-                .addAsLibraries(ArchiveUtils.getDeltaSpikeCoreAndJpaArchive())
-                .addAsLibraries(testJar)
-                .addAsServiceProvider(Extension.class, TransactionContextExtension.class)
-                .addAsWebInfResource(ArchiveUtils.getBeansXml(), "beans.xml");
-    }
-
-    @Before
-    public void init()
-    {
-        ProjectStageProducer.setProjectStage(ProjectStage.UnitTest);
-    }
-
-    @Test
-    public void autoInjectionRollbackOnly1Test()
-    {
-        TestEntityManager defaultEntityManager = entityManagerProducer.getDefaultEntityManager();
-        TestEntityManager firstEntityManager = entityManagerProducer.getFirstEntityManager();
-        TestEntityManager secondEntityManager = entityManagerProducer.getSecondEntityManager();
-
-        Assert.assertNotNull(defaultEntityManager);
-        TestEntityTransaction defaultTransaction = (TestEntityTransaction) (defaultEntityManager).getTransaction();
-
-        Assert.assertEquals(false, defaultEntityManager.isFlushed());
-        Assert.assertEquals(false, defaultTransaction.isActive());
-        Assert.assertEquals(false, defaultTransaction.isStarted());
-        Assert.assertEquals(false, defaultTransaction.isCommitted());
-        Assert.assertEquals(false, defaultTransaction.isRolledBack());
-
-        Assert.assertNotNull(firstEntityManager);
-        TestEntityTransaction firstTransaction = (TestEntityTransaction) (firstEntityManager).getTransaction();
-
-        Assert.assertEquals(false, firstEntityManager.isFlushed());
-        Assert.assertEquals(false, firstTransaction.isActive());
-        Assert.assertEquals(false, firstTransaction.isStarted());
-        Assert.assertEquals(false, firstTransaction.isCommitted());
-        Assert.assertEquals(false, firstTransaction.isRolledBack());
-
-        Assert.assertNotNull(secondEntityManager);
-        TestEntityTransaction secondTransaction = (TestEntityTransaction) (secondEntityManager).getTransaction();
-
-        Assert.assertEquals(false, secondEntityManager.isFlushed());
-        Assert.assertEquals(false, secondTransaction.isActive());
-        Assert.assertEquals(false, secondTransaction.isStarted());
-        Assert.assertEquals(false, secondTransaction.isCommitted());
-        Assert.assertEquals(false, secondTransaction.isRolledBack());
-
-        multiTransactionBean.executeInTransactionRollback1();
-
-        Assert.assertEquals(true, defaultEntityManager.isFlushed());
-        Assert.assertEquals(false, defaultTransaction.isActive());
-        Assert.assertEquals(true, defaultTransaction.isStarted());
-        Assert.assertEquals(false, defaultTransaction.isCommitted());
-        Assert.assertEquals(true, defaultTransaction.isRolledBack());
-
-        Assert.assertEquals(true, firstEntityManager.isFlushed());
-        Assert.assertEquals(false, firstTransaction.isActive());
-        Assert.assertEquals(true, firstTransaction.isStarted());
-        Assert.assertEquals(false, firstTransaction.isCommitted());
-        Assert.assertEquals(true, firstTransaction.isRolledBack());
-
-        Assert.assertEquals(true, secondEntityManager.isFlushed());
-        Assert.assertEquals(false, secondTransaction.isActive());
-        Assert.assertEquals(true, secondTransaction.isStarted());
-        Assert.assertEquals(false, secondTransaction.isCommitted());
-        Assert.assertEquals(true, secondTransaction.isRolledBack());
-
-        Assert.assertEquals(false, TransactionBeanStorage.isOpen());
-    }
-}

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/cdb86507/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/getRollbackOnly/multipleinjection/auto/MultipleEntityManagerInjectionRollbackOnly2Test.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/getRollbackOnly/multipleinjection/auto/MultipleEntityManagerInjectionRollbackOnly2Test.java b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/getRollbackOnly/multipleinjection/auto/MultipleEntityManagerInjectionRollbackOnly2Test.java
deleted file mode 100644
index 17e5c9e..0000000
--- a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/getRollbackOnly/multipleinjection/auto/MultipleEntityManagerInjectionRollbackOnly2Test.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.apache.deltaspike.test.jpa.api.transactional.getRollbackOnly.multipleinjection.auto;
-
-import org.apache.deltaspike.core.api.projectstage.ProjectStage;
-import org.apache.deltaspike.core.util.ProjectStageProducer;
-import org.apache.deltaspike.jpa.impl.transaction.context.TransactionBeanStorage;
-import org.apache.deltaspike.jpa.impl.transaction.context.TransactionContextExtension;
-import org.apache.deltaspike.test.category.SeCategory;
-import org.apache.deltaspike.test.jpa.api.shared.TestEntityManager;
-import org.apache.deltaspike.test.jpa.api.shared.TestEntityTransaction;
-import org.apache.deltaspike.test.util.ArchiveUtils;
-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.spec.JavaArchive;
-import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import javax.enterprise.inject.spi.Extension;
-import javax.inject.Inject;
-
-//different classes needed due to arquillian restriction
-@RunWith(Arquillian.class)
-@Category(SeCategory.class)
-public class MultipleEntityManagerInjectionRollbackOnly2Test
-{
-    @Inject
-    private MultiTransactionBean multiTransactionBean;
-
-    @Inject
-    private TestEntityManagerProducer entityManagerProducer;
-
-    @Deployment
-    public static WebArchive deploy()
-    {
-        JavaArchive testJar = ShrinkWrap.create(JavaArchive.class, "autoInjectionRollbackOnly2Test.jar")
-                .addPackage(ArchiveUtils.SHARED_PACKAGE)
-                .addPackage(MultipleEntityManagerInjectionRollbackOnly2Test.class.getPackage().getName())
-                .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
-
-        return ShrinkWrap.create(WebArchive.class)
-                .addAsLibraries(ArchiveUtils.getDeltaSpikeCoreAndJpaArchive())
-                .addAsLibraries(testJar)
-                .addAsServiceProvider(Extension.class, TransactionContextExtension.class)
-                .addAsWebInfResource(ArchiveUtils.getBeansXml(), "beans.xml");
-    }
-
-    @Before
-    public void init()
-    {
-        ProjectStageProducer.setProjectStage(ProjectStage.UnitTest);
-    }
-
-    @Test
-    public void autoInjectionRollbackOnly2Test()
-    {
-        TestEntityManager defaultEntityManager = entityManagerProducer.getDefaultEntityManager();
-        TestEntityManager firstEntityManager = entityManagerProducer.getFirstEntityManager();
-        TestEntityManager secondEntityManager = entityManagerProducer.getSecondEntityManager();
-
-        Assert.assertNotNull(defaultEntityManager);
-        TestEntityTransaction defaultTransaction = (TestEntityTransaction) (defaultEntityManager).getTransaction();
-
-        Assert.assertEquals(false, defaultEntityManager.isFlushed());
-        Assert.assertEquals(false, defaultTransaction.isActive());
-        Assert.assertEquals(false, defaultTransaction.isStarted());
-        Assert.assertEquals(false, defaultTransaction.isCommitted());
-        Assert.assertEquals(false, defaultTransaction.isRolledBack());
-
-        Assert.assertNotNull(firstEntityManager);
-        TestEntityTransaction firstTransaction = (TestEntityTransaction) (firstEntityManager).getTransaction();
-
-        Assert.assertEquals(false, firstEntityManager.isFlushed());
-        Assert.assertEquals(false, firstTransaction.isActive());
-        Assert.assertEquals(false, firstTransaction.isStarted());
-        Assert.assertEquals(false, firstTransaction.isCommitted());
-        Assert.assertEquals(false, firstTransaction.isRolledBack());
-
-        Assert.assertNotNull(secondEntityManager);
-        TestEntityTransaction secondTransaction = (TestEntityTransaction) (secondEntityManager).getTransaction();
-
-        Assert.assertEquals(false, secondEntityManager.isFlushed());
-        Assert.assertEquals(false, secondTransaction.isActive());
-        Assert.assertEquals(false, secondTransaction.isStarted());
-        Assert.assertEquals(false, secondTransaction.isCommitted());
-        Assert.assertEquals(false, secondTransaction.isRolledBack());
-
-        multiTransactionBean.executeInTransactionRollback2();
-
-        Assert.assertEquals(true, defaultEntityManager.isFlushed());
-        Assert.assertEquals(false, defaultTransaction.isActive());
-        Assert.assertEquals(true, defaultTransaction.isStarted());
-        Assert.assertEquals(false, defaultTransaction.isCommitted());
-        Assert.assertEquals(true, defaultTransaction.isRolledBack());
-
-        Assert.assertEquals(true, firstEntityManager.isFlushed());
-        Assert.assertEquals(false, firstTransaction.isActive());
-        Assert.assertEquals(true, firstTransaction.isStarted());
-        Assert.assertEquals(false, firstTransaction.isCommitted());
-        Assert.assertEquals(true, firstTransaction.isRolledBack());
-
-        Assert.assertEquals(true, secondEntityManager.isFlushed());
-        Assert.assertEquals(false, secondTransaction.isActive());
-        Assert.assertEquals(true, secondTransaction.isStarted());
-        Assert.assertEquals(false, secondTransaction.isCommitted());
-        Assert.assertEquals(true, secondTransaction.isRolledBack());
-
-        Assert.assertEquals(false, TransactionBeanStorage.isOpen());
-    }
-}

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/cdb86507/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/getRollbackOnly/multipleinjection/auto/MultipleEntityManagerInjectionRollbackOnlyTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/getRollbackOnly/multipleinjection/auto/MultipleEntityManagerInjectionRollbackOnlyTest.java b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/getRollbackOnly/multipleinjection/auto/MultipleEntityManagerInjectionRollbackOnlyTest.java
deleted file mode 100644
index ebb2835..0000000
--- a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/getRollbackOnly/multipleinjection/auto/MultipleEntityManagerInjectionRollbackOnlyTest.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.apache.deltaspike.test.jpa.api.transactional.getRollbackOnly.multipleinjection.auto;
-
-import org.apache.deltaspike.core.api.projectstage.ProjectStage;
-import org.apache.deltaspike.core.util.ProjectStageProducer;
-import org.apache.deltaspike.jpa.impl.transaction.context.TransactionBeanStorage;
-import org.apache.deltaspike.jpa.impl.transaction.context.TransactionContextExtension;
-import org.apache.deltaspike.test.category.SeCategory;
-import org.apache.deltaspike.test.jpa.api.shared.TestEntityManager;
-import org.apache.deltaspike.test.jpa.api.shared.TestEntityTransaction;
-import org.apache.deltaspike.test.util.ArchiveUtils;
-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.spec.JavaArchive;
-import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-
-import javax.enterprise.inject.spi.Extension;
-import javax.inject.Inject;
-
-//different classes needed due to arquillian restriction
-@RunWith(Arquillian.class)
-@Category(SeCategory.class)
-public class MultipleEntityManagerInjectionRollbackOnlyTest
-{
-    @Inject
-    private MultiTransactionBean multiTransactionBean;
-
-    @Inject
-    private TestEntityManagerProducer entityManagerProducer;
-
-    @Deployment
-    public static WebArchive deploy()
-    {
-        JavaArchive testJar = ShrinkWrap.create(JavaArchive.class, "autoInjectionRollbackOnlyTest.jar")
-                .addPackage(ArchiveUtils.SHARED_PACKAGE)
-                .addPackage(MultipleEntityManagerInjectionRollbackOnlyTest.class.getPackage().getName())
-                .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
-
-        return ShrinkWrap.create(WebArchive.class)
-                .addAsLibraries(ArchiveUtils.getDeltaSpikeCoreAndJpaArchive())
-                .addAsLibraries(testJar)
-                .addAsServiceProvider(Extension.class, TransactionContextExtension.class)
-                .addAsWebInfResource(ArchiveUtils.getBeansXml(), "beans.xml");
-    }
-
-    @Before
-    public void init()
-    {
-        ProjectStageProducer.setProjectStage(ProjectStage.UnitTest);
-    }
-
-    @Test
-    public void autoInjectionRollbackOnlyDefaultTest()
-    {
-        TestEntityManager defaultEntityManager = entityManagerProducer.getDefaultEntityManager();
-        TestEntityManager firstEntityManager = entityManagerProducer.getFirstEntityManager();
-        TestEntityManager secondEntityManager = entityManagerProducer.getSecondEntityManager();
-
-        Assert.assertNotNull(defaultEntityManager);
-        TestEntityTransaction defaultTransaction = (TestEntityTransaction) (defaultEntityManager).getTransaction();
-
-        Assert.assertEquals(false, defaultEntityManager.isFlushed());
-        Assert.assertEquals(false, defaultTransaction.isActive());
-        Assert.assertEquals(false, defaultTransaction.isStarted());
-        Assert.assertEquals(false, defaultTransaction.isCommitted());
-        Assert.assertEquals(false, defaultTransaction.isRolledBack());
-
-        Assert.assertNotNull(firstEntityManager);
-        TestEntityTransaction firstTransaction = (TestEntityTransaction) (firstEntityManager).getTransaction();
-
-        Assert.assertEquals(false, firstEntityManager.isFlushed());
-        Assert.assertEquals(false, firstTransaction.isActive());
-        Assert.assertEquals(false, firstTransaction.isStarted());
-        Assert.assertEquals(false, firstTransaction.isCommitted());
-        Assert.assertEquals(false, firstTransaction.isRolledBack());
-
-        Assert.assertNotNull(secondEntityManager);
-        TestEntityTransaction secondTransaction = (TestEntityTransaction) (secondEntityManager).getTransaction();
-
-        Assert.assertEquals(false, secondEntityManager.isFlushed());
-        Assert.assertEquals(false, secondTransaction.isActive());
-        Assert.assertEquals(false, secondTransaction.isStarted());
-        Assert.assertEquals(false, secondTransaction.isCommitted());
-        Assert.assertEquals(false, secondTransaction.isRolledBack());
-
-        multiTransactionBean.executeInTransactionRollbackDefault();
-
-        Assert.assertEquals(true, defaultEntityManager.isFlushed());
-        Assert.assertEquals(false, defaultTransaction.isActive());
-        Assert.assertEquals(true, defaultTransaction.isStarted());
-        Assert.assertEquals(false, defaultTransaction.isCommitted());
-        Assert.assertEquals(true, defaultTransaction.isRolledBack());
-
-        Assert.assertEquals(true, firstEntityManager.isFlushed());
-        Assert.assertEquals(false, firstTransaction.isActive());
-        Assert.assertEquals(true, firstTransaction.isStarted());
-        Assert.assertEquals(false, firstTransaction.isCommitted());
-        Assert.assertEquals(true, firstTransaction.isRolledBack());
-
-        Assert.assertEquals(true, secondEntityManager.isFlushed());
-        Assert.assertEquals(false, secondTransaction.isActive());
-        Assert.assertEquals(true, secondTransaction.isStarted());
-        Assert.assertEquals(false, secondTransaction.isCommitted());
-        Assert.assertEquals(true, secondTransaction.isRolledBack());
-
-        Assert.assertEquals(false, TransactionBeanStorage.isOpen());
-    }
-}

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/cdb86507/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/getRollbackOnly/multipleinjection/auto/RollbackOnly1Test.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/getRollbackOnly/multipleinjection/auto/RollbackOnly1Test.java b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/getRollbackOnly/multipleinjection/auto/RollbackOnly1Test.java
new file mode 100644
index 0000000..57f8a00
--- /dev/null
+++ b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/transactional/getRollbackOnly/multipleinjection/auto/RollbackOnly1Test.java
@@ -0,0 +1,132 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.apache.deltaspike.test.jpa.api.transactional.getRollbackOnly.multipleinjection.auto;
+
+import org.apache.deltaspike.core.api.projectstage.ProjectStage;
+import org.apache.deltaspike.core.util.ProjectStageProducer;
+import org.apache.deltaspike.jpa.impl.transaction.context.TransactionBeanStorage;
+import org.apache.deltaspike.jpa.impl.transaction.context.TransactionContextExtension;
+import org.apache.deltaspike.test.category.SeCategory;
+import org.apache.deltaspike.test.jpa.api.shared.TestEntityManager;
+import org.apache.deltaspike.test.jpa.api.shared.TestEntityTransaction;
+import org.apache.deltaspike.test.util.ArchiveUtils;
+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.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+
+import javax.enterprise.inject.spi.Extension;
+import javax.inject.Inject;
+
+//different classes needed due to arquillian restriction
+@RunWith(Arquillian.class)
+@Category(SeCategory.class)
+public class RollbackOnly1Test
+{
+    @Inject
+    private MultiTransactionBean multiTransactionBean;
+
+    @Inject
+    private TestEntityManagerProducer entityManagerProducer;
+
+    @Deployment
+    public static WebArchive deploy()
+    {
+        JavaArchive testJar = ShrinkWrap.create(JavaArchive.class, "autoInjectionRollbackOnly1Test.jar")
+                .addPackage(ArchiveUtils.SHARED_PACKAGE)
+                .addPackage(RollbackOnly1Test.class.getPackage().getName())
+                .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
+
+        return ShrinkWrap.create(WebArchive.class)
+                .addAsLibraries(ArchiveUtils.getDeltaSpikeCoreAndJpaArchive())
+                .addAsLibraries(testJar)
+                .addAsServiceProvider(Extension.class, TransactionContextExtension.class)
+                .addAsWebInfResource(ArchiveUtils.getBeansXml(), "beans.xml");
+    }
+
+    @Before
+    public void init()
+    {
+        ProjectStageProducer.setProjectStage(ProjectStage.UnitTest);
+    }
+
+    @Test
+    public void autoInjectionRollbackOnly1Test()
+    {
+        TestEntityManager defaultEntityManager = entityManagerProducer.getDefaultEntityManager();
+        TestEntityManager firstEntityManager = entityManagerProducer.getFirstEntityManager();
+        TestEntityManager secondEntityManager = entityManagerProducer.getSecondEntityManager();
+
+        Assert.assertNotNull(defaultEntityManager);
+        TestEntityTransaction defaultTransaction = (TestEntityTransaction) (defaultEntityManager).getTransaction();
+
+        Assert.assertEquals(false, defaultEntityManager.isFlushed());
+        Assert.assertEquals(false, defaultTransaction.isActive());
+        Assert.assertEquals(false, defaultTransaction.isStarted());
+        Assert.assertEquals(false, defaultTransaction.isCommitted());
+        Assert.assertEquals(false, defaultTransaction.isRolledBack());
+
+        Assert.assertNotNull(firstEntityManager);
+        TestEntityTransaction firstTransaction = (TestEntityTransaction) (firstEntityManager).getTransaction();
+
+        Assert.assertEquals(false, firstEntityManager.isFlushed());
+        Assert.assertEquals(false, firstTransaction.isActive());
+        Assert.assertEquals(false, firstTransaction.isStarted());
+        Assert.assertEquals(false, firstTransaction.isCommitted());
+        Assert.assertEquals(false, firstTransaction.isRolledBack());
+
+        Assert.assertNotNull(secondEntityManager);
+        TestEntityTransaction secondTransaction = (TestEntityTransaction) (secondEntityManager).getTransaction();
+
+        Assert.assertEquals(false, secondEntityManager.isFlushed());
+        Assert.assertEquals(false, secondTransaction.isActive());
+        Assert.assertEquals(false, secondTransaction.isStarted());
+        Assert.assertEquals(false, secondTransaction.isCommitted());
+        Assert.assertEquals(false, secondTransaction.isRolledBack());
+
+        multiTransactionBean.executeInTransactionRollback1();
+
+        Assert.assertEquals(true, defaultEntityManager.isFlushed());
+        Assert.assertEquals(false, defaultTransaction.isActive());
+        Assert.assertEquals(true, defaultTransaction.isStarted());
+        Assert.assertEquals(false, defaultTransaction.isCommitted());
+        Assert.assertEquals(true, defaultTransaction.isRolledBack());
+
+        Assert.assertEquals(true, firstEntityManager.isFlushed());
+        Assert.assertEquals(false, firstTransaction.isActive());
+        Assert.assertEquals(true, firstTransaction.isStarted());
+        Assert.assertEquals(false, firstTransaction.isCommitted());
+        Assert.assertEquals(true, firstTransaction.isRolledBack());
+
+        Assert.assertEquals(true, secondEntityManager.isFlushed());
+        Assert.assertEquals(false, secondTransaction.isActive());
+        Assert.assertEquals(true, secondTransaction.isStarted());
+        Assert.assertEquals(false, secondTransaction.isCommitted());
+        Assert.assertEquals(true, secondTransaction.isRolledBack());
+
+        Assert.assertEquals(false, TransactionBeanStorage.isOpen());
+    }
+}