Add log separators for integration and build tests

MaciejG604 · MaciejG604 · commit 464ee18edfe1 · 2023-11-22T08:30:17.000+01:00
diff --git a/modules/build/src/test/scala/scala/build/tests/ActionableDiagnosticTests.scala b/modules/build/src/test/scala/scala/build/tests/ActionableDiagnosticTests.scala
@@ -12,7 +12,7 @@ import coursier.core.Version
 
 import scala.build.errors.{BuildException, CompositeBuildException}
 
-class ActionableDiagnosticTests extends munit.FunSuite {
+class ActionableDiagnosticTests extends TestUtil.ScalaCliBuildSuite {
 
   val extraRepoTmpDir = os.temp.dir(prefix = "scala-cli-tests-actionable-diagnostic-")
   val directories     = Directories.under(extraRepoTmpDir)
diff --git a/modules/build/src/test/scala/scala/build/tests/BspServerTests.scala b/modules/build/src/test/scala/scala/build/tests/BspServerTests.scala
@@ -21,7 +21,7 @@ import scala.jdk.CollectionConverters.*
 import scala.build.bsp.{WrappedSourcesItem, WrappedSourcesResult}
 import scala.build.internal.ClassCodeWrapper
 
-class BspServerTests extends munit.FunSuite {
+class BspServerTests extends TestUtil.ScalaCliBuildSuite {
   val extraRepoTmpDir = os.temp.dir(prefix = "scala-cli-tests-actionable-diagnostic-")
   val directories     = Directories.under(extraRepoTmpDir)
   val baseOptions = BuildOptions(
diff --git a/modules/build/src/test/scala/scala/build/tests/BuildOptionsTests.scala b/modules/build/src/test/scala/scala/build/tests/BuildOptionsTests.scala
@@ -30,7 +30,7 @@ import scala.build.Positioned
 import scala.build.tests.util.BloopServer
 import scala.concurrent.duration.DurationInt
 
-class BuildOptionsTests extends munit.FunSuite {
+class BuildOptionsTests extends TestUtil.ScalaCliBuildSuite {
 
   val extraRepoTmpDir = os.temp.dir(prefix = "scala-cli-tests-extra-repo-")
   val directories     = Directories.under(extraRepoTmpDir)
diff --git a/modules/build/src/test/scala/scala/build/tests/BuildProjectTests.scala b/modules/build/src/test/scala/scala/build/tests/BuildProjectTests.scala
@@ -21,7 +21,7 @@ import scala.build.options.{
 }
 import scala.build.{Build, LocalRepo, Logger, Position, Positioned, Sources}
 
-class BuildProjectTests extends munit.FunSuite {
+class BuildProjectTests extends TestUtil.ScalaCliBuildSuite {
 
   class LoggerMock extends Logger {
 
diff --git a/modules/build/src/test/scala/scala/build/tests/BuildTests.scala b/modules/build/src/test/scala/scala/build/tests/BuildTests.scala
@@ -30,8 +30,7 @@ import scala.meta.internal.semanticdb.TextDocuments
 import scala.util.Properties
 import scala.jdk.CollectionConverters.*
 
-abstract class BuildTests(server: Boolean) extends munit.FunSuite {
-
+abstract class BuildTests(server: Boolean) extends TestUtil.ScalaCliBuildSuite {
   private def hasDiagnostics = server
 
   val buildThreads = BuildThreads.create()
diff --git a/modules/build/src/test/scala/scala/build/tests/DirectiveTests.scala b/modules/build/src/test/scala/scala/build/tests/DirectiveTests.scala
@@ -23,7 +23,7 @@ import scala.build.errors.{
   ToolkitDirectiveMissingVersionError
 }
 
-class DirectiveTests extends munit.FunSuite {
+class DirectiveTests extends TestUtil.ScalaCliBuildSuite {
 
   val buildThreads = BuildThreads.create()
 
diff --git a/modules/build/src/test/scala/scala/build/tests/DistinctByTests.scala b/modules/build/src/test/scala/scala/build/tests/DistinctByTests.scala
@@ -3,7 +3,7 @@ package scala.build.tests
 import com.eed3si9n.expecty.Expecty.expect
 
 import scala.build.CollectionOps.distinctBy
-class DistinctByTests extends munit.FunSuite {
+class DistinctByTests extends TestUtil.ScalaCliBuildSuite {
   case class Message(a: String, b: Int)
   val distinctData = Seq(
     Message(a = "1", b = 4),
diff --git a/modules/build/src/test/scala/scala/build/tests/ExcludeTests.scala b/modules/build/src/test/scala/scala/build/tests/ExcludeTests.scala
@@ -15,7 +15,7 @@ import scala.build.options.{BuildOptions, Scope, SuppressWarningOptions}
 import scala.build.preprocessing.Preprocessor
 import scala.concurrent.ExecutionContext
 
-class ExcludeTests extends munit.FunSuite {
+class ExcludeTests extends TestUtil.ScalaCliBuildSuite {
 
   val preprocessors: Seq[Preprocessor] = Sources.defaultPreprocessors(
     archiveCache = ArchiveCache().withCache(
diff --git a/modules/build/src/test/scala/scala/build/tests/InputsTests.scala b/modules/build/src/test/scala/scala/build/tests/InputsTests.scala
@@ -17,7 +17,7 @@ import scala.build.tests.util.BloopServer
 import scala.build.{BuildThreads, Directories, LocalRepo}
 import scala.build.internal.Constants
 
-class InputsTests extends munit.FunSuite {
+class InputsTests extends TestUtil.ScalaCliBuildSuite {
   val buildThreads: BuildThreads               = BuildThreads.create()
   val extraRepoTmpDir: os.Path                 = os.temp.dir(prefix = "scala-cli-tests-extra-repo-")
   val directories: Directories                 = Directories.under(extraRepoTmpDir)
diff --git a/modules/build/src/test/scala/scala/build/tests/PackagingUsingDirectiveTests.scala b/modules/build/src/test/scala/scala/build/tests/PackagingUsingDirectiveTests.scala
@@ -6,7 +6,7 @@ import scala.build.options.{BuildOptions, InternalOptions, PackageType}
 import scala.build.tests.util.BloopServer
 import scala.build.{BuildThreads, Directories, LocalRepo}
 
-class PackagingUsingDirectiveTests extends munit.FunSuite {
+class PackagingUsingDirectiveTests extends TestUtil.ScalaCliBuildSuite {
 
   val buildThreads = BuildThreads.create()
   def bloopConfig  = Some(BloopServer.bloopConfig)
diff --git a/modules/build/src/test/scala/scala/build/tests/PreprocessingTests.scala b/modules/build/src/test/scala/scala/build/tests/PreprocessingTests.scala
@@ -6,7 +6,7 @@ import com.eed3si9n.expecty.Expecty.expect
 import scala.build.input.{Inputs, MarkdownFile, ScalaCliInvokeData, Script, SourceScalaFile}
 import scala.build.options.SuppressWarningOptions
 
-class PreprocessingTests extends munit.FunSuite {
+class PreprocessingTests extends TestUtil.ScalaCliBuildSuite {
 
   test("Report error if scala file not exists") {
     val logger    = TestLogger()
diff --git a/modules/build/src/test/scala/scala/build/tests/ReplArtifactsTests.scala b/modules/build/src/test/scala/scala/build/tests/ReplArtifactsTests.scala
@@ -6,7 +6,7 @@ import dependency.ScalaParameters
 
 import scala.build.{Directories, Logger, ReplArtifacts}
 
-class ReplArtifactsTests extends munit.FunSuite {
+class ReplArtifactsTests extends TestUtil.ScalaCliBuildSuite {
 
   def scalaPyTest(version: String, usesFormerOrg: Boolean = false): Unit =
     TestInputs.withTmpDir("replartifactstests") { root =>
diff --git a/modules/build/src/test/scala/scala/build/tests/ScalaNativeUsingDirectiveTests.scala b/modules/build/src/test/scala/scala/build/tests/ScalaNativeUsingDirectiveTests.scala
@@ -7,7 +7,7 @@ import scala.build.options.{BuildOptions, InternalOptions}
 import scala.build.tests.util.BloopServer
 import scala.build.{BuildThreads, Directories, LocalRepo}
 
-class ScalaNativeUsingDirectiveTests extends munit.FunSuite {
+class ScalaNativeUsingDirectiveTests extends TestUtil.ScalaCliBuildSuite {
 
   val buildThreads = BuildThreads.create()
   def bloopConfig  = Some(BloopServer.bloopConfig)
diff --git a/modules/build/src/test/scala/scala/build/tests/ScalaPreprocessorTests.scala b/modules/build/src/test/scala/scala/build/tests/ScalaPreprocessorTests.scala
@@ -6,7 +6,7 @@ import scala.build.input.{ScalaCliInvokeData, Script, SourceScalaFile}
 import scala.build.options.SuppressWarningOptions
 import scala.build.preprocessing.{PreprocessedSource, ScalaPreprocessor, ScriptPreprocessor}
 
-class ScalaPreprocessorTests extends munit.FunSuite {
+class ScalaPreprocessorTests extends TestUtil.ScalaCliBuildSuite {
 
   test("should respect using directives in a .scala file with the shebang line") {
     val lastUsingLine =
diff --git a/modules/build/src/test/scala/scala/build/tests/ScriptWrapperTests.scala b/modules/build/src/test/scala/scala/build/tests/ScriptWrapperTests.scala
@@ -18,7 +18,7 @@ import scala.build.options.{
 import scala.build.tests.util.BloopServer
 import scala.build.{Build, BuildThreads, Directories, LocalRepo, Position, Positioned}
 
-class ScriptWrapperTests extends munit.FunSuite {
+class ScriptWrapperTests extends TestUtil.ScalaCliBuildSuite {
 
   def expectAppWrapper(wrapperName: String, path: os.Path) = {
     val generatedFileContent = os.read(path)
diff --git a/modules/build/src/test/scala/scala/build/tests/SourceGeneratorTests.scala b/modules/build/src/test/scala/scala/build/tests/SourceGeneratorTests.scala
@@ -19,7 +19,7 @@ import scala.build.options.{
 import scala.build.tests.util.BloopServer
 import scala.build.{Build, BuildThreads, Directories, LocalRepo, Position, Positioned}
 
-class SourceGeneratorTests extends munit.FunSuite {
+class SourceGeneratorTests extends TestUtil.ScalaCliBuildSuite {
 
   val buildThreads = BuildThreads.create()
 
diff --git a/modules/build/src/test/scala/scala/build/tests/SourcesTests.scala b/modules/build/src/test/scala/scala/build/tests/SourcesTests.scala
@@ -13,7 +13,7 @@ import scala.build.input.ScalaCliInvokeData
 import scala.build.options.{BuildOptions, Scope, SuppressWarningOptions}
 import scala.build.internal.ScalaJsLinkerConfig
 
-class SourcesTests extends munit.FunSuite {
+class SourcesTests extends TestUtil.ScalaCliBuildSuite {
 
   def scalaVersion       = "2.13.5"
   def scalaParams        = ScalaParameters(scalaVersion)
diff --git a/modules/build/src/test/scala/scala/build/tests/TestUtil.scala b/modules/build/src/test/scala/scala/build/tests/TestUtil.scala
@@ -5,6 +5,26 @@ import scala.build.options.{BuildOptions, Platform}
 import munit.Assertions.assertEquals
 
 object TestUtil {
+  abstract class ScalaCliBuildSuite extends munit.FunSuite {
+    val testStartEndLogger = new Fixture[Unit]("files") {
+      def apply(): Unit = ()
+
+      override def beforeEach(context: BeforeEach): Unit = {
+        val fileName = os.Path(context.test.location.path).baseName
+        System.err.println(
+          s">==== ${Console.CYAN}Running '${context.test.name}' from $fileName${Console.RESET}"
+        )
+      }
+
+      override def afterEach(context: AfterEach): Unit = {
+        val fileName = os.Path(context.test.location.path).baseName
+        System.err.println(
+          s"X==== ${Console.CYAN}Finishing '${context.test.name}' from $fileName${Console.RESET}"
+        )
+      }
+    }
+    override def munitFixtures = List(testStartEndLogger)
+  }
 
   val isCI = System.getenv("CI") != null
 
diff --git a/modules/build/src/test/scala/scala/build/tests/markdown/MarkdownCodeBlockTests.scala b/modules/build/src/test/scala/scala/build/tests/markdown/MarkdownCodeBlockTests.scala
@@ -6,9 +6,10 @@ import scala.build.Position
 import scala.build.errors.{BuildException, MarkdownUnclosedBackticksError}
 import scala.build.internal.markdown.MarkdownCodeBlock
 import scala.build.preprocessing.MarkdownCodeBlockProcessor
+import scala.build.tests.TestUtil
 import scala.build.tests.markdown.MarkdownTestUtil.*
 
-class MarkdownCodeBlockTests extends munit.FunSuite {
+class MarkdownCodeBlockTests extends TestUtil.ScalaCliBuildSuite {
   test("no code blocks are extracted from markdown if none are present") {
     val markdown: String =
       """
diff --git a/modules/build/src/test/scala/scala/build/tests/markdown/MarkdownCodeWrapperTests.scala b/modules/build/src/test/scala/scala/build/tests/markdown/MarkdownCodeWrapperTests.scala
@@ -12,9 +12,10 @@ import scala.build.preprocessing.{
   PreprocessedMarkdown,
   PreprocessedMarkdownCodeBlocks
 }
+import scala.build.tests.TestUtil
 import scala.build.tests.markdown.MarkdownTestUtil.*
 
-class MarkdownCodeWrapperTests extends munit.FunSuite {
+class MarkdownCodeWrapperTests extends TestUtil.ScalaCliBuildSuite {
 
   test("empty markdown produces no wrapped code") {
     val result = MarkdownCodeWrapper(os.sub / "Example.md", PreprocessedMarkdown.empty)
diff --git a/modules/integration/src/test/scala/scala/cli/integration/ScalaCliSuite.scala b/modules/integration/src/test/scala/scala/cli/integration/ScalaCliSuite.scala
@@ -1,7 +1,27 @@
 package scala.cli.integration
 
 abstract class ScalaCliSuite extends munit.FunSuite {
-  def group: ScalaCliSuite.TestGroup = ScalaCliSuite.TestGroup.Third
+
+  val testStartEndLogger = new Fixture[Unit]("files") {
+    def apply(): Unit = ()
+
+    override def beforeEach(context: BeforeEach): Unit = {
+      val fileName = os.Path(context.test.location.path).baseName
+      System.err.println(
+        s">==== ${Console.CYAN}Running '${context.test.name}' from $fileName${Console.RESET}"
+      )
+    }
+
+    override def afterEach(context: AfterEach): Unit = {
+      val fileName = os.Path(context.test.location.path).baseName
+      System.err.println(
+        s"X==== ${Console.CYAN}Finishing '${context.test.name}' from $fileName${Console.RESET}"
+      )
+    }
+  }
+
+  override def munitFixtures: List[Fixture[Unit]] = List(testStartEndLogger)
+  def group: ScalaCliSuite.TestGroup              = ScalaCliSuite.TestGroup.Third
 
   override def munitIgnore: Boolean =
     Option(System.getenv("SCALA_CLI_IT_GROUP"))

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ import scala.build.options.{`
`21`	`21`	`}`
`22`	`22`	`import scala.build.{Build, LocalRepo, Logger, Position, Positioned, Sources}`
`23`	`23`
`24`		`-class BuildProjectTests extends munit.FunSuite {`
	`24`	`+class BuildProjectTests extends TestUtil.ScalaCliBuildSuite {`
`25`	`25`
`26`	`26`	`class LoggerMock extends Logger {`
`27`	`27`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ import scala.build.errors.{`
`23`	`23`	`ToolkitDirectiveMissingVersionError`
`24`	`24`	`}`
`25`	`25`
`26`		`-class DirectiveTests extends munit.FunSuite {`
	`26`	`+class DirectiveTests extends TestUtil.ScalaCliBuildSuite {`
`27`	`27`
`28`	`28`	`val buildThreads = BuildThreads.create()`
`29`	`29`