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

Merge branch '1.5.x' into 2.0.x

This commit is contained in:
Phillip Webb 2018-05-30 20:29:03 -07:00
parent 5ae061f491 bb0550ab95
commit bdd541b2cc
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/jar/JarURLConnectionTests.java
View File

@ -150,12 +150,13 @@ public class JarURLConnectionTests {
.hasSameContentAs(new ByteArrayInputStream(new byte[] { 3 })); .hasSameContentAs(new ByteArrayInputStream(new byte[] { 3 }));
} }
@Test(expected = FileNotFoundException.class) @Test
public void connectionToEntryUsingWrongAbsoluteUrlForEntryFromNestedJarFile() public void connectionToEntryUsingWrongAbsoluteUrlForEntryFromNestedJarFile()
throws Exception { throws Exception {
URL url = new URL("jar:file:" + getAbsolutePath() + "!/w.jar!/3.dat"); URL url = new URL("jar:file:" + getAbsolutePath() + "!/w.jar!/3.dat");
JarFile nested = this.jarFile JarFile nested = this.jarFile
.getNestedJarFile(this.jarFile.getEntry("nested.jar")); .getNestedJarFile(this.jarFile.getEntry("nested.jar"));
this.thrown.expect(FileNotFoundException.class);
JarURLConnection.get(url, nested).getInputStream(); JarURLConnection.get(url, nested).getInputStream();
} }