Fix oomph tests

org.eclipse.buildship.oomph.test/.classpath

@@ -4,49 +4,4 @@
   <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
   <classpathentry kind="con" path="GROOVY_DSL_SUPPORT"/>
   <classpathentry kind="output" path="bin"/>
-  <classpathentry exported="true" kind="lib" path="lib/ant-1.9.15.jar" sourcepath="lib/ant-1.9.15-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/ant-antlr-1.9.15.jar" sourcepath="lib/ant-antlr-1.9.15-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/ant-junit-1.9.15.jar" sourcepath="lib/ant-junit-1.9.15-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/ant-launcher-1.9.15.jar" sourcepath="lib/ant-launcher-1.9.15-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/cglib-nodep-2.2.jar" sourcepath="lib/cglib-nodep-2.2-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/commons-cli-1.4.jar" sourcepath="lib/commons-cli-1.4-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/groovy-2.5.14.jar" sourcepath="lib/groovy-2.5.14-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/groovy-ant-2.5.14.jar" sourcepath="lib/groovy-ant-2.5.14-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/groovy-cli-commons-2.5.14.jar" sourcepath="lib/groovy-cli-commons-2.5.14-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/groovy-cli-picocli-2.5.14.jar" sourcepath="lib/groovy-cli-picocli-2.5.14-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/groovy-console-2.5.14.jar" sourcepath="lib/groovy-console-2.5.14-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/groovy-datetime-2.5.14.jar" sourcepath="lib/groovy-datetime-2.5.14-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/groovy-docgenerator-2.5.14.jar" sourcepath="lib/groovy-docgenerator-2.5.14-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/groovy-groovydoc-2.5.14.jar" sourcepath="lib/groovy-groovydoc-2.5.14-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/groovy-groovysh-2.5.14.jar" sourcepath="lib/groovy-groovysh-2.5.14-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/groovy-jmx-2.5.14.jar" sourcepath="lib/groovy-jmx-2.5.14-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/groovy-json-2.5.14.jar" sourcepath="lib/groovy-json-2.5.14-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/groovy-jsr223-2.5.14.jar" sourcepath="lib/groovy-jsr223-2.5.14-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/groovy-macro-2.5.14.jar" sourcepath="lib/groovy-macro-2.5.14-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/groovy-nio-2.5.14.jar" sourcepath="lib/groovy-nio-2.5.14-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/groovy-servlet-2.5.14.jar" sourcepath="lib/groovy-servlet-2.5.14-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/groovy-sql-2.5.14.jar" sourcepath="lib/groovy-sql-2.5.14-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/groovy-swing-2.5.14.jar" sourcepath="lib/groovy-swing-2.5.14-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/groovy-templates-2.5.14.jar" sourcepath="lib/groovy-templates-2.5.14-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/groovy-test-2.5.14.jar" sourcepath="lib/groovy-test-2.5.14-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/groovy-test-junit5-2.5.14.jar" sourcepath="lib/groovy-test-junit5-2.5.14-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/groovy-testng-2.5.14.jar" sourcepath="lib/groovy-testng-2.5.14-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/groovy-xml-2.5.14.jar" sourcepath="lib/groovy-xml-2.5.14-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/hamcrest-core-1.3.jar" sourcepath="lib/hamcrest-core-1.3-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/jcommander-1.72.jar" sourcepath="lib/jcommander-1.72-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/jline-2.14.6.jar" sourcepath="lib/jline-2.14.6-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/junit-4.13.1.jar" sourcepath="lib/junit-4.13.1-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/junit-jupiter-api-5.4.2.jar" sourcepath="lib/junit-jupiter-api-5.4.2-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/junit-jupiter-engine-5.4.2.jar" sourcepath="lib/junit-jupiter-engine-5.4.2-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/junit-platform-commons-1.4.2.jar" sourcepath="lib/junit-platform-commons-1.4.2-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/junit-platform-engine-1.4.2.jar" sourcepath="lib/junit-platform-engine-1.4.2-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/junit-platform-launcher-1.4.2.jar" sourcepath="lib/junit-platform-launcher-1.4.2-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/objenesis-2.2.jar" sourcepath="lib/objenesis-2.2-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/opentest4j-1.1.1.jar" sourcepath="lib/opentest4j-1.1.1-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/picocli-4.3.2.jar" sourcepath="lib/picocli-4.3.2-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/qdox-1.12.1.jar" sourcepath="lib/qdox-1.12.1-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/slf4j-api-1.7.2.jar" sourcepath="lib/slf4j-api-1.7.2-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/slf4j-simple-1.7.2.jar" sourcepath="lib/slf4j-simple-1.7.2-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/spock-core-1.3-groovy-2.5.jar" sourcepath="lib/spock-core-1.3-groovy-2.5-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/testng-6.13.1.jar" sourcepath="lib/testng-6.13.1-sources.jar"/>
 </classpath>

org.eclipse.buildship.oomph.test/META-INF/MANIFEST.MF

@@ -7,7 +7,7 @@ Bundle-Vendor: Eclipse Buildship
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Fragment-Host: org.eclipse.buildship.oomph
 Automatic-Module-Name: org.eclipse.buildship.oomph.test
-Require-Bundle: org.junit,
+Require-Bundle: org.eclipse.buildship.testfixtures,
  org.eclipse.oomph.setup.core,
  com.google.guava;bundle-version="[30.1.0,32.0.0)",
  org.eclipse.debug.core,
@@ -16,49 +16,3 @@ Require-Bundle: org.junit,
 Import-Package: org.eclipse.buildship.oomph,
  org.eclipse.buildship.oomph.impl,
  org.eclipse.oomph.resources.impl;version="[1.1.0,2.0.0)"
-Bundle-ClassPath: .,
- lib/ant-1.9.15.jar,
- lib/ant-antlr-1.9.15.jar,
- lib/ant-junit-1.9.15.jar,
- lib/ant-launcher-1.9.15.jar,
- lib/cglib-nodep-2.2.jar,
- lib/commons-cli-1.4.jar,
- lib/groovy-2.5.14.jar,
- lib/groovy-ant-2.5.14.jar,
- lib/groovy-cli-commons-2.5.14.jar,
- lib/groovy-cli-picocli-2.5.14.jar,
- lib/groovy-console-2.5.14.jar,
- lib/groovy-datetime-2.5.14.jar,
- lib/groovy-docgenerator-2.5.14.jar,
- lib/groovy-groovydoc-2.5.14.jar,
- lib/groovy-groovysh-2.5.14.jar,
- lib/groovy-jmx-2.5.14.jar,
- lib/groovy-json-2.5.14.jar,
- lib/groovy-jsr223-2.5.14.jar,
- lib/groovy-macro-2.5.14.jar,
- lib/groovy-nio-2.5.14.jar,
- lib/groovy-servlet-2.5.14.jar,
- lib/groovy-sql-2.5.14.jar,
- lib/groovy-swing-2.5.14.jar,
- lib/groovy-templates-2.5.14.jar,
- lib/groovy-test-2.5.14.jar,
- lib/groovy-test-junit5-2.5.14.jar,
- lib/groovy-testng-2.5.14.jar,
- lib/groovy-xml-2.5.14.jar,
- lib/hamcrest-core-1.3.jar,
- lib/jcommander-1.72.jar,
- lib/jline-2.14.6.jar,
- lib/junit-4.13.1.jar,
- lib/junit-jupiter-api-5.4.2.jar,
- lib/junit-jupiter-engine-5.4.2.jar,
- lib/junit-platform-commons-1.4.2.jar,
- lib/junit-platform-engine-1.4.2.jar,
- lib/junit-platform-launcher-1.4.2.jar,
- lib/objenesis-2.2.jar,
- lib/opentest4j-1.1.1.jar,
- lib/picocli-4.3.2.jar,
- lib/qdox-1.12.1.jar,
- lib/slf4j-api-1.7.2.jar,
- lib/slf4j-simple-1.7.2.jar,
- lib/spock-core-1.3-groovy-2.5.jar,
- lib/testng-6.13.1.jar

org.eclipse.buildship.oomph.test/build.gradle

@@ -2,16 +2,10 @@ apply plugin: eclipsebuild.TestBundlePlugin
 apply plugin: 'groovy'
 
 dependencies {
-    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 "cglib:cglib-nodep:$cglibLibVersion"
-    bundled "org.slf4j:slf4j-simple:$slf4jLibVersion"
-    bundled 'org.spockframework:spock-core:1.3-groovy-2.5'
     implementation project(':org.eclipse.buildship.compat')
     implementation project(':org.eclipse.buildship.core')
     implementation project(':org.eclipse.buildship.oomph')
+    implementation project(':org.eclipse.buildship.testfixtures')
 }
 
 eclipseTest {

org.eclipse.buildship.oomph.test/src/main/groovy/org/eclipse/buildship/oomph/internal/test/fixtures/WorkspaceSpecification.groovy

@@ -9,10 +9,9 @@
  ******************************************************************************/
 package org.eclipse.buildship.oomph.internal.test.fixtures
 
-import org.junit.Rule
-import org.junit.rules.TemporaryFolder
 import spock.lang.AutoCleanup
 import spock.lang.Specification
+import spock.lang.TempDir
 
 import com.google.common.collect.ImmutableList
 import com.google.common.io.Files
@@ -33,14 +32,14 @@ import org.eclipse.debug.core.ILaunchManager
 import org.eclipse.jdt.core.IJavaProject
 import org.eclipse.jdt.core.JavaCore
 
+import org.eclipse.buildship.core.GradleDistribution
 import org.eclipse.buildship.core.internal.CorePlugin
 import org.eclipse.buildship.core.internal.configuration.BuildConfiguration
 import org.eclipse.buildship.core.internal.configuration.ConfigurationManager
 import org.eclipse.buildship.core.internal.launch.GradleRunConfigurationDelegate
 import org.eclipse.buildship.core.internal.marker.GradleErrorMarker
 import org.eclipse.buildship.core.internal.preferences.DefaultPersistentModel
 import org.eclipse.buildship.core.internal.preferences.PersistentModel
-import org.eclipse.buildship.core.GradleDistribution
 import org.eclipse.buildship.core.internal.workspace.EclipseVmUtil
 import org.eclipse.buildship.core.internal.workspace.PersistentModelBuilder
 import org.eclipse.buildship.core.internal.workspace.WorkspaceOperations
@@ -51,8 +50,8 @@ import org.eclipse.buildship.core.internal.workspace.WorkspaceOperations
  */
 abstract class WorkspaceSpecification extends Specification {
 
-    @Rule
-    TemporaryFolder tempFolderProvider
+    @TempDir
+    File tempFolderProvider
 
     @AutoCleanup
     TestEnvironment environment = TestEnvironment.INSTANCE
@@ -62,7 +61,7 @@ abstract class WorkspaceSpecification extends Specification {
     private LogCollector logCollector = new LogCollector()
 
     def setup() {
-        externalTestDir = tempFolderProvider.newFolder('external')
+        externalTestDir = new File(tempFolderProvider, 'external')
         Platform.addLogListener(logCollector)
         EclipseVmUtil.findOrRegisterVM("8", new File(System.getProperty("jdk8.location")))
         EclipseVmUtil.findOrRegisterVM("11", new File(System.getProperty("jdk11.location")))