Allow a single test to run multiple apps

jknack · jknack · commit 0ccb00c9ea2d · 2019-12-06T19:27:00.000-03:00
diff --git a/tests/src/test/java/io/jooby/FeaturedTest.java b/tests/src/test/java/io/jooby/FeaturedTest.java
@@ -1315,7 +1315,7 @@ public void methodNotAllowed(ServerTestRunner runner) {
 
   @ServerTest
   public void silentFavicon(ServerTestRunner runner) {
-    runner.define(Jooby::new).ready(client -> {
+    runner.use(Jooby::new).ready(client -> {
       client.get("/favicon.ico", rsp -> {
         assertEquals(StatusCode.NOT_FOUND.value(), rsp.code());
       });
@@ -2734,6 +2734,47 @@ public void requestUrlWithContextPath(ServerTestRunner runner) {
     });
   }
 
+  @ServerTest
+  public void shouldAccessToWebVariables(ServerTestRunner runner) {
+    runner.define(app -> {
+      app.decorator(new WebVariables());
+
+      app.get("/webvars", ctx ->
+          Arrays.asList(ctx.attribute("contextPath"), ctx.attribute("path"), ctx.attribute("user"))
+      );
+    }).ready(client -> {
+      client.get("/webvars", rsp -> {
+        assertEquals("[, /webvars, null]", rsp.body().string().trim());
+      });
+    });
+
+    runner.define(app -> {
+      app.setContextPath("/app");
+
+      app.decorator(new WebVariables());
+
+      app.get("/webvars", ctx ->
+          Arrays.asList(ctx.attribute("contextPath"), ctx.attribute("path"), ctx.attribute("user"))
+      );
+    }).ready(client -> {
+      client.get("/app/webvars", rsp -> {
+        assertEquals("[/app, /app/webvars, null]", rsp.body().string().trim());
+      });
+    });
+
+    runner.define(app -> {
+      app.decorator(new WebVariables("scope"));
+
+      app.get("/webvars", ctx ->
+          Arrays.asList(ctx.attribute("scope.contextPath"), ctx.attribute("scope.path"), ctx.attribute("scope.user"))
+      );
+    }).ready(client -> {
+      client.get("/webvars", rsp -> {
+        assertEquals("[, /webvars, null]", rsp.body().string().trim());
+      });
+    });
+  }
+
   private byte[][] partition(byte[] bytes, int size) {
     List<byte[]> result = new ArrayList<>();
     int offset = 0;
diff --git a/tests/src/test/java/io/jooby/Issue1349.java b/tests/src/test/java/io/jooby/Issue1349.java
@@ -33,7 +33,7 @@ public String something() {
 
   @ServerTest
   public void issue1349(ServerTestRunner runner) {
-    runner.define(App1349::new)
+    runner.use(App1349::new)
         .ready(client -> {
           client.get("/1349", rsp -> {
             assertEquals(401, rsp.code());
diff --git a/tests/src/test/java/io/jooby/junit/ServerExtensionImpl.java b/tests/src/test/java/io/jooby/junit/ServerExtensionImpl.java
@@ -16,6 +16,7 @@
 import java.util.List;
 import java.util.ServiceLoader;
 import java.util.Set;
+import java.util.function.Supplier;
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
@@ -26,13 +27,13 @@ public class ServerExtensionImpl implements TestTemplateInvocationContextProvide
 
   private static class ServerInfo implements Comparable<ServerInfo> {
     private final int index;
-    private Server server;
+    private Supplier<Server> server;
 
     private ExecutionMode mode;
 
     private String description;
 
-    public ServerInfo(Server server, ExecutionMode mode, int index, String description) {
+    public ServerInfo(Supplier<Server> server, ExecutionMode mode, int index, String description) {
       this.server = server;
       this.mode = mode;
       this.description = description;
@@ -98,8 +99,8 @@ public ServerInfo(Server server, ExecutionMode mode, int index, String descripti
         .map(info -> invocationContext(info));
   }
 
-  private Server newServer(Class serverClass) {
-    return stream(ServiceLoader.load(Server.class).spliterator(), false)
+  private Supplier<Server> newServer(Class serverClass) {
+    return () -> stream(ServiceLoader.load(Server.class).spliterator(), false)
         .filter(s -> serverClass.isInstance(s))
         .findFirst()
         .orElseThrow(() -> new IllegalArgumentException("Server not found: " + serverClass));
diff --git a/tests/src/test/java/io/jooby/junit/ServerParameterResolver.java b/tests/src/test/java/io/jooby/junit/ServerParameterResolver.java
@@ -8,15 +8,16 @@
 import org.junit.jupiter.api.extension.ParameterResolver;
 
 import java.lang.reflect.Method;
+import java.util.function.Supplier;
 
 public class ServerParameterResolver implements ParameterResolver {
 
-  private final Server server;
+  private final Supplier<Server> server;
 
   private final ExecutionMode executionMode;
 
 
-  public ServerParameterResolver(Server server, ExecutionMode executionMode) {
+  public ServerParameterResolver(Supplier<Server> server, ExecutionMode executionMode) {
     this.server = server;
     this.executionMode = executionMode;
   }
diff --git a/tests/src/test/java/io/jooby/junit/ServerTestRunner.java b/tests/src/test/java/io/jooby/junit/ServerTestRunner.java
@@ -19,30 +19,30 @@ public class ServerTestRunner {
 
   private final String testName;
 
-  private final Server server;
+  private final Supplier<Server> server;
 
   private final ExecutionMode executionMode;
 
   private Supplier<Jooby> provider;
 
   private boolean followRedirects = true;
 
-  public ServerTestRunner(String testName, Server server, ExecutionMode executionMode) {
+  public ServerTestRunner(String testName, Supplier<Server> server, ExecutionMode executionMode) {
     this.testName = testName;
     this.server = server;
     this.executionMode = executionMode;
   }
 
   public ServerTestRunner define(Consumer<Jooby> consumer) {
-    define(() -> {
+    use(() -> {
       Jooby app = new Jooby();
       consumer.accept(app);
       return app;
     });
     return this;
   }
 
-  public ServerTestRunner define(Supplier<Jooby> provider) {
+  public ServerTestRunner use(Supplier<Jooby> provider) {
     this.provider = provider;
     return this;
   }
@@ -52,6 +52,7 @@ public void ready(SneakyThrows.Consumer<WebClient> onReady) {
   }
 
   public void ready(SneakyThrows.Consumer2<WebClient, WebClient> onReady) {
+    Server server = this.server.get();
     try {
       System.setProperty("___app_name__", testName);
       Jooby app = provider.get();
diff --git a/tests/src/test/kotlin/io/jooby/FeaturedKotlinTest.kt b/tests/src/test/kotlin/io/jooby/FeaturedKotlinTest.kt
@@ -3,12 +3,10 @@ package io.jooby
 import io.jooby.internal.mvc.KotlinMvc
 import io.jooby.junit.ServerTest
 import io.jooby.junit.ServerTestRunner
-import io.jooby.netty.Netty
 import io.reactivex.Flowable
 import io.reactivex.schedulers.Schedulers
 import kotlinx.coroutines.delay
 import org.junit.jupiter.api.Assertions.assertEquals
-import org.junit.jupiter.api.Test
 
 class FeaturedKotlinTest {
 
@@ -27,7 +25,7 @@ class FeaturedKotlinTest {
 
   @ServerTest
   fun implicitContext(runner: ServerTestRunner) {
-    runner.define { ->
+    runner.use { ->
       Kooby {
         get("/") {
           ctx.send("Hello World!")
@@ -42,7 +40,7 @@ class FeaturedKotlinTest {
 
   @ServerTest
   fun coroutineNoSuspend(runner: ServerTestRunner) {
-    runner.define { ->
+    runner.use { ->
       Kooby {
         coroutine {
           get {
@@ -59,7 +57,7 @@ class FeaturedKotlinTest {
 
   @ServerTest
   fun coroutineSuspend(runner: ServerTestRunner) {
-    runner.define { ->
+    runner.use { ->
       Kooby {
         coroutine {
           get("/") {
@@ -77,7 +75,7 @@ class FeaturedKotlinTest {
 
   @ServerTest
   fun javaApiWithReactiveType(runner: ServerTestRunner) {
-    runner.define { ->
+    runner.use { ->
       Jooby().apply {
         get("/") {
           println(Thread.currentThread())
@@ -127,7 +125,7 @@ class FeaturedKotlinTest {
 
   @ServerTest
   fun suspendMvc(runner: ServerTestRunner) {
-    runner.define { ->
+    runner.use { ->
       Kooby {
         coroutine {
           mvc(SuspendMvc())
