From 044858260368f335cce53ac136d2605de6dab7cf Mon Sep 17 00:00:00 2001 From: Bjørn Madsen Date: Wed, 30 Aug 2017 14:31:25 +0200 Subject: Rename subprojects to be more consistent --- .../scala/com/softwaremill/sttp/BasicTests.scala | 37 ++++++++++------------ .../com/softwaremill/sttp/IllTypedTests.scala | 4 +-- .../com/softwaremill/sttp/StreamingTests.scala | 8 ++--- .../sttp/streaming/AkkaHttpStreamingTests.scala | 29 +++++++++++++++++ .../sttp/streaming/AkkaStreamingTests.scala | 29 ----------------- .../AsyncHttpClientFs2StreamingTests.scala | 29 +++++++++++++++++ .../AsyncHttpClientMonixStreamingTests.scala | 17 ++++++++++ .../sttp/streaming/Fs2StreamingTests.scala | 29 ----------------- .../sttp/streaming/MonixAHCStreamingTests.scala | 17 ---------- .../sttp/streaming/MonixOKHStreamingTests.scala | 17 ---------- .../sttp/streaming/OkHttpMonixStreamingTests.scala | 17 ++++++++++ 11 files changed, 114 insertions(+), 119 deletions(-) create mode 100644 tests/src/test/scala/com/softwaremill/sttp/streaming/AkkaHttpStreamingTests.scala delete mode 100644 tests/src/test/scala/com/softwaremill/sttp/streaming/AkkaStreamingTests.scala create mode 100644 tests/src/test/scala/com/softwaremill/sttp/streaming/AsyncHttpClientFs2StreamingTests.scala create mode 100644 tests/src/test/scala/com/softwaremill/sttp/streaming/AsyncHttpClientMonixStreamingTests.scala delete mode 100644 tests/src/test/scala/com/softwaremill/sttp/streaming/Fs2StreamingTests.scala delete mode 100644 tests/src/test/scala/com/softwaremill/sttp/streaming/MonixAHCStreamingTests.scala delete mode 100644 tests/src/test/scala/com/softwaremill/sttp/streaming/MonixOKHStreamingTests.scala create mode 100644 tests/src/test/scala/com/softwaremill/sttp/streaming/OkHttpMonixStreamingTests.scala (limited to 'tests/src/test') diff --git a/tests/src/test/scala/com/softwaremill/sttp/BasicTests.scala b/tests/src/test/scala/com/softwaremill/sttp/BasicTests.scala index 1594ef3..2275c5e 100644 --- a/tests/src/test/scala/com/softwaremill/sttp/BasicTests.scala +++ b/tests/src/test/scala/com/softwaremill/sttp/BasicTests.scala @@ -14,16 +14,13 @@ import akka.http.scaladsl.server.Route import akka.http.scaladsl.server.directives.Credentials import akka.util.ByteString import better.files._ -import com.softwaremill.sttp.akkahttp.AkkaHttpSttpHandler -import com.softwaremill.sttp.asynchttpclient.cats.CatsAsyncHttpClientHandler -import com.softwaremill.sttp.asynchttpclient.future.FutureAsyncHttpClientHandler -import com.softwaremill.sttp.asynchttpclient.monix.MonixAsyncHttpClientHandler -import com.softwaremill.sttp.asynchttpclient.scalaz.ScalazAsyncHttpClientHandler -import com.softwaremill.sttp.okhttp.monix.OkHttpMonixClientHandler -import com.softwaremill.sttp.okhttp.{ - OkHttpFutureClientHandler, - OkHttpSyncClientHandler -} +import com.softwaremill.sttp.akkahttp.AkkaHttpHandler +import com.softwaremill.sttp.asynchttpclient.cats.AsyncHttpClientCatsHandler +import com.softwaremill.sttp.asynchttpclient.future.AsyncHttpClientFutureHandler +import com.softwaremill.sttp.asynchttpclient.monix.AsyncHttpClientMonixHandler +import com.softwaremill.sttp.asynchttpclient.scalaz.AsyncHttpClientScalazHandler +import com.softwaremill.sttp.okhttp.monix.OkHttpMonixHandler +import com.softwaremill.sttp.okhttp.{OkHttpFutureHandler, OkHttpSyncHandler} import com.typesafe.scalalogging.StrictLogging import org.scalatest.concurrent.{IntegrationPatience, ScalaFutures} import org.scalatest.{path => _, _} @@ -158,24 +155,22 @@ class BasicTests var closeHandlers: List[() => Unit] = Nil - runTests("HttpURLConnection")(HttpURLConnectionSttpHandler, - ForceWrappedValue.id) - runTests("Akka HTTP")(AkkaHttpSttpHandler.usingActorSystem(actorSystem), + runTests("HttpURLConnection")(HttpURLConnectionHandler, ForceWrappedValue.id) + runTests("Akka HTTP")(AkkaHttpHandler.usingActorSystem(actorSystem), ForceWrappedValue.future) - runTests("Async Http Client - Future")(FutureAsyncHttpClientHandler(), + runTests("Async Http Client - Future")(AsyncHttpClientFutureHandler(), ForceWrappedValue.future) - runTests("Async Http Client - Scalaz")(ScalazAsyncHttpClientHandler(), + runTests("Async Http Client - Scalaz")(AsyncHttpClientScalazHandler(), ForceWrappedValue.scalazTask) - runTests("Async Http Client - Monix")(MonixAsyncHttpClientHandler(), + runTests("Async Http Client - Monix")(AsyncHttpClientMonixHandler(), ForceWrappedValue.monixTask) runTests("Async Http Client - Cats Effect")( - CatsAsyncHttpClientHandler[cats.effect.IO](), + AsyncHttpClientCatsHandler[cats.effect.IO](), ForceWrappedValue.catsIo) - runTests("OkHttpSyncClientHandler")(OkHttpSyncClientHandler(), - ForceWrappedValue.id) - runTests("OkHttpAsyncClientHandler - Future")(OkHttpFutureClientHandler(), + runTests("OkHttpSyncClientHandler")(OkHttpSyncHandler(), ForceWrappedValue.id) + runTests("OkHttpAsyncClientHandler - Future")(OkHttpFutureHandler(), ForceWrappedValue.future) - runTests("OkHttpAsyncClientHandler - Monix")(OkHttpMonixClientHandler(), + runTests("OkHttpAsyncClientHandler - Monix")(OkHttpMonixHandler(), ForceWrappedValue.monixTask) def runTests[R[_]](name: String)( diff --git a/tests/src/test/scala/com/softwaremill/sttp/IllTypedTests.scala b/tests/src/test/scala/com/softwaremill/sttp/IllTypedTests.scala index 6137ed2..4e03fc2 100644 --- a/tests/src/test/scala/com/softwaremill/sttp/IllTypedTests.scala +++ b/tests/src/test/scala/com/softwaremill/sttp/IllTypedTests.scala @@ -12,7 +12,7 @@ class IllTypedTests extends FlatSpec with Matchers { import com.softwaremill.sttp._ import akka.stream.scaladsl.Source import akka.util.ByteString - implicit val sttpHandler = HttpURLConnectionSttpHandler + implicit val sttpHandler = HttpURLConnectionHandler sttp.get(uri"http://example.com").response(asStream[Source[ByteString, Any]]).send() """) } @@ -25,7 +25,7 @@ class IllTypedTests extends FlatSpec with Matchers { val thrown = intercept[ToolBoxError] { EvalScala(""" import com.softwaremill.sttp._ - implicit val sttpHandler = HttpURLConnectionSttpHandler + implicit val sttpHandler = HttpURLConnectionHandler sttp.send() """) } diff --git a/tests/src/test/scala/com/softwaremill/sttp/StreamingTests.scala b/tests/src/test/scala/com/softwaremill/sttp/StreamingTests.scala index d3c7b89..bb198b8 100644 --- a/tests/src/test/scala/com/softwaremill/sttp/StreamingTests.scala +++ b/tests/src/test/scala/com/softwaremill/sttp/StreamingTests.scala @@ -33,10 +33,10 @@ class StreamingTests var closeHandlers: List[() => Unit] = Nil - runTests("Akka Http", new AkkaStreamingTests(actorSystem)) - runTests("Monix Async Http Client", new MonixAHCStreamingTests) - runTests("Monix OkHttp", new MonixOKHStreamingTests) - runTests("fs2 Async Http Client", new Fs2StreamingTests) + runTests("Akka Http", new AkkaHttpStreamingTests(actorSystem)) + runTests("Monix Async Http Client", new AsyncHttpClientMonixStreamingTests) + runTests("Monix OkHttp", new OkHttpMonixStreamingTests) + runTests("fs2 Async Http Client", new AsyncHttpClientFs2StreamingTests) def runTests[R[_], S]( name: String, diff --git a/tests/src/test/scala/com/softwaremill/sttp/streaming/AkkaHttpStreamingTests.scala b/tests/src/test/scala/com/softwaremill/sttp/streaming/AkkaHttpStreamingTests.scala new file mode 100644 index 0000000..25a8d6e --- /dev/null +++ b/tests/src/test/scala/com/softwaremill/sttp/streaming/AkkaHttpStreamingTests.scala @@ -0,0 +1,29 @@ +package com.softwaremill.sttp.streaming + +import akka.NotUsed +import akka.actor.ActorSystem +import akka.stream.Materializer +import akka.stream.scaladsl.Source +import akka.util.ByteString +import com.softwaremill.sttp.akkahttp.AkkaHttpHandler +import com.softwaremill.sttp.{ForceWrappedValue, SttpHandler} + +import scala.concurrent.Future + +class AkkaHttpStreamingTests(actorSystem: ActorSystem)( + implicit materializer: Materializer) + extends TestStreamingHandler[Future, Source[ByteString, Any]] { + + override implicit val handler: SttpHandler[Future, Source[ByteString, Any]] = + AkkaHttpHandler.usingActorSystem(actorSystem) + + override implicit val forceResponse: ForceWrappedValue[Future] = + ForceWrappedValue.future + + override def bodyProducer(body: String): Source[ByteString, NotUsed] = + Source.single(ByteString(body)) + + override def bodyConsumer(stream: Source[ByteString, Any]): Future[String] = + stream.map(_.utf8String).runReduce(_ + _) + +} diff --git a/tests/src/test/scala/com/softwaremill/sttp/streaming/AkkaStreamingTests.scala b/tests/src/test/scala/com/softwaremill/sttp/streaming/AkkaStreamingTests.scala deleted file mode 100644 index 53fe63e..0000000 --- a/tests/src/test/scala/com/softwaremill/sttp/streaming/AkkaStreamingTests.scala +++ /dev/null @@ -1,29 +0,0 @@ -package com.softwaremill.sttp.streaming - -import akka.NotUsed -import akka.actor.ActorSystem -import akka.stream.Materializer -import akka.stream.scaladsl.Source -import akka.util.ByteString -import com.softwaremill.sttp.{ForceWrappedValue, SttpHandler} -import com.softwaremill.sttp.akkahttp.AkkaHttpSttpHandler - -import scala.concurrent.Future - -class AkkaStreamingTests(actorSystem: ActorSystem)( - implicit materializer: Materializer) - extends TestStreamingHandler[Future, Source[ByteString, Any]] { - - override implicit val handler: SttpHandler[Future, Source[ByteString, Any]] = - AkkaHttpSttpHandler.usingActorSystem(actorSystem) - - override implicit val forceResponse: ForceWrappedValue[Future] = - ForceWrappedValue.future - - override def bodyProducer(body: String): Source[ByteString, NotUsed] = - Source.single(ByteString(body)) - - override def bodyConsumer(stream: Source[ByteString, Any]): Future[String] = - stream.map(_.utf8String).runReduce(_ + _) - -} diff --git a/tests/src/test/scala/com/softwaremill/sttp/streaming/AsyncHttpClientFs2StreamingTests.scala b/tests/src/test/scala/com/softwaremill/sttp/streaming/AsyncHttpClientFs2StreamingTests.scala new file mode 100644 index 0000000..b55d104 --- /dev/null +++ b/tests/src/test/scala/com/softwaremill/sttp/streaming/AsyncHttpClientFs2StreamingTests.scala @@ -0,0 +1,29 @@ +package com.softwaremill.sttp.streaming + +import java.nio.ByteBuffer + +import cats.effect._ +import cats.implicits._ +import com.softwaremill.sttp.asynchttpclient.fs2.AsyncHttpClientFs2Handler +import com.softwaremill.sttp.{ForceWrappedValue, SttpHandler} +import fs2._ + +class AsyncHttpClientFs2StreamingTests + extends TestStreamingHandler[IO, Stream[IO, ByteBuffer]] { + + override implicit val handler: SttpHandler[IO, Stream[IO, ByteBuffer]] = + AsyncHttpClientFs2Handler[IO]() + + override implicit val forceResponse: ForceWrappedValue[IO] = + ForceWrappedValue.catsIo + + override def bodyProducer(body: String): Stream[IO, ByteBuffer] = + Stream.emits(body.getBytes("utf-8").map(b => ByteBuffer.wrap(Array(b)))) + + override def bodyConsumer(stream: Stream[IO, ByteBuffer]): IO[String] = + stream + .map(bb => Chunk.array(bb.array)) + .through(text.utf8DecodeC) + .runFoldMonoid + +} diff --git a/tests/src/test/scala/com/softwaremill/sttp/streaming/AsyncHttpClientMonixStreamingTests.scala b/tests/src/test/scala/com/softwaremill/sttp/streaming/AsyncHttpClientMonixStreamingTests.scala new file mode 100644 index 0000000..a76aa26 --- /dev/null +++ b/tests/src/test/scala/com/softwaremill/sttp/streaming/AsyncHttpClientMonixStreamingTests.scala @@ -0,0 +1,17 @@ +package com.softwaremill.sttp.streaming + +import java.nio.ByteBuffer + +import com.softwaremill.sttp.SttpHandler +import com.softwaremill.sttp.asynchttpclient.monix.AsyncHttpClientMonixHandler +import monix.eval.Task +import monix.reactive.Observable + +class AsyncHttpClientMonixStreamingTests extends MonixBaseHandler { + + import monix.execution.Scheduler.Implicits.global + + override implicit val handler: SttpHandler[Task, Observable[ByteBuffer]] = + AsyncHttpClientMonixHandler() + +} diff --git a/tests/src/test/scala/com/softwaremill/sttp/streaming/Fs2StreamingTests.scala b/tests/src/test/scala/com/softwaremill/sttp/streaming/Fs2StreamingTests.scala deleted file mode 100644 index b9d249b..0000000 --- a/tests/src/test/scala/com/softwaremill/sttp/streaming/Fs2StreamingTests.scala +++ /dev/null @@ -1,29 +0,0 @@ -package com.softwaremill.sttp.streaming - -import java.nio.ByteBuffer - -import cats.effect._ -import cats.implicits._ -import com.softwaremill.sttp.asynchttpclient.fs2.Fs2AsyncHttpClientHandler -import com.softwaremill.sttp.{ForceWrappedValue, SttpHandler} -import fs2._ - -class Fs2StreamingTests - extends TestStreamingHandler[IO, Stream[IO, ByteBuffer]] { - - override implicit val handler: SttpHandler[IO, Stream[IO, ByteBuffer]] = - Fs2AsyncHttpClientHandler[IO]() - - override implicit val forceResponse: ForceWrappedValue[IO] = - ForceWrappedValue.catsIo - - override def bodyProducer(body: String): Stream[IO, ByteBuffer] = - Stream.emits(body.getBytes("utf-8").map(b => ByteBuffer.wrap(Array(b)))) - - override def bodyConsumer(stream: Stream[IO, ByteBuffer]): IO[String] = - stream - .map(bb => Chunk.array(bb.array)) - .through(text.utf8DecodeC) - .runFoldMonoid - -} diff --git a/tests/src/test/scala/com/softwaremill/sttp/streaming/MonixAHCStreamingTests.scala b/tests/src/test/scala/com/softwaremill/sttp/streaming/MonixAHCStreamingTests.scala deleted file mode 100644 index 4a4ff96..0000000 --- a/tests/src/test/scala/com/softwaremill/sttp/streaming/MonixAHCStreamingTests.scala +++ /dev/null @@ -1,17 +0,0 @@ -package com.softwaremill.sttp.streaming - -import java.nio.ByteBuffer - -import com.softwaremill.sttp.SttpHandler -import com.softwaremill.sttp.asynchttpclient.monix.MonixAsyncHttpClientHandler -import monix.eval.Task -import monix.reactive.Observable - -class MonixAHCStreamingTests extends MonixBaseHandler { - - import monix.execution.Scheduler.Implicits.global - - override implicit val handler: SttpHandler[Task, Observable[ByteBuffer]] = - MonixAsyncHttpClientHandler() - -} diff --git a/tests/src/test/scala/com/softwaremill/sttp/streaming/MonixOKHStreamingTests.scala b/tests/src/test/scala/com/softwaremill/sttp/streaming/MonixOKHStreamingTests.scala deleted file mode 100644 index 04666be..0000000 --- a/tests/src/test/scala/com/softwaremill/sttp/streaming/MonixOKHStreamingTests.scala +++ /dev/null @@ -1,17 +0,0 @@ -package com.softwaremill.sttp.streaming - -import java.nio.ByteBuffer - -import com.softwaremill.sttp.SttpHandler -import com.softwaremill.sttp.okhttp.monix.OkHttpMonixClientHandler -import monix.eval.Task -import monix.reactive.Observable - -class MonixOKHStreamingTests extends MonixBaseHandler { - - import monix.execution.Scheduler.Implicits.global - - override implicit val handler: SttpHandler[Task, Observable[ByteBuffer]] = - OkHttpMonixClientHandler() - -} diff --git a/tests/src/test/scala/com/softwaremill/sttp/streaming/OkHttpMonixStreamingTests.scala b/tests/src/test/scala/com/softwaremill/sttp/streaming/OkHttpMonixStreamingTests.scala new file mode 100644 index 0000000..2ea1322 --- /dev/null +++ b/tests/src/test/scala/com/softwaremill/sttp/streaming/OkHttpMonixStreamingTests.scala @@ -0,0 +1,17 @@ +package com.softwaremill.sttp.streaming + +import java.nio.ByteBuffer + +import com.softwaremill.sttp.SttpHandler +import com.softwaremill.sttp.okhttp.monix.OkHttpMonixHandler +import monix.eval.Task +import monix.reactive.Observable + +class OkHttpMonixStreamingTests extends MonixBaseHandler { + + import monix.execution.Scheduler.Implicits.global + + override implicit val handler: SttpHandler[Task, Observable[ByteBuffer]] = + OkHttpMonixHandler() + +} -- cgit v1.2.3