move unit test support to his own project

jknack · jknack · commit 5427f9cd90b3 · 2019-04-14T17:45:41.000-03:00
diff --git a/jooby/pom.xml b/jooby/pom.xml
@@ -110,28 +110,6 @@
         </executions>
       </plugin>
 
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <executions>
-          <execution>
-            <goals>
-              <goal>test-jar</goal>
-            </goals>
-            <configuration>
-              <includes>
-                <include>io/jooby/*</include>
-              </includes>
-              <excludes>
-                <exclude>**/*Test.*</exclude>
-                <exclude>**/*Test$*.*</exclude>
-                <exclude>**/internal</exclude>
-              </excludes>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
       <!-- sure-fire -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -263,6 +241,12 @@
       <artifactId>logback-classic</artifactId>
       <scope>test</scope>
     </dependency>
+
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
 </project>
diff --git a/jooby/src/test/java/io/jooby/internal/ChiTest.java b/jooby/src/test/java/io/jooby/internal/ChiTest.java
@@ -1,7 +1,8 @@
 package io.jooby.internal;
 
+import static org.mockito.Mockito.mock;
+
 import io.jooby.Context;
-import io.jooby.MockContext;
 import io.jooby.Renderer;
 import io.jooby.Route;
 import io.jooby.Throwing;
@@ -11,6 +12,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.when;
 
 public class ChiTest {
 
@@ -23,12 +25,19 @@ public void routeOverride() {
     router.insert(bar);
 
     RouterMatch result = router
-        .find(new MockContext().setPathString("/abcd"), Renderer.TO_STRING,
+        .find(ctx("/abcd"), Renderer.TO_STRING,
             Collections.emptyList());
     assertTrue(result.matches);
     assertEquals(bar, result.route());
   }
 
+  private Context ctx(String path) {
+    Context context = mock(Context.class);
+    when(context.pathString()).thenReturn(path);
+    when(context.getMethod()).thenReturn("GET");
+    return context;
+  }
+
   @Test
   public void routeCase() {
     $Chi router = new $Chi();
@@ -39,7 +48,7 @@ public void routeCase() {
     router.insert(foos);
 
     RouterMatch result = router
-        .find(new MockContext().setPathString("/abcd/"), Renderer.TO_STRING,
+        .find(ctx("/abcd/"), Renderer.TO_STRING,
             Collections.emptyList());
     assertTrue(result.matches);
     assertEquals(foos, result.route());
@@ -73,8 +82,9 @@ public void wildOnRoot() throws Exception {
     });
   }
 
-  private void find($Chi router, String pattern, Throwing.Consumer2<Context, RouterMatch> consumer) {
-    Context rootctx = new MockContext().setPathString(pattern);
+  private void find($Chi router, String pattern,
+      Throwing.Consumer2<Context, RouterMatch> consumer) {
+    Context rootctx = ctx(pattern);
     RouterMatch result = router
         .find(rootctx, Renderer.TO_STRING, Collections.emptyList());
     consumer.accept(rootctx, result);
diff --git a/modules/jooby-freemarker/pom.xml b/modules/jooby-freemarker/pom.xml
@@ -53,9 +53,8 @@
 
     <dependency>
       <groupId>io.jooby</groupId>
-      <artifactId>jooby</artifactId>
+      <artifactId>jooby-test</artifactId>
       <version>${jooby.version}</version>
-      <classifier>tests</classifier>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/modules/jooby-guice/pom.xml b/modules/jooby-guice/pom.xml
@@ -44,19 +44,5 @@
       <classifier>runtime</classifier>
       <scope>test</scope>
     </dependency>
-
-    <dependency>
-      <groupId>com.squareup.okhttp3</groupId>
-      <artifactId>okhttp</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>io.jooby</groupId>
-      <artifactId>jooby</artifactId>
-      <version>${jooby.version}</version>
-      <classifier>tests</classifier>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 </project>
diff --git a/modules/jooby-handlebars/pom.xml b/modules/jooby-handlebars/pom.xml
@@ -53,9 +53,7 @@
 
     <dependency>
       <groupId>io.jooby</groupId>
-      <artifactId>jooby</artifactId>
-      <version>${jooby.version}</version>
-      <classifier>tests</classifier>
+      <artifactId>jooby-test</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/modules/jooby-hikari/pom.xml b/modules/jooby-hikari/pom.xml
@@ -64,13 +64,5 @@
       <artifactId>log4jdbc</artifactId>
       <scope>test</scope>
     </dependency>
-
-    <dependency>
-      <groupId>io.jooby</groupId>
-      <artifactId>jooby</artifactId>
-      <version>${jooby.version}</version>
-      <classifier>tests</classifier>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 </project>
diff --git a/modules/jooby-jackson/pom.xml b/modules/jooby-jackson/pom.xml
@@ -72,10 +72,8 @@
     </dependency>
 
     <dependency>
-      <groupId>io.jooby</groupId>
-      <artifactId>jooby</artifactId>
-      <version>${jooby.version}</version>
-      <classifier>tests</classifier>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/modules/jooby-jackson/src/test/java/io/jooby/json/JacksonTest.java b/modules/jooby-jackson/src/test/java/io/jooby/json/JacksonTest.java
@@ -1,33 +1,44 @@
 package io.jooby.json;
 
-import io.jooby.MockContext;
+import io.jooby.Body;
+import io.jooby.Context;
+import io.jooby.MediaType;
 import org.junit.jupiter.api.Test;
 
 import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Map;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 public class JacksonTest {
 
   @Test
   public void render() throws Exception {
+    Context ctx = mock(Context.class);
+
     Jackson jackson = new Jackson();
-    MockContext ctx = new MockContext();
-    byte [] bytes = jackson.render(ctx, mapOf("k", "v"));
+
+    byte[] bytes = jackson.render(ctx, mapOf("k", "v"));
     assertEquals("{\"k\":\"v\"}", new String(bytes, StandardCharsets.UTF_8));
-    /** Type: */
-    assertEquals("application/json", ctx.getResponseContentType().getValue());
-    assertEquals("utf-8", ctx.getResponseCharset().name().toLowerCase());
+
+    verify(ctx).setDefaultContentType(MediaType.json);
   }
 
   @Test
   public void parse() throws Exception {
+    byte[] bytes = "{\"k\":\"v\"}".getBytes(StandardCharsets.UTF_8);
+    Body body = mock(Body.class);
+    when(body.isInMemory()).thenReturn(true);
+    when(body.bytes()).thenReturn(bytes);
+
+    Context ctx = mock(Context.class);
+    when(ctx.body()).thenReturn(body);
+
     Jackson jackson = new Jackson();
-    MockContext ctx = new MockContext();
-    ctx.setBody("{\"k\":\"v\"}".getBytes(StandardCharsets.UTF_8));
 
     Map<String, String> result = jackson.parse(ctx, Map.class);
     assertEquals(mapOf("k", "v"), result);
diff --git a/modules/jooby-rocker/pom.xml b/modules/jooby-rocker/pom.xml
@@ -58,13 +58,5 @@
       <artifactId>okhttp</artifactId>
       <scope>test</scope>
     </dependency>
-
-    <dependency>
-      <groupId>io.jooby</groupId>
-      <artifactId>jooby</artifactId>
-      <version>${jooby.version}</version>
-      <classifier>tests</classifier>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 </project>
diff --git a/modules/jooby-spring/pom.xml b/modules/jooby-spring/pom.xml
@@ -51,12 +51,5 @@
       <scope>test</scope>
     </dependency>
 
-    <dependency>
-      <groupId>io.jooby</groupId>
-      <artifactId>jooby</artifactId>
-      <version>${jooby.version}</version>
-      <classifier>tests</classifier>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 </project>
diff --git a/modules/jooby-test/pom.xml b/modules/jooby-test/pom.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <parent>
+    <groupId>io.jooby</groupId>
+    <artifactId>modules</artifactId>
+    <version>2.0.0.M2</version>
+  </parent>
+
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>jooby-test</artifactId>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.google.code.findbugs</groupId>
+      <artifactId>jsr305</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>io.jooby</groupId>
+      <artifactId>jooby</artifactId>
+      <version>${jooby.version}</version>
+    </dependency>
+
+    <!-- Test dependencies -->
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.jacoco</groupId>
+      <artifactId>org.jacoco.agent</artifactId>
+      <classifier>runtime</classifier>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>com.squareup.okhttp3</groupId>
+      <artifactId>okhttp</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/modules/jooby-test/src/main/java/io/jooby/MockContext.java b/modules/jooby-test/src/main/java/io/jooby/MockContext.java
@@ -1,3 +1,18 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Copyright 2014 Edgar Espina
+ */
 package io.jooby;
 
 import io.jooby.internal.UrlParser;
diff --git a/modules/jooby-test/src/main/java/io/jooby/MockResponse.java b/modules/jooby-test/src/main/java/io/jooby/MockResponse.java
@@ -23,7 +23,7 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-public class Result {
+public class MockResponse {
 
   private final Object value;
 
@@ -37,7 +37,7 @@ public class Result {
 
   private long length = -1;
 
-  public Result(Object value, StatusCode statusCode) {
+  public MockResponse(Object value, StatusCode statusCode) {
     this.value = value;
     this.statusCode = statusCode;
   }
@@ -46,12 +46,12 @@ public Result(Object value, StatusCode statusCode) {
     return headers == null ? Collections.emptyMap() : Collections.unmodifiableMap(headers);
   }
 
-  public @Nonnull Result headers(@Nonnull Map<String, String> headers) {
+  public @Nonnull MockResponse headers(@Nonnull Map<String, String> headers) {
     headers.forEach(this::header);
     return this;
   }
 
-  public @Nonnull Result header(@Nonnull String name, @Nonnull String value) {
+  public @Nonnull MockResponse header(@Nonnull String name, @Nonnull String value) {
     if ("content-type".equalsIgnoreCase(name)) {
       setContentType(MediaType.valueOf(value));
     } else if ("content-length".equalsIgnoreCase(name)) {
@@ -66,11 +66,11 @@ public Result(Object value, StatusCode statusCode) {
     return contentType == null ? MediaType.text : contentType;
   }
 
-  public @Nonnull Result setContentType(@Nonnull MediaType contentType) {
+  public @Nonnull MockResponse setContentType(@Nonnull MediaType contentType) {
     return setContentType(contentType, contentType.getCharset());
   }
 
-  public @Nonnull Result setContentType(@Nonnull MediaType contentType, @Nullable Charset charset) {
+  public @Nonnull MockResponse setContentType(@Nonnull MediaType contentType, @Nullable Charset charset) {
     this.contentType = contentType;
     this.charset = charset;
     headers.put("content-type", contentType.toContentTypeHeader(charset));
@@ -85,7 +85,7 @@ public long getContentLength() {
     return length;
   }
 
-  public Result setContentLength(long length) {
+  public MockResponse setContentLength(long length) {
     this.length = length;
     headers.put("content-length", Long.toString(length));
     return this;
diff --git a/modules/jooby-test/src/main/java/io/jooby/MockRouter.java b/modules/jooby-test/src/main/java/io/jooby/MockRouter.java
diff --git a/modules/jooby-test/src/test/java/io/jooby/UnitTest.java b/modules/jooby-test/src/test/java/io/jooby/UnitTest.java
diff --git a/modules/jooby-weld/pom.xml b/modules/jooby-weld/pom.xml
diff --git a/modules/pom.xml b/modules/pom.xml
diff --git a/pom.xml b/pom.xml
