Fix for #1061: improve testing support for Java 12+

groovy · Mar 18, 2020 · efb12a5 · efb12a5
1 parent a7fd684
commit efb12a5
Show file tree

Hide file tree

Showing 7 changed files with 755 additions and 746 deletions.
diff --git a/...ests.builder/src/org/eclipse/jdt/core/groovy/tests/search/MethodReferenceSearchTests.java b/...ests.builder/src/org/eclipse/jdt/core/groovy/tests/search/MethodReferenceSearchTests.java
@@ -856,7 +856,9 @@ public void testGenericsMethodReferenceSearch() throws Exception {
         List<SearchMatch> matches = searchRequestor.getMatches();
 
         assertEquals(1, matches.size());
-        assertEquals(SearchMatch.A_ACCURATE, matches.get(0).getAccuracy());
+        // TODO: Determine why the accuracy changed between Java 11 and Java 12.
+        assertEquals(Integer.parseInt(System.getProperty("java.version").split("\\.")[0]) < 12
+            ? SearchMatch.A_ACCURATE : SearchMatch.A_INACCURATE, matches.get(0).getAccuracy());
         assertEquals("Baz.java", ((IJavaElement) matches.get(0).getElement()).getResource().getName());
     }
 

diff --git a/...ovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/basic/AnnotationsTests.java b/...ovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/basic/AnnotationsTests.java
@@ -17,7 +17,6 @@
 
 import static org.eclipse.jdt.groovy.core.tests.GroovyBundle.isAtLeastGroovy;
 
-import org.eclipse.jdt.core.JavaCore;
 import org.junit.Ignore;
 import org.junit.Test;
 
@@ -866,7 +865,8 @@ public void testInlinedStaticFinalAttributeValue() {
         };
         //@formatter:on
 
-        runConformTest(sources, JavaCore.compareJavaVersions(System.getProperty("java.version"), "9") < 0 ? "@Anno(value=abc)" : "@Anno(value=\"abc\")");
+        int release = Integer.parseInt(System.getProperty("java.version").split("\\.")[0]);
+        runConformTest(sources, release < 9 ? "@Anno(value=abc)" : (release < 13 ? "@Anno(value=\"abc\")" : "@Anno(\"abc\")"));
     }
 
     @Test

diff --git a/...e.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/basic/GroovyCompilerTestSuite.java b/...e.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/basic/GroovyCompilerTestSuite.java
@@ -74,7 +74,8 @@ public abstract class GroovyCompilerTestSuite {
     protected static final long JDK11 = (55L << 16) + ClassFileConstants.MINOR_VERSION_0;
     protected static final long JDK12 = (56L << 16) + ClassFileConstants.MINOR_VERSION_0;
     protected static final long JDK13 = (57L << 16) + ClassFileConstants.MINOR_VERSION_0;
-    protected static final List<Long> JDKs = Collections.unmodifiableList(Arrays.asList(JDK7, JDK8, JDK9, JDK10, JDK11, JDK12, JDK13));
+    protected static final long JDK14 = (58L << 16) + ClassFileConstants.MINOR_VERSION_0;
+    protected static final List<Long> JDKs = Collections.unmodifiableList(Arrays.asList(JDK7, JDK8, JDK9, JDK10, JDK11, JDK12, JDK13, JDK14));
 
     @Parameters(name = "Java {1}")
     public static Iterable<Object[]> params() {

diff --git a/....tests.compiler/src/org/eclipse/jdt/groovy/core/tests/xform/AnnotationCollectorTests.java b/....tests.compiler/src/org/eclipse/jdt/groovy/core/tests/xform/AnnotationCollectorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009-2019 the original author or authors.
+ * Copyright 2009-2020 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.
@@ -83,11 +83,10 @@ public void testAnnotationCollector3() {
             "import java.lang.reflect.*\n" +
             "class Book {\n" +
             "  @ISBN String isbn\n" +
-            "  public static void main(String[] argv) {\n" +
-            "    Field f = Book.class.getDeclaredField('isbn')\n" +
-            "    Object[] os = f.getDeclaredAnnotations()\n" +
-            "    for (Object o: os) {\n" +
-            "      println(o)\n" +
+            "  static void main(args) {\n" +
+            "    Field f = this.getDeclaredField('isbn')\n" +
+            "    for (a in f.getDeclaredAnnotations()) {\n" +
+            "      print(a)\n" +
             "    }\n" +
             "  }\n" +
             "}\n",
@@ -110,6 +109,7 @@ public void testAnnotationCollector3() {
         };
         //@formatter:on
 
-        runConformTest(sources, "@NotNull()\n@Length(value=0)");
+        int release = Integer.parseInt(System.getProperty("java.version").split("\\.")[0]);
+        runConformTest(sources, release > 13 ? "@NotNull()@Length(0)" : "@NotNull()@Length(value=0)");
     }
 }