From 32819e2edc88dd06095704c04ed9c2dd0603386f Mon Sep 17 00:00:00 2001
From: Martijn Hoekstra <Martijn Hoekstra>
Date: Sat, 3 Sep 2016 12:10:53 +0200
Subject: honor -encoding compiler flag and defaults

rename test/pos/valueclasses to pos_valueclasses

tests/pos/valueclasses generates a valueclasses.flags
file in /tests/partest-generated/pos that conflicts
with the valueClasses.flags file that
tests/neg/valueClasses.scala tries to create
---
 test/test/CompilerTest.scala | 8 +++++---
 test/test/DottyTest.scala    | 1 +
 test/test/ParserTest.scala   | 3 ++-
 test/test/ScannerTest.scala  | 5 +++--
 4 files changed, 11 insertions(+), 6 deletions(-)

(limited to 'test/test')

diff --git a/test/test/CompilerTest.scala b/test/test/CompilerTest.scala
index d0e4b9a52..6bd5f7030 100644
--- a/test/test/CompilerTest.scala
+++ b/test/test/CompilerTest.scala
@@ -413,7 +413,8 @@ abstract class CompilerTest {
     val flags = oldFlags.map(f => if (f == oldOutput) partestOutput else f) ++
       List(s"-classpath $partestOutput") // Required for separate compilation tests
 
-    getExisting(dest).isDifferent(source, flags, nerr) match {
+    val difference = getExisting(dest).isDifferent(source, flags, nerr)
+    difference match {
       case NotExists => copyFiles(source, dest, partestOutput, flags, nerr, kind)
       case ExistsSame => // nothing else to do
       case ExistsDifferent =>
@@ -449,6 +450,7 @@ abstract class CompilerTest {
   /** Recursively copy over source files and directories, excluding extensions
     * that aren't in extensionsToCopy. */
   private def recCopyFiles(sourceFile: Path, dest: Path): Unit = {
+
     def copyfile(file: SFile, bytewise: Boolean): Unit = {
       if (bytewise) {
         val in = file.inputStream()
@@ -490,7 +492,7 @@ abstract class CompilerTest {
 
   /** Reads the existing files for the given test source if any. */
   private def getExisting(dest: Path): ExistingFiles = {
-    val content: Option[Option[String]] = processFileDir(dest, f => f.safeSlurp, d => Some(""))
+    val content: Option[Option[String]] = processFileDir(dest, f => try Some(f.slurp("UTF8")) catch {case io: java.io.IOException => Some(io.toString())}, d => Some(""))
     if (content.isDefined && content.get.isDefined) {
       val flags = (dest changeExtension "flags").toFile.safeSlurp
       val nerr = (dest changeExtension "nerr").toFile.safeSlurp
@@ -504,7 +506,7 @@ abstract class CompilerTest {
       if (!genSrc.isDefined) {
         NotExists
       } else {
-        val source = processFileDir(sourceFile, { f => f.safeSlurp }, { d => Some("") },
+        val source = processFileDir(sourceFile, { f => try Some(f.slurp("UTF8")) catch {case _: java.io.IOException => None} }, { d => Some("") },
             Some("DPCompilerTest sourceFile doesn't exist: " + sourceFile)).get
         if (source == genSrc) {
           nerr match {
diff --git a/test/test/DottyTest.scala b/test/test/DottyTest.scala
index 15d82c208..4b767b318 100644
--- a/test/test/DottyTest.scala
+++ b/test/test/DottyTest.scala
@@ -23,6 +23,7 @@ class DottyTest /*extends ContextEscapeDetection*/ {
     import base.settings._
     val ctx = base.initialCtx.fresh
     base.initialize()(ctx)
+    ctx.setSetting(ctx.settings.encoding, "UTF8")
     ctx
   }
 /*
diff --git a/test/test/ParserTest.scala b/test/test/ParserTest.scala
index 524be272d..f66dbf55d 100644
--- a/test/test/ParserTest.scala
+++ b/test/test/ParserTest.scala
@@ -4,6 +4,7 @@ import scala.reflect.io._
 import dotty.tools.dotc.util._
 import dotty.tools.dotc.core._
 import dotty.tools.dotc.parsing._
+import scala.io.Codec
 import Tokens._, Parsers._
 import dotty.tools.dotc.ast.untpd._
 import org.junit.Test
@@ -23,7 +24,7 @@ class ParserTest extends DottyTest {
 
   def parse(file: PlainFile): Tree = {
     //println("***** parsing " + file)
-    val source = new SourceFile(file)
+    val source = new SourceFile(file, Codec.UTF8)
     val parser = new Parser(source)
     val tree = parser.parse()
     parsed += 1
diff --git a/test/test/ScannerTest.scala b/test/test/ScannerTest.scala
index f8f09ff6f..5ff9bba0c 100644
--- a/test/test/ScannerTest.scala
+++ b/test/test/ScannerTest.scala
@@ -1,6 +1,7 @@
 package test
 
 import scala.reflect.io._
+import scala.io.Codec
 import dotty.tools.dotc.util._
 import dotty.tools.dotc.parsing._
 import Tokens._, Scanners._
@@ -16,8 +17,8 @@ class ScannerTest extends DottyTest {
   def scan(name: String): Unit = scan(new PlainFile(name))
 
   def scan(file: PlainFile): Unit = {
-    println("***** scanning " + file)
-    val source = new SourceFile(file)
+    //println("***** scanning " + file)
+    val source = new SourceFile(file, Codec.UTF8)
     val scanner = new Scanner(source)
     var i = 0
     while (scanner.token != EOF) {
-- 
cgit v1.2.3