feat(zio): support Native

Author: ThijsBroersen

build.sbt

@@ -27,7 +27,7 @@ def dependenciesFor(version: String)(deps: (Option[(Long, Long)] => ModuleID)*):
 val commonSettings = commonSmlBuildSettings ++ ossPublishSettings ++ Seq(
   organization := "com.softwaremill.sttp.shared",
   libraryDependencies ++= Seq(
-    "org.scalatest" %% "scalatest" % scalaTestVersion % Test
+    "org.scalatest" %%% "scalatest" % scalaTestVersion % Test
   ),
   mimaPreviousArtifacts := Set.empty,
   versionScheme := Some("semver-spec")
@@ -59,14 +59,15 @@ val commonJsSettings = commonSettings ++ Seq(
     }
   },
   libraryDependencies ++= Seq(
-    "org.scala-js" %%% "scalajs-dom" % "2.8.0"
+    "org.scala-js" %%% "scalajs-dom" % "2.8.0",
+    "io.github.cquiroz" %%% "scala-java-time" % "2.6.0" % Test
   )
 )
 
 val commonNativeSettings = commonSettings ++ Seq(
   ideSkipProject := true,
   libraryDependencies ++= Seq(
-    "org.scala-native" %%% "test-interface" % nativeVersion
+    "io.github.cquiroz" %%% "scala-java-time" % "2.6.0" % Test
   )
 )
 
@@ -231,7 +232,12 @@ 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)
+    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
   )
   .jvmPlatform(
     scalaVersions = scala2 ++ scala3,
@@ -241,6 +247,10 @@ lazy val zio = (projectMatrix in file("zio"))
     scalaVersions = scala2alive ++ scala3,
     settings = commonJsSettings ++ browserChromeTestSettings
   )
+  .nativePlatform(
+    scalaVersions = scala3,
+    settings = commonNativeSettings
+  )
   .dependsOn(core)
 
 lazy val vertx = (projectMatrix in file("vertx"))

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

@@ -1,54 +1,44 @@
 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
-
-class ZioStreamsTest extends AsyncFlatSpec with Matchers {
-  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 {
+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 {
             case StreamMaxLengthExceededException(limit) =>
-              ZIO.succeed(limit shouldBe maxBytes)
+              ZIO.succeed(limit)
             case other =>
-              ZIO.succeed(fail(s"Unexpected failure cause: $other"))
+              ZIO.fail(s"Unexpected failure cause: $other")
           }
-      )
-    )
-  }
+      } yield assertTrue(limit == maxBytes)
+    }
+  )
 }