From 311d4c95a3ef00d0cbeaeba7411fad9bc266c384 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Wed, 23 Mar 2016 18:35:26 +0100 Subject: [PATCH] Revised newline handling tests pass on Windows now Issue: SPR-13503 --- .../web/servlet/view/freemarker/FreeMarkerMacroTests.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerMacroTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerMacroTests.java index f462250618..6157655214 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerMacroTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerMacroTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2015 the original author or authors. + * Copyright 2002-2016 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. @@ -326,6 +326,7 @@ public class FreeMarkerMacroTests { // tokenize output and ignore whitespace String output = response.getContentAsString(); + output = output.replace("\r\n", "\n"); return output.trim(); }