From c81cee468c80c91def394db7438e7444001f3791 Mon Sep 17 00:00:00 2001 From: Eric Milles Date: Thu, 20 Dec 2018 20:53:11 -0600 Subject: [PATCH] Java 11 fix-ups #686 --- .../jdt/groovy/core/tests/basic/TraitsTests.java | 8 -------- .../build.properties | 8 ++++---- extras/groovy-eclipse-compiler-tests/pom.xml | 2 +- .../codeassist/tests/TypeCompletionTests.groovy | 16 ++++++++-------- .../core/tests/builder/TestingEnvironment.java | 4 ++-- .../core/tests/builder/TestingEnvironment.java | 2 +- .../core/tests/builder/TestingEnvironment.java | 4 ++-- .../core/tests/builder/TestingEnvironment.java | 4 ++-- 8 files changed, 20 insertions(+), 28 deletions(-) diff --git a/base-test/org.eclipse.jdt.groovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/basic/TraitsTests.java b/base-test/org.eclipse.jdt.groovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/basic/TraitsTests.java index d78def06ce..d13103d232 100644 --- a/base-test/org.eclipse.jdt.groovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/basic/TraitsTests.java +++ b/base-test/org.eclipse.jdt.groovy.core.tests.compiler/src/org/eclipse/jdt/groovy/core/tests/basic/TraitsTests.java @@ -21,19 +21,11 @@ import org.codehaus.groovy.ast.ClassNode; import org.codehaus.groovy.control.CompilationUnit; -import org.junit.Before; import org.junit.Ignore; import org.junit.Test; public final class TraitsTests extends GroovyCompilerTestSuite { - @Before - public void setUp() { - if (Float.parseFloat(System.getProperty("java.specification.version")) > 8) { - vmArguments = new String[] {"--add-modules=java.xml.bind"}; - } - } - @Test public void testTraits() { String[] sources = { diff --git a/extras/groovy-eclipse-batch-builder/build.properties b/extras/groovy-eclipse-batch-builder/build.properties index c70dde60c1..39ee7bebc4 100644 --- a/extras/groovy-eclipse-batch-builder/build.properties +++ b/extras/groovy-eclipse-batch-builder/build.properties @@ -1,6 +1,6 @@ # version numbers -version2.4=2.4.16-01 -version2.5=2.5.4-01 +version2.4=2.4.16-02 +version2.5=2.5.4-02 version2.6=2.6.0-01 # uncomment to do a particular build -- only one should be uncommented at a time @@ -9,10 +9,10 @@ do-25-build=true #do-26-build=true # location of the plugins directory for the eclipse install -eclipse.install.plugins=C:/Users/Public/Eclipse-4.9/plugins +eclipse.install.plugins=C:/Users/Public/Eclipse-4.10/plugins # location of the cloned groovy-eclipse git repository git.repo.loc=C:/Users/Name/workspace/groovy-eclipse # which JDT Core patch is active in your workspace? -jdt.patch.target=e49 +jdt.patch.target=e410 diff --git a/extras/groovy-eclipse-compiler-tests/pom.xml b/extras/groovy-eclipse-compiler-tests/pom.xml index 7f2c35037a..14bb008f6e 100644 --- a/extras/groovy-eclipse-compiler-tests/pom.xml +++ b/extras/groovy-eclipse-compiler-tests/pom.xml @@ -10,7 +10,7 @@ 2.5.4 - 2.5.4-01 + 2.5.4-02 3.1 diff --git a/ide-test/org.codehaus.groovy.eclipse.codeassist.completion.test/src/org/codehaus/groovy/eclipse/codeassist/tests/TypeCompletionTests.groovy b/ide-test/org.codehaus.groovy.eclipse.codeassist.completion.test/src/org/codehaus/groovy/eclipse/codeassist/tests/TypeCompletionTests.groovy index de86af510c..1f320f4ed0 100644 --- a/ide-test/org.codehaus.groovy.eclipse.codeassist.completion.test/src/org/codehaus/groovy/eclipse/codeassist/tests/TypeCompletionTests.groovy +++ b/ide-test/org.codehaus.groovy.eclipse.codeassist.completion.test/src/org/codehaus/groovy/eclipse/codeassist/tests/TypeCompletionTests.groovy @@ -210,30 +210,30 @@ final class TypeCompletionTests extends CompletionTestSuite { @Test void testCompleteClass2() { - String contents = 'class Foo { }\nFoo.can' + String contents = 'class Foo { }\nFoo.com' ICompletionProposal[] proposals = createProposalsAtOffset(contents, contents.length()) - proposalExists(proposals, 'canonicalName', 1, true) + proposalExists(proposals, 'componentType', 1, true) } @Test void testCompleteClass3() { - String contents = 'class Foo { }\nFoo.getCan' + String contents = 'class Foo { }\nFoo.getCom' ICompletionProposal[] proposals = createProposalsAtOffset(contents, contents.length()) - proposalExists(proposals, 'getCanonicalName', 1, true) + proposalExists(proposals, 'getComponentType', 1, true) } @Test void testCompleteClass4() { - String contents = 'class Foo { }\nFoo.class.can' + String contents = 'class Foo { }\nFoo.class.com' ICompletionProposal[] proposals = createProposalsAtOffset(contents, contents.length()) - proposalExists(proposals, 'canonicalName', 1) + proposalExists(proposals, 'componentType', 1) } @Test void testCompleteClass5() { - String contents = 'class Foo { }\nFoo.class.getCan' + String contents = 'class Foo { }\nFoo.class.getCom' ICompletionProposal[] proposals = createProposalsAtOffset(contents, contents.length()) - proposalExists(proposals, 'getCanonicalName', 1) + proposalExists(proposals, 'getComponentType', 1) } @Test diff --git a/jdt-patch/e410/org.eclipse.jdt.core.tests.builder/src/org/eclipse/jdt/core/tests/builder/TestingEnvironment.java b/jdt-patch/e410/org.eclipse.jdt.core.tests.builder/src/org/eclipse/jdt/core/tests/builder/TestingEnvironment.java index 74c12d515d..67dfbba564 100644 --- a/jdt-patch/e410/org.eclipse.jdt.core.tests.builder/src/org/eclipse/jdt/core/tests/builder/TestingEnvironment.java +++ b/jdt-patch/e410/org.eclipse.jdt.core.tests.builder/src/org/eclipse/jdt/core/tests/builder/TestingEnvironment.java @@ -138,11 +138,11 @@ public IPath addPackage(IPath packageFragmentRootPath, String packageName) { } public IPath addPackageFragmentRoot(IPath projectPath, String sourceFolderName) throws JavaModelException { - return addPackageFragmentRoot(projectPath, sourceFolderName, null, null); //$NON-NLS-1$ + return addPackageFragmentRoot(projectPath, sourceFolderName, null, null); } public IPath addTestPackageFragmentRoot(IPath projectPath, String sourceFolderName) throws JavaModelException { - return addPackageFragmentRoot(projectPath, sourceFolderName, null, null, "bin-"+sourceFolderName, true); + return addPackageFragmentRoot(projectPath, sourceFolderName, null, null, "bin-" + sourceFolderName, true); //$NON-NLS-1$ } /** Adds a package fragment root to the workspace. If diff --git a/jdt-patch/e47/org.eclipse.jdt.core.tests.builder/src/org/eclipse/jdt/core/tests/builder/TestingEnvironment.java b/jdt-patch/e47/org.eclipse.jdt.core.tests.builder/src/org/eclipse/jdt/core/tests/builder/TestingEnvironment.java index 3c09035716..b369a51a40 100644 --- a/jdt-patch/e47/org.eclipse.jdt.core.tests.builder/src/org/eclipse/jdt/core/tests/builder/TestingEnvironment.java +++ b/jdt-patch/e47/org.eclipse.jdt.core.tests.builder/src/org/eclipse/jdt/core/tests/builder/TestingEnvironment.java @@ -135,7 +135,7 @@ public IPath addPackage(IPath packageFragmentRootPath, String packageName) { } public IPath addPackageFragmentRoot(IPath projectPath, String sourceFolderName) throws JavaModelException { - return addPackageFragmentRoot(projectPath, sourceFolderName, null, null); //$NON-NLS-1$ + return addPackageFragmentRoot(projectPath, sourceFolderName, null, null); } /** Adds a package fragment root to the workspace. If diff --git a/jdt-patch/e48/org.eclipse.jdt.core.tests.builder/src/org/eclipse/jdt/core/tests/builder/TestingEnvironment.java b/jdt-patch/e48/org.eclipse.jdt.core.tests.builder/src/org/eclipse/jdt/core/tests/builder/TestingEnvironment.java index b6208c75fa..6176053bb1 100644 --- a/jdt-patch/e48/org.eclipse.jdt.core.tests.builder/src/org/eclipse/jdt/core/tests/builder/TestingEnvironment.java +++ b/jdt-patch/e48/org.eclipse.jdt.core.tests.builder/src/org/eclipse/jdt/core/tests/builder/TestingEnvironment.java @@ -135,11 +135,11 @@ public IPath addPackage(IPath packageFragmentRootPath, String packageName) { } public IPath addPackageFragmentRoot(IPath projectPath, String sourceFolderName) throws JavaModelException { - return addPackageFragmentRoot(projectPath, sourceFolderName, null, null); //$NON-NLS-1$ + return addPackageFragmentRoot(projectPath, sourceFolderName, null, null); } public IPath addTestPackageFragmentRoot(IPath projectPath, String sourceFolderName) throws JavaModelException { - return addPackageFragmentRoot(projectPath, sourceFolderName, null, null, "bin-"+sourceFolderName, true); + return addPackageFragmentRoot(projectPath, sourceFolderName, null, null, "bin-" + sourceFolderName, true); //$NON-NLS-1$ } /** Adds a package fragment root to the workspace. If diff --git a/jdt-patch/e49/org.eclipse.jdt.core.tests.builder/src/org/eclipse/jdt/core/tests/builder/TestingEnvironment.java b/jdt-patch/e49/org.eclipse.jdt.core.tests.builder/src/org/eclipse/jdt/core/tests/builder/TestingEnvironment.java index 74c12d515d..67dfbba564 100644 --- a/jdt-patch/e49/org.eclipse.jdt.core.tests.builder/src/org/eclipse/jdt/core/tests/builder/TestingEnvironment.java +++ b/jdt-patch/e49/org.eclipse.jdt.core.tests.builder/src/org/eclipse/jdt/core/tests/builder/TestingEnvironment.java @@ -138,11 +138,11 @@ public IPath addPackage(IPath packageFragmentRootPath, String packageName) { } public IPath addPackageFragmentRoot(IPath projectPath, String sourceFolderName) throws JavaModelException { - return addPackageFragmentRoot(projectPath, sourceFolderName, null, null); //$NON-NLS-1$ + return addPackageFragmentRoot(projectPath, sourceFolderName, null, null); } public IPath addTestPackageFragmentRoot(IPath projectPath, String sourceFolderName) throws JavaModelException { - return addPackageFragmentRoot(projectPath, sourceFolderName, null, null, "bin-"+sourceFolderName, true); + return addPackageFragmentRoot(projectPath, sourceFolderName, null, null, "bin-" + sourceFolderName, true); //$NON-NLS-1$ } /** Adds a package fragment root to the workspace. If