Code review updates

Remove tests sub project, all tests are now in core.
Remove TestStreamingBackend, StreamingTest now has the required abstract
methods.

2 files changed, 26 insertions, 28 deletions

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 f1b262b..0000000
--- a/implementations/monix/src/test/scala/com/softwaremill/sttp/impl/monix/MonixTestStreamingBackend.scala
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.softwaremill.sttp.impl.monix
-
-import com.softwaremill.sttp.testing.ConvertToFuture
-import com.softwaremill.sttp.testing.streaming.TestStreamingBackend
-import monix.eval.Task
-import monix.reactive.Observable
-
-trait MonixTestStreamingBackend[T] extends TestStreamingBackend[Task, Observable[T]] {
-
-  def toByteArray(v: T): Array[Byte]
-  def fromByteArray(v: Array[Byte]): T
-
-  override implicit def convertToFuture: ConvertToFuture[Task] = convertMonixTaskToFuture
-
-  override def bodyProducer(body: String): Observable[T] =
-    Observable
-      .fromIterable(
-        body.getBytes("utf-8")
-      )
-      .map(v => fromByteArray(Array(v)))
-
-  override def bodyConsumer(stream: Observable[T]): Task[String] =
-    stream
-      .flatMap(v => Observable.fromIterable(toByteArray(v)))
-      .toListL
-      .map(bs => new String(bs.toArray, "utf8"))
-
-}