From 4e17685008c0e189bd7a388ba30d8416ae225b51 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Fri, 30 May 2014 17:27:14 +0200 Subject: [PATCH] Made transform test pass on Windows --- .../resource/CssLinkResourceTransformerTests.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/CssLinkResourceTransformerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/CssLinkResourceTransformerTests.java index 1e163b05f7..6afc078836 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/CssLinkResourceTransformerTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/CssLinkResourceTransformerTests.java @@ -16,17 +16,18 @@ package org.springframework.web.servlet.resource; +import java.util.ArrayList; +import java.util.List; + import org.junit.Before; import org.junit.Test; + import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.Resource; import org.springframework.mock.web.test.MockHttpServletRequest; +import org.springframework.util.StringUtils; -import java.util.ArrayList; -import java.util.List; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertSame; +import static org.junit.Assert.*; /** * Unit tests for @@ -79,7 +80,9 @@ public class CssLinkResourceTransformerTests { "body { background: url(\"images/image-f448cd1d5dba82b774f3202c878230b3.png\") }\n\n" + "li { list-style: url(http://www.example.com/redball.png) disc }\n"; - assertEquals(expected, new String(transformedResource.getByteArray(), "UTF-8")); + String result = new String(transformedResource.getByteArray(), "UTF-8"); + result = StringUtils.deleteAny(result, "\r"); + assertEquals(expected, result); } @Test