Adjust tests

Author: sebaciv

rest/.jvm/src/test/resources/StreamingRestTestApi.json

@@ -6,9 +6,27 @@
     "description": "Some test REST API"
   },
   "paths": {
-    "/emptyStream": {
-      "get": {
-        "operationId": "emptyStream",
+    "/errorStream": {
+      "post": {
+        "operationId": "errorStream",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "immediate": {
+                    "type": "boolean"
+                  }
+                },
+                "required": [
+                  "immediate"
+                ]
+              }
+            }
+          },
+          "required": true
+        },
         "responses": {
           "200": {
             "description": "Success",
@@ -17,8 +35,7 @@
                 "schema": {
                   "type": "array",
                   "items": {
-                    "type": "integer",
-                    "format": "int32"
+                    "$ref": "#/components/schemas/RestEntity"
                   }
                 }
               }
@@ -50,6 +67,18 @@
     "/simpleStream": {
       "get": {
         "operationId": "simpleStream",
+        "parameters": [
+          {
+            "name": "size",
+            "in": "query",
+            "required": true,
+            "explode": false,
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          }
+        ],
         "responses": {
           "200": {
             "description": "Success",
@@ -58,7 +87,8 @@
                 "schema": {
                   "type": "array",
                   "items": {
-                    "type": "string"
+                    "type": "integer",
+                    "format": "int32"
                   }
                 }
               }

rest/src/test/scala/io/udash/rest/RestApiTest.scala

@@ -149,11 +149,11 @@ trait RestApiTestScenarios extends RestApiTest {
 trait StreamingRestApiTestScenarios extends RestApiTest {
 
   "empty GET stream" in {
-    testStream(_.emptyStream)
+    testStream(_.simpleStream(0))
   }
 
   "trivial GET stream" in {
-    testStream(_.simpleStream)
+    testStream(_.simpleStream(5))
   }
 
   "json GET stream" in {

rest/src/test/scala/io/udash/rest/StreamingRestTestApi.scala

@@ -1,29 +1,39 @@
 package io.udash
 package rest
 
+import io.udash.rest.raw.HttpErrorException
 import monix.execution.Scheduler
 import monix.reactive.Observable
 
 trait StreamingRestTestApi {
-  @GET def emptyStream: Observable[Int]
-
-  @GET def simpleStream: Observable[String]
+  @GET def simpleStream(size: Int): Observable[Int]
 
   @GET def jsonStream: Observable[RestEntity]
+
+  @POST def errorStream(immediate: Boolean): Observable[RestEntity]
 }
 object StreamingRestTestApi extends DefaultRestApiCompanion[StreamingRestTestApi] {
 
   import Scheduler.Implicits.global
 
   final class Impl extends StreamingRestTestApi {
-    override def emptyStream: Observable[Int] = Observable.empty
 
-    override def simpleStream: Observable[String] = Observable("a", "b", "c")
+    override def simpleStream(size: Int): Observable[Int] =
+      Observable.fromIterable(Range(0, size))
 
     override def jsonStream: Observable[RestEntity] = Observable(
       RestEntity(RestEntityId("1"), "first"),
       RestEntity(RestEntityId("2"), "second"),
       RestEntity(RestEntityId("3"), "third")
     )
+
+    override def errorStream(immediate: Boolean): Observable[RestEntity] =
+      if (immediate)
+        Observable.raiseError(HttpErrorException.plain(400, "bad"))
+      else
+        Observable.fromIterable(Range(0, 3)).map { i =>
+          if (i < 2) RestEntity(RestEntityId(i.toString), "first")
+          else throw HttpErrorException.plain(400, "later bad")
+        }
   }
 }