Fixes problems with Spock and @Rollback - Fixes #9493

Author: graemerocher

grails-core/src/main/groovy/org/grails/transaction/transform/TransactionalTransform.groovy

@@ -119,6 +119,10 @@ class TransactionalTransform implements ASTTransformation{
 
                 if( methodName.contains('$') && !methodName.startsWith('$spock') ) continue
 
+                if(md.getAnnotations().any { AnnotationNode an -> an.classNode.name == "org.spockframework.runtime.model.DataProviderMetadata"}) {
+                    continue
+                }
+
                 if(METHOD_NAME_EXCLUDES.contains(methodName)) continue
 
                 if(isSetterOrGetterMethod(md)) continue
@@ -129,7 +133,7 @@ class TransactionalTransform implements ASTTransformation{
                 if(hasAnnotation(md, DelegatingMethod.class)) continue
                 weaveTransactionalMethod(source, classNode, annotationNode, md);
             }
-            else if("setup".equals(methodName) && isSpockTest(classNode)) {
+            else if(("setup".equals(methodName) ||  "cleanup".equals(methodName)) && isSpockTest(classNode)) {
                 def requiresNewTransaction = new AnnotationNode(annotationNode.classNode)
                 requiresNewTransaction.addMember("propagation", new PropertyExpression(new ClassExpression(ClassHelper.make(Propagation.class)), "REQUIRES_NEW"))
                 weaveTransactionalMethod(source, classNode, requiresNewTransaction, md, "execute")

grails-test-suite-uber/src/test/groovy/grails/transaction/TransactionalTransformSpec.groovy

@@ -60,6 +60,10 @@ class TransactionalTransformSpec extends Specification {
 
         }
 
+        def cleanup() {
+
+        }
+
         void "my test method"() {
             expect:
                 1 == 1
@@ -72,7 +76,45 @@ class TransactionalTransformSpec extends Specification {
         TransactionManagerAware.isAssignableFrom(mySpec)
         mySpec.getDeclaredMethod('setup')
         mySpec.getDeclaredMethod('$tt__setup', TransactionStatus)
+        mySpec.getDeclaredMethod('cleanup')
+        mySpec.getDeclaredMethod('$tt__cleanup', TransactionStatus)
+
+        mySpec.getDeclaredMethod('$spock_feature_0_0')
+        mySpec.getDeclaredMethod('$tt__$spock_feature_0_0', TransactionStatus)
+    }
+
+    void "Test @Rollback when applied to Spock specifications and where blocks"() {
+        when:"A new instance of a class with a @Transactional method is created that subclasses another transactional class"
+        Class mySpec = new GroovyShell().evaluate('''
+import grails.test.mixin.integration.Integration
+import grails.transaction.Rollback
+import spock.lang.Specification
+
+@Integration
+@Rollback
+class DemoSpec extends Specification {
+
+    def "test toUpperCase"() {
+        given:
+        def result = value.toUpperCase()
+
+        expect:
+        result == expectedResult
+
+        where:
+        value | expectedResult
+        'King Crimson' | 'KING CRIMSON\'
+        'Riverside'    | 'RIVERSIDE\'
+    }
+}
+    DemoSpec
+    ''')
+
+        then:"It implements TransactionManagerAware"
+        TransactionManagerAware.isAssignableFrom(mySpec)
         mySpec.getDeclaredMethod('$spock_feature_0_0')
+        mySpec.getDeclaredMethod('$spock_feature_0_0prov0')
+        !mySpec.getDeclaredMethod('$tt__$spock_feature_0_0prov0')
         mySpec.getDeclaredMethod('$tt__$spock_feature_0_0', TransactionStatus)
     }