Merge pull request #3377 from VladimirNik/sprinter-eol-fix

Fix EOL-printing in Printers test suite

1 files changed, 7 insertions, 2 deletions

diff --git a/test/junit/scala/reflect/internal/PrintersTest.scala b/test/junit/scala/reflect/internal/PrintersTest.scala
index 53ea3fd8a3..a08a29a9d1 100644
--- a/test/junit/scala/reflect/internal/PrintersTest.scala
+++ b/test/junit/scala/reflect/internal/PrintersTest.scala
@@ -19,14 +19,19 @@ class PrintersTest extends BasePrintTests
 object PrinterHelper {
   val toolbox = cm.mkToolBox()
   def assertPrintedCode(code: String, tree: Tree = EmptyTree) = {
+    def processEOL(resultCode: String) = {
+      import scala.reflect.internal.Chars._
+      resultCode.replaceAll(s"$CR$LF", s"$LF").replace(CR, LF)
+    }
+
     val toolboxTree = 
       try{
         toolbox.parse(code)
       } catch {
         case e:scala.tools.reflect.ToolBoxError => throw new Exception(e.getMessage + ": " + code)
       }
-    if (tree ne EmptyTree) assertEquals("using quasiquote or given tree"+"\n", code.trim, showCode(tree))
-    else assertEquals("using toolbox parser", code.trim, showCode(toolboxTree))
+    if (tree ne EmptyTree) assertEquals("using quasiquote or given tree"+"\n", code.trim, processEOL(showCode(tree)))
+    else assertEquals("using toolbox parser", code.trim, processEOL(showCode(toolboxTree)))
   }
   
   implicit class StrContextStripMarginOps(val stringContext: StringContext) extends util.StripMarginInterpolator