root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge branch '5.1.x'

This commit is contained in:
Sam Brannen 2019-05-11 18:21:44 +02:00
parent 33fcde4c3e e1b0bf22bf
commit da1b004254
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
spring-test/src/main/java/org/springframework/test/util/AssertionErrors.java
View File

@ -39,16 +39,19 @@ public abstract class AssertionErrors {
/**
* Fail a test with the given message passing along expected and actual
* values to be added to the message.
* values to be appended to the message.
* <p>For example given:
* <pre class="code">
* assertEquals("Response header [" + name + "]", actual, expected);
* String name = "Accept";
* String expected = "application/json";
* String actual = "text/plain";
* fail("Response header [" + name + "]", expected, actual);
* </pre>
* <p>The resulting message is:
* <pre class="code">
* Response header [Accept] expected:&lt;application/json&gt; but was:&lt;text/plain&gt;
* </pre>
* @param message a message describes the value that failed the match
* @param message a message that describes the use case that failed
* @param expected the expected value
* @param actual the actual value
*/
@ -85,9 +88,10 @@ public abstract class AssertionErrors {
* <pre class="code">
* assertEquals("Response header [" + name + "]", expected, actual);
* </pre>
* @param message a message that describes the reason for the failure
* @param message a message that describes the value being checked
* @param expected the expected value
* @param actual the actual value
* @see #fail(String, Object, Object)
*/
public static void assertEquals(String message, @Nullable Object expected, @Nullable Object actual) {
if (!ObjectUtils.nullSafeEquals(expected, actual)) {
@ -101,7 +105,7 @@ public abstract class AssertionErrors {
* <pre class="code">
* assertNotEquals("Response header [" + name + "]", expected, actual);
* </pre>
* @param message a message that describes the reason for the failure
* @param message a message that describes the value being checked
* @param expected the expected value
* @param actual the actual value
*/