Merge pull request #3390 from tgodzik/previous-compilation

tests: Add tests for issue with rereporting errors

Author: tgodzik

modules/integration/src/test/scala/scala/cli/integration/CompileTestDefinitions.scala

@@ -737,4 +737,88 @@ abstract class CompileTestDefinitions
         os.proc(TestUtil.cli, "compile", extraOptions, ".").call(cwd = root)
       }
     }
+
+  test("no previous compilation error should be printed") {
+    val filename = "Main.scala"
+    val inputs = TestInputs(
+      os.rel / filename ->
+        """|object Main extends App {
+           |  val msg: String = "1"
+           |}
+           |""".stripMargin
+    )
+    inputs.fromRoot { root =>
+      val result = os.proc(TestUtil.cli, "compile", ".", extraOptions).call(
+        cwd = root,
+        check = false,
+        mergeErrIntoOut = true
+      )
+
+      assertEquals(
+        TestUtil.fullStableOutput(result),
+        s"""|Compiling project (Scala $actualScalaVersion, JVM (${Constants
+             .defaultGraalVMJavaVersion}))
+            |Compiled project (Scala $actualScalaVersion, JVM (${Constants
+             .defaultGraalVMJavaVersion}))""".stripMargin
+      )
+
+      os.write.over(
+        root / filename,
+        """|object Main extends App {
+           |    val msg: String = 1
+           |}
+           |""".stripMargin
+      )
+
+      val result2 = os.proc(TestUtil.cli, "compile", ".", extraOptions).call(
+        cwd = root,
+        check = false,
+        mergeErrIntoOut = true
+      )
+
+      val expectedError = if (actualScalaVersion.startsWith("2"))
+        """|[error] type mismatch;
+           |[error]  found   : Int(1)
+           |[error]  required: String""".stripMargin
+      else
+        """|[error] Found:    (1 : Int)
+           |[error] Required: String""".stripMargin
+
+      assertEquals(
+        TestUtil.fullStableOutput(result2).trim,
+        s"""|Compiling project (Scala $actualScalaVersion, JVM (${Constants
+             .defaultGraalVMJavaVersion}))
+            |[error] .${File.separatorChar}Main.scala:2:23
+            |$expectedError
+            |[error]     val msg: String = 1
+            |[error]                       ^
+            |Error compiling project (Scala $actualScalaVersion, JVM (${Constants
+             .defaultGraalVMJavaVersion}))
+            |Compilation failed""".stripMargin
+      )
+
+      os.write.over(
+        root / filename,
+        """|object Main extends App {
+           |    val msg: String = "1"
+           |}
+           |""".stripMargin
+      )
+
+      val result3 = os.proc(TestUtil.cli, "compile", ".", extraOptions).call(
+        cwd = root,
+        check = false,
+        mergeErrIntoOut = true
+      )
+
+      assertEquals(
+        TestUtil.fullStableOutput(result3),
+        s"""|Compiling project (Scala $actualScalaVersion, JVM (${Constants
+             .defaultGraalVMJavaVersion}))
+            |Compiled project (Scala $actualScalaVersion, JVM (${Constants
+             .defaultGraalVMJavaVersion}))""".stripMargin
+      )
+
+    }
+  }
 }

modules/integration/src/test/scala/scala/cli/integration/CompileTests213.scala

@@ -47,15 +47,17 @@ class CompileTests213 extends CompileTestDefinitions with Test213 {
       val result = os.proc(TestUtil.cli, "test", ".").call(
         cwd = root,
         check = false,
-        // stdout = ProcessOutput.Readlines{ str => stringBuffer.append(str)},
         mergeErrIntoOut = true
       )
       val separator = if (Properties.isWin) "\\" else "/"
 
       val expectedOutput =
-        s"""|Compiling project (Scala ${Constants.scala213}, JVM (17))
-            |Compiled project (Scala ${Constants.scala213}, JVM (17))
-            |Compiling project (test, Scala ${Constants.scala213}, JVM (17))
+        s"""|Compiling project (Scala ${Constants.scala213}, JVM (${Constants
+             .defaultGraalVMJavaVersion}))
+            |Compiled project (Scala ${Constants.scala213}, JVM (${Constants
+             .defaultGraalVMJavaVersion}))
+            |Compiling project (test, Scala ${Constants.scala213}, JVM (${Constants
+             .defaultGraalVMJavaVersion}))
             |[info] .${separator}Test.test.scala:6:5
             |[info] scala.Predef.ArrowAssoc[Int](1).->[String]("test")
             |[info] scala.Predef.ArrowAssoc[Int](1).->[String]("test")
@@ -69,16 +71,13 @@ class CompileTests213 extends CompileTestDefinitions with Test213 {
             |[error] example error message
             |[error]     Scala2Example.macroMethod(1 -> "test")
             |[error]     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-            |Error compiling project (test, Scala ${Constants.scala213}, JVM (17))
+            |Error compiling project (test, Scala ${Constants.scala213}, JVM (${Constants
+             .defaultGraalVMJavaVersion}))
             |Compilation failed
             |""".stripMargin
 
       assertNoDiff(
-        result.toString.trim().linesIterator.filterNot { str =>
-          // these lines are not stable and can easily change
-          val shouldNotContain = Set("Starting compilation server", "hint", "Download", "Result of")
-          shouldNotContain.exists(str.contains)
-        }.mkString("\n"),
+        TestUtil.fullStableOutput(result),
         expectedOutput
       )
     }

modules/integration/src/test/scala/scala/cli/integration/TestUtil.scala

@@ -114,6 +114,14 @@ object TestUtil {
 
   def removeAnsiColors(str: String) = str.replaceAll("\\e\\[[0-9]+m", "")
 
+  def fullStableOutput(result: os.CommandResult) =
+    removeAnsiColors(result.toString).trim().linesIterator.filterNot { str =>
+      // these lines are not stable and can easily change
+      val shouldNotContain =
+        Set("Starting compilation server", "hint", "Download", "Result of", "Checking", "Checked")
+      shouldNotContain.exists(str.contains)
+    }.mkString(System.lineSeparator())
+
   def retry[T](
     maxAttempts: Int = 3,
     waitDuration: FiniteDuration = 5.seconds