ZIO Test: Do Not Share Execution Event Sink (zio#8227)

* do not share execution event sink

* fix compilation errors

* cleanup

Author: adamgfraser

test-sbt/js/src/main/scala/zio/test/sbt/ZTestRunnerJS.scala

@@ -90,7 +90,15 @@ sealed class ZTestTask(
   sendSummary: SendSummary,
   testArgs: TestArgs,
   spec: ZIOSpecAbstract
-) extends BaseTestTask(taskDef, testClassLoader, sendSummary, testArgs, spec, Runtime.default) {
+) extends BaseTestTask(
+      taskDef,
+      testClassLoader,
+      sendSummary,
+      testArgs,
+      spec,
+      Runtime.default,
+      zio.Console.ConsoleLive
+    ) {
 
   def execute(eventHandler: EventHandler, loggers: Array[Logger], continuation: Array[Task] => Unit): Unit = {
     val fiber = Runtime.default.unsafe.fork {

test-sbt/jvm/src/main/scala/zio/test/sbt/ZTestRunnerJVM.scala

@@ -86,27 +86,23 @@ final class ZTestRunnerJVM(val args: Array[String], val remoteArgs: Array[String
   private[sbt] def tasksZ(
     defs: Array[TaskDef],
     console: zio.Console
-  )(implicit trace: Trace): Array[ZTestTask[ExecutionEventSink]] = {
+  )(implicit trace: Trace): Array[ZTestTask[Any]] = {
     val testArgs = TestArgs.parse(args)
 
     renderer = testArgs.testRenderer // Ensures summary is pretty in same style as rest of the test output
-    val sharedSinkLayer = ExecutionEventSink.live(console, testArgs.testEventRenderer)
 
     val specTasks: Array[ZIOSpecAbstract] = defs.map(disectTask(_, testClassLoader))
     val sharedLayerFromSpecs: ZLayer[Any, Any, Any] =
       (Scope.default ++ ZIOAppArgs.empty) >>> specTasks
         .map(_.bootstrap)
         .foldLeft(ZLayer.empty: ZLayer[ZIOAppArgs, Any, Any])(_ +!+ _)
 
-    val sharedLayer: ZLayer[Any, Any, ExecutionEventSink] =
-      sharedLayerFromSpecs +!+ sharedSinkLayer
-
-    val runtime: Runtime.Scoped[ExecutionEventSink] =
-      zio.Runtime.unsafe.fromLayer(sharedLayer)(Trace.empty, Unsafe.unsafe)
+    val runtime =
+      zio.Runtime.unsafe.fromLayer(sharedLayerFromSpecs)(Trace.empty, Unsafe.unsafe)
 
     shutdownHook = Some(() => runtime.unsafe.shutdown()(Unsafe.unsafe))
 
-    defs.map(ZTestTask(_, testClassLoader, sendSummary, testArgs, runtime))
+    defs.map(ZTestTask(_, testClassLoader, sendSummary, testArgs, runtime, console))
   }
 
   private def disectTask(taskDef: TaskDef, testClassLoader: ClassLoader): ZIOSpecAbstract = {
@@ -127,19 +123,21 @@ final class ZTestTask[T](
   sendSummary: SendSummary,
   testArgs: TestArgs,
   spec: ZIOSpecAbstract,
-  runtime: zio.Runtime[T]
-) extends BaseTestTask(taskDef, testClassLoader, sendSummary, testArgs, spec, runtime)
+  runtime: zio.Runtime[T],
+  console: zio.Console
+) extends BaseTestTask(taskDef, testClassLoader, sendSummary, testArgs, spec, runtime, console)
 
 object ZTestTask {
   def apply[T](
     taskDef: TaskDef,
     testClassLoader: ClassLoader,
     sendSummary: SendSummary,
     args: TestArgs,
-    runtime: zio.Runtime[T]
+    runtime: zio.Runtime[T],
+    console: zio.Console
   ): ZTestTask[T] = {
     val zioSpec = disectTask(taskDef, testClassLoader)
-    new ZTestTask(taskDef, testClassLoader, sendSummary, args, zioSpec, runtime)
+    new ZTestTask(taskDef, testClassLoader, sendSummary, args, zioSpec, runtime, console)
   }
 
   private def disectTask(taskDef: TaskDef, testClassLoader: ClassLoader): ZIOSpecAbstract = {

test-sbt/jvm/src/test/scala/zio/test/sbt/ZTestFrameworkSbtSpec.scala

@@ -162,7 +162,8 @@ object ZTestFrameworkSbtSpec {
           zTestTask.sendSummary.provideEnvironment(ZEnvironment(Summary(1, 0, 0, "foo"))),
           TestArgs.empty,
           zTestTask.spec,
-          zio.Runtime.default
+          zio.Runtime.default,
+          zio.Console.ConsoleLive
         )
       }
       .head
@@ -186,7 +187,8 @@ object ZTestFrameworkSbtSpec {
           zTestTask.sendSummary.provideEnvironment(ZEnvironment(Summary(0, 0, 0, "foo"))),
           TestArgs.empty,
           zTestTask.spec,
-          zio.Runtime.default
+          zio.Runtime.default,
+          zio.Console.ConsoleLive
         )
       }
       .head

test-sbt/native/src/main/scala/zio/test/sbt/ZTestRunnerNative.scala

@@ -90,7 +90,15 @@ sealed class ZTestTask(
   sendSummary: SendSummary,
   testArgs: TestArgs,
   spec: ZIOSpecAbstract
-) extends BaseTestTask(taskDef, testClassLoader, sendSummary, testArgs, spec, zio.Runtime.default) {
+) extends BaseTestTask(
+      taskDef,
+      testClassLoader,
+      sendSummary,
+      testArgs,
+      spec,
+      zio.Runtime.default,
+      zio.Console.ConsoleLive
+    ) {
 
   override def execute(eventHandler: EventHandler, loggers: Array[Logger]): Array[sbt.testing.Task] = {
     val fiber = Runtime.default.unsafe.fork {

test-sbt/shared/src/main/scala/zio/test/sbt/BaseTestTask.scala

@@ -1,7 +1,7 @@
 package zio.test.sbt
 
 import sbt.testing.{EventHandler, Logger, Task, TaskDef}
-import zio.{CancelableFuture, Scope, Trace, Unsafe, ZEnvironment, ZIO, ZIOAppArgs, ZLayer}
+import zio.{CancelableFuture, Console, Scope, Trace, Unsafe, ZEnvironment, ZIO, ZIOAppArgs, ZLayer}
 import zio.test._
 
 import scala.concurrent.Await
@@ -14,7 +14,8 @@ abstract class BaseTestTask[T](
   val sendSummary: SendSummary,
   val args: TestArgs,
   val spec: ZIOSpecAbstract,
-  val runtime: zio.Runtime[T]
+  val runtime: zio.Runtime[T],
+  val console: Console
 ) extends Task {
 
   final override def taskDef(): TaskDef = taskDef0
@@ -29,7 +30,14 @@ abstract class BaseTestTask[T](
   )(implicit trace: Trace): ZIO[Any, Throwable, Unit] =
     (for {
       summary <-
-        spec.runSpecWithSharedRuntimeLayer(taskDef0.fullyQualifiedName(), spec.spec, args, runtime, eventHandlerZ)
+        spec.runSpecWithSharedRuntimeLayer(
+          taskDef0.fullyQualifiedName(),
+          spec.spec,
+          args,
+          runtime,
+          eventHandlerZ,
+          console
+        )
       _ <- sendSummary.provideEnvironment(ZEnvironment(summary))
     } yield ())
       .provideLayer(sharedFilledTestLayer)

test/shared/src/main/scala/zio/test/ZIOSpecAbstract.scala

@@ -130,21 +130,22 @@ abstract class ZIOSpecAbstract extends ZIOApp with ZIOSpecAbstractVersionSpecifi
     spec: Spec[Environment with TestEnvironment with Scope, Any],
     testArgs: TestArgs,
     runtime: Runtime[_],
-    testEventHandler: ZTestEventHandler
+    testEventHandler: ZTestEventHandler,
+    console: Console
   )(implicit
     trace: Trace
   ): UIO[Summary] = {
     val filteredSpec = FilteredSpec(spec, testArgs)
 
-    val castedRuntime: Runtime[Environment with ExecutionEventSink] =
-      runtime.asInstanceOf[Runtime[Environment with ExecutionEventSink]]
+    val castedRuntime: Runtime[Environment] =
+      runtime.asInstanceOf[Runtime[Environment]]
 
     TestRunner(
       TestExecutor
         .default[Environment, Any](
           ZLayer.succeedEnvironment(castedRuntime.environment),
           testEnvironment ++ Scope.default,
-          ZLayer.succeedEnvironment(castedRuntime.environment),
+          ExecutionEventSink.live(console, testArgs.testEventRenderer),
           testEventHandler
         )
     ).run(fullyQualifiedName, aspects.foldLeft(filteredSpec)(_ @@ _) @@ TestAspect.fibers)