Browse Source

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.
pull/1722/head
Yannik Hampe 7 years ago committed by Sam Brannen
parent
commit
4094879daf
  1. 3
      spring-test/src/main/java/org/springframework/test/web/client/match/MockRestRequestMatchers.java

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

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

Loading…
Cancel
Save