Change unit test for MVC apps not to use MockRouter.

imeszaros · imeszaros · commit bd72080c078b · 2020-09-29T23:58:08.000+02:00
diff --git a/modules/jooby-cli/src/main/java/io/jooby/cli/CreateCmd.java b/modules/jooby-cli/src/main/java/io/jooby/cli/CreateCmd.java
@@ -109,9 +109,9 @@ public class CreateCmd extends Cmd {
     String server;
     boolean stork = !gradle && this.stork;
     if (interactive) {
-      gradle = yesNo(ctx.readLine("Use Gradle (yes/No): "));
+      gradle = yesNo(ctx.readLine("Use Gradle (yes/no): "));
 
-      kotlin = yesNo(ctx.readLine("Use Kotlin (yes/No): "));
+      kotlin = yesNo(ctx.readLine("Use Kotlin (yes/no): "));
 
       packageName = ctx.readLine("Enter a groupId/package: ");
 
@@ -120,9 +120,9 @@ public class CreateCmd extends Cmd {
         version = "1.0.0";
       }
 
-      mvc = yesNo(ctx.readLine("Use MVC (yes/No): "));
+      mvc = yesNo(ctx.readLine("Use MVC (yes/no): "));
 
-      openapi = yesNo(ctx.readLine("Configure OpenAPI (yes/No): "));
+      openapi = yesNo(ctx.readLine("Configure OpenAPI (yes/no): "));
 
       server = server(ctx.readLine("Choose a server (jetty, netty or undertow): "));
 
@@ -131,7 +131,7 @@ public class CreateCmd extends Cmd {
             .equals("stork");
       }
 
-      docker = yesNo(ctx.readLine("Generates Dockerfile (yes/No): "));
+      docker = yesNo(ctx.readLine("Generates Dockerfile (yes/no): "));
     } else {
       String[] parts = name.split(":");
       switch (parts.length) {
diff --git a/modules/jooby-cli/src/main/resources/cli/UnitTest.java.hbs b/modules/jooby-cli/src/main/resources/cli/UnitTest.java.hbs
@@ -1,18 +1,25 @@
 package {{package}};
 
+{{#unless mvc}}
 import io.jooby.MockRouter;
 import io.jooby.StatusCode;
+{{/unless}}
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class UnitTest {
   @Test
   public void welcome() {
+{{#if mvc}}
+    Controller controller = new Controller();
+    assertEquals("Welcome to Jooby!", controller.sayHi());
+{{else}}
     MockRouter router = new MockRouter(new App());
     router.get("/", rsp -> {
       assertEquals("Welcome to Jooby!", rsp.value());
       assertEquals(StatusCode.OK, rsp.getStatusCode());
     });
+{{/if}}
   }
 }
diff --git a/modules/jooby-cli/src/main/resources/cli/UnitTest.kt.hbs b/modules/jooby-cli/src/main/resources/cli/UnitTest.kt.hbs
@@ -1,18 +1,25 @@
 package {{package}}
 
+{{#unless mvc}}
 import io.jooby.MockRouter
 import io.jooby.StatusCode
+{{/unless}}
 import org.junit.jupiter.api.Test
 
 import org.junit.jupiter.api.Assertions.assertEquals
 
 class UnitTest {
   @Test
   fun welcome() {
+{{#if mvc}}
+    val controller = Controller()
+    assertEquals("Welcome to Jooby!", controller.sayHi())
+{{else}}
     val router = MockRouter(App())
     router.get("/") { rsp ->
       assertEquals("Welcome to Jooby!", rsp.value())
       assertEquals(StatusCode.OK, rsp.getStatusCode())
     }
+{{/if}}
   }
 }
