Add transactions to setup / cleanup to restore 1.x behaviour

test-core/src/main/java/io/micronaut/test/context/TestExecutionListener.java

@@ -33,6 +33,46 @@ default void beforeTestClass(TestContext testContext) throws Exception {
 
   }
 
+  /**
+   * Executed before the setup method of a test method.
+   *
+   * @param testContext the test context
+   * @throws Exception allows any exception to propagate
+   */
+  default void beforeSetupTest(TestContext testContext) throws Exception {
+
+  }
+
+  /**
+   * Executed after the setup method of a test method.
+   *
+   * @param testContext the test context
+   * @throws Exception allows any exception to propagate
+   */
+  default void afterSetupTest(TestContext testContext) throws Exception {
+
+  }
+
+  /**
+   * Executed before the setup method of a test method.
+   *
+   * @param testContext the test context
+   * @throws Exception allows any exception to propagate
+   */
+  default void beforeCleanupTest(TestContext testContext) throws Exception {
+
+  }
+
+  /**
+   * Executed after the setup method of a test method.
+   *
+   * @param testContext the test context
+   * @throws Exception allows any exception to propagate
+   */
+  default void afterCleanupTest(TestContext testContext) throws Exception {
+
+  }
+
   /**
    * Executed before a test method is executed (a test method may contain multiple iterations).
    *

test-core/src/main/java/io/micronaut/test/extensions/AbstractMicronautExtension.java

@@ -73,6 +73,16 @@ public void beforeTestExecution(TestContext testContext) throws Exception {
         fireListeners(TestExecutionListener::beforeTestExecution, testContext);
     }
 
+    @Override
+    public void beforeCleanupTest(TestContext testContext) throws Exception {
+        fireListeners(TestExecutionListener::beforeCleanupTest, testContext);
+    }
+
+    @Override
+    public void afterCleanupTest(TestContext testContext) throws Exception {
+        fireListeners(TestExecutionListener::afterCleanupTest, testContext);
+    }
+
     /** {@inheritDoc} */
     @Override
     public void afterTestExecution(TestContext testContext) throws Exception {
@@ -91,6 +101,16 @@ public void afterTestClass(TestContext testContext) throws Exception {
         fireListeners(TestExecutionListener::afterTestClass, testContext);
     }
 
+    @Override
+    public void beforeSetupTest(TestContext testContext) throws Exception {
+        fireListeners(TestExecutionListener::beforeSetupTest, testContext);
+    }
+
+    @Override
+    public void afterSetupTest(TestContext testContext) throws Exception {
+        fireListeners(TestExecutionListener::afterSetupTest, testContext);
+    }
+
     /** {@inheritDoc} */
     @Override
     public void beforeTestMethod(TestContext testContext) throws Exception {

test-core/src/main/java/io/micronaut/test/transaction/spring/SpringTransactionTestExecutionListener.java

@@ -50,22 +50,35 @@ public class SpringTransactionTestExecutionListener implements TestExecutionList
      */
     public SpringTransactionTestExecutionListener(
         PlatformTransactionManager transactionManager,
-        @Property(name = AbstractMicronautExtension.TEST_ROLLBACK) boolean rollback) {
+        @Property(name = AbstractMicronautExtension.TEST_ROLLBACK, defaultValue = "true") boolean rollback) {
 
         this.transactionManager = transactionManager;
         this.rollback = rollback;
+    }
+
+    @Override
+    public void beforeSetupTest(TestContext testContext) {
+        beforeTestExecution(testContext);
+    }
+
+    @Override
+    public void afterSetupTest(TestContext testContext) {
+        afterTestExecution(false);
+    }
 
+    @Override
+    public void beforeCleanupTest(TestContext testContext) throws Exception {
+        beforeTestExecution(testContext);
+    }
+
+    @Override
+    public void afterCleanupTest(TestContext testContext) throws Exception {
+        afterTestExecution(false);
     }
 
     @Override
     public void afterTestExecution(TestContext testContext) {
-        if (counter.decrementAndGet() == 0) {
-            if (rollback) {
-                transactionManager.rollback(tx);
-            } else {
-                transactionManager.commit(tx);
-            }
-        }
+        afterTestExecution(this.rollback);
     }
 
     @Override
@@ -74,4 +87,14 @@ public void beforeTestExecution(TestContext testContext) {
             tx = transactionManager.getTransaction(new DefaultTransactionDefinition());
         }
     }
+
+    private void afterTestExecution(boolean rollback) {
+        if (counter.decrementAndGet() == 0) {
+            if (rollback) {
+                transactionManager.rollback(tx);
+            } else {
+                transactionManager.commit(tx);
+            }
+        }
+    }
 }

test-junit5/src/main/java/io/micronaut/test/extensions/junit5/MicronautJunit5Extension.java

@@ -33,6 +33,7 @@
 import javax.inject.Named;
 import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Field;
+import java.lang.reflect.Method;
 import java.util.*;
 
 /**
@@ -41,7 +42,7 @@
  * @author graemerocher
  * @since 1.0
  */
-public class MicronautJunit5Extension extends AbstractMicronautExtension<ExtensionContext> implements BeforeAllCallback, AfterAllCallback, BeforeEachCallback, AfterEachCallback, ExecutionCondition, BeforeTestExecutionCallback, AfterTestExecutionCallback, ParameterResolver {
+public class MicronautJunit5Extension extends AbstractMicronautExtension<ExtensionContext> implements BeforeAllCallback, AfterAllCallback, BeforeEachCallback, AfterEachCallback, ExecutionCondition, BeforeTestExecutionCallback, AfterTestExecutionCallback, ParameterResolver, InvocationInterceptor {
     private static final ExtensionContext.Namespace NAMESPACE = ExtensionContext.Namespace.create(MicronautJunit5Extension.class);
 
     @Override
@@ -60,6 +61,20 @@ public void beforeAll(ExtensionContext extensionContext) throws Exception {
         beforeTestClass(buildContext(extensionContext));
     }
 
+    @Override
+    public void interceptBeforeEachMethod(Invocation<Void> invocation, ReflectiveInvocationContext<Method> invocationContext, ExtensionContext extensionContext) throws Throwable {
+        beforeSetupTest(buildContext(extensionContext));
+        invocation.proceed();
+        afterSetupTest(buildContext(extensionContext));
+    }
+
+    @Override
+    public void interceptAfterEachMethod(Invocation<Void> invocation, ReflectiveInvocationContext<Method> invocationContext, ExtensionContext extensionContext) throws Throwable {
+        beforeCleanupTest(buildContext(extensionContext));
+        invocation.proceed();
+        afterCleanupTest(buildContext(extensionContext));
+    }
+
     @Override
     public void afterAll(ExtensionContext extensionContext) throws Exception {
         afterTestClass(buildContext(extensionContext));

test-junit5/src/test/java/io/micronaut/test/junit5/TransactionalTest.java

@@ -19,8 +19,12 @@
 import io.micronaut.test.annotation.MicronautTest;
 import io.micronaut.test.transaction.spring.SpringTransactionTestExecutionListener;
 import javax.inject.Inject;
+
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.springframework.transaction.support.TransactionSynchronizationManager;
 
 @MicronautTest(transactional = true)
 @DbProperties
@@ -29,6 +33,16 @@ class TransactionalTest {
   @Inject
   ApplicationContext applicationContext;
 
+  @BeforeEach
+  void setup() {
+    Assertions.assertTrue(TransactionSynchronizationManager.isSynchronizationActive());
+  }
+
+  @AfterEach
+  void cleanup() {
+    Assertions.assertTrue(TransactionSynchronizationManager.isSynchronizationActive());
+  }
+
   @Test
   void testSpringTransactionListenerMissing() {
     Assertions.assertTrue(applicationContext.containsBean(SpringTransactionTestExecutionListener.class));

test-spock/src/main/java/io/micronaut/test/extensions/spock/MicronautSpockExtension.java

@@ -108,6 +108,7 @@ public void visitSpecAnnotation(MicronautTest annotation, SpecInfo spec) {
         spec.addCleanupSpecInterceptor(invocation -> {
             afterTestClass(buildContext(invocation, null));
             afterClass(invocation);
+
             invocation.proceed();
             singletonMocks.clear();
         });
@@ -123,7 +124,12 @@ public void visitSpecAnnotation(MicronautTest annotation, SpecInfo spec) {
             for (Object mock : singletonMocks) {
                 mockUtil.attachMock(mock, (Specification) instance);
             }
-            invocation.proceed();
+            try {
+                beforeSetupTest(buildContext(invocation, null));
+                invocation.proceed();
+            } finally {
+                afterSetupTest(buildContext(invocation, null));
+            }
         });
 
         spec.addCleanupInterceptor(invocation -> {
@@ -135,7 +141,12 @@ public void visitSpecAnnotation(MicronautTest annotation, SpecInfo spec) {
             }
             creatableMocks.clear();
             afterEach(invocation);
-            invocation.proceed();
+            try {
+                beforeCleanupTest(buildContext(invocation, null));
+                invocation.proceed();
+            } finally {
+                afterCleanupTest(buildContext(invocation, null));
+            }
         });
     }
 

test-spock/src/test/groovy/io/micronaut/test/spock/GormTransactionalRollbackSpec.groovy

@@ -18,10 +18,10 @@ package io.micronaut.test.spock
 import io.micronaut.context.ApplicationContext
 import io.micronaut.context.annotation.Property
 import io.micronaut.core.util.StringUtils
-import io.micronaut.inject.qualifiers.Qualifiers
 import io.micronaut.test.annotation.MicronautTest
 import io.micronaut.test.spock.entities.Book
 import io.micronaut.test.transaction.spring.SpringTransactionTestExecutionListener
+import org.springframework.transaction.support.TransactionSynchronizationManager
 import spock.lang.Specification
 import spock.lang.Stepwise
 
@@ -44,6 +44,16 @@ class GormTransactionalRollbackSpec extends Specification {
     @Inject
     ApplicationContext applicationContext
 
+    def setup() {
+        // check transaction is present in setup
+        assert TransactionSynchronizationManager.isSynchronizationActive()
+    }
+
+    def cleanup() {
+        // check transaction is present in setup
+        assert TransactionSynchronizationManager.isSynchronizationActive()
+    }
+
     void "bean SpringTransactionTestExecutionListener exists"() {
         expect:
         applicationContext.containsBean(SpringTransactionTestExecutionListener)