Update the Groovy plugin to 4.0.4

for #1381
groovy · Jul 21, 2022 · 6c4dacf · 6c4dacf
1 parent d3797ed
commit 6c4dacf
Show file tree

Hide file tree

Showing 46 changed files with 2,025 additions and 2,568 deletions.
diff --git a/....core.tests.builder/src/org/eclipse/jdt/core/groovy/tests/search/DGMInferencingTests.java b/....core.tests.builder/src/org/eclipse/jdt/core/groovy/tests/search/DGMInferencingTests.java
@@ -1085,9 +1085,7 @@ public void testDGMDeclaring6() {
     @Test // https://github.com/groovy/groovy-eclipse/issues/1002
     public void testDGMDeclaring7() {
         String contents = "['x','y','z'].stream().toList()";
-        float version = Float.parseFloat(System.getProperty("java.specification.version"));
-        assertDeclType(contents, "toList", version > 15 ? "java.util.stream.Stream<java.lang.String>"
-            : isAtLeastGroovy(40) ? "org.codehaus.groovy.runtime.StreamGroovyMethods" : "org.codehaus.groovy.vmplugin.v8.PluginDefaultGroovyMethods");
+        assertDeclType(contents, "toList", isAtLeastGroovy(40) ? "org.codehaus.groovy.runtime.StreamGroovyMethods" : "org.codehaus.groovy.vmplugin.v8.PluginDefaultGroovyMethods");
     }
 
     @Test // https://github.com/groovy/groovy-eclipse/issues/1002

diff --git a/....tests.builder/src/org/eclipse/jdt/core/groovy/tests/search/Groovy25InferencingTests.java b/....tests.builder/src/org/eclipse/jdt/core/groovy/tests/search/Groovy25InferencingTests.java
@@ -63,7 +63,9 @@ public void testCompileStaticVariableAssignment4() {
             "  }\n" +
             "}\n";
 
-        assertType(contents, "list", "java.util.ArrayList<java.io.Serializable or java.lang.Comparable>");
+        float version = Float.parseFloat(System.getProperty("java.specification.version"));
+        assertType(contents, "list", "java.util.ArrayList<java.io.Serializable or java.lang.Comparable" +
+            (version > 11 ? " or java.lang.constant.Constable or java.lang.constant.ConstantDesc" : "") + ">");
     }
 
     @Test
@@ -110,6 +112,8 @@ public void testCompileStaticVariableAssignment8() {
             "  }\n" +
             "}\n";
 
-        assertType(contents, "map", "java.util.LinkedHashMap<java.lang.String,java.io.Serializable or java.lang.Comparable>");
+        float version = Float.parseFloat(System.getProperty("java.specification.version"));
+        assertType(contents, "map", "java.util.LinkedHashMap<java.lang.String,java.io.Serializable or java.lang.Comparable" +
+                            (version > 11 ? " or java.lang.constant.Constable or java.lang.constant.ConstantDesc" : "") + ">");
     }
 }