root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Broaden deprecation warning check in Gradle Plugin's tests 

Closes gh-21111
This commit is contained in:
Andy Wilkinson 2020-04-24 17:15:45 +01:00
parent 581ce09f88
commit 29dc236bb2
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/testkit/GradleBuild.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2019 the original author or authors. * Copyright 2012-2020 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -81,7 +81,7 @@ public class GradleBuild {
} }
void after() { void after() {
GradleBuild.this.script = null; this.script = null;
FileSystemUtils.deleteRecursively(this.projectDir); FileSystemUtils.deleteRecursively(this.projectDir);
} }
@ -113,8 +113,8 @@ public class GradleBuild {
public BuildResult build(String... arguments) { public BuildResult build(String... arguments) {
try { try {
BuildResult result = prepareRunner(arguments).build(); BuildResult result = prepareRunner(arguments).build();
if (this.gradleVersion != null && this.expectDeprecationWarnings != null if (this.expectDeprecationWarnings == null || (this.gradleVersion != null
&& this.expectDeprecationWarnings.compareTo(GradleVersion.version(this.gradleVersion)) > 0) { && this.expectDeprecationWarnings.compareTo(GradleVersion.version(this.gradleVersion)) > 0)) {
assertThat(result.getOutput()).doesNotContain("Deprecated").doesNotContain("deprecated"); assertThat(result.getOutput()).doesNotContain("Deprecated").doesNotContain("deprecated");
} }
return result; return result;
@ -149,13 +149,16 @@ public class GradleBuild {
if (this.gradleVersion != null) { if (this.gradleVersion != null) {
gradleRunner.withGradleVersion(this.gradleVersion); gradleRunner.withGradleVersion(this.gradleVersion);
} }
else if (this.dsl == Dsl.KOTLIN) { else {
gradleRunner.withGradleVersion("4.10.3"); File settingsFile = new File(this.projectDir, "settings" + this.dsl.getExtension());
FileCopyUtils.copy("enableFeaturePreview(\"STABLE_PUBLISHING\")", new FileWriter(settingsFile));
} }
List<String> allArguments = new ArrayList<>(); List<String> allArguments = new ArrayList<>();
allArguments.add("-PbootVersion=" + getBootVersion()); allArguments.add("-PbootVersion=" + getBootVersion());
allArguments.add("--stacktrace"); allArguments.add("--stacktrace");
allArguments.addAll(Arrays.asList(arguments)); allArguments.addAll(Arrays.asList(arguments));
allArguments.add("--warning-mode");
allArguments.add("all");
return gradleRunner.withArguments(allArguments); return gradleRunner.withArguments(allArguments);
} }