Repository: tomee Updated Branches: refs/heads/master 4e4311162 -> 85635cd8c
TOMEE-2043 test dontRollbackOn @Transactional config Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/85635cd8 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/85635cd8 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/85635cd8 Branch: refs/heads/master Commit: 85635cd8ca5e7256d3295bbaa5cc88674eebcfca Parents: 4e43111 Author: rmannibucau <rmannibu...@apache.org> Authored: Thu Jun 1 11:23:35 2017 +0200 Committer: rmannibucau <rmannibu...@apache.org> Committed: Thu Jun 1 11:23:35 2017 +0200 ---------------------------------------------------------------------- .../cdi/transactional/TransactionalTest.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/85635cd8/container/openejb-core/src/test/java/org/apache/openejb/cdi/transactional/TransactionalTest.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/test/java/org/apache/openejb/cdi/transactional/TransactionalTest.java b/container/openejb-core/src/test/java/org/apache/openejb/cdi/transactional/TransactionalTest.java index d63b7af..265e5b2 100644 --- a/container/openejb-core/src/test/java/org/apache/openejb/cdi/transactional/TransactionalTest.java +++ b/container/openejb-core/src/test/java/org/apache/openejb/cdi/transactional/TransactionalTest.java @@ -47,6 +47,7 @@ import static javax.transaction.Transactional.TxType.REQUIRES_NEW; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotSame; +import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -61,6 +62,17 @@ public class TransactionalTest { @Inject private TxBean bean; + @Test + public void dontRollbackCommits() throws SystemException { + assertNull(OpenEJB.getTransactionManager().getTransaction()); + try { + bean.dontRollback(); + } catch (final TransactionalException e) { + // expected + } + assertNull(OpenEJB.getTransactionManager().getTransaction()); + } + @Test(expected = TransactionalException.class) public void mandatoryKO() { for (int i = 0; i < 2; i++) { @@ -361,6 +373,11 @@ public class TransactionalTest { } } + @Transactional(dontRollbackOn = AnException.class) + public void dontRollback() { + throw new AnException(); + } + @Transactional(value = MANDATORY, rollbackOn = AnException.class) public void anException() { throw new AnException();