summaryrefslogtreecommitdiff
path: root/test/junit
diff options
context:
space:
mode:
authorVladimirNik <vladimir.nikolaev9@gmail.com>2014-01-17 05:06:41 +0400
committerVladimirNik <vladimir.nikolaev9@gmail.com>2014-01-17 05:06:41 +0400
commit06bae51b0767e5bfcc7968448c60659523dd4370 (patch)
tree3845ff0cb341fab7a7dabc2e7167091eb4b717c7 /test/junit
parent695b9e11a02175c2df47222e7a80627453f39e52 (diff)
downloadscala-06bae51b0767e5bfcc7968448c60659523dd4370.tar.gz
scala-06bae51b0767e5bfcc7968448c60659523dd4370.tar.bz2
scala-06bae51b0767e5bfcc7968448c60659523dd4370.zip
Problem with EOL in tests for Printers is fixed
Diffstat (limited to 'test/junit')
-rw-r--r--test/junit/scala/reflect/internal/PrintersTest.scala9
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