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

Polish "Handle missing manifest files in JarTypeFilter" 

See gh-24597
This commit is contained in:
Stephane Nicoll 2020-12-23 09:12:58 +01:00
parent 86eecb01b3
commit 4cdfd6f13d
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/JarTypeFilterTests.java
View File

@ -65,12 +65,12 @@ class JarTypeFilterTests {
assertThat(new JarTypeFilter().filter(createArtifactWithNoManifest())).isFalse(); assertThat(new JarTypeFilter().filter(createArtifactWithNoManifest())).isFalse();
} }
private Artifact createArtifact(String jarType) { private Artifact createArtifact(String springBootJarType) {
Path jarPath = this.temp.resolve("test.jar"); Path jarPath = this.temp.resolve("test.jar");
Manifest manifest = new Manifest(); Manifest manifest = new Manifest();
manifest.getMainAttributes().putValue("Manifest-Version", "1.0"); manifest.getMainAttributes().putValue("Manifest-Version", "1.0");
if (jarType != null) { if (springBootJarType != null) {
manifest.getMainAttributes().putValue("Spring-Boot-Jar-Type", jarType); manifest.getMainAttributes().putValue("Spring-Boot-Jar-Type", springBootJarType);
} }
try { try {
new JarOutputStream(new FileOutputStream(jarPath.toFile()), manifest).close(); new JarOutputStream(new FileOutputStream(jarPath.toFile()), manifest).close();
@ -78,9 +78,7 @@ class JarTypeFilterTests {
catch (IOException ex) { catch (IOException ex) {
throw new RuntimeException(ex); throw new RuntimeException(ex);
} }
Artifact artifact = mock(Artifact.class); return mockArtifact(jarPath);
given(artifact.getFile()).willReturn(jarPath.toFile());
return artifact;
} }
private Artifact createArtifactWithNoManifest() { private Artifact createArtifactWithNoManifest() {
@ -91,6 +89,10 @@ class JarTypeFilterTests {
catch (IOException ex) { catch (IOException ex) {
throw new RuntimeException(ex); throw new RuntimeException(ex);
} }
return mockArtifact(jarPath);
}
private Artifact mockArtifact(Path jarPath) {
Artifact artifact = mock(Artifact.class); Artifact artifact = mock(Artifact.class);
given(artifact.getFile()).willReturn(jarPath.toFile()); given(artifact.getFile()).willReturn(jarPath.toFile());
return artifact; return artifact;