Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revised isInstanceOf/isAssignable message concatenation

Browse Source 
Issue: SPR-15196
This commit is contained in:
Juergen Hoeller
2017-02-16 13:13:20 +01:00
parent 8c04a65eb1
commit 22322fde26
2 changed files with 130 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
spring-core/src/test/java/org/springframework/util/AssertTests.java
View File

@@ -497,6 +497,21 @@ public class AssertTests {
Assert.isInstanceOf(String.class, 42L, "Custom message");
}
@Test
public void isInstanceOfWithTypeMismatchAndCustomMessageWithSeparator() {
thrown.expect(IllegalArgumentException.class);
thrown.expectMessage(
"Custom message: Object of class [java.lang.Long] must be an instance of class java.lang.String");
Assert.isInstanceOf(String.class, 42L, "Custom message:");
}
@Test
public void isInstanceOfWithTypeMismatchAndCustomMessageWithSpace() {
thrown.expect(IllegalArgumentException.class);
thrown.expectMessage("Custom message for java.lang.Long");
Assert.isInstanceOf(String.class, 42L, "Custom message for ");
}
@Test
public void isInstanceOfWithMessageSupplier() {
Assert.isInstanceOf(String.class, "foo", () -> "enigma");
@@ -559,8 +574,22 @@ public class AssertTests {
@Test
public void isAssignableWithTypeMismatchAndCustomMessage() {
thrown.expect(IllegalArgumentException.class);
thrown.expectMessage("enigma: class java.lang.Integer");
Assert.isAssignable(String.class, Integer.class, "enigma");
thrown.expectMessage("Custom message: class java.lang.Integer");
Assert.isAssignable(String.class, Integer.class, "Custom message");
}
@Test
public void isAssignableWithTypeMismatchAndCustomMessageWithSeparator() {
thrown.expect(IllegalArgumentException.class);
thrown.expectMessage("Custom message: class java.lang.Integer is not assignable to class java.lang.String");
Assert.isAssignable(String.class, Integer.class, "Custom message:");
}
@Test
public void isAssignableWithTypeMismatchAndCustomMessageWithSpace() {
thrown.expect(IllegalArgumentException.class);
thrown.expectMessage("Custom message for class java.lang.Integer");
Assert.isAssignable(String.class, Integer.class, "Custom message for ");
}
@Test