made TestDataLoader cope with JTA transactions

Author: Daniel Behrwind

pom.xml

@@ -31,14 +31,27 @@
 
     <groupId>triology-blog</groupId>
     <artifactId>test-data-loader</artifactId>
-    <version>v0.1</version>
+    <version>v0.1.1</version>
 
     <dependencies>
         <dependency>
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy-all</artifactId>
             <version>2.4.7</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.7.21</version>
+        </dependency>
+
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>1.1.7</version>
+        </dependency>
+
         <dependency>
             <groupId>org.eclipse.persistence</groupId>
             <artifactId>javax.persistence</artifactId>

src/main/groovy/de/triology/blog/testdataloader/TestDataLoader.groovy

@@ -23,6 +23,9 @@
  */
 package de.triology.blog.testdataloader
 
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
+
 import javax.persistence.EntityManager
 
 /**
@@ -31,6 +34,8 @@ import javax.persistence.EntityManager
  */
 class TestDataLoader {
 
+    private static final Logger LOG = LoggerFactory.getLogger(TestDataLoader)
+
     private EntityManager entityManager
     private EntityBuilder entityBuilder
     private EntityDeleter entityDeleter
@@ -100,16 +105,21 @@ class TestDataLoader {
     }
 
     private void withTransaction(Closure doWithinTransaction) {
-        if (!transactionIsActive()) {
+        if (newTransactionRequired()) {
             withNewTransaction(doWithinTransaction)
         } else {
             // Someone else is taking care of transaction handling
             doWithinTransaction();
         }
     }
 
-    private boolean transactionIsActive() {
-        return entityManager.getTransaction().isActive()
+    private boolean newTransactionRequired() {
+        try {
+            return !entityManager.getTransaction().isActive()
+        } catch (IllegalStateException e) {
+            LOG.info('Caught IllegalStateException while accessing entityManager.getTransaction(). Assuming JTA transaction management', e)
+            return false;
+        }
     }
 
     private void withNewTransaction(Closure doWithinTransaction) {

src/test/java/de/triology/blog/testdataloader/TestDataLoaderTest.java

@@ -1,4 +1,4 @@
-/**
+/*
  * The MIT License (MIT)
  *
  * Copyright (c) 2016 TRIOLOGY GmbH
@@ -56,6 +56,12 @@ public void setUp() throws Exception {
         testDataLoader = new TestDataLoader(entityManagerMock);
     }
 
+    private EntityManager createTransactionalEntityManagerMock() {
+        EntityManager entityManagerMock = mock(EntityManager.class);
+        when(entityManagerMock.getTransaction()).thenReturn(mock(EntityTransaction.class));
+        return entityManagerMock;
+    }
+
     @Test
     public void getsCreatedEntityByName() throws Exception {
         BasicTestEntity entity = loadDefaultTestDataAndCallGetEntityByName("basicEntity", BasicTestEntity.class);
@@ -98,9 +104,10 @@ public void clearsEntitiesFromDatabase() throws Exception {
         verify(entityManagerMock, times(12)).remove(any());
     }
 
-    private EntityManager createTransactionalEntityManagerMock() {
-        EntityManager entityManagerMock = mock(EntityManager.class);
-        when(entityManagerMock.getTransaction()).thenReturn(mock(EntityTransaction.class));
-        return entityManagerMock;
+    @Test
+    public void copesWithIllegalStateExceptionWhenTryingToAccessAJTATransaction() throws Exception {
+        //noinspection unchecked
+        when(entityManagerMock.getTransaction()).thenThrow(IllegalStateException.class);
+        testDataLoader.loadTestData(Collections.singletonList("tests/testEntityDefinitions.groovy"));
     }
 }