Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.0.x' into 3.1.x

Browse Source 
Closes gh-37661
This commit is contained in:
Andy Wilkinson
2023-10-03 10:57:28 +01:00
parent 904bd52260 931584f8af
commit a4100e12ff
17 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-tools/spring-boot-autoconfigure-processor/src/test/java/org/springframework/boot/autoconfigureprocessor/AutoConfigureAnnotationProcessorTests.java
View File

@@ -27,7 +27,7 @@ import org.springframework.core.test.tools.SourceFile;
import org.springframework.core.test.tools.TestCompiler;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.fail;
import static org.assertj.core.api.Assertions.fail;
/**
* Tests for {@link AutoConfigureAnnotationProcessor}.

6
spring-boot-project/spring-boot-tools/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/init/InitCommandTests.java
View File

@@ -34,7 +34,7 @@ import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.boot.cli.command.status.ExitStatus;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.fail;
import static org.assertj.core.api.Assertions.fail;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.assertArg;
import static org.mockito.ArgumentMatchers.isNull;
@@ -192,7 +192,7 @@ class InitCommandTests extends AbstractHttpClientMockTests {
}
@Test
void generateProjectAndExtractUnknownContentType(@TempDir File tempDir) throws Exception {
void generateProjectAndExtractUnknownContentType(@TempDir File tempDir) {
String fileName = UUID.randomUUID().toString() + ".zip";
File file = new File(fileName);
assertThat(file).as("file should not exist").doesNotExist();
@@ -204,7 +204,7 @@ class InitCommandTests extends AbstractHttpClientMockTests {
assertThat(file).as("file should have been saved instead").exists();
}
catch (Exception ex) {
fail(ex);
fail(null, ex);
}
finally {
assertThat(file.delete()).as("failed to delete test file").isTrue();

2
spring-boot-project/spring-boot-tools/spring-boot-gradle-test-support/src/main/java/org/springframework/boot/testsupport/gradle/testkit/GradleBuild.java
View File

@@ -61,7 +61,7 @@ import org.springframework.util.FileCopyUtils;
import org.springframework.util.FileSystemUtils;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.fail;
import static org.assertj.core.api.Assertions.fail;
/**
* A {@code GradleBuild} is used to run a Gradle build using {@link GradleRunner}.

2
spring-boot-project/spring-boot-tools/spring-boot-test-support/src/test/java/org/springframework/boot/testsupport/process/DisabledIfProcessUnavailableTests.java
View File

@@ -18,7 +18,7 @@ package org.springframework.boot.testsupport.process;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.fail;
import static org.assertj.core.api.Assertions.fail;
/**
* Tests for {@link DisabledIfProcessUnavailable}.