Merge pull request #94 from guymers/scalajs-2HEADmaster

Move backend tests into their projects

5 files changed, 29 insertions, 25 deletions

diff --git a/implementations/cats/src/test/scala/com/softwaremill/sttp/impl/cats/package.scala b/implementations/cats/src/test/scala/com/softwaremill/sttp/impl/cats/package.scala
index abffc90..5f3db65 100644
--- a/implementations/cats/src/test/scala/com/softwaremill/sttp/impl/cats/package.scala
+++ b/implementations/cats/src/test/scala/com/softwaremill/sttp/impl/cats/package.scala
@@ -1,7 +1,7 @@
 package com.softwaremill.sttp.impl
 
 import _root_.cats.effect.IO
-import com.softwaremill.sttp.testing.streaming.ConvertToFuture
+import com.softwaremill.sttp.testing.ConvertToFuture
 
 import scala.concurrent.Future
 
diff --git a/implementations/monix/src/test/scala/com/softwaremill/sttp/impl/monix/MonixStreamingTest.scala b/implementations/monix/src/test/scala/com/softwaremill/sttp/impl/monix/MonixStreamingTest.scala
new file mode 100644
index 0000000..d00c056
--- /dev/null
+++ b/implementations/monix/src/test/scala/com/softwaremill/sttp/impl/monix/MonixStreamingTest.scala
@@ -0,0 +1,26 @@
+package com.softwaremill.sttp.impl.monix
+
+import java.nio.ByteBuffer
+
+import com.softwaremill.sttp.testing.ConvertToFuture
+import com.softwaremill.sttp.testing.streaming.StreamingTest
+import monix.eval.Task
+import monix.reactive.Observable
+
+abstract class MonixStreamingTest extends StreamingTest[Task, Observable[ByteBuffer]] {
+
+  override implicit val convertToFuture: ConvertToFuture[Task] = convertMonixTaskToFuture
+
+  override def bodyProducer(body: String): Observable[ByteBuffer] =
+    Observable
+      .fromIterable(
+        body.getBytes("utf-8")
+      )
+      .map(v => ByteBuffer.wrap(Array(v)))
+
+  override def bodyConsumer(stream: Observable[ByteBuffer]): Task[String] =
+    stream
+      .flatMap(v => Observable.fromIterable(v.array()))
+      .toListL
+      .map(bs => new String(bs.toArray, "utf8"))
+}
diff --git a/implementations/monix/src/test/scala/com/softwaremill/sttp/impl/monix/MonixTestStreamingBackend.scala b/implementations/monix/src/test/scala/com/softwaremill/sttp/impl/monix/MonixTestStreamingBackend.scala
deleted file mode 100644
index 3f84ec3..0000000
--- a/implementations/monix/src/test/scala/com/softwaremill/sttp/impl/monix/MonixTestStreamingBackend.scala
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.softwaremill.sttp.impl.monix
-
-import java.nio.ByteBuffer
-
-import com.softwaremill.sttp.testing.streaming.{ConvertToFuture, TestStreamingBackend}
-import monix.eval.Task
-import monix.reactive.Observable
-
-trait MonixTestStreamingBackend extends TestStreamingBackend[Task, Observable[ByteBuffer]] {
-
-  override implicit def convertToFuture: ConvertToFuture[Task] = convertMonixTaskToFuture
-
-  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/implementations/monix/src/test/scala/com/softwaremill/sttp/impl/monix/package.scala b/implementations/monix/src/test/scala/com/softwaremill/sttp/impl/monix/package.scala
index f77aa93..02fef8b 100644
--- a/implementations/monix/src/test/scala/com/softwaremill/sttp/impl/monix/package.scala
+++ b/implementations/monix/src/test/scala/com/softwaremill/sttp/impl/monix/package.scala
@@ -3,7 +3,7 @@ package com.softwaremill.sttp.impl
 import scala.concurrent.Future
 
 import _root_.monix.eval.Task
-import com.softwaremill.sttp.testing.streaming.ConvertToFuture
+import com.softwaremill.sttp.testing.ConvertToFuture
 
 package object monix {
 
diff --git a/implementations/scalaz/src/test/scala/com/softwaremill/sttp/impl/scalaz/package.scala b/implementations/scalaz/src/test/scala/com/softwaremill/sttp/impl/scalaz/package.scala
index 8ac6446..27b4759 100644
--- a/implementations/scalaz/src/test/scala/com/softwaremill/sttp/impl/scalaz/package.scala
+++ b/implementations/scalaz/src/test/scala/com/softwaremill/sttp/impl/scalaz/package.scala
@@ -1,6 +1,6 @@
 package com.softwaremill.sttp.impl
 
-import com.softwaremill.sttp.testing.streaming.ConvertToFuture
+import com.softwaremill.sttp.testing.ConvertToFuture
 
 import _root_.scalaz.concurrent.Task
 import _root_.scalaz.{-\/, \/-}