fix failing tests

mfatihercik · Mar 10, 2015 · 6017486 · 6017486
1 parent a79de2d
commit 6017486
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/grails-core/src/main/groovy/org/grails/compiler/injection/GrailsASTUtils.java b/grails-core/src/main/groovy/org/grails/compiler/injection/GrailsASTUtils.java
@@ -886,8 +886,8 @@ public static AnnotationNode addEnhancedAnnotation(final ClassNode classNode, fi
             }
             if(grailsVersion != null) {
                 enhancedAnnotationNode.setMember("version", new ConstantExpression(grailsVersion));
-                classNode.addAnnotation(enhancedAnnotationNode);
             }
+            classNode.addAnnotation(enhancedAnnotationNode);
         } else {
             enhancedAnnotationNode = annotations.get(0);
         }

diff --git a/...-test-suite-uber/src/test/groovy/org/grails/compiler/injection/GrailsASTUtilsTests.groovy b/...-test-suite-uber/src/test/groovy/org/grails/compiler/injection/GrailsASTUtilsTests.groovy
@@ -14,6 +14,16 @@ import org.codehaus.groovy.ast.builder.AstBuilder
  */
 class GrailsASTUtilsTests extends GroovyTestCase {
 
+    @Override
+    protected void setUp() throws Exception {
+        System.setProperty("grails.version", "3.0.0")
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        System.setProperty("grails.version", "")
+    }
+
     void testGetFurthestParent() {
         def fooNode = new ClassNode(Foo)
         def barNode = new ClassNode(Bar)