Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make MockRestRequestMatchers independent of JUnit (#1720)

Browse Source 
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 b70d400c71
commit ff53a26333
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2016 the original author or authors.
* Copyright 2002-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -34,7 +34,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;
@@ -166,7 +165,7 @@ public abstract class MockRestRequestMatchers {
List<String> values = map.get(name);
String message = "Expected " + valueType + " <" + name + ">";
assertNotNull(message, values);
assertTrue(message + " to exist but was null", values != null);
assertTrue(message + " to have at least <" + count + "> values but found " + values,
count <= values.size());