only auto-add @test annotation to methods that return void

Author: graemerocher

grails-plugin-testing/src/main/groovy/org/codehaus/groovy/grails/compiler/injection/test/TestForTransformation.java

@@ -93,6 +93,7 @@ public class TestForTransformation extends TestMixinTransformation {
 
     public static final AnnotationNode TEST_ANNOTATION = new AnnotationNode(new ClassNode(Test.class));
     public static final ClassNode GROOVY_TEST_CASE_CLASS = new ClassNode(GroovyTestCase.class);
+    public static final String VOID_TYPE = "void";
 
     private ResourceLocator resourceLocator;
 
@@ -216,7 +217,9 @@ public void testFor(ClassNode classNode, ClassExpression ce) {
                 List<AnnotationNode> existingTestAnnotations = methodNode.getAnnotations(testAnnotationClassNode);
                 if (isCandidateMethod(methodNode) && (methodNode.getName().startsWith("test") || existingTestAnnotations.size()>0)) {
                     if (existingTestAnnotations.size()==0) {
-                        methodNode.addAnnotation(TEST_ANNOTATION);
+                        ClassNode returnType = methodNode.getReturnType();
+                        if(returnType.getName().equals(VOID_TYPE))
+                            methodNode.addAnnotation(TEST_ANNOTATION);
                     }
                     hasTestMethods = true;
                 }

grails-test-suite-uber/src/test/groovy/grails/test/mixin/ControllerAndGroovyPageMixinTests.groovy

@@ -0,0 +1,18 @@
+package grails.test.mixin
+
+import grails.test.mixin.web.GroovyPageUnitTestMixin
+import org.junit.Test
+
+/**
+ * @author Graeme Rocher
+ */
+@TestMixin(GroovyPageUnitTestMixin)
+@TestFor(MyController)
+class ControllerAndGroovyPageMixinTests {
+
+    // verifies the above 2 mixins can operator together without error
+    @Test
+    void testController() {
+        controller != null
+    }
+}