Fix up a few tests

#412
groovy · Mar 18, 2018 · 393c6d8 · 393c6d8
1 parent 56ed572
commit 393c6d8
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 11 deletions.
diff --git a/...re.tests.builder/src/org/eclipse/jdt/core/groovy/tests/builder/BuildAccessRulesTests.java b/...re.tests.builder/src/org/eclipse/jdt/core/groovy/tests/builder/BuildAccessRulesTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009-2017 the original author or authors.
+ * Copyright 2009-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -106,7 +106,7 @@ public void testAccessForImplements() {
         String source = "import java.beans.*\n" +
             "abstract class Foo implements BeanInfo {}";
 
-        assertAccessRestriction(source, "BeanInfo "); // interface has +1 sloc...
+        assertAccessRestriction(source, "BeanInfo");
     }
 
     @Test

diff --git a/....builder/src/org/eclipse/jdt/core/groovy/tests/locations/ASTNodeSourceLocationsTests.java b/....builder/src/org/eclipse/jdt/core/groovy/tests/locations/ASTNodeSourceLocationsTests.java
@@ -15,6 +15,7 @@
  */
 package org.eclipse.jdt.core.groovy.tests.locations;
 
+import static org.eclipse.jdt.groovy.core.tests.GroovyBundle.isParrotParser;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
@@ -259,7 +260,7 @@ public void testBinaryExpr7() throws Exception {
         checkBinaryExprSLocs(
             "  a = b   ",
             new BinaryExpressionSLocTester(),
-            Boolean.getBoolean("groovy.antlr4") ? "a = b" : "a = b   ");
+            isParrotParser() ? "a = b" : "a = b   ");
     }
 
     @Test

diff --git a/...se.jdt.groovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/GroovyBundle.java b/...se.jdt.groovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/GroovyBundle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009-2017 the original author or authors.
+ * Copyright 2009-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,4 +29,8 @@ public abstract class GroovyBundle {
     public static boolean isAtLeastGroovy(int level) {
         return (GROOVY_LEVEL >= level);
     }
+
+    public static boolean isParrotParser() {
+        return (isAtLeastGroovy(26) && Boolean.getBoolean("groovy.antlr4"));
+    }
 }
diff --git a/...y.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/basic/ErrorRecoveryTests.java b/...y.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/basic/ErrorRecoveryTests.java
@@ -15,6 +15,7 @@
  */
 package org.eclipse.jdt.groovy.core.tests.basic;
 
+import static org.eclipse.jdt.groovy.core.tests.GroovyBundle.isParrotParser;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
@@ -516,7 +517,7 @@ public void testParsingRecovery_GRE1107_1() {
             "  }\n" +
             "}\n",
         },
-        Boolean.getBoolean("groovy.antlr4") ? "" :
+        isParrotParser() ? "" :
         "----------\n" +
         "1. ERROR in foo\\X.groovy (at line 6)\n" +
         "\tdo {\n" +
@@ -549,7 +550,7 @@ public void testParsingRecovery_GRE1107_2() {
             "  }\n" +
             "}\n",
         },
-        Boolean.getBoolean("groovy.antlr4") ? "" :
+        isParrotParser() ? "" :
         "----------\n" +
         "1. ERROR in foo\\X.groovy (at line 7)\n" +
         "\tdo {\n" +

diff --git a/...vy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/basic/GroovySimpleTests.java b/...vy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/basic/GroovySimpleTests.java
@@ -16,6 +16,7 @@
 package org.eclipse.jdt.groovy.core.tests.basic;
 
 import static org.eclipse.jdt.groovy.core.tests.GroovyBundle.isAtLeastGroovy;
+import static org.eclipse.jdt.groovy.core.tests.GroovyBundle.isParrotParser;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
@@ -2331,12 +2332,13 @@ public void testMemberTypeResolution() {
     public void testFailureWhilstAttemptingToReportError() {
         runNegativeTest(new String[] {
             "T.groovy",
-            "public class T{\n"+
-            "	def x () {\n"+
-            "		this \"\"\n"+
+            "public class T {\n" +
+            "	def x () {\n" +
+            "		this \"\"\n" + // not a ctor call
             "	}\n"+
-            "}\n"
+            "}\n",
         },
+        isParrotParser() ? "" :
         "----------\n" +
         "1. ERROR in T.groovy (at line 3)\n" +
         "\tthis \"\"\n" +

diff --git a/...core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/basic/TransformationsTests.java b/...core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/basic/TransformationsTests.java
@@ -15,6 +15,7 @@
  */
 package org.eclipse.jdt.groovy.core.tests.basic;
 
+import static org.eclipse.jdt.groovy.core.tests.GroovyBundle.isParrotParser;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assume.assumeTrue;
 
@@ -846,7 +847,7 @@ public void testTypeChecked1() {
             "----------\n" +
             "2. ERROR in Foo.groovy (at line 5)\n" +
             "\tprintln \"Did you spot the error in this ${message.toUppercase()}?\"\n" +
-            "\t                                         " + (Boolean.getBoolean("groovy.antlr4") ? " ^^^^^^^^^^^^^^^^^^^^^" : "^^^^^^^^^^^^^^^^^^^^^^^") + "\n" +
+            "\t                                         " + (isParrotParser() ? " ^^^^^^^^^^^^^^^^^^^^^" : "^^^^^^^^^^^^^^^^^^^^^^^") + "\n" +
             "Groovy:[Static type checking] - Cannot find matching method java.lang.String#toUppercase(). Please check if the declared type is correct and if the method exists.\n" +
             "----------\n");
     }