From 4094879daf49f9b9c2326578904ba8e55230bf60 Mon Sep 17 00:00:00 2001 From: Yannik Hampe Date: Wed, 7 Mar 2018 13:07:32 +0100 Subject: [PATCH] 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. --- .../test/web/client/match/MockRestRequestMatchers.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/spring-test/src/main/java/org/springframework/test/web/client/match/MockRestRequestMatchers.java b/spring-test/src/main/java/org/springframework/test/web/client/match/MockRestRequestMatchers.java index d67c6762dd..f9b7a825bd 100644 --- a/spring-test/src/main/java/org/springframework/test/web/client/match/MockRestRequestMatchers.java +++ b/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 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 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());