Code refactor

Author: liufengyun

compiler/test/dotty/tools/dotc/printing/PrintingTest.scala

@@ -35,21 +35,8 @@ class PrintingTest {
         e.printStackTrace()
     }
 
-    val actualLines = byteStream.toString("UTF-8").split("\\r?\\n")
-    // 'options' includes option '-Xprint:typer' so the first output line
-    // looks similar to "result of tests/printing/i620.scala after typer:";
-    // check files use slashes as file separators (Unix) but running tests
-    // on Windows produces backslashes.
-    // NB. option '-Xprint:<..>' can specify several phases.
-    val filteredLines =
-      if (config.Properties.isWin)
-        actualLines.map(line =>
-          if (line.startsWith("result of")) line.replaceAll("\\\\", "/") else line
-        )
-      else
-        actualLines
-
-    FileDiff.checkAndDump(path.toString, filteredLines.toIndexedSeq, checkFilePath)
+    val actualLines = byteStream.toString("UTF-8").linesIterator
+    FileDiff.checkAndDump(path.toString, actualLines.toIndexedSeq, checkFilePath)
   }
 
   @Test

compiler/test/dotty/tools/dotc/transform/PatmatExhaustivityTest.scala

@@ -20,50 +20,39 @@ class PatmatExhaustivityTest {
   // stop-after: patmatexhaust-huge.scala crash compiler
   val options = List("-color:never", "-Ystop-after:crossCast", "-Ycheck-all-patmat", "-classpath", TestConfiguration.basicClasspath)
 
-  private def compileFile(path: JPath): Boolean = {
+  private def compile(files: Seq[String]): Seq[String] = {
     val stringBuffer = new StringWriter()
     val reporter = TestReporter.simplifiedReporter(new PrintWriter(stringBuffer))
 
     try {
-      Main.process((path.toString::options).toArray, reporter, null)
+      Main.process((options ++ files).toArray, reporter, null)
     } catch {
       case e: Throwable =>
-        println(s"Compile $path exception:")
+        println(s"Compile $files exception:")
         e.printStackTrace()
     }
 
-    val actualLines: Seq[String] = stringBuffer.toString.trim.replaceAll("\\s+\n", "\n") match {
+    stringBuffer.toString.trim.replaceAll("\\s+\n", "\n") match {
       case "" => Nil
-      case s  => s.split("\\r?\\n").toIndexedSeq
+      case s  => s.linesIterator.toSeq
     }
-    val baseFilePath = path.toString.stripSuffix(".scala")
+  }
+
+  private def compileFile(path: JPath): Boolean = {
+    val actualLines   = compile(path.toString :: Nil)
+    val baseFilePath  = path.toString.stripSuffix(".scala")
     val checkFilePath = baseFilePath + ".check"
 
     FileDiff.checkAndDump(path.toString, actualLines, checkFilePath)
   }
 
   /** A single test with multiple files grouped in a folder */
   private def compileDir(path: JPath): Boolean = {
-    val stringBuffer = new StringWriter()
-    val reporter = TestReporter.simplifiedReporter(new PrintWriter(stringBuffer))
-
     val files = Directory(path).list.toList
       .filter(f => f.extension == "scala" || f.extension == "java" )
       .map(_.jpath.toString)
 
-    try {
-      Main.process((options ++ files).toArray, reporter, null)
-    } catch {
-      case e: Throwable =>
-        println(s"Compile $path exception:")
-        e.printStackTrace()
-    }
-
-    val actualLines: Seq[String] = stringBuffer.toString.trim.replaceAll("\\s+\n", "\n") match {
-      case "" => Nil
-      case s  => s.split("\\r?\\n").toIndexedSeq
-    }
-
+    val actualLines   = compile(files)
     val checkFilePath = s"${path}${File.separator}expected.check"
 
     FileDiff.checkAndDump(path.toString, actualLines, checkFilePath)