lsm/initializr
1
0
Fork 0
mirror of https://gitee.com/dcren/initializr.git synced 2025-09-18 09:44:47 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Migrate ProjectAssert to java.nio.file.Path

Browse Source
This commit is contained in:
Stephane Nicoll
2019-05-28 15:29:28 +02:00
parent b8cac0407b
commit 62d0a94364
5 changed files with 58 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
initializr-web/src/test/java/io/spring/initializr/web/AbstractInitializrIntegrationTests.java
View File

@@ -16,11 +16,10 @@
package io.spring.initializr.web;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.Charset;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Collections;
@@ -69,7 +68,7 @@ public abstract class AbstractInitializrIntegrationTests {
private static final ObjectMapper objectMapper = new ObjectMapper();
public File folder;
public Path folder;
@Autowired
private RestTemplateBuilder restTemplateBuilder;
@@ -79,7 +78,7 @@ public abstract class AbstractInitializrIntegrationTests {
@BeforeEach
public void before(@TempDir Path folder) {
this.restTemplate = this.restTemplateBuilder.build();
this.folder = folder.toFile();
this.folder = folder;
}
protected abstract String createUrl(String context);
@@ -199,9 +198,8 @@ public abstract class AbstractInitializrIntegrationTests {
protected ProjectAssert projectAssert(byte[] content, ArchiveType archiveType) {
try {
File archiveFile = writeArchive(content);
File project = new File(this.folder, "project");
Path archiveFile = writeArchive(content);
Path project = this.folder.resolve("project");
switch (archiveType) {
case ZIP:
unzip(archiveFile, project);
@@ -217,30 +215,28 @@ public abstract class AbstractInitializrIntegrationTests {
}
}
private void untar(File archiveFile, File project) {
private void untar(Path archiveFile, Path project) {
Untar expand = new Untar();
expand.setProject(new Project());
expand.setDest(project);
expand.setSrc(archiveFile);
expand.setDest(project.toFile());
expand.setSrc(archiveFile.toFile());
Untar.UntarCompressionMethod method = new Untar.UntarCompressionMethod();
method.setValue("gzip");
expand.setCompression(method);
expand.execute();
}
private void unzip(File archiveFile, File project) {
private void unzip(Path archiveFile, Path project) {
Expand expand = new Expand();
expand.setProject(new Project());
expand.setDest(project);
expand.setSrc(archiveFile);
expand.setDest(project.toFile());
expand.setSrc(archiveFile.toFile());
expand.execute();
}
protected File writeArchive(byte[] body) throws IOException {
File archiveFile = new File(this.folder, "archive");
try (FileOutputStream stream = new FileOutputStream(archiveFile)) {
stream.write(body);
}
protected Path writeArchive(byte[] body) throws IOException {
Path archiveFile = this.folder.resolve("archive");
Files.write(archiveFile, body);
return archiveFile;
}

2
initializr-web/src/test/java/io/spring/initializr/web/project/ProjectGenerationInvokerTests.java
View File

@@ -91,8 +91,8 @@ public class ProjectGenerationInvokerTests {
request.initialize(metadata);
ProjectGenerationResult result = this.invoker
.invokeProjectStructureGeneration(request);
new ProjectAssert(result.getRootDirectory()).isJavaProject();
File file = result.getRootDirectory().toFile();
new ProjectAssert(file).isJavaProject();
Map<String, List<File>> tempFiles = (Map<String, List<File>>) ReflectionTestUtils
.getField(this.invoker, "temporaryFiles");
assertThat(tempFiles.get(file.getName())).contains(file);