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

Fix windows build 

This commit makes sure that files that are generated in a temporary
directory are closed once the related test completes.
This commit is contained in:
Stephane Nicoll 2022-09-10 16:23:56 +02:00
parent a896fd0a36
commit 9fe24fe692
2 changed files with 20 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,12 +16,8 @@
package org.springframework.boot.autoconfigureprocessor;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
import java.io.IOException;
import java.util.List;
import java.util.stream.Collectors;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@ -30,11 +26,13 @@ import org.junit.jupiter.api.io.TempDir;
import org.springframework.boot.testsupport.compiler.TestCompiler;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.linesOf;
/**
* Tests for {@link AutoConfigurationImportsAnnotationProcessor}.
*
* @author Scott Frederick
* @author Stephane Nicoll
*/
class AutoConfigurationImportsAnnotationProcessorTests {
@ -49,34 +47,24 @@ class AutoConfigurationImportsAnnotationProcessorTests {
}
@Test
void annotatedClasses() throws Exception {
List<String> classes = compile(TestAutoConfigurationOnlyConfiguration.class,
void annotatedClasses() {
File generatedFile = generateAnnotatedClasses(TestAutoConfigurationOnlyConfiguration.class,
TestAutoConfigurationConfiguration.class);
assertThat(classes).hasSize(2);
assertThat(classes).containsExactly(
assertThat(generatedFile).exists().isFile();
assertThat(linesOf(generatedFile)).containsExactly(
"org.springframework.boot.autoconfigureprocessor.TestAutoConfigurationConfiguration",
"org.springframework.boot.autoconfigureprocessor.TestAutoConfigurationOnlyConfiguration");
}
@Test
void notAnnotatedClasses() throws Exception {
List<String> classes = compile(TestAutoConfigurationImportsAnnotationProcessor.class);
assertThat(classes).isNull();
void notAnnotatedClasses() {
assertThat(generateAnnotatedClasses(TestAutoConfigurationImportsAnnotationProcessor.class)).doesNotExist();
}
private List<String> compile(Class<?>... types) throws IOException {
private File generateAnnotatedClasses(Class<?>... types) {
TestAutoConfigurationImportsAnnotationProcessor processor = new TestAutoConfigurationImportsAnnotationProcessor();
this.compiler.getTask(types).call(processor);
return getWrittenImports(processor.getImportsFilePath());
}
private List<String> getWrittenImports(String importsFilePath) throws IOException {
File file = new File(this.tempDir, importsFilePath);
if (!file.exists()) {
return null;
}
BufferedReader reader = new BufferedReader(new FileReader(file));
return reader.lines().collect(Collectors.toList());
return new File(this.tempDir, processor.getImportsFilePath());
}
}

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

@ -16,12 +16,8 @@
package org.springframework.boot.autoconfigureprocessor;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
import java.io.IOException;
import java.util.List;
import java.util.stream.Collectors;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@ -30,11 +26,13 @@ import org.junit.jupiter.api.io.TempDir;
import org.springframework.boot.testsupport.compiler.TestCompiler;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.linesOf;
/**
* Tests for {@link ManagementContextConfigurationImportsAnnotationProcessor}.
*
* @author Scott Frederick
* @author Stephane Nicoll
*/
class ManagementContextConfigurationImportsAnnotationProcessorTests {
@ -49,34 +47,24 @@ class ManagementContextConfigurationImportsAnnotationProcessorTests {
}
@Test
void annotatedClasses() throws Exception {
List<String> classes = compile(TestManagementContextConfigurationTwo.class,
void annotatedClasses() {
File generatedFile = generateAnnotatedClasses(TestManagementContextConfigurationTwo.class,
TestManagementContextConfigurationOne.class);
assertThat(classes).hasSize(2);
assertThat(classes).containsExactly(
assertThat(generatedFile).exists().isFile();
assertThat(linesOf(generatedFile)).containsExactly(
"org.springframework.boot.autoconfigureprocessor.TestManagementContextConfigurationOne",
"org.springframework.boot.autoconfigureprocessor.TestManagementContextConfigurationTwo");
}
@Test
void notAnnotatedClasses() throws Exception {
List<String> classes = compile(TestAutoConfigurationConfiguration.class);
assertThat(classes).isNull();
void notAnnotatedClasses() {
assertThat(generateAnnotatedClasses(TestAutoConfigurationImportsAnnotationProcessor.class)).doesNotExist();
}
private List<String> compile(Class<?>... types) throws IOException {
private File generateAnnotatedClasses(Class<?>... types) {
TestManagementContextConfigurationImportsAnnotationProcessor processor = new TestManagementContextConfigurationImportsAnnotationProcessor();
this.compiler.getTask(types).call(processor);
return getWrittenImports(processor.getImportsFilePath());
}
private List<String> getWrittenImports(String importsFilePath) throws IOException {
File file = new File(this.tempDir, importsFilePath);
if (!file.exists()) {
return null;
}
BufferedReader reader = new BufferedReader(new FileReader(file));
return reader.lines().collect(Collectors.toList());
return new File(this.tempDir, processor.getImportsFilePath());
}
}