Feature: unit testing and integration testing fix #579

Author: jknack

coverage-report/pom.xml

@@ -667,7 +667,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <scope>test</scope>
+      <optional>true</optional>
     </dependency>
 
     <dependency>

gource.mp4

@@ -45,25 +45,10 @@
     </dependency>
 
     <dependency>
-      <groupId>org.jooby</groupId>
-      <artifactId>jooby</artifactId>
-      <scope>test</scope>
-      <classifier>tests</classifier>
-    </dependency>
-
-    <!-- Fluent HC -->
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>fluent-hc</artifactId>
+      <groupId>io.rest-assured</groupId>
+      <artifactId>rest-assured</artifactId>
       <scope>test</scope>
     </dependency>
-
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpmime</artifactId>
-      <scope>test</scope>
-    </dependency>
-
   </dependencies>
 
   <build>

jooby-archetype/src/main/resources/archetype-resources/pom.xml

@@ -1,17 +1,42 @@
 package ${package};
 
+import static io.restassured.RestAssured.get;
+import static org.hamcrest.Matchers.equalTo;
+import static org.junit.Assert.assertEquals;
+
+import org.jooby.test.JoobyRule;
+import org.jooby.test.MockRouter;
+import org.junit.ClassRule;
 import org.junit.Test;
 
 /**
  * @author jooby generator
  */
-public class AppTest extends BaseTest {
+public class AppTest {
+
+  /**
+   * One app/server for all the test of this class. If you want to start/stop a new server per test,
+   * remove the static modifier and replace the {@link ClassRule} annotation with {@link Rule}.
+   */
+  @ClassRule
+  public static JoobyRule app = new JoobyRule(new App());
+
+  @Test
+  public void integrationTest() {
+    get("/")
+        .then()
+        .assertThat()
+        .body(equalTo("Hello World!"))
+        .statusCode(200)
+        .contentType("text/html;charset=UTF-8");
+  }
 
   @Test
-  public void index() throws Exception {
-    server.get("/")
-        .expect(200)
-        .header("Content-Type", "text/html;charset=UTF-8");
+  public void unitTest() throws Throwable {
+    String result = new MockRouter(new App())
+        .get("/");
+
+    assertEquals("Hello World!", result);
   }
 
 }

jooby-archetype/src/main/resources/archetype-resources/src/test/java/AppTest.java

@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
 package org.jooby.thymeleaf;
 
 import static java.util.Objects.requireNonNull;

jooby-archetype/src/main/resources/archetype-resources/src/test/java/BaseTest.java

@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
 package org.jooby.thymeleaf;
 
 import java.io.FileNotFoundException;

jooby-thymeleaf/src/main/java/org/jooby/thymeleaf/Thl.java

@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
 package org.jooby.thymeleaf;
 
 import org.jooby.Env;

jooby-thymeleaf/src/main/java/org/jooby/thymeleaf/ThlEngine.java

@@ -135,7 +135,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <scope>test</scope>
+      <optional>true</optional>
     </dependency>
 
     <dependency>

jooby-thymeleaf/src/main/java/org/jooby/thymeleaf/Thlxss.java

@@ -287,6 +287,7 @@ public void resolve(final Object value) {
     } else {
       Result result;
       if (value instanceof Result) {
+        super.set(value);
         result = (Result) value;
       } else {
         super.set(value);
@@ -303,6 +304,7 @@ public void resolve(final Object value) {
    * @param cause A value for this deferred.
    */
   public void reject(final Throwable cause) {
+    super.set(cause);
     handler.handle(null, cause);
   }