Merge branch '1.5.x' into 2.0.x

philwebb · philwebb · commit bdd541b2cce8 · 2018-05-30T20:29:03.000-07:00
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/jar/JarURLConnectionTests.java b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/jar/JarURLConnectionTests.java
@@ -150,12 +150,13 @@ public void connectionToEntryWithEncodedSpaceNestedEntry() throws Exception {
 				.hasSameContentAs(new ByteArrayInputStream(new byte[] { 3 }));
 	}
 
-	@Test(expected = FileNotFoundException.class)
+	@Test
 	public void connectionToEntryUsingWrongAbsoluteUrlForEntryFromNestedJarFile()
 			throws Exception {
 		URL url = new URL("jar:file:" + getAbsolutePath() + "!/w.jar!/3.dat");
 		JarFile nested = this.jarFile
 				.getNestedJarFile(this.jarFile.getEntry("nested.jar"));
+		this.thrown.expect(FileNotFoundException.class);
 		JarURLConnection.get(url, nested).getInputStream();
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -150,12 +150,13 @@ public void connectionToEntryWithEncodedSpaceNestedEntry() throws Exception {`
`150`	`150`	`.hasSameContentAs(new ByteArrayInputStream(new byte[] { 3 }));`
`151`	`151`	`}`
`152`	`152`
`153`		`- @Test(expected = FileNotFoundException.class)`
	`153`	`+ @Test`
`154`	`154`	`public void connectionToEntryUsingWrongAbsoluteUrlForEntryFromNestedJarFile()`
`155`	`155`	`throws Exception {`
`156`	`156`	`URL url = new URL("jar:file:" + getAbsolutePath() + "!/w.jar!/3.dat");`
`157`	`157`	`JarFile nested = this.jarFile`
`158`	`158`	`.getNestedJarFile(this.jarFile.getEntry("nested.jar"));`
	`159`	`+ this.thrown.expect(FileNotFoundException.class);`
`159`	`160`	`JarURLConnection.get(url, nested).getInputStream();`
`160`	`161`	`}`
`161`	`162`