Fix tests

softwaremill · Nov 22, 2023 · e61e396 · e61e396
1 parent fbeb677
commit e61e396
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/...meria-server/zio1/src/test/scala/sttp/tapir/server/armeria/zio/ArmeriaZioServerTest.scala b/...meria-server/zio1/src/test/scala/sttp/tapir/server/armeria/zio/ArmeriaZioServerTest.scala
@@ -19,6 +19,6 @@ class ArmeriaZioServerTest extends TestSuite {
 
     new AllServerTests(createServerTest, interpreter, backend, basic = false, options = false).tests() ++
       new ServerBasicTests(createServerTest, interpreter, supportsUrlEncodedPathSegments = false).tests() ++
-      new ServerStreamingTests(createServerTest, ZioStreams).tests()
+      new ServerStreamingTests(createServerTest, maxLengthSupported = false).tests(ZioStreams)(_ => Task.unit)
   }
 }
diff --git a/server/vertx-server/zio/src/test/scala/sttp/tapir/server/vertx/zio/ZioVertxServerTest.scala b/server/vertx-server/zio/src/test/scala/sttp/tapir/server/vertx/zio/ZioVertxServerTest.scala
@@ -1,18 +1,19 @@
 package sttp.tapir.server.vertx.zio
 
+import _root_.zio.stream.ZStream
+import _root_.zio.{Task, ZIO}
 import cats.effect.{IO, Resource}
 import io.vertx.core.Vertx
+import org.scalatest.OptionValues
+import org.scalatest.matchers.should.Matchers._
 import sttp.capabilities.zio.ZioStreams
+import sttp.client3.basicRequest
 import sttp.monad.MonadError
+import sttp.tapir._
 import sttp.tapir.server.tests._
 import sttp.tapir.tests.{Test, TestSuite}
-import sttp.tapir._
-import _root_.zio.{Task, ZIO}
-import _root_.zio.stream.ZStream
-import org.scalatest.OptionValues
-import sttp.client3.basicRequest
 import sttp.tapir.ztapir.RIOMonadError
-import org.scalatest.matchers.should.Matchers._
+import zio.stream.ZSink
 
 class ZioVertxServerTest extends TestSuite with OptionValues {
   def vertxResource: Resource[IO, Vertx] =
@@ -32,14 +33,16 @@ class ZioVertxServerTest extends TestSuite with OptionValues {
           basicRequest.get(baseUri).send(backend).map(_.body.toOption.value should not include "vert.x-eventloop-thread")
         }
       )
+      def drainZStream(zStream: ZioStreams.BinaryStream): Task[Unit] =
+        zStream.run(ZSink.drain)
 
       new AllServerTests(createServerTest, interpreter, backend, multipart = false, reject = false, options = false).tests() ++
         new ServerMultipartTests(
           createServerTest,
           partContentTypeHeaderSupport = false, // README: doesn't seem supported but I may be wrong
           partOtherHeaderSupport = false
         ).tests() ++ additionalTests() ++
-        new ServerStreamingTests(createServerTest, ZioStreams).tests() ++
+        new ServerStreamingTests(createServerTest, maxLengthSupported = true).tests(ZioStreams)(drainZStream) ++
         new ServerWebSocketTests(createServerTest, ZioStreams) {
           override def functionToPipe[A, B](f: A => B): streams.Pipe[A, B] = in => in.map(f)
           override def emptyPipe[A, B]: streams.Pipe[A, B] = _ => ZStream.empty