Fix tests

eclipse-buildship · Jun 12, 2024 · 434ede8 · 434ede8
1 parent 376528c
commit 434ede8
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/build.gradle b/build.gradle
@@ -133,7 +133,7 @@ subprojects {
                     languageVersion = JavaLanguageVersion.of(8)
                 }
             }
-        } else if (config.targetPlatform.eclipseVersion in ['417', '418', '419', '420', '21', '422', '423', '424'])) {
+        } else if (config.targetPlatform.eclipseVersion in ['417', '418', '419', '420', '21', '422', '423', '424']) {
             java {
                 toolchain {
                     languageVersion = JavaLanguageVersion.of(11)

diff --git a/.../groovy/org/eclipse/buildship/core/internal/configuration/ProjectConfigurationTest.groovy b/.../groovy/org/eclipse/buildship/core/internal/configuration/ProjectConfigurationTest.groovy
@@ -190,7 +190,7 @@ class ProjectConfigurationTest extends ProjectSynchronizationSpecification {
 
         when:
         configurationManager.saveProjectConfiguration(projectConfig)
-        configurationManager.saveWorkspaceConfiguration(new WorkspaceConfiguration(distribution, gradleUserHome, javaHome, offlineMode, buildScansEnabled, autoSync, arguments, jvmArguments, showConsole, showExecutions, false))
+        configurationManager.saveWorkspaceConfiguration(new WorkspaceConfiguration(distribution, gradleUserHome, javaHome, offlineMode, buildScansEnabled, autoSync, arguments, jvmArguments, showConsole, showExecutions, false, false))
         projectConfig = configurationManager.loadProjectConfiguration(project)
 
         then:
@@ -224,7 +224,7 @@ class ProjectConfigurationTest extends ProjectSynchronizationSpecification {
 
         when:
         configurationManager.saveProjectConfiguration(projectConfig)
-        configurationManager.saveWorkspaceConfiguration(new WorkspaceConfiguration(GradleDistribution.fromBuild(), null, null, !buildScansEnabled, !offlineMode, !autoSync, [], [], false, false, false))
+        configurationManager.saveWorkspaceConfiguration(new WorkspaceConfiguration(GradleDistribution.fromBuild(), null, null, !buildScansEnabled, !offlineMode, !autoSync, [], [], false, false, false, false))
         projectConfig = configurationManager.loadProjectConfiguration(project)
 
         then:

diff --git a/...in/groovy/org/eclipse/buildship/core/internal/test/fixtures/WorkspaceSpecification.groovy b/...in/groovy/org/eclipse/buildship/core/internal/test/fixtures/WorkspaceSpecification.groovy
@@ -247,7 +247,8 @@ abstract class WorkspaceSpecification extends Specification {
     }
 
     protected List<IMarker> getGradleErrorMarkers(IResource rootResource = workspace.root) {
-        rootResource.findMarkers(GradleErrorMarker.ID, false, IResource.DEPTH_INFINITE) as List
+        // error markers created from Tooling API problem events are filtered
+        (rootResource.findMarkers(GradleErrorMarker.ID, false, IResource.DEPTH_INFINITE) as List).findAll { IMarker m -> m.getAttribute(GradleErrorMarker.ATTRIBUTE_ID, null) == null }
     }
 
     protected List<IStatus> getPlatformLogErrors() {

diff --git a/...lipse/buildship/core/internal/workspace/SynchronizingBuildScriptUpdateListenerTest.groovy b/...lipse/buildship/core/internal/workspace/SynchronizingBuildScriptUpdateListenerTest.groovy
@@ -212,6 +212,7 @@ class SynchronizingBuildScriptUpdateListenerTest extends ProjectSynchronizationS
             workspaceConfig.jvmArguments,
             workspaceConfig.showConsoleView,
             workspaceConfig.showExecutionsView,
+            false,
             false)
         configurationManager.saveWorkspaceConfiguration(workspaceConfig)
     }

diff --git a/...n/groovy/org/eclipse/buildship/ui/internal/workspace/AddBuildshipNatureHandlerTest.groovy b/...n/groovy/org/eclipse/buildship/ui/internal/workspace/AddBuildshipNatureHandlerTest.groovy
@@ -41,7 +41,7 @@ class AddBuildshipNatureHandlerTest extends WorkspaceSpecification {
     def "Uses configuration from workspace settings"() {
         setup:
         WorkspaceConfiguration originalWorkspaceConfig = configurationManager.loadWorkspaceConfiguration()
-        WorkspaceConfiguration config = new WorkspaceConfiguration(GradleDistribution.forVersion("3.0"), dir('custom-gradle-home'), null, false, false, false, [], [], false, false, false)
+        WorkspaceConfiguration config = new WorkspaceConfiguration(GradleDistribution.forVersion("3.0"), dir('custom-gradle-home'), null, false, false, false, [], [], false, false, false, false)
         configurationManager.saveWorkspaceConfiguration(config)
 
         IProject project = EclipseProjects.newProject('add-buildship-nature')