Introduce soft assertions for MockMvc
It happens very often that MockMvc is used in heavyweight integration tests. It's no use to waste time to check if another condition has been fixed or not. Soft assertions help a lot by checking all conditions at once even if one of them fails. See gh-26917 Co-authored-by: Sach Nguyen <sachnbbkhn@gmail.com>
This commit is contained in:
committed by
Sam Brannen
parent
4c153b80ee
commit
35bec8102b
@@ -42,7 +42,7 @@ public interface ResultActions {
|
||||
* .andExpect(jsonPath("$.person.name").value("Jason"));
|
||||
* </pre>
|
||||
*
|
||||
* <p>Or alternatively provide all matchers as a vararg:
|
||||
* <p>Either provide all matchers as a vararg:
|
||||
* <pre class="code">
|
||||
* static imports: MockMvcRequestBuilders.*, MockMvcResultMatchers.*, ResultMatcher.matchAll
|
||||
*
|
||||
@@ -56,6 +56,16 @@ public interface ResultActions {
|
||||
* flash().attribute("message", "success!"))
|
||||
* );
|
||||
* </pre>
|
||||
*
|
||||
* <p>Or provide all matchers to be evaluated no matter if one of them fail:
|
||||
* <pre class="code">
|
||||
* static imports: MockMvcRequestBuilders.*, MockMvcResultMatchers.*, ResultMatcher.matchAllSoftly
|
||||
* mockMvc.perform(post("/form"))
|
||||
* .andExpect(matchAllSoftly(
|
||||
* status().isOk(),
|
||||
* redirectedUrl("/person/1")
|
||||
* );
|
||||
* </pre>
|
||||
*/
|
||||
ResultActions andExpect(ResultMatcher matcher) throws Exception;
|
||||
|
||||
|
||||
@@ -16,6 +16,9 @@
|
||||
|
||||
package org.springframework.test.web.servlet;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* A {@code ResultMatcher} matches the result of an executed request against
|
||||
* some expectation.
|
||||
@@ -70,4 +73,30 @@ public interface ResultMatcher {
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* Static method for matching with an array of result matchers whose assertion failures are caught and stored.
|
||||
* Only when all of them would be called a {@link AssertionError} be thrown containing the error messages of those
|
||||
* previously caught assertion failures.
|
||||
* @param matchers the matchers
|
||||
* @author Michał Rowicki
|
||||
* @since 5.2
|
||||
*/
|
||||
static ResultMatcher matchAllSoftly(ResultMatcher... matchers) {
|
||||
return result -> {
|
||||
List<String> failedMessages = new ArrayList<>();
|
||||
for (int i = 0; i < matchers.length; i++) {
|
||||
ResultMatcher matcher = matchers[i];
|
||||
try {
|
||||
matcher.match(result);
|
||||
}
|
||||
catch (AssertionError assertionException) {
|
||||
failedMessages.add("[" + i + "] " + assertionException.getMessage());
|
||||
}
|
||||
}
|
||||
if (!failedMessages.isEmpty()) {
|
||||
throw new AssertionError(String.join("\n", failedMessages));
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user