drop zio-test, override executioncontext

Author: ThijsBroersen

build.sbt

@@ -232,12 +232,7 @@ lazy val zio1 = (projectMatrix in file("zio1"))
 lazy val zio = (projectMatrix in file("zio"))
   .settings(
     name := "zio",
-    libraryDependencies ++= Seq("dev.zio" %%% "zio-streams" % zio2Version, "dev.zio" %%% "zio" % zio2Version) ++
-      Seq(
-        "dev.zio" %%% "zio-test" % zio2Version % Test,
-        "dev.zio" %%% "zio-test-sbt" % zio2Version % Test
-      ),
-    testFrameworks += TestFrameworks.ZIOTest
+    libraryDependencies ++= Seq("dev.zio" %%% "zio-streams" % zio2Version, "dev.zio" %%% "zio" % zio2Version)
   )
   .jvmPlatform(
     scalaVersions = scala2 ++ scala3,

fs2/src/test/scala/sttp/capabilities/fs2/Fs2StreamsTest.scala

@@ -2,20 +2,16 @@ package sttp.capabilities.fs2
 
 import cats.effect.IO
 import cats.effect.unsafe
+import cats.effect.unsafe.implicits.global
 import fs2._
 import org.scalatest.flatspec.AsyncFlatSpec
 import org.scalatest.matchers.should.Matchers
 import sttp.capabilities.StreamMaxLengthExceededException
+import scala.concurrent.ExecutionContext
 
 class Fs2StreamsTest extends AsyncFlatSpec with Matchers {
 
-  implicit val runtime: unsafe.IORuntime = unsafe.IORuntime(
-    executionContext,
-    executionContext,
-    unsafe.IORuntime.global.scheduler,
-    unsafe.IORuntime.global.shutdown,
-    unsafe.IORuntime.global.config
-  )
+  override implicit val executionContext: ExecutionContext = unsafe.IORuntime.global.compute
 
   behavior of "Fs2Streams"
 

zio/src/test/scala/sttp/capabilities/zio/ZioStreamsTest.scala

@@ -1,44 +1,57 @@
 package sttp.capabilities.zio
 
+import org.scalatest.flatspec.AsyncFlatSpec
+import org.scalatest.matchers.should.Matchers
 import sttp.capabilities.StreamMaxLengthExceededException
 import zio._
 import zio.stream.ZStream
-import zio.test._
-
-object ZioStreamsTest extends ZIOSpecDefault {
-  def spec: Spec[TestEnvironment, Any] = suite("ZioStreams")(
-    test("should Pass all bytes if limit is not exceeded") {
-      // given
-      val inputByteCount = 8192
-      val maxBytes = 8192L
-      val inputStream = ZStream.fromIterator(Iterator.fill[Byte](inputByteCount)('5'.toByte))
-
-      // when
-      val stream = ZioStreams.limitBytes(inputStream, maxBytes)
-
-      // then
-      for {
-        count <- stream.runFold(0L)((acc, _) => acc + 1)
-      } yield assertTrue(count == inputByteCount)
-    },
-    test("should Fail stream if limit is exceeded") {
-      val inputByteCount = 8192
-      val maxBytes = 8191L
-      val inputStream = ZStream.fromIterator(Iterator.fill[Byte](inputByteCount)('5'.toByte))
-
-      // when
-      val stream = ZioStreams.limitBytes(inputStream, maxBytes)
-
-      // then
-      for {
-        limit <- stream.runLast.flip
-          .flatMap {
+import scala.concurrent.ExecutionContext
+
+class ZioStreamsTest extends AsyncFlatSpec with Matchers {
+  override implicit val executionContext: ExecutionContext = Runtime.defaultExecutor.asExecutionContext
+
+  behavior of "ZioStreams"
+
+  implicit val r: Runtime[Any] = Runtime.default
+
+  it should "Pass all bytes if limit is not exceeded" in {
+    // given
+    val inputByteCount = 8192
+    val maxBytes = 8192L
+    val inputStream = ZStream.fromIterator(Iterator.fill[Byte](inputByteCount)('5'.toByte))
+
+    // when
+    val stream = ZioStreams.limitBytes(inputStream, maxBytes)
+
+    // then
+    Unsafe.unsafe(implicit u =>
+      r.unsafe.runToFuture(stream.runFold(0L)((acc, _) => acc + 1).map { count =>
+        count shouldBe inputByteCount
+      })
+    )
+  }
+
+  it should "Fail stream if limit is exceeded" in {
+    // given
+    val inputByteCount = 8192
+    val maxBytes = 8191L
+    val inputStream = ZStream.fromIterator(Iterator.fill[Byte](inputByteCount)('5'.toByte))
+
+    // when
+    val stream = ZioStreams.limitBytes(inputStream, maxBytes)
+
+    // then
+    Unsafe.unsafe(implicit u =>
+      r.unsafe.runToFuture(
+        stream.runLast
+          .flatMap(_ => ZIO.succeed(fail("Unexpected end of stream")))
+          .catchSome {
             case StreamMaxLengthExceededException(limit) =>
-              ZIO.succeed(limit)
+              ZIO.succeed(limit shouldBe maxBytes)
             case other =>
-              ZIO.fail(s"Unexpected failure cause: $other")
+              ZIO.succeed(fail(s"Unexpected failure cause: $other"))
           }
-      } yield assertTrue(limit == maxBytes)
-    }
-  )
+      )
+    )
+  }
 }