From 893688c26060d6c1b69df383ca4a43686253f98e Mon Sep 17 00:00:00 2001 From: Daniel Fiala Date: Mon, 31 Jul 2023 22:46:55 +0200 Subject: [PATCH] enhancement(test): enhanced tests --- .../java/dev/shiperist/AuthResourceTest.java | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/server/src/test/java/dev/shiperist/AuthResourceTest.java b/server/src/test/java/dev/shiperist/AuthResourceTest.java index 5da6443..835aba7 100644 --- a/server/src/test/java/dev/shiperist/AuthResourceTest.java +++ b/server/src/test/java/dev/shiperist/AuthResourceTest.java @@ -5,11 +5,8 @@ import io.restassured.http.ContentType; import org.instancio.Instancio; import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; -import java.util.UUID; - import static io.restassured.RestAssured.given; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.notNullValue; @@ -23,7 +20,10 @@ class AuthResourceTest { @BeforeEach public void setUp() { user = Instancio.of(User.class) - .generate(field(User::getName, gen -> gen.name().fullName())) + .generate(field(User::getName), gen -> gen.text().uuid()) + .generate(field(User::getEmail), gen -> gen.text().pattern("[a-z]{5}@test.com")) + .generate(field(User::getImage), gen -> gen.net().url()) + .generate(field(User::getPassword), gen -> gen.text().uuid()) .create(); } @@ -38,29 +38,29 @@ public void testGetSettings() { public void testSignUp() { given() .contentType(ContentType.JSON) - .body(USER) + .body(user) .when().post("/auth/signup") .then().statusCode(200) - .body("name", equalTo(USER.getName()), - "email", equalTo(USER.getEmail()), - "image", equalTo(USER.getImage())); + .body("name", equalTo(user.getName()), + "email", equalTo(user.getEmail()), + "image", equalTo(user.getImage())); } @Test public void testToken() { given() .contentType(ContentType.JSON) - .body(USER) + .body(user) .when().post("/auth/signup") .then().statusCode(200) - .body("name", equalTo(USER.getName()), - "email", equalTo(USER.getEmail()), - "image", equalTo(USER.getImage())); + .body("name", equalTo(user.getName()), + "email", equalTo(user.getEmail()), + "image", equalTo(user.getImage())); given() .formParam("grant_type", "password") - .formParam("email", USER.getEmail()) - .formParam("password", USER.getPassword()) + .formParam("email", user.getEmail()) + .formParam("password", user.getPassword()) .when().post("/auth/token") .then().statusCode(200) .body("accessToken", notNullValue(),