Merge branch '1.5.x'

2017-03-28 10:27:31 +02:00
parent ae1475dcb8 d8e90af3bf
commit ff50331168
3 changed files with 6 additions and 6 deletions
--- a/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/LayoutsTests.java
+++ b/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/LayoutsTests.java
@@ -55,7 +55,7 @@ public class LayoutsTests {

 	@Test
 	public void unknownFile() throws Exception {
-		this.thrown.equals(IllegalStateException.class);
+		this.thrown.expect(IllegalStateException.class);
 		this.thrown.expectMessage("Unable to deduce layout for 'test.txt'");
 		Layouts.forFile(new File("test.txt"));
 	}