root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Revised newline handling tests pass on Windows now 

Issue: SPR-13503
This commit is contained in:
Juergen Hoeller 2016-03-23 18:35:26 +01:00
parent 3c18a4533a
commit 311d4c95a3
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerMacroTests.java
View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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 // tokenize output and ignore whitespace
String output = response.getContentAsString(); String output = response.getContentAsString();
output = output.replace("\r\n", "\n");
return output.trim(); return output.trim();
} }