camel test coverage 100%

Author: jknack

jooby-camel/src/main/java/org/jooby/camel/Camel.java

@@ -19,6 +19,9 @@
 package org.jooby.camel;
 
 import static java.util.Objects.requireNonNull;
+import static javaslang.API.$;
+import static javaslang.API.Case;
+import static javaslang.API.Match;
 
 import java.io.File;
 import java.lang.reflect.Method;
@@ -50,6 +53,8 @@
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
 
+import javaslang.control.Try;
+
 /**
  * Camel for Jooby. Exposes a {@link CamelContext}, {@link ProducerTemplate} and
  * {@link ConsumerTemplate}.
@@ -272,6 +277,12 @@ public Camel routes(final Class<?> routeClass) {
     return this;
   }
 
+  /**
+   * Hook to customize a {@link CamelContext}.
+   *
+   * @param configurer A configurer callback.
+   * @return This instance.
+   */
   public Camel doWith(final Configurer<CamelContext> configurer) {
     this.configurer = requireNonNull(configurer, "A configurer is required.");
     return this;
@@ -311,8 +322,7 @@ public void configure(final Env env, final Config config, final Binder binder) {
         .withoutPath("shutdown")
         .withoutPath("threads")
         .withoutPath("jmx")
-        .withoutPath("streamCaching")
-        );
+        .withoutPath("streamCaching"));
 
     if (!$camel.getBoolean("jmx")) {
       ctx.disableJMX();
@@ -356,7 +366,7 @@ public void configure(final Env env, final Config config, final Binder binder) {
       try {
         routes(routes, ctx, config);
       } catch (Exception ex) {
-        throw new IllegalStateException("Route builder resulted in error", ex);
+        throw new IllegalStateException("context.addRoutes(RouteBuilder) resulted in error", ex);
       }
     }
 
@@ -426,29 +436,26 @@ private <T> T configure(final T source, final Config config) {
     config.entrySet().forEach(o -> {
       String key = o.getKey();
       String setter = "set" + CaseFormat.LOWER_CAMEL.to(CaseFormat.UPPER_CAMEL, key);
-      Object value = o.getValue().unwrapped();
+      Object raw = o.getValue().unwrapped();
       Optional<Method> result = methods.stream()
           .filter(m -> m.getName().equals(setter))
           .findFirst();
       if (result.isPresent()) {
         Method method = result.get();
         Class type = method.getParameterTypes()[0];
-        if (Enum.class.isAssignableFrom(type)) {
-          value = Enum.valueOf(type, value.toString());
-        }
-        if (Long.class.isAssignableFrom(type)) {
-          value = ((Number) value).longValue();
-        }
-        if (File.class.isAssignableFrom(type)) {
-          value = new File(value.toString());
-        }
-        try {
-          method.invoke(source, value);
-        } catch (Exception ex) {
-          throw new IllegalArgumentException("Bad option: <" + value + "> for: " + method, ex);
-        }
+        Object value = Match(type).of(
+            Case(Enum.class::isAssignableFrom, () -> {
+              Object e = Enum.valueOf(type, raw.toString());
+              return e;
+            }),
+            Case(Long.class::isAssignableFrom, () -> ((Number) raw).longValue()),
+            Case(File.class::isAssignableFrom, () -> new File(raw.toString())),
+            Case($(), raw));
+        Try.of(() -> method.invoke(source, value)).onFailure(ex -> {
+          throw new IllegalArgumentException("Bad option: <" + raw + "> for: " + method, ex);
+        });
       } else {
-        log.error("Unknown option camel.{} = {}", key, value);
+        log.error("Unknown option camel.{} = {}", key, raw);
       }
     });
     return source;

jooby-camel/src/test/java/org/jooby/camel/CamelTest.java

@@ -4,7 +4,6 @@
 import static org.easymock.EasyMock.expectLastCall;
 import static org.easymock.EasyMock.isA;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
 
 import java.io.File;
 import java.io.IOException;
@@ -862,7 +861,7 @@ public void withRoutes() throws Exception {
   }
 
   @SuppressWarnings("unchecked")
-  @Test
+  @Test(expected = IllegalStateException.class)
   public void withRoutesErr() throws Exception {
     Config camel = defConfig;
     new MockUnit(Env.class, Config.class, Binder.class)
@@ -917,6 +916,7 @@ public void withRoutesErr() throws Exception {
           ctx.addComponent("properties", properties);
           ctx.disableJMX();
           ctx.addRoutes(unit.capture(RouteBuilder.class));
+          expectLastCall().andThrow(new Exception("intentional error"));
 
           ProducerTemplate producer = unit.mock(ProducerTemplate.class);
           expect(ctx.createProducerTemplate()).andReturn(producer);
@@ -964,19 +964,9 @@ public void withRoutesErr() throws Exception {
         })
         .expect(onStop)
         .run(unit -> {
-          new Camel() {
-            @Override
-            public void configure(final Env env, final Config config, final Binder binder) {
-              super.configure(env, config, binder);
-              try {
-                unit.captured(RouteBuilder.class).iterator().next().configure();
-              } catch (Exception ex) {
-                assertTrue(ex instanceof IllegalStateException);
-              }
-            }
-          }.routes((router, config) -> {
-            throw new IllegalStateException("intentional err");
-          }).configure(unit.get(Env.class), unit.get(Config.class), unit.get(Binder.class));
+          new Camel()
+              .routes((router, config) -> {
+              }).configure(unit.get(Env.class), unit.get(Config.class), unit.get(Binder.class));
         });
   }