No effective change - add more tests for javalin

Author: rbygrave

tests/test-javalin/src/main/java/org/example/myapp/Main.java

@@ -9,6 +9,8 @@
 import io.javalin.http.staticfiles.Location;
 import io.swagger.v3.oas.annotations.OpenAPIDefinition;
 import io.swagger.v3.oas.annotations.info.Info;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -18,6 +20,8 @@
 @OpenAPIDefinition(info = @Info(title = "Example service", description = "Example Javalin controllers with Java and Maven"))
 public class Main {
 
+  private static final Logger log = LoggerFactory.getLogger(Main.class);
+
   public static void main(String[] args) {
     start(8082);
   }
@@ -28,13 +32,12 @@ public static Javalin start(int port) {
       config.showJavalinBanner = false;
       config.logIfServerNotStarted = false;
       config.addStaticFiles("public", Location.CLASSPATH);
+      config.accessManager((handler, ctx, permittedRoles) -> {
+        log.debug("allow access ...");
+        handler.handle(ctx);
+      });
     });
 
-//    app.accessManager((handler, ctx, permittedRoles) -> {
-//      //System.out.println("allow access ...");
-//      handler.handle(ctx);
-//    });
-
     app.exception(ValidationException.class, (exception, ctx) -> {
 
       Map<String,Object> map = new LinkedHashMap<>();

tests/test-javalin/src/main/java/org/example/myapp/service/BazRepo.java

@@ -8,11 +8,15 @@
 import java.util.List;
 
 @Singleton
-public class BazRepo implements Repository<Baz,Long> {
+public class BazRepo implements Repository<Baz, Long> {
 
   @Override
   public Baz findById(Long id) {
-    return new Baz();
+    Baz baz = new Baz();
+    baz.id = id;
+    baz.name = "Baz" + id;
+    //baz.startDate = LocalDate.of(2020, 1, 1);
+    return baz;
   }
 
   @Override

tests/test-javalin/src/main/java/org/example/myapp/web/BarController.java

@@ -10,7 +10,10 @@ public class BarController implements BarInterface {
 
   @Override
   public Bar getById(long id) {
-    return new Bar();
+    Bar bar = new Bar();
+    bar.id = id;
+    bar.name = "Rob" + id;
+    return bar;
   }
 
   @Override

tests/test-javalin/src/main/java/org/example/myapp/web/HelloController.java

@@ -17,9 +17,7 @@
 import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
 
-import static java.util.Objects.nonNull;
 import static java.util.Objects.requireNonNull;
 import static org.example.myapp.web.AppRoles.ADMIN;
 
@@ -56,7 +54,6 @@ String getPlainMessage() {
    * @return The Hello DTO given the id and name.
    * @deprecated Please migrate away
    */
-//  @Deprecated
   @Get("/:id/:date")
   HelloDto hello(int id, LocalDate date, String otherParam) {
     return new HelloDto(id, date.toString(), otherParam);

tests/test-javalin/src/test/java/org/example/myapp/BarControllerTest.java

@@ -0,0 +1,43 @@
+package org.example.myapp;
+
+import org.example.myapp.web.Bar;
+import org.junit.jupiter.api.Test;
+
+import static io.restassured.RestAssured.given;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+
+class BarControllerTest extends BaseWebTest {
+
+  @Test
+  void getBars() {
+    given()
+      .get(baseUrl + "/bars")
+      .then()
+      .statusCode(200)
+      .body(equalTo("Hello"));
+  }
+
+  @Test
+  void getById() {
+
+    Bar bar = given()
+      .get(baseUrl + "/bars/53")
+      .then()
+      .statusCode(200)
+      .extract()
+      .as(Bar.class);
+
+    assertThat(bar.id).isEqualTo(53L);
+    assertThat(bar.name).isEqualTo("Rob53");
+  }
+
+  @Test
+  void findByCode() {
+    given()
+      .get(baseUrl + "/bars/find/mycode")
+      .then()
+      .statusCode(200);
+  }
+
+}

tests/test-javalin/src/test/java/org/example/myapp/BazControllerTest.java

@@ -0,0 +1,41 @@
+package org.example.myapp;
+
+import org.example.myapp.web.Baz;
+import org.junit.jupiter.api.Test;
+
+import static io.restassured.RestAssured.given;
+import static org.assertj.core.api.Assertions.assertThat;
+
+class BazControllerTest extends BaseWebTest {
+
+  @Test
+  void findAll() {
+    given()
+      .get(baseUrl + "/baz")
+      .then()
+      .statusCode(200);
+  }
+
+  @Test
+  void findById() {
+
+    Baz baz = given()
+      .get(baseUrl + "/baz/53")
+      .then()
+      .statusCode(200)
+      .extract()
+      .as(Baz.class);
+
+    assertThat(baz.id).isEqualTo(53L);
+    assertThat(baz.name).isEqualTo("Baz53");
+  }
+
+  @Test
+  void searchByName() {
+    given()
+      .get(baseUrl + "/baz/findbyname/mycode")
+      .then()
+      .statusCode(200);
+  }
+
+}

tests/test-javalin/src/test/java/org/example/myapp/ErrorResponse.java

@@ -0,0 +1,27 @@
+package org.example.myapp;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+public class ErrorResponse {
+
+  private String message;
+
+  private Map<String,String> errors = new LinkedHashMap<>();
+
+  public String getMessage() {
+    return message;
+  }
+
+  public void setMessage(String message) {
+    this.message = message;
+  }
+
+  public Map<String, String> getErrors() {
+    return errors;
+  }
+
+  public void setErrors(Map<String, String> errors) {
+    this.errors = errors;
+  }
+}

tests/test-javalin/src/test/java/org/example/myapp/HelloControllerTest.java

@@ -7,12 +7,13 @@
 import org.junit.jupiter.api.Test;
 
 import java.util.List;
+import java.util.Map;
 
 import static io.restassured.RestAssured.get;
 import static io.restassured.RestAssured.given;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.startsWith;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 class HelloControllerTest extends BaseWebTest {
 
@@ -23,13 +24,12 @@ void hello() {
     assertThat(response.statusCode()).isEqualTo(200);
   }
 
-  @SuppressWarnings("unchecked")
   @Test
   void hello2() {
 
-    TypeRef listDto = new TypeRef<List<HelloDto>>() { };
-    final List<HelloDto> beans =
-      (List<HelloDto>)given().get(baseUrl + "/hello")
+    TypeRef<List<HelloDto>> listDto = new TypeRef<List<HelloDto>>() { };
+    final List<HelloDto> beans = given()
+      .get(baseUrl + "/hello")
       .then()
       .statusCode(200)
       .extract()
@@ -38,14 +38,39 @@ void hello2() {
     assertThat(beans).hasSize(2);
   }
 
+  @Test
+  void getWithPathParamAndQueryParam() {
+
+    final HelloDto bean = given()
+      .get(baseUrl + "/hello/43/2020-03-05?otherParam=other")
+      .then()
+      .statusCode(200)
+      .extract()
+      .as(HelloDto.class);
+
+    assertThat(bean.id).isEqualTo(43L);
+    assertThat(bean.name).isEqualTo("2020-03-05");
+    assertThat(bean.otherParam).isEqualTo("other");
+  }
+
   @Test
   void postIt() {
     HelloDto dto = new HelloDto(12, "rob", "other");
 
-    given().body(dto).post(baseUrl + "/savebean/bar")
+    given().body(dto).post(baseUrl + "/hello")
+      .then()
+      .body("id", equalTo(12))
+      .body("name", equalTo("posted"))
+      .body("otherParam", equalTo("other"));
+  }
+
+  @Test
+  void saveBean() {
+    HelloDto dto = new HelloDto(12, "rob", "other");
+
+    given().body(dto).post(baseUrl + "/hello/savebean/foo")
       .then()
-      .body("age", equalTo(45))
-      .body("name", startsWith("testName=hello"));
+      .statusCode(201);
   }
 
   @Test
@@ -60,7 +85,6 @@ void postForm_controller_using_formbean() {
       .post(baseUrl + "/hello/saveform")
       .then()
       .statusCode(201);
-
   }
 
   @Test
@@ -94,6 +118,26 @@ void postForm3_controllerFormBean_responseJsonDto() {
       .statusCode(201);
   }
 
+  @Test
+  void postForm_validation_expect_badRequest() {
+
+    final ErrorResponse res = given().urlEncodingEnabled(true)
+      .param("email", "[email protected]")
+      .param("url", "notAValidUrl")
+      .header("Accept", ContentType.JSON.getAcceptHeader())
+      .post(baseUrl + "/hello/saveform")
+      .then()
+      .statusCode(422)
+      .extract()
+      .as(ErrorResponse.class);
+
+    assertNotNull(res);
+    assertThat(res.getMessage()).contains("failed validation");
+    final Map<String, String> errors = res.getErrors();
+    assertThat(errors.get("url")).isEqualTo("must be a valid URL");
+    assertThat(errors.get("name")).isEqualTo("must not be null");
+  }
+
   @Test
   void delete() {
     given().delete(baseUrl + "/hello/52")