From d586c064fcf0ffe184586bc11c15bc2c2d1ec90d Mon Sep 17 00:00:00 2001 From: Steffen Nitschke Date: Sun, 31 Jan 2021 03:59:12 +0100 Subject: [PATCH] extract getCompleteUser routing to ServerApp --- .../src/main/java/de/fd/fh/ServerApp.java | 1 + .../de/fd/fh/server/user/web/UserController.java | 1 - .../src/test/java/de/fd/fh/ServerAppTest.java | 15 +++++++++++++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/fh.fd.ci.server/src/main/java/de/fd/fh/ServerApp.java b/fh.fd.ci.server/src/main/java/de/fd/fh/ServerApp.java index 62dfd47..bb152ed 100644 --- a/fh.fd.ci.server/src/main/java/de/fd/fh/ServerApp.java +++ b/fh.fd.ci.server/src/main/java/de/fd/fh/ServerApp.java @@ -47,6 +47,7 @@ public class ServerApp delete("/accounts/:player_id", accessController::deletePlayer); post("/users", userController::updateUser); + get("/users", userController::getCompleteUser); get("/hello", (req, res) -> "Hello World"); diff --git a/fh.fd.ci.server/src/main/java/de/fd/fh/server/user/web/UserController.java b/fh.fd.ci.server/src/main/java/de/fd/fh/server/user/web/UserController.java index 016475b..5fffc37 100644 --- a/fh.fd.ci.server/src/main/java/de/fd/fh/server/user/web/UserController.java +++ b/fh.fd.ci.server/src/main/java/de/fd/fh/server/user/web/UserController.java @@ -92,7 +92,6 @@ public class UserController public UserController(final UserService service) { this.service = service; - post("/users", this::getCompleteUser); get("/users/:user_id", this::getUser); } diff --git a/fh.fd.ci.server/src/test/java/de/fd/fh/ServerAppTest.java b/fh.fd.ci.server/src/test/java/de/fd/fh/ServerAppTest.java index 962bf54..b41b23d 100644 --- a/fh.fd.ci.server/src/test/java/de/fd/fh/ServerAppTest.java +++ b/fh.fd.ci.server/src/test/java/de/fd/fh/ServerAppTest.java @@ -133,4 +133,19 @@ class ServerAppTest assertEquals(200, res.getStatus()); then(userController).should().updateUser(any(), any()); } + + @Test + void getPlayers() throws JsonProcessingException + { + when(userController.getCompleteUser(any(), any())).thenReturn(mock(Response.class)); + + String url = "/users"; + + ApiTestUtils.TestResponse res = new ApiTestUtils() + .request("GET", url, null, null, String.class); + + assertNotNull(res); + assertEquals(200, res.getStatus()); + then(userController).should().getCompleteUser(any(), any()); + } } \ No newline at end of file