Review comments

rchodava · Apr 7, 2017 · 9b2d058 · 9b2d058
1 parent c7fa5ab
commit 9b2d058
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 74 deletions.
diff --git a/core/src/test/java/foundation/stack/datamill/http/builder/ElseBuilderTest.java b/core/src/test/java/foundation/stack/datamill/http/builder/ElseBuilderTest.java
diff --git a/core/src/test/java/foundation/stack/datamill/http/builder/RouteBuilderTest.java b/core/src/test/java/foundation/stack/datamill/http/builder/RouteBuilderTest.java
@@ -21,13 +21,15 @@
 public class RouteBuilderTest {
 
     private RouteBuilder routeBuilder;
+    private ElseBuilder elseBuilder;
 
     private Route anyRoute = mock(Route.class);
     private Route orElseRoute = mock(Route.class);
 
     @Before
     public void setup() {
         routeBuilder = new RouteBuilderImpl();
+        elseBuilder = new RouteBuilderImpl();
     }
 
     @Test
@@ -52,8 +54,6 @@ public void anyRouteHonoredIfObservableReturned() {
 
     @Test
     public void elseOfAnyRouteHonoredIfNoObservableReturned() {
-
-        mock(Response.class);
         when(anyRoute.apply(any(ServerRequest.class))).thenReturn(null);
 
         Response elseRouteMockResponse = mock(Response.class);
@@ -70,4 +70,42 @@ public void elseOfAnyRouteHonoredIfNoObservableReturned() {
         assertThat(elseRouteMockResponse, is(actualResponse));
     }
 
+
+    @Test
+    public void elseAnyRouteHonoredIfObservableReturned() {
+        Response anyRouteMockResponse = mock(Response.class);
+        when(anyRoute.apply(any(ServerRequest.class))).thenReturn(Observable.just(anyRouteMockResponse));
+
+        Response elseRouteMockResponse = mock(Response.class);
+        when(orElseRoute.apply(any(ServerRequest.class))).thenReturn(Observable.just(elseRouteMockResponse));
+
+        Route route = elseBuilder.elseAny(anyRoute).orElse(orElseRoute);
+
+        ServerRequest serverRequest = mock(ServerRequest.class);
+        when(serverRequest.method()).thenReturn(Method.GET);
+
+        Observable<Response> responseObservable = route.apply(serverRequest);
+        Response actualResponse = responseObservable.toBlocking().lastOrDefault(null);
+
+        assertThat(anyRouteMockResponse, is(actualResponse));
+
+    }
+
+    @Test
+    public void elseOfElseAnyRouteHonoredIfNoObservableReturned() {
+        when(anyRoute.apply(any(ServerRequest.class))).thenReturn(null);
+
+        Response elseRouteMockResponse = mock(Response.class);
+        when(orElseRoute.apply(any(ServerRequest.class))).thenReturn(Observable.just(elseRouteMockResponse));
+
+        Route route = elseBuilder.elseAny(anyRoute).orElse(orElseRoute);
+
+        ServerRequest serverRequest = mock(ServerRequest.class);
+        when(serverRequest.method()).thenReturn(Method.GET);
+
+        Observable<Response> responseObservable = route.apply(serverRequest);
+        Response actualResponse = responseObservable.toBlocking().lastOrDefault(null);
+
+        assertThat(elseRouteMockResponse, is(actualResponse));
+    }
 }