diff options
Diffstat (limited to 'tests/src/test/scala/com/softwaremill/sttp/streaming')
6 files changed, 14 insertions, 48 deletions
diff --git a/tests/src/test/scala/com/softwaremill/sttp/streaming/AkkaHttpStreamingTests.scala b/tests/src/test/scala/com/softwaremill/sttp/streaming/AkkaHttpStreamingTests.scala index d8fbb82..691df81 100644 --- a/tests/src/test/scala/com/softwaremill/sttp/streaming/AkkaHttpStreamingTests.scala +++ b/tests/src/test/scala/com/softwaremill/sttp/streaming/AkkaHttpStreamingTests.scala @@ -5,8 +5,9 @@ import akka.actor.ActorSystem import akka.stream.Materializer import akka.stream.scaladsl.Source import akka.util.ByteString +import com.softwaremill.sttp.SttpBackend import com.softwaremill.sttp.akkahttp.AkkaHttpBackend -import com.softwaremill.sttp.{ForceWrappedValue, SttpBackend} +import com.softwaremill.sttp.testing.streaming.{ConvertToFuture, TestStreamingBackend} import scala.concurrent.Future @@ -16,8 +17,8 @@ class AkkaHttpStreamingTests(actorSystem: ActorSystem)(implicit materializer: Ma override implicit val backend: SttpBackend[Future, Source[ByteString, Any]] = AkkaHttpBackend.usingActorSystem(actorSystem) - override implicit val forceResponse: ForceWrappedValue[Future] = - ForceWrappedValue.future + override implicit val convertToFuture: ConvertToFuture[Future] = + ConvertToFuture.future override def bodyProducer(body: String): Source[ByteString, NotUsed] = Source.single(ByteString(body)) diff --git a/tests/src/test/scala/com/softwaremill/sttp/streaming/AsyncHttpClientFs2StreamingTests.scala b/tests/src/test/scala/com/softwaremill/sttp/streaming/AsyncHttpClientFs2StreamingTests.scala index 82f36be..680e91a 100644 --- a/tests/src/test/scala/com/softwaremill/sttp/streaming/AsyncHttpClientFs2StreamingTests.scala +++ b/tests/src/test/scala/com/softwaremill/sttp/streaming/AsyncHttpClientFs2StreamingTests.scala @@ -3,18 +3,19 @@ package com.softwaremill.sttp.streaming import java.nio.ByteBuffer import cats.effect._ -import cats.implicits._ +import cats.instances.string._ +import com.softwaremill.sttp.SttpBackend import com.softwaremill.sttp.asynchttpclient.fs2.AsyncHttpClientFs2Backend -import com.softwaremill.sttp.{ForceWrappedValue, SttpBackend} -import fs2._ +import com.softwaremill.sttp.testing.streaming.{ConvertToFuture, TestStreamingBackend} +import fs2.{Chunk, Stream, text} class AsyncHttpClientFs2StreamingTests extends TestStreamingBackend[IO, Stream[IO, ByteBuffer]] { override implicit val backend: SttpBackend[IO, Stream[IO, ByteBuffer]] = AsyncHttpClientFs2Backend[IO]() - override implicit val forceResponse: ForceWrappedValue[IO] = - ForceWrappedValue.catsIo + override implicit val convertToFuture: ConvertToFuture[IO] = + com.softwaremill.sttp.impl.cats.convertToFuture override def bodyProducer(body: String): Stream[IO, ByteBuffer] = Stream.emits(body.getBytes("utf-8").map(b => ByteBuffer.wrap(Array(b)))) diff --git a/tests/src/test/scala/com/softwaremill/sttp/streaming/AsyncHttpClientMonixStreamingTests.scala b/tests/src/test/scala/com/softwaremill/sttp/streaming/AsyncHttpClientMonixStreamingTests.scala index 0357668..faebf8b 100644 --- a/tests/src/test/scala/com/softwaremill/sttp/streaming/AsyncHttpClientMonixStreamingTests.scala +++ b/tests/src/test/scala/com/softwaremill/sttp/streaming/AsyncHttpClientMonixStreamingTests.scala @@ -4,10 +4,11 @@ import java.nio.ByteBuffer import com.softwaremill.sttp.SttpBackend import com.softwaremill.sttp.asynchttpclient.monix.AsyncHttpClientMonixBackend +import com.softwaremill.sttp.impl.monix.MonixTestStreamingBackend import monix.eval.Task import monix.reactive.Observable -class AsyncHttpClientMonixStreamingTests extends MonixBaseBackend { +class AsyncHttpClientMonixStreamingTests extends MonixTestStreamingBackend { import monix.execution.Scheduler.Implicits.global diff --git a/tests/src/test/scala/com/softwaremill/sttp/streaming/MonixBaseBackend.scala b/tests/src/test/scala/com/softwaremill/sttp/streaming/MonixBaseBackend.scala deleted file mode 100644 index acd67a7..0000000 --- a/tests/src/test/scala/com/softwaremill/sttp/streaming/MonixBaseBackend.scala +++ /dev/null @@ -1,23 +0,0 @@ -package com.softwaremill.sttp.streaming - -import java.nio.ByteBuffer - -import com.softwaremill.sttp.ForceWrappedValue -import monix.eval.Task -import monix.reactive.Observable - -trait MonixBaseBackend extends TestStreamingBackend[Task, Observable[ByteBuffer]] { - - override implicit def forceResponse: ForceWrappedValue[Task] = - ForceWrappedValue.monixTask - - override def bodyProducer(body: String): Observable[ByteBuffer] = - Observable.fromIterable(body.getBytes("utf-8").map(b => ByteBuffer.wrap(Array(b)))) - - override def bodyConsumer(stream: Observable[ByteBuffer]): Task[String] = - stream - .flatMap(bb => Observable.fromIterable(bb.array())) - .toListL - .map(bs => new String(bs.toArray, "utf8")) - -} diff --git a/tests/src/test/scala/com/softwaremill/sttp/streaming/OkHttpMonixStreamingTests.scala b/tests/src/test/scala/com/softwaremill/sttp/streaming/OkHttpMonixStreamingTests.scala index 9bfcc26..27a4517 100644 --- a/tests/src/test/scala/com/softwaremill/sttp/streaming/OkHttpMonixStreamingTests.scala +++ b/tests/src/test/scala/com/softwaremill/sttp/streaming/OkHttpMonixStreamingTests.scala @@ -3,11 +3,12 @@ package com.softwaremill.sttp.streaming import java.nio.ByteBuffer import com.softwaremill.sttp.SttpBackend +import com.softwaremill.sttp.impl.monix.MonixTestStreamingBackend import com.softwaremill.sttp.okhttp.monix.OkHttpMonixBackend import monix.eval.Task import monix.reactive.Observable -class OkHttpMonixStreamingTests extends MonixBaseBackend { +class OkHttpMonixStreamingTests extends MonixTestStreamingBackend { import monix.execution.Scheduler.Implicits.global diff --git a/tests/src/test/scala/com/softwaremill/sttp/streaming/TestStreamingBackend.scala b/tests/src/test/scala/com/softwaremill/sttp/streaming/TestStreamingBackend.scala deleted file mode 100644 index 5fc1c57..0000000 --- a/tests/src/test/scala/com/softwaremill/sttp/streaming/TestStreamingBackend.scala +++ /dev/null @@ -1,15 +0,0 @@ -package com.softwaremill.sttp.streaming - -import com.softwaremill.sttp.{ForceWrappedValue, SttpBackend} - -import scala.language.higherKinds - -trait TestStreamingBackend[R[_], S] { - implicit def backend: SttpBackend[R, S] - - implicit def forceResponse: ForceWrappedValue[R] - - def bodyProducer(body: String): S - - def bodyConsumer(stream: S): R[String] -} |