upgrade spock to 2.3 and groovy to 3.0.19

build.gradle

@@ -18,8 +18,8 @@ def eclipseVersionAgnosticDependencies = [
         'org.slf4j.simple'                     : '1.7.30',
         'com.google.guava'                     : "$guavaVersion",
         'com.google.gson'                      : '2.7.0',
-        'org.eclipse.swtbot.eclipse.finder'    : '2.2.1',
-        'org.eclipse.swtbot.junit4_x'          : '2.2.1',
+        'org.eclipse.swtbot.eclipse.finder'    : "$swtBotVersion",
+        'org.eclipse.swtbot.junit5_x'          : "$swtBotVersion",
         'org.jetbrains.kotlin.bundled-compiler': '0.8.7',
         'org.jetbrains.kotlin.core'            : '0.8.7'
 ]
@@ -150,7 +150,9 @@ subprojects {
             implementation "org.codehaus.groovy:groovy-all:$groovyLibVersion"
             bundled "org.codehaus.groovy:groovy-all:$groovyLibVersion"
             bundled "org.objenesis:objenesis:$objenesisLibVersion"
-            bundled "org.spockframework:spock-core:$spockLibVersion"
+            bundled("org.spockframework:spock-core:$spockLibVersion") {
+                exclude group:"org.hamcrest", module: "hamcrest"
+            }
             bundled "cglib:cglib-nodep:$cglibLibVersion"
             bundled "org.slf4j:slf4j-simple:$slf4jLibVersion"
         }
@@ -180,10 +182,9 @@ subprojects {
         jvmArgs "-Djdk8.location=${java8.get().metadata.installationPath.asFile}"
         jvmArgs "-Djdk11.location=${java11.get().metadata.installationPath.asFile}"
 
-        // TODO re-enable html test reporting on Windows
-        if (org.gradle.internal.os.OperatingSystem.current().windows) {
-            reports.html.enabled = false
-        }
+        // TODO re-enable html test reporting
+        reports.html.enabled = false
+        reports.junitXml.enabled = false
     }
 
     // configure the repositories where the external dependencies can be found

buildSrc/build.gradle

@@ -9,6 +9,10 @@ repositories {
     }
 }
 
+tasks.named('test') { Test task ->
+    task.useJUnitPlatform()
+}
+
 dependencies {
     implementation gradleApi()
     implementation localGroovy()
@@ -20,5 +24,7 @@ dependencies {
     implementation "com.google.guava:guava:$guavaVersion-jre"
     implementation 'commons-io:commons-io:2.11.0'
     implementation 'org.apache.commons:commons-compress:1.22'
+    testImplementation 'org.spockframework:spock-core:2.3-groovy-3.0'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.0'
 }
 

buildSrc/src/main/groovy/eclipsebuild/BundlePlugin.groovy

@@ -11,21 +11,18 @@
 
 package eclipsebuild
 
-import org.gradle.api.GradleException
-import org.gradle.api.plugins.JavaLibraryPlugin
-import org.gradle.jvm.tasks.Jar;
-import org.osgi.framework.VersionRange;
-
 import org.eclipse.osgi.framework.util.Headers
 import org.eclipse.osgi.internal.resolver.StateObjectFactoryImpl
 import org.eclipse.osgi.internal.resolver.UserState
 import org.eclipse.osgi.service.resolver.BundleSpecification
-
+import org.gradle.api.GradleException
 import org.gradle.api.Plugin
 import org.gradle.api.Project
-import org.gradle.api.plugins.JavaPlugin
+import org.gradle.api.plugins.JavaLibraryPlugin
 import org.gradle.api.tasks.Copy
+import org.gradle.jvm.tasks.Jar
 import org.osgi.framework.Version
+import org.osgi.framework.VersionRange
 
 /**
  * Gradle plug-in for building Eclipse bundles.
@@ -177,7 +174,6 @@ class BundlePlugin implements Plugin<Project> {
             // copy the dependencies to the 'libs' folder
             into libDir
             from project.configurations.bundled
-            from project.configurations.bundledSource
         }
     }
 

buildSrc/src/main/groovy/eclipsebuild/Config.groovy

@@ -14,7 +14,6 @@ package eclipsebuild
 import eclipsebuild.BuildDefinitionPlugin.TargetPlatform
 import org.gradle.api.Project
 import org.gradle.api.file.Directory
-import org.gradle.api.file.DirectoryProperty
 import org.gradle.api.provider.Provider
 import org.gradle.internal.os.OperatingSystem
 

buildSrc/src/main/groovy/eclipsebuild/LogOutputStream.groovy

@@ -11,8 +11,8 @@
 
 package eclipsebuild
 
-import org.gradle.api.logging.Logger
 import org.gradle.api.logging.LogLevel
+import org.gradle.api.logging.Logger
 
 /**
  * Output stream forwarding the content of the stream to Gradle logging.

buildSrc/src/main/groovy/eclipsebuild/PluginUtils.groovy

@@ -13,6 +13,7 @@ package eclipsebuild
 
 import org.apache.tools.ant.filters.ReplaceTokens
 import org.gradle.api.Project
+
 import java.nio.file.Paths
 
 /**

buildSrc/src/main/groovy/eclipsebuild/UnPack.groovy

@@ -1,11 +1,7 @@
 package eclipsebuild
 
 import com.google.common.hash.HashingOutputStream
-import org.gradle.api.artifacts.transform.CacheableTransform
-import org.gradle.api.artifacts.transform.InputArtifact
-import org.gradle.api.artifacts.transform.TransformAction
-import org.gradle.api.artifacts.transform.TransformOutputs
-import org.gradle.api.artifacts.transform.TransformParameters
+import org.gradle.api.artifacts.transform.*
 import org.gradle.api.file.FileSystemLocation
 import org.gradle.api.provider.Provider
 import org.gradle.internal.io.NullOutputStream

buildSrc/src/main/groovy/eclipsebuild/UnTarGz.groovy

@@ -1,7 +1,8 @@
 package eclipsebuild
 
-import org.apache.commons.io.IOUtils
 import org.apache.commons.compress.archivers.tar.TarArchiveInputStream
+import org.apache.commons.io.IOUtils
+
 import java.util.zip.GZIPInputStream
 
 abstract class UnTarGz extends UnPack {

buildSrc/src/main/groovy/eclipsebuild/jar/ConvertOsgiBundleTask.groovy

@@ -7,11 +7,7 @@ import org.gradle.api.artifacts.Configuration
 import org.gradle.api.file.ConfigurableFileCollection
 import org.gradle.api.file.DirectoryProperty
 import org.gradle.api.provider.Property
-import org.gradle.api.tasks.Classpath
-import org.gradle.api.tasks.Input
-import org.gradle.api.tasks.InputFiles
-import org.gradle.api.tasks.OutputDirectory
-import org.gradle.api.tasks.TaskAction
+import org.gradle.api.tasks.*
 
 abstract class ConvertOsgiBundleTask extends DefaultTask {
 

buildSrc/src/main/groovy/eclipsebuild/mavenize/Bundle2Pom.groovy

@@ -14,9 +14,10 @@
 
 package eclipsebuild.mavenize
 
+import org.osgi.framework.Constants
+
 import java.util.jar.JarFile
 import java.util.jar.Manifest
-import org.osgi.framework.Constants
 
 /**
  * Converts bundle manifest to POM.

buildSrc/src/main/groovy/eclipsebuild/testing/EclipsePluginTestClassScanner.java

@@ -11,8 +11,6 @@
 
 package eclipsebuild.testing;
 
-import java.io.File;
-
 import org.apache.bcel.classfile.ClassParser;
 import org.apache.bcel.classfile.JavaClass;
 import org.gradle.api.file.EmptyFileVisitor;
@@ -22,6 +20,8 @@
 import org.gradle.api.internal.tasks.testing.TestClassProcessor;
 import org.gradle.api.internal.tasks.testing.TestClassRunInfo;
 
+import java.io.File;
+
 public final class EclipsePluginTestClassScanner implements Runnable {
 
     private final FileTree candidateClassFiles;

buildSrc/src/main/groovy/eclipsebuild/testing/EclipseTestEvent.java

@@ -1,62 +1,131 @@
 package eclipsebuild.testing;
 
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 interface EclipseTestEvent {
+
+    class TestTreeEntry extends TestLifecycleCommon {
+
+// 2,GradleImportTaskTest,true,5,false,1,GradleImportTaskTest,,[engine:spock]/[spec:org.eclipse.buildship.oomph.internal.test.GradleImportTaskTest]
+// 3,Imports project into workspace,false,1,false,2,Imports project into workspace,,[engine:spock]/[spec:org.eclipse.buildship.oomph.internal.test.GradleImportTaskTest]/[feature:$spock_feature_2_0]
+// 4,Manual trigger causes synchronization,false,1,false,2,Manual trigger causes synchronization,,[engine:spock]/[spec:org.eclipse.buildship.oomph.internal.test.GradleImportTaskTest]/[feature:$spock_feature_2_1]
+// 5,Startup trigger does not synchronize existing projects,false,1,false,2,Startup trigger does not synchronize existing projects,,[engine:spock]/[spec:org.eclipse.buildship.oomph.internal.test.GradleImportTaskTest]/[feature:$spock_feature_2_2]
+// 6,Startup trigger imports projects that are not already in the workspace,false,1,false,2,Startup trigger imports projects that are not already in the workspace,,[engine:spock]/[spec:org.eclipse.buildship.oomph.internal.test.GradleImportTaskTest]/[feature:$spock_feature_2_3]
+// 7,new build configuration can override workspace settings,false,1,false,2,new build configuration can override workspace settings,,[engine:spock]/[spec:org.eclipse.buildship.oomph.internal.test.GradleImportTaskTest]/[feature:$spock_feature_2_4]
+// 11,
+// new build configuration can override workspace settings [distribution: GRADLE_DISTRIBUTION(LOCAL_INSTALLATION(/Users/reinholddegenfellner/.gradle/wrapper/dists/gradle-5.4.1-bin/e75iq110yv9r9wt1a6619x2xm/gradle-5.4.1))\, distributionType: LOCAL_INSTALLATION\, offlineMode: false\, buildScansEnabled: true\, autoSync: false\, showConsole: true\, showExecutions: false\, customGradleHome: true\, #3],
+// false,1,true,7,
+// new build configuration can override workspace settings [distribution: GRADLE_DISTRIBUTION(LOCAL_INSTALLATION(/Users/reinholddegenfellner/.gradle/wrapper/dists/gradle-5.4.1-bin/e75iq110yv9r9wt1a6619x2xm/gradle-5.4.1))\, distributionType: LOCAL_INSTALLATION\, offlineMode: false\, buildScansEnabled: true\, autoSync: false\, showConsole: true\, showExecutions: false\, customGradleHome: true\, #3],,
+// [engine:spock]/[spec:org.eclipse.buildship.oomph.internal.test.GradleImportTaskTest]/[feature:$spock_feature_2_4]/[iteration:3]
+
+        private static final Pattern ENGINE_SPOCK = Pattern.compile(".*\\[engine:spock\\]\\/\\[spec:([^\\]]+)\\](\\/\\[feature:([^\\]]+)\\])?\\/?(\\[iteration:([0-9]+)\\])?");
+        private static final Pattern TREE_ENTRY = Pattern.compile("(\\w+),(.*[^\\\\]),(true|false),([0-9]+).*");
+        private final boolean isSpock;
+        private String spockSpec;
+        private String spockFeature;
+        private int testCount;
+        private boolean isSuite = false;
+        private String spockIteration = null;
+
+        public TestTreeEntry(String description){
+            super(null, null);
+            Matcher spockMatcher = ENGINE_SPOCK.matcher(description);
+            this.isSpock = spockMatcher.matches();
+            if(isSpock()){
+                this.spockIteration = spockMatcher.group(5);
+                this.spockFeature = spockMatcher.group(3);
+                this.spockSpec = spockMatcher.group(1);
+            }
+            Matcher treeEntryMatch = TREE_ENTRY.matcher(description);
+            if (treeEntryMatch.matches()) {
+                this.testId = treeEntryMatch.group(1);
+                this.testName = treeEntryMatch.group(2);
+                this.isSuite = Boolean.parseBoolean(treeEntryMatch.group(3));
+                this.testCount = Integer.parseInt(treeEntryMatch.group(4));
+            }
+        }
+
+        public boolean isSpock() {
+            return isSpock;
+        }
+
+        public String getSpockIteration() {
+            return spockIteration;
+        }
+
+        public String getSpockSpec() {
+            return spockSpec;
+        }
+
+        public String getSpockFeature() {
+            return spockFeature;
+        }
+
+        public String getFullFeatureQualifier(){
+            return spockSpec + "/" + spockFeature;
+        }
+    }
+
     class TestRunStarted implements EclipseTestEvent {
+        final int count;
+
+        TestRunStarted(int count){
+            this.count = count;
+        }
+
+        public String toString() {
+            return count + " " + super.toString();
+        }
     }
 
     class TestRunEnded implements EclipseTestEvent {
     }
 
-    class TestStarted implements EclipseTestEvent {
+    abstract class TestLifecycleCommon implements EclipseTestEvent {
 
-        private final String testId;
-        private final String testName;
+        protected String testId;
+        protected String testName;
 
-        public TestStarted(String testId, String testName) {
+        public TestLifecycleCommon(String testId, String testName) {
             this.testId = testId;
             this.testName = testName;
         }
 
         public String getTestId() {
-            return testId;
+            return testId;// + " " + testName.hashCode();
         }
 
         public String getTestName() {
             return testName;
         }
-    }
-
-    class TestEnded implements EclipseTestEvent {
 
-        private final String testId;
-        private final String testName;
-
-        public TestEnded(String testId, String testName) {
-            this.testId = testId;
-            this.testName = testName;
+        public String toString() {
+            return testId + ":" + testName;
         }
+    }
 
-        public String getTestId() {
-            return testId;
+    class TestStarted extends TestLifecycleCommon {
+
+        public TestStarted(String testId, String testName) {
+            super(testId, testName);
         }
+    }
 
-        public String getTestName() {
-            return testName;
+    class TestEnded extends TestLifecycleCommon  {
+        public TestEnded(String testId, String testName) {
+            super(testId, testName);
         }
     }
 
-    class TestFailed implements EclipseTestEvent {
+    class TestFailed extends TestLifecycleCommon {
         private final int status;
-        private final String testId;
-        private final String testName;
         private final String trace;
         private final String expected;
         private final String actual;
 
         public TestFailed(int status, String testId, String testName, String trace, String expected, String actual) {
+            super(testId, testName);
             this.status = status;
-            this.testId = testId;
-            this.testName = testName;
             this.trace = trace;
             this.expected = expected;
             this.actual = actual;
@@ -66,14 +135,6 @@ public int getStatus() {
             return status;
         }
 
-        public String getTestId() {
-            return testId;
-        }
-
-        public String getTestName() {
-            return testName;
-        }
-
         public String getTrace() {
             return trace;
         }

buildSrc/src/main/groovy/eclipsebuild/testing/EclipseTestExecuter.java

@@ -114,13 +114,13 @@ private void runPDETestsInEclipse(final TestExecutionSpec testSpec, final TestRe
             programArgs.add(optionsFile.getAbsolutePath());
         }
         programArgs.add("-version");
-        programArgs.add("4");
+        programArgs.add("5");
         programArgs.add("-port");
         programArgs.add(Integer.toString(pdeTestPort));
         programArgs.add("-testLoaderClass");
-        programArgs.add("org.eclipse.jdt.internal.junit4.runner.JUnit4TestLoader");
+        programArgs.add("org.eclipse.jdt.internal.junit5.runner.JUnit5TestLoader");
         programArgs.add("-loaderpluginname");
-        programArgs.add("org.eclipse.jdt.junit4.runtime");
+        programArgs.add("org.eclipse.jdt.junit5.runtime");
         programArgs.add("-classNames");
 
         List<String> testNames = new ArrayList(collectTestNames(testTask, testTaskOperationId, workerLeaseService));

buildSrc/src/main/groovy/eclipsebuild/testing/EclipseTestExecutionSpec.java

@@ -3,7 +3,6 @@
 import org.gradle.api.internal.tasks.testing.JvmTestExecutionSpec;
 import org.gradle.api.tasks.testing.Test;
 
-import java.util.List;
 import java.util.Set;
 
 public class EclipseTestExecutionSpec extends JvmTestExecutionSpec {