forked from spring-projects/spring-boot
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Disable failing Gradle plugin tests on JDK 17
- Loading branch information
Showing
8 changed files
with
146 additions
and
10 deletions.
There are no files selected for viewing
49 changes: 49 additions & 0 deletions
49
...rc/test/java/org/springframework/boot/gradle/junit/DisabledTemplateInvocationContext.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
/* | ||
* Copyright 2012-2021 the original author or authors. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* https://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package org.springframework.boot.gradle.junit; | ||
|
||
import java.util.Collections; | ||
import java.util.List; | ||
|
||
import org.junit.jupiter.api.extension.ConditionEvaluationResult; | ||
import org.junit.jupiter.api.extension.ExecutionCondition; | ||
import org.junit.jupiter.api.extension.Extension; | ||
import org.junit.jupiter.api.extension.ExtensionContext; | ||
import org.junit.jupiter.api.extension.TestTemplateInvocationContext; | ||
|
||
/** | ||
* {@link TestTemplateInvocationContext} that disables tests. | ||
* | ||
* @author Christoph Dreis | ||
*/ | ||
final class DisabledTemplateInvocationContext implements TestTemplateInvocationContext { | ||
|
||
@Override | ||
public List<Extension> getAdditionalExtensions() { | ||
return Collections.singletonList(new DisabledCondition()); | ||
} | ||
|
||
private static class DisabledCondition implements ExecutionCondition { | ||
|
||
@Override | ||
public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext context) { | ||
return ConditionEvaluationResult.disabled(""); | ||
} | ||
|
||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
81 changes: 81 additions & 0 deletions
81
...adle-plugin/src/test/java/org/springframework/boot/gradle/junit/GradleProjectBuilder.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,81 @@ | ||
/* | ||
* Copyright 2012-2021 the original author or authors. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* https://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package org.springframework.boot.gradle.junit; | ||
|
||
import java.io.File; | ||
|
||
import org.gradle.api.JavaVersion; | ||
import org.gradle.api.Project; | ||
import org.gradle.internal.nativeintegration.services.NativeServices; | ||
import org.gradle.testfixtures.ProjectBuilder; | ||
import org.gradle.testfixtures.internal.ProjectBuilderImpl; | ||
|
||
import org.springframework.util.Assert; | ||
import org.springframework.util.StringUtils; | ||
|
||
/** | ||
* Helper class to build Gradle {@link Project Projects} for test fixtures. Wraps | ||
* functionality of Gradle's own {@link ProjectBuilder} in order to workaround an issue on | ||
* JDK 17. | ||
* | ||
* @author Christoph Dreis | ||
* @see <a href="https://github.com/gradle/gradle/issues/16857">Gradle Support JDK 17</a> | ||
*/ | ||
public final class GradleProjectBuilder { | ||
|
||
private File projectDir; | ||
|
||
private String name; | ||
|
||
private GradleProjectBuilder() { | ||
} | ||
|
||
public static GradleProjectBuilder builder() { | ||
return new GradleProjectBuilder(); | ||
} | ||
|
||
public GradleProjectBuilder withProjectDir(File dir) { | ||
this.projectDir = dir; | ||
return this; | ||
} | ||
|
||
public GradleProjectBuilder withName(String name) { | ||
this.name = name; | ||
return this; | ||
} | ||
|
||
public Project build() { | ||
Assert.notNull(this.projectDir, "ProjectDir must not be null"); | ||
ProjectBuilder builder = ProjectBuilder.builder(); | ||
builder.withProjectDir(this.projectDir); | ||
File userHome = new File(this.projectDir, "userHome"); | ||
builder.withGradleUserHomeDir(userHome); | ||
if (StringUtils.hasText(this.name)) { | ||
builder.withName(this.name); | ||
} | ||
if (JavaVersion.current() == JavaVersion.VERSION_17) { | ||
NativeServices.initialize(userHome); | ||
try { | ||
ProjectBuilderImpl.getGlobalServices(); | ||
} | ||
catch (Throwable ignore) { | ||
} | ||
} | ||
return builder.build(); | ||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters