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

Merge pull request #8660 from dreis2211:cleanup-equals-exceptions 

* pr/8660:
  Fix test assertions
This commit is contained in:
Stephane Nicoll 2017-03-28 10:26:56 +02:00
parent 113279c1bc 1266642aba
commit 595fada2ff
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/LayoutsTests.java
View File

@ -55,7 +55,7 @@ public class LayoutsTests {
@Test @Test
public void unknownFile() throws Exception { 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'"); this.thrown.expectMessage("Unable to deduce layout for 'test.txt'");
Layouts.forFile(new File("test.txt")); Layouts.forFile(new File("test.txt"));
} }

8
spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/data/RandomAccessDataFileTests.java
View File

@ -87,28 +87,28 @@ public class RandomAccessDataFileTests {
@Test @Test
public void fileNotNull() throws Exception { public void fileNotNull() throws Exception {
this.thrown.expect(IllegalArgumentException.class); this.thrown.expect(IllegalArgumentException.class);
this.thrown.equals("File must not be null"); this.thrown.expectMessage("File must not be null");
new RandomAccessDataFile(null); new RandomAccessDataFile(null);
} }
@Test @Test
public void fileExists() throws Exception { public void fileExists() throws Exception {
this.thrown.expect(IllegalArgumentException.class); this.thrown.expect(IllegalArgumentException.class);
this.thrown.equals("File must exist"); this.thrown.expectMessage("File must exist");
new RandomAccessDataFile(new File("/does/not/exist")); new RandomAccessDataFile(new File("/does/not/exist"));
} }
@Test @Test
public void fileNotNullWithConcurrentReads() throws Exception { public void fileNotNullWithConcurrentReads() throws Exception {
this.thrown.expect(IllegalArgumentException.class); this.thrown.expect(IllegalArgumentException.class);
this.thrown.equals("File must not be null"); this.thrown.expectMessage("File must not be null");
new RandomAccessDataFile(null, 1); new RandomAccessDataFile(null, 1);
} }
@Test @Test
public void fileExistsWithConcurrentReads() throws Exception { public void fileExistsWithConcurrentReads() throws Exception {
this.thrown.expect(IllegalArgumentException.class); this.thrown.expect(IllegalArgumentException.class);
this.thrown.equals("File must exist"); this.thrown.expectMessage("File must exist");
new RandomAccessDataFile(new File("/does/not/exist"), 1); new RandomAccessDataFile(new File("/does/not/exist"), 1);
} }