From 66069333f1e44774590487fbfbb5de3198328dea Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Tue, 21 Oct 2014 16:18:23 +0200 Subject: [PATCH] Fix JUnit imports in SourceHttpMessageConverterTests When org.junit.Assert.* is statically imported, the class does not compile in Eclipse/STS since XMLAssert extends junit.framework.Assert. --- .../http/converter/xml/SourceHttpMessageConverterTests.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spring-web/src/test/java/org/springframework/http/converter/xml/SourceHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/xml/SourceHttpMessageConverterTests.java index e298ba7a8b..53c05e2666 100644 --- a/spring-web/src/test/java/org/springframework/http/converter/xml/SourceHttpMessageConverterTests.java +++ b/spring-web/src/test/java/org/springframework/http/converter/xml/SourceHttpMessageConverterTests.java @@ -45,8 +45,9 @@ import org.springframework.http.MockHttpOutputMessage; import org.springframework.util.FileCopyUtils; import static org.custommonkey.xmlunit.XMLAssert.*; +// Do NOT statically import org.junit.Assert.*, since XMLAssert extends junit.framework.Assert import static org.junit.Assert.assertEquals; -import static org.junit.Assert.*; +import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertTrue; /**