more unit/test & coverage

Author: jknack

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

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

jooby-jackson/pom.xml

@@ -55,6 +55,14 @@
     </dependency>
 
     <!-- Test dependencies -->
+    <dependency>
+      <groupId>org.jooby</groupId>
+      <artifactId>jooby</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+      <classifier>tests</classifier>
+    </dependency>
+
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

jooby-jackson/src/test/java/org/jooby/json/JacksonParserTest.java

@@ -0,0 +1,57 @@
+package org.jooby.json;
+
+import static org.easymock.EasyMock.expect;
+
+import org.jooby.MediaType;
+import org.jooby.Parser;
+import org.jooby.Parser.Context;
+import org.jooby.test.MockUnit;
+import org.junit.Test;
+
+import com.fasterxml.jackson.databind.JavaType;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.inject.TypeLiteral;
+
+public class JacksonParserTest {
+
+  @Test
+  public void parseAny() throws Exception {
+    Object value = new Object();
+    new MockUnit(ObjectMapper.class, Parser.Context.class, MediaType.class)
+        .expect(unit -> {
+          MediaType type = unit.get(MediaType.class);
+          expect(type.isAny()).andReturn(true);
+
+          Context ctx = unit.get(Parser.Context.class);
+          expect(ctx.type()).andReturn(type);
+          expect(ctx.next()).andReturn(value);
+        })
+        .run(unit -> {
+          new JacksonParser(unit.get(ObjectMapper.class), MediaType.json)
+              .parse(TypeLiteral.get(JacksonParserTest.class), unit.get(Parser.Context.class));
+        });
+  }
+
+  @Test
+  public void parseSkip() throws Exception {
+    Object value = new Object();
+    new MockUnit(ObjectMapper.class, Parser.Context.class, MediaType.class, TypeLiteral.class)
+        .expect(unit -> {
+          MediaType type = unit.get(MediaType.class);
+          expect(type.isAny()).andReturn(false);
+
+          Context ctx = unit.get(Parser.Context.class);
+          expect(ctx.type()).andReturn(type);
+          expect(ctx.next()).andReturn(value);
+
+          JavaType javaType = unit.mock(JavaType.class);
+
+          ObjectMapper mapper = unit.get(ObjectMapper.class);
+          expect(mapper.constructType(null)).andReturn(javaType);
+        })
+        .run(unit -> {
+          new JacksonParser(unit.get(ObjectMapper.class), MediaType.json)
+              .parse(unit.get(TypeLiteral.class), unit.get(Parser.Context.class));
+        });
+  }
+}

jooby-jade/src/test/java/org/jooby/jade/JadeTest.java

@@ -52,6 +52,18 @@ public void testConfigurableSuffix() throws Exception {
         });
   }
 
+  @Test
+  public void testCachingOn() throws Exception {
+    new MockUnit(Env.class, Config.class, Binder.class)
+        .expect(env("prod"))
+        .expect(conf(".jade", true, false))
+        .expect(jade(".jade", true, false))
+        .run(unit -> {
+          new Jade()
+              .configure(unit.get(Env.class), unit.get(Config.class), unit.get(Binder.class));
+        });
+  }
+
   @Test
   public void testCachingOnInProduction() throws Exception {
     new MockUnit(Env.class, Config.class, Binder.class)
@@ -142,6 +154,9 @@ private Block conf(final String suffix, final boolean caching, final boolean pre
     return unit -> {
       Config config = unit.get(Config.class);
       expect(config.hasPath("jade.caching")).andReturn(caching);
+      if (caching) {
+        expect(config.getBoolean("jade.caching")).andReturn(caching);
+      }
       expect(config.hasPath("jade.prettyprint")).andReturn(prettyprint);
     };
   }

jooby-jdbc/src/main/java/org/jooby/jdbc/Jdbc.java

@@ -148,7 +148,9 @@
  * }
  * </pre>
  *
- * <p>application.conf</p>
+ * <p>
+ * application.conf
+ * </p>
  *
  * <pre>
  * # main database
@@ -162,7 +164,9 @@
  * db.audit.password = ....
  * </pre>
  *
- * <p>Same principle applies if you need to tweak hikari:</p>
+ * <p>
+ * Same principle applies if you need to tweak hikari:
+ * </p>
  *
  * <pre>
  * # max pool size for main db
@@ -222,8 +226,7 @@ private Config dbConfig(final String key, final Config source) {
       if (db.toString().indexOf(':') == -1 && source.hasPath(embeddeddb)) {
         Config dbtree = source.getConfig(embeddeddb);
         dbtree = dbtree.withValue("url", ConfigValueFactory.fromAnyRef(
-            dbtree.getString("url").replace("{mem.seed}", System.currentTimeMillis() + "")
-            ));
+            dbtree.getString("url").replace("{mem.seed}", System.currentTimeMillis() + "")));
         // write embedded with current key
         return ConfigFactory.empty()
             .withValue(key, dbtree.root())
@@ -266,10 +269,8 @@ private HikariDataSourceProvider newDataSource(final String key, final Config co
      * # db.* -> dataSource.*
      * # hikari.* -> * (no prefix)
      */
-    dbtype.ifPresent(type ->
-        config.getConfig("databases." + type)
-            .entrySet().forEach(entry -> dumper.accept("dataSource.", entry))
-        );
+    dbtype.ifPresent(type -> config.getConfig("databases." + type)
+        .entrySet().forEach(entry -> dumper.accept("dataSource.", entry)));
 
     config.getConfig(key).entrySet().forEach(entry -> dumper.accept("dataSource.", entry));
 
@@ -294,10 +295,7 @@ private Optional<String> dbtype(final String key, final Config config) {
         .findFirst()
         .get();
 
-    if (config.hasPath("databases." + type)) {
-      return Optional.of(type);
-    }
-    return Optional.empty();
+    return Optional.of(type);
   }
 
   /**