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

Make MockRestRequestMatchers independent of JUnit (#1720) 

MockRestRequestMatchers was using org.junit.Assert.assertNotNull
and thus could not be used in projects that use e.g. TestNG instead
of JUnit 4.
This commit is contained in:
Yannik Hampe 2018-03-07 13:07:32 +01:00 committed by Sam Brannen
parent 27815847b1
commit 4094879daf
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spring-test/src/main/java/org/springframework/test/web/client/match/MockRestRequestMatchers.java
View File

@ -32,7 +32,6 @@ import org.springframework.util.MultiValueMap;
import org.springframework.web.util.UriComponentsBuilder;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertNotNull;
import static org.springframework.test.util.AssertionErrors.assertEquals;
import static org.springframework.test.util.AssertionErrors.assertTrue;
@ -148,7 +147,7 @@ public abstract class MockRestRequestMatchers {
List<String> values = map.get(name);
String message = "Expected " + valueType + " <" + name + ">";
assertNotNull(message, values);
Assert.notNull(values, message);
assertTrue(message + " to have at least <" + count + "> values but found " + values,
count <= values.size());