Fixed JavaDoc and test cases are now complete.

Author: imeszaros

modules/jooby-banner/src/main/java/io/jooby/banner/BannerModule.java

@@ -31,7 +31,7 @@
  * package com.myapp;
  *
  * {
- *   use(new Banner());
+ *   install(new BannerModule());
  * }
  * }</pre>
  *
@@ -44,7 +44,7 @@
  * package com.myapp;
  *
  * {
- *   use(new Banner("my awesome app"));
+ *   install(new BannerModule("my awesome app"));
  * }
  * }</pre>
  *
@@ -57,7 +57,7 @@
  * package com.myapp;
  *
  * {
- *   use(new Banner("my awesome app").font("slant"));
+ *   install(new BannerModule("my awesome app").font("slant"));
  * }
  * }</pre>
  *

modules/jooby-banner/src/test/java/io/jooby/banner/BannerModuleTest.java

@@ -18,7 +18,7 @@
 import static com.github.lalyos.jfiglet.FigletFont.convertOneLine;
 import static io.jooby.banner.BannerModule.fontPath;
 import static io.jooby.banner.BannerModule.rtrim;
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.*;
@@ -27,60 +27,99 @@ public class BannerModuleTest {
 
   @Test
   public void install() throws Exception {
-    Map<String, String> map = new HashMap<>();
-    map.put("application.name", "Jooby");
-    map.put("application.version", "2.0.0");
-
-    Config config = ConfigFactory.parseMap(map);
-
-    ServiceRegistry registry = mock(ServiceRegistry.class);
-    when(registry.put(Mockito.<ServiceKey<String>>any(), Mockito.<Provider<String>>any())).thenReturn(null);
-
-    Logger logger = mock(Logger.class);
-    doNothing().when(logger).info(anyString(), any(), any());
-
-    Jooby app = mock(Jooby.class);
-    when(app.getConfig()).thenReturn(config);
-    when(app.getServices()).thenReturn(registry);
-    when(app.getLog()).thenReturn(logger);
-    when(app.onStarting(any(SneakyThrows.Runnable.class))).thenReturn(app);
+    Jooby app = setup("Jooby", "2.0.0");
 
-    new BannerModule().install(app);
+    new BannerModule("banner").install(app);
 
     @SuppressWarnings("unchecked")
     ArgumentCaptor<ServiceKey<String>> keyCaptor = ArgumentCaptor.forClass(ServiceKey.class);
     @SuppressWarnings("unchecked")
     ArgumentCaptor<Provider<String>> providerCaptor = ArgumentCaptor.forClass(Provider.class);
-    verify(registry).put(keyCaptor.capture(), providerCaptor.capture());
+    verify(app.getServices()).put(keyCaptor.capture(), providerCaptor.capture());
 
     assertEquals(String.class, keyCaptor.getValue().getType());
     assertEquals("application.banner", keyCaptor.getValue().getName());
-    assertEquals(rtrim(convertOneLine(fontPath("speed"), map.get("application.name"))), providerCaptor.getValue().get());
-
-    ArgumentCaptor<SneakyThrows.Runnable> runnableCaptor = ArgumentCaptor.forClass(SneakyThrows.Runnable.class);
-    verify(app).onStarting(runnableCaptor.capture());
+    assertEquals(rtrim(convertOneLine(fontPath("speed"), "banner")), providerCaptor.getValue().get());
 
-    runnableCaptor.getValue().run();
-    verify(logger).info("\n{} v{}\n", providerCaptor.getValue().get(), map.get("application.version"));
+    verify(app).onStarting(Mockito.any(SneakyThrows.Runnable.class));
   }
 
   @Test
   public void trimEnd() throws Exception {
+    Jooby app = setup("Jooby", "2.0.0");
+
+    new BannerModule("banner      ").install(app);
 
+    @SuppressWarnings("unchecked")
+    ArgumentCaptor<Provider<String>> providerCaptor = ArgumentCaptor.forClass(Provider.class);
+    verify(app.getServices()).put(Mockito.<ServiceKey<String>>any(), providerCaptor.capture());
+
+    String banner = providerCaptor.getValue().get();
+    assertFalse(Character.isWhitespace(banner.charAt(banner.length() - 1)));
   }
 
   @Test
   public void print() throws Exception {
+    Jooby app = setup("Jooby", "2.0.0");
+
+    new BannerModule("banner").install(app);
 
+    @SuppressWarnings("unchecked")
+    ArgumentCaptor<Provider<String>> providerCaptor = ArgumentCaptor.forClass(Provider.class);
+    verify(app.getServices()).put(Mockito.<ServiceKey<String>>any(), providerCaptor.capture());
+
+    ArgumentCaptor<SneakyThrows.Runnable> runnableCaptor = ArgumentCaptor.forClass(SneakyThrows.Runnable.class);
+    verify(app).onStarting(runnableCaptor.capture());
+
+    runnableCaptor.getValue().run();
+    verify(app.getLog()).info("\n{} v{}\n", providerCaptor.getValue().get(), "2.0.0");
   }
 
   @Test
   public void font() throws Exception {
+    Jooby app = setup("Jooby", "2.0.0");
+
+    new BannerModule("banner").font("doom").install(app);
+
+    @SuppressWarnings("unchecked")
+    ArgumentCaptor<Provider<String>> providerCaptor = ArgumentCaptor.forClass(Provider.class);
+    verify(app.getServices()).put(Mockito.<ServiceKey<String>>any(), providerCaptor.capture());
 
+    assertEquals(rtrim(convertOneLine(fontPath("doom"), "banner")), providerCaptor.getValue().get());
   }
 
   @Test
   public void defprint() throws Exception {
+    Jooby app = setup("Jooby", "2.0.0");
+
+    new BannerModule().install(app);
+
+    @SuppressWarnings("unchecked")
+    ArgumentCaptor<Provider<String>> providerCaptor = ArgumentCaptor.forClass(Provider.class);
+    verify(app.getServices()).put(Mockito.<ServiceKey<String>>any(), providerCaptor.capture());
+
+    assertEquals(rtrim(convertOneLine(fontPath("speed"), "Jooby")), providerCaptor.getValue().get());
+  }
+
+  private Jooby setup(String appName, String appVersion) {
+    Map<String, String> map = new HashMap<>();
+    map.put("application.name", appName);
+    map.put("application.version", appVersion);
+
+    Config config = ConfigFactory.parseMap(map);
+
+    ServiceRegistry registry = mock(ServiceRegistry.class);
+    when(registry.put(Mockito.<ServiceKey<String>>any(), Mockito.<Provider<String>>any())).thenReturn(null);
+
+    Logger logger = mock(Logger.class);
+    doNothing().when(logger).info(anyString(), any(), any());
+
+    Jooby app = mock(Jooby.class);
+    when(app.getConfig()).thenReturn(config);
+    when(app.getServices()).thenReturn(registry);
+    when(app.getLog()).thenReturn(logger);
+    when(app.onStarting(any(SneakyThrows.Runnable.class))).thenReturn(app);
 
+    return app;
   }
 }