summaryrefslogtreecommitdiff
path: root/test/junit
diff options
context:
space:
mode:
authorLinas Medziunas <linas.medziunas+git@gmail.com>2016-01-13 12:36:50 +0200
committerLinas Medziunas <linas.medziunas+git@gmail.com>2016-01-13 12:36:50 +0200
commita4242d6d905454fb04c04dd541f549a85fdd84d4 (patch)
treea1c53f5e4fddd4e28fb79a8781e0448a64aee078 /test/junit
parentfb22e2b0a73605d654c153e02d454e5cec21f355 (diff)
downloadscala-a4242d6d905454fb04c04dd541f549a85fdd84d4.tar.gz
scala-a4242d6d905454fb04c04dd541f549a85fdd84d4.tar.bz2
scala-a4242d6d905454fb04c04dd541f549a85fdd84d4.zip
Make StringContextTest pass on Windows
One assertion in StringContextTest."f interpolator baseline"() was relying on platform specific newline encoding, making it fail when run on Windows.
Diffstat (limited to 'test/junit')
-rw-r--r--test/junit/scala/StringContextTest.scala5
1 files changed, 2 insertions, 3 deletions
diff --git a/test/junit/scala/StringContextTest.scala b/test/junit/scala/StringContextTest.scala
index 900852fcc6..b93cd978f4 100644
--- a/test/junit/scala/StringContextTest.scala
+++ b/test/junit/scala/StringContextTest.scala
@@ -224,11 +224,10 @@ class StringContextTest {
// literals and arg indexes
f"%%" -> "%",
- f" mind%n------%nmatter%n" ->
+ f" mind%n------%nmatter" ->
"""| mind
|------
- |matter
- |""".stripMargin,
+ |matter""".stripMargin.lines.mkString(compat.Platform.EOL),
f"${i}%d %<d ${9}%d" -> "42 42 9",
f"${7}%d %<d ${9}%d" -> "7 7 9",
f"${7}%d %2$$d ${9}%d" -> "7 9 9",