more unit test and coverage

Author: jknack

jooby-aws/src/main/java/org/jooby/internal/aws/AwsGenericManaged.java

@@ -66,7 +66,8 @@ public void stop() throws Exception {
         log.debug("no shutdown method found for: {}", dep);
       }
     } catch (InvocationTargetException ex) {
-      Throwables.propagate(ex.getCause());
+      RuntimeException x = Throwables.propagate(ex.getCause());
+      throw x;
     } finally {
       dep = null;
     }

jooby/src/main/java/org/jooby/Sse.java

@@ -875,16 +875,14 @@ private Future<Optional<Object>> send(final Event event) {
     List<MediaType> produces = event.type().<List<MediaType>> map(ImmutableList::of)
         .orElse(this.produces);
     SseRenderer ctx = new SseRenderer(renderers, produces, StandardCharsets.UTF_8, locals);
-    try {
+    return Try.of(() -> {
       byte[] bytes = ctx.format(event);
-      return send(event.id(), bytes).future();
-    } catch (Throwable cause) {
+      return send(event.id(), bytes);
+    }).recover(cause -> {
       Promise<Optional<Object>> promise = Promise.make(MoreExecutors.newDirectExecutorService());
       promise.failure(cause);
-      return promise.future();
-    } finally {
-      ctx.clear();
-    }
+      return promise;
+    }).get().future();
   }
 
 }

jooby/src/main/java/org/jooby/internal/SseRenderer.java

@@ -83,11 +83,9 @@ public byte[] format(final Sse.Event event) throws Exception {
 
     data = ByteSource.concat(data, NL);
 
-    return data.read();
-  }
-
-  public void clear() {
+    byte[] bytes = data.read();
     data = null;
+    return bytes;
   }
 
   @Override

jooby/src/main/java/org/jooby/internal/js/JsJooby.java

@@ -24,6 +24,7 @@
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.nio.charset.StandardCharsets;
+import java.util.function.Consumer;
 import java.util.function.Supplier;
 
 import javax.script.ScriptEngine;
@@ -58,12 +59,12 @@ void eval(final InputStream stream) throws Exception {
     eval(new InputStreamReader(stream, StandardCharsets.UTF_8));
   }
 
+  @SuppressWarnings({"rawtypes", "unchecked" })
   void eval(final Reader reader) throws Exception {
-    try {
-      engine.eval(reader);
-    } finally {
-      Closeables.closeQuietly(reader);
-    }
+    Consumer closer = x -> Closeables.closeQuietly(reader);
+    Try.run(() -> engine.eval(reader))
+        .onFailure(closer)
+        .onSuccess(closer);
   }
 
 }

jooby/src/test/java/org/jooby/CookieDefinitionTest.java

@@ -107,4 +107,10 @@ public void cookieSecure() {
     assertEquals(true, def.secure(true).secure().get());
     assertEquals(true, def.toCookie().secure());
   }
+
+  @Test
+  public void toStr() {
+    Definition def = new Cookie.Definition("name", "q");
+    assertEquals("name=q;Version=1", def.toString());
+  }
 }

jooby/src/test/java/org/jooby/RequestTest.java

@@ -110,7 +110,7 @@ public Locale locale(final BiFunction<List<LanguageRange>, List<Locale>, Locale>
 
     @Override
     public List<Locale> locales() {
-      throw new UnsupportedOperationException();
+      return Request.super.locales();
     }
 
     @Override
@@ -314,4 +314,18 @@ public Route route() {
         });
   }
 
+  @Test
+  public void locales() throws Exception {
+    new MockUnit(Route.class)
+        .run(unit -> {
+          assertEquals(null, new RequestMock() {
+            @Override
+            public List<Locale> locales(
+                final BiFunction<List<LanguageRange>, List<Locale>, List<Locale>> filter) {
+              return null;
+            }
+          }.locales());
+        });
+  }
+
 }

jooby/src/test/java/org/jooby/SseTest.java

@@ -445,57 +445,6 @@ public void renderFailure() throws Exception {
               .build(isA(List.class), isA(List.class), eq(StandardCharsets.UTF_8), isA(Map.class));
 
           expect(renderer.format(isA(Sse.Event.class))).andThrow(new IOException("failure"));
-          renderer.clear();
-        })
-        .run(unit -> {
-          Sse sse = new Sse() {
-
-            @Override
-            protected void closeInternal() {
-            }
-
-            @Override
-            protected void fireCloseEvent() {
-            }
-
-            @Override
-            protected Promise<Optional<Object>> send(final Optional<Object> id, final byte[] data) {
-              Promise<Optional<Object>> promise = Promise
-                  .make(MoreExecutors.newDirectExecutorService());
-              promise.failure(new IOException("intentional err"));
-              return promise;
-            }
-
-            @Override
-            public Sse keepAlive(final long millis) {
-              return this;
-            }
-
-            @Override
-            protected void handshake(final Runnable handler) throws Exception {
-            }
-          };
-          sse.handshake(unit.get(Request.class), unit.get(Runnable.class));
-          sse.event(data).type(MediaType.all).send().onFailure(cause -> latch.countDown());
-          latch.await();
-        });
-  }
-
-  @SuppressWarnings("resource")
-  @Test(expected = IllegalStateException.class)
-  public void sendFailure() throws Exception {
-    CountDownLatch latch = new CountDownLatch(1);
-    Object data = new Object();
-    new MockUnit(Request.class, Route.class, Injector.class, Runnable.class)
-        .expect(handshake)
-        .expect(unit -> {
-          SseRenderer renderer = unit.constructor(SseRenderer.class)
-              .args(List.class, List.class, Charset.class, Map.class)
-              .build(isA(List.class), isA(List.class), eq(StandardCharsets.UTF_8), isA(Map.class));
-
-          expect(renderer.format(isA(Sse.Event.class))).andReturn(new byte[0]);
-          renderer.clear();
-          expectLastCall().andThrow(new IllegalStateException("intentional err"));
         })
         .run(unit -> {
           Sse sse = new Sse() {

jooby/src/test/java/org/jooby/StatusTest.java

@@ -8,4 +8,5 @@ public class StatusTest {
   public void badCode() {
     Status.valueOf(907);
   }
+
 }