spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-30 22:39:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '3.5.x' into 4.0.x

Browse Source 
Closes gh-50089
This commit is contained in:
Andy Wilkinson
2026-04-16 11:25:34 +01:00
parent a96de880e0 662fef2c83
commit 0d5f6b883f
4 changed files with 37 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cli/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/init/InitCommandTests.java
+32 -16
View File
@@ -26,6 +26,7 @@ import java.util.zip.ZipOutputStream;
import joptsimple.OptionSet;
import org.apache.hc.core5.http.HttpHost;
import org.assertj.core.api.SoftAssertionsProvider.ThrowingRunnable;
import org.jspecify.annotations.Nullable;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -214,26 +215,30 @@ class InitCommandTests extends AbstractHttpClientMockTests {
@Test
void fileNotOverwrittenByDefault(@TempDir File tempDir) throws Exception {
File file = new File(tempDir, "test.file");
file.createNewFile();
long fileLength = file.length();
MockHttpProjectGenerationRequest request = new MockHttpProjectGenerationRequest("application/zip",
file.getAbsolutePath());
mockSuccessfulProjectGeneration(request);
assertThat(this.command.run()).as("Should have failed").isEqualTo(ExitStatus.ERROR);
assertThat(file.length()).as("File should not have changed").isEqualTo(fileLength);
withUserDir(tempDir, () -> {
File file = new File(tempDir, "test.file");
file.createNewFile();
long fileLength = file.length();
MockHttpProjectGenerationRequest request = new MockHttpProjectGenerationRequest("application/zip",
file.getAbsolutePath());
mockSuccessfulProjectGeneration(request);
assertThat(this.command.run()).as("Should have failed").isEqualTo(ExitStatus.ERROR);
assertThat(file.length()).as("File should not have changed").isEqualTo(fileLength);
});
}
@Test
void overwriteFile(@TempDir File tempDir) throws Exception {
File file = new File(tempDir, "test.file");
file.createNewFile();
long fileLength = file.length();
MockHttpProjectGenerationRequest request = new MockHttpProjectGenerationRequest("application/zip",
file.getAbsolutePath());
mockSuccessfulProjectGeneration(request);
assertThat(this.command.run("--force")).isEqualTo(ExitStatus.OK);
assertThat(fileLength).as("File should have changed").isNotEqualTo(file.length());
withUserDir(tempDir, () -> {
File file = new File(tempDir, "test.file");
file.createNewFile();
long fileLength = file.length();
MockHttpProjectGenerationRequest request = new MockHttpProjectGenerationRequest("application/zip",
file.getAbsolutePath());
mockSuccessfulProjectGeneration(request);
assertThat(this.command.run("--force")).isEqualTo(ExitStatus.OK);
assertThat(fileLength).as("File should have changed").isNotEqualTo(file.length());
});
}
@Test
@@ -408,6 +413,17 @@ class InitCommandTests extends AbstractHttpClientMockTests {
request.getHeaders("User-Agent")[0].getValue().startsWith("SpringBootCli/"))), isNull());
}
private void withUserDir(File userDir, ThrowingRunnable action) throws Exception {
String previous = System.getProperty("user.dir");
System.setProperty("user.dir", userDir.getAbsolutePath());
try {
action.run();
}
finally {
System.setProperty("user.dir", previous);
}
}
private byte[] createFakeZipArchive(String fileName, String content) throws IOException {
try (ByteArrayOutputStream bos = new ByteArrayOutputStream()) {
try (ZipOutputStream zos = new ZipOutputStream(bos)) {
cli/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/init/InitializrServiceTests.java
+2 -2
View File
@@ -50,9 +50,9 @@ class InitializrServiceTests extends AbstractHttpClientMockTests {
void generateSimpleProject() throws Exception {
ProjectGenerationRequest request = new ProjectGenerationRequest();
MockHttpProjectGenerationRequest mockHttpRequest = new MockHttpProjectGenerationRequest("application/xml",
"foo.zip");
"nested/path/foo.zip");
ProjectGenerationResponse entity = generateProject(request, mockHttpRequest);
assertProjectEntity(entity, mockHttpRequest.contentType, mockHttpRequest.fileName);
assertProjectEntity(entity, mockHttpRequest.contentType, "foo.zip");
}
@Test