diff --git a/src/test/java/io/github/mfaisalkhatri/api/manager/RequestManager.java b/src/test/java/io/github/mfaisalkhatri/api/manager/RequestManager.java index d430399..8856b78 100644 --- a/src/test/java/io/github/mfaisalkhatri/api/manager/RequestManager.java +++ b/src/test/java/io/github/mfaisalkhatri/api/manager/RequestManager.java @@ -14,67 +14,67 @@ **/ public class RequestManager { - private Playwright playwright; + private Playwright playwright; private APIRequestContext apiRequestContext; - public void createPlaywright () { - playwright = Playwright.create (); + public void createPlaywright() { + playwright = Playwright.create(); } - public void setApiRequestContext (String baseUrl, Map headers) { - apiRequestContext = playwright.request () - .newContext (new APIRequest.NewContextOptions ().setBaseURL (baseUrl) - .setExtraHTTPHeaders (headers)); + public void setApiRequestContext(String baseUrl, Map headers) { + apiRequestContext = playwright.request() + .newContext(new APIRequest.NewContextOptions().setBaseURL(baseUrl) + .setExtraHTTPHeaders(headers)); } - public APIResponse getRequest (String endpoint) { - return apiRequestContext.get (endpoint); + public APIResponse getRequest(String endpoint) { + return apiRequestContext.get(endpoint); } - public APIResponse getRequest (String endpoint, RequestOptions options) { - return apiRequestContext.get (endpoint, options); + public APIResponse getRequest(String endpoint, RequestOptions options) { + return apiRequestContext.get(endpoint, options); } - public APIResponse postRequest (String endpoint) { - return apiRequestContext.post (endpoint); + public APIResponse postRequest(String endpoint) { + return apiRequestContext.post(endpoint); } - public APIResponse postRequest (String endpoint, RequestOptions options) { - return apiRequestContext.post (endpoint, options); + public APIResponse postRequest(String endpoint, RequestOptions options) { + return apiRequestContext.post(endpoint, options); } - public APIResponse putRequest (String endpoint) { - return apiRequestContext.put (endpoint); + public APIResponse putRequest(String endpoint) { + return apiRequestContext.put(endpoint); } - public APIResponse putRequest (String endpoint, RequestOptions options) { - return apiRequestContext.put (endpoint, options); + public APIResponse putRequest(String endpoint, RequestOptions options) { + return apiRequestContext.put(endpoint, options); } - public APIResponse patchRequest (String endpoint) { - return apiRequestContext.patch (endpoint); + public APIResponse patchRequest(String endpoint) { + return apiRequestContext.patch(endpoint); } - public APIResponse patchRequest (String endpoint, RequestOptions options) { - return apiRequestContext.patch (endpoint, options); + public APIResponse patchRequest(String endpoint, RequestOptions options) { + return apiRequestContext.patch(endpoint, options); } - public APIResponse deleteRequest (String endpoint) { - return apiRequestContext.delete (endpoint); + public APIResponse deleteRequest(String endpoint) { + return apiRequestContext.delete(endpoint); } - public APIResponse deleteRequest (String endpoint, RequestOptions options) { - return apiRequestContext.delete (endpoint, options); + public APIResponse deleteRequest(String endpoint, RequestOptions options) { + return apiRequestContext.delete(endpoint, options); } - public void disposeAPIRequestContext () { - apiRequestContext.dispose (); + public void disposeAPIRequestContext() { + apiRequestContext.dispose(); } - public void closePlaywright () { - playwright.close (); + public void closePlaywright() { + playwright.close(); } } diff --git a/src/test/java/io/github/mfaisalkhatri/api/reqres/data/EmployeeDataBuilder.java b/src/test/java/io/github/mfaisalkhatri/api/reqres/data/EmployeeDataBuilder.java index 65f8db4..5a10b44 100644 --- a/src/test/java/io/github/mfaisalkhatri/api/reqres/data/EmployeeDataBuilder.java +++ b/src/test/java/io/github/mfaisalkhatri/api/reqres/data/EmployeeDataBuilder.java @@ -8,14 +8,14 @@ **/ public class EmployeeDataBuilder { - public static EmployeeData getEmployeeData () { - Faker faker = new Faker (); - return EmployeeData.builder () - .name (faker.name () - .firstName ()) - .job (faker.job () - .title ()) - .build (); + public static EmployeeData getEmployeeData() { + Faker faker = new Faker(); + return EmployeeData.builder() + .name(faker.name() + .firstName()) + .job(faker.job() + .title()) + .build(); } } diff --git a/src/test/java/io/github/mfaisalkhatri/api/reqres/tests/ApiTests.java b/src/test/java/io/github/mfaisalkhatri/api/reqres/tests/ApiTests.java index 0ef9b28..96cda77 100644 --- a/src/test/java/io/github/mfaisalkhatri/api/reqres/tests/ApiTests.java +++ b/src/test/java/io/github/mfaisalkhatri/api/reqres/tests/ApiTests.java @@ -16,64 +16,64 @@ **/ public class ApiTests extends BaseTest { @Test - public void testGetAPI () { - APIResponse response = manager.getRequest ("/api/users/4"); - assertEquals (response.status (), 200); + public void testGetAPI() { + APIResponse response = manager.getRequest("/api/users/4"); + assertEquals(response.status(), 200); - JSONObject jsonObject = new JSONObject (response.text ()); - JSONObject dataObject = jsonObject.getJSONObject ("data"); + JSONObject jsonObject = new JSONObject(response.text()); + JSONObject dataObject = jsonObject.getJSONObject("data"); - assertEquals (dataObject.get ("email") - .toString (), "eve.holt@reqres.in"); - assertEquals (dataObject.get ("first_name") - .toString (), "Eve"); + assertEquals(dataObject.get("email") + .toString(), "eve.holt@reqres.in"); + assertEquals(dataObject.get("first_name") + .toString(), "Eve"); } @Test - public void testPostAPI () { - EmployeeData employeeData = getEmployeeData (); - APIResponse response = manager.postRequest ("/api/users", RequestOptions.create () - .setData (employeeData)); - assertEquals (response.status (), 201); + public void testPostAPI() { + EmployeeData employeeData = getEmployeeData(); + APIResponse response = manager.postRequest("/api/users", RequestOptions.create() + .setData(employeeData)); + assertEquals(response.status(), 201); - JSONObject jsonObject = new JSONObject (response.text ()); - assertNotNull (jsonObject.get ("id")); - assertEquals (jsonObject.get ("name"), employeeData.getName ()); - assertEquals (jsonObject.get ("job"), employeeData.getJob ()); + JSONObject jsonObject = new JSONObject(response.text()); + assertNotNull(jsonObject.get("id")); + assertEquals(jsonObject.get("name"), employeeData.getName()); + assertEquals(jsonObject.get("job"), employeeData.getJob()); } @Test - public void testPutAPI () { - EmployeeData employeeData = getEmployeeData (); - APIResponse response = manager.putRequest ("/api/users/2", RequestOptions.create () - .setData (employeeData)); - assertEquals (response.status (), 200); + public void testPutAPI() { + EmployeeData employeeData = getEmployeeData(); + APIResponse response = manager.putRequest("/api/users/2", RequestOptions.create() + .setData(employeeData)); + assertEquals(response.status(), 200); - JSONObject jsonObject = new JSONObject (response.text ()); - assertNotNull (jsonObject.get ("updatedAt")); - assertEquals (jsonObject.get ("name"), employeeData.getName ()); - assertEquals (jsonObject.get ("job"), employeeData.getJob ()); + JSONObject jsonObject = new JSONObject(response.text()); + assertNotNull(jsonObject.get("updatedAt")); + assertEquals(jsonObject.get("name"), employeeData.getName()); + assertEquals(jsonObject.get("job"), employeeData.getJob()); } @Test - public void testPatchAPI () { - EmployeeData employeeData = getEmployeeData (); - APIResponse response = manager.patchRequest ("/api/users/2", RequestOptions.create () - .setData (employeeData)); - assertEquals (response.status (), 200); + public void testPatchAPI() { + EmployeeData employeeData = getEmployeeData(); + APIResponse response = manager.patchRequest("/api/users/2", RequestOptions.create() + .setData(employeeData)); + assertEquals(response.status(), 200); - JSONObject jsonObject = new JSONObject (response.text ()); - assertNotNull (jsonObject.get ("updatedAt")); - assertEquals (jsonObject.get ("name"), employeeData.getName ()); - assertEquals (jsonObject.get ("job"), employeeData.getJob ()); + JSONObject jsonObject = new JSONObject(response.text()); + assertNotNull(jsonObject.get("updatedAt")); + assertEquals(jsonObject.get("name"), employeeData.getName()); + assertEquals(jsonObject.get("job"), employeeData.getJob()); } @Test - public void testDeleteAPI () { - EmployeeData employeeData = getEmployeeData (); - APIResponse response = manager.deleteRequest ("/api/users/2", RequestOptions.create () - .setData (employeeData)); - assertEquals (response.status (), 204); + public void testDeleteAPI() { + EmployeeData employeeData = getEmployeeData(); + APIResponse response = manager.deleteRequest("/api/users/2", RequestOptions.create() + .setData(employeeData)); + assertEquals(response.status(), 204); } } diff --git a/src/test/java/io/github/mfaisalkhatri/api/reqres/tests/BaseTest.java b/src/test/java/io/github/mfaisalkhatri/api/reqres/tests/BaseTest.java index 6567451..a2377fb 100644 --- a/src/test/java/io/github/mfaisalkhatri/api/reqres/tests/BaseTest.java +++ b/src/test/java/io/github/mfaisalkhatri/api/reqres/tests/BaseTest.java @@ -16,18 +16,18 @@ public class BaseTest { protected RequestManager manager; @BeforeClass - public void setup () { - manager = new RequestManager (); - manager.createPlaywright (); + public void setup() { + manager = new RequestManager(); + manager.createPlaywright(); String baseUrl = "https://reqres.in"; - Map headers = new HashMap<> (); - headers.put ("content-type", "application/json"); - manager.setApiRequestContext (baseUrl, headers); + Map headers = new HashMap<>(); + headers.put("content-type", "application/json"); + manager.setApiRequestContext(baseUrl, headers); } @AfterClass - public void tearDown () { - manager.disposeAPIRequestContext (); - manager.closePlaywright (); + public void tearDown() { + manager.disposeAPIRequestContext(); + manager.closePlaywright(); } } diff --git a/src/test/java/io/github/mfaisalkhatri/api/restfulbooker/data/BookingData.java b/src/test/java/io/github/mfaisalkhatri/api/restfulbooker/data/BookingData.java index 8467f97..903723e 100644 --- a/src/test/java/io/github/mfaisalkhatri/api/restfulbooker/data/BookingData.java +++ b/src/test/java/io/github/mfaisalkhatri/api/restfulbooker/data/BookingData.java @@ -10,11 +10,11 @@ @Getter @Builder public class BookingData { - private String firstname; - private String lastname; - private int totalprice; + private String firstname; + private String lastname; + private int totalprice; private boolean depositpaid; private BookingDates bookingdates; - private String additionalneeds; + private String additionalneeds; } diff --git a/src/test/java/io/github/mfaisalkhatri/api/restfulbooker/data/BookingDataBuilder.java b/src/test/java/io/github/mfaisalkhatri/api/restfulbooker/data/BookingDataBuilder.java index a7e2dfb..c958b98 100644 --- a/src/test/java/io/github/mfaisalkhatri/api/restfulbooker/data/BookingDataBuilder.java +++ b/src/test/java/io/github/mfaisalkhatri/api/restfulbooker/data/BookingDataBuilder.java @@ -11,35 +11,35 @@ **/ public class BookingDataBuilder { - private static final Faker FAKER = new Faker (); + private static final Faker FAKER = new Faker(); - public static BookingData getBookingData () { - SimpleDateFormat formatter = new SimpleDateFormat ("YYYY-MM-dd"); - return BookingData.builder () - .firstname (FAKER.name () - .firstName ()) - .lastname (FAKER.name () - .lastName ()) - .totalprice (FAKER.number () - .numberBetween (1, 2000)) - .depositpaid (true) - .bookingdates (BookingDates.builder () - .checkin (formatter.format (FAKER.date () - .past (20, TimeUnit.DAYS))) - .checkout (formatter.format (FAKER.date () - .future (5, TimeUnit.DAYS))) - .build ()) - .additionalneeds ("Breakfast") - .build (); + public static BookingData getBookingData() { + SimpleDateFormat formatter = new SimpleDateFormat("YYYY-MM-dd"); + return BookingData.builder() + .firstname(FAKER.name() + .firstName()) + .lastname(FAKER.name() + .lastName()) + .totalprice(FAKER.number() + .numberBetween(1, 2000)) + .depositpaid(true) + .bookingdates(BookingDates.builder() + .checkin(formatter.format(FAKER.date() + .past(20, TimeUnit.DAYS))) + .checkout(formatter.format(FAKER.date() + .future(5, TimeUnit.DAYS))) + .build()) + .additionalneeds("Breakfast") + .build(); } - public static PartialBookingData getPartialBookingData () { - return PartialBookingData.builder () - .firstname (FAKER.name () - .firstName ()) - .totalprice (FAKER.number () - .numberBetween (100, 5000)) - .build (); + public static PartialBookingData getPartialBookingData() { + return PartialBookingData.builder() + .firstname(FAKER.name() + .firstName()) + .totalprice(FAKER.number() + .numberBetween(100, 5000)) + .build(); } } diff --git a/src/test/java/io/github/mfaisalkhatri/api/restfulbooker/data/PartialBookingData.java b/src/test/java/io/github/mfaisalkhatri/api/restfulbooker/data/PartialBookingData.java index 4144c56..e535e0d 100644 --- a/src/test/java/io/github/mfaisalkhatri/api/restfulbooker/data/PartialBookingData.java +++ b/src/test/java/io/github/mfaisalkhatri/api/restfulbooker/data/PartialBookingData.java @@ -11,5 +11,5 @@ @Builder public class PartialBookingData { String firstname; - int totalprice; + int totalprice; } \ No newline at end of file diff --git a/src/test/java/io/github/mfaisalkhatri/api/restfulbooker/data/TokenBuilder.java b/src/test/java/io/github/mfaisalkhatri/api/restfulbooker/data/TokenBuilder.java index cbfc51c..d8e9e1f 100644 --- a/src/test/java/io/github/mfaisalkhatri/api/restfulbooker/data/TokenBuilder.java +++ b/src/test/java/io/github/mfaisalkhatri/api/restfulbooker/data/TokenBuilder.java @@ -6,10 +6,10 @@ **/ public class TokenBuilder { - public static Tokencreds getToken () { - return Tokencreds.builder () - .username ("admin") - .password ("password123") - .build (); + public static Tokencreds getToken() { + return Tokencreds.builder() + .username("admin") + .password("password123") + .build(); } } \ No newline at end of file diff --git a/src/test/java/io/github/mfaisalkhatri/api/restfulbooker/tests/BaseTest.java b/src/test/java/io/github/mfaisalkhatri/api/restfulbooker/tests/BaseTest.java index 5f8294b..42678da 100644 --- a/src/test/java/io/github/mfaisalkhatri/api/restfulbooker/tests/BaseTest.java +++ b/src/test/java/io/github/mfaisalkhatri/api/restfulbooker/tests/BaseTest.java @@ -16,19 +16,19 @@ public class BaseTest { protected RequestManager manager; @BeforeTest - public void setupBase () { - manager = new RequestManager (); - manager.createPlaywright (); + public void setupBase() { + manager = new RequestManager(); + manager.createPlaywright(); final String baseUrl = "http://localhost:3001"; - Map headers = new HashMap<> (); - headers.put ("content-type", "application/json"); - headers.put ("Accept", "application/json"); - manager.setApiRequestContext (baseUrl, headers); + Map headers = new HashMap<>(); + headers.put("content-type", "application/json"); + headers.put("Accept", "application/json"); + manager.setApiRequestContext(baseUrl, headers); } @AfterTest - public void tearDown () { - manager.disposeAPIRequestContext (); - manager.closePlaywright (); + public void tearDown() { + manager.disposeAPIRequestContext(); + manager.closePlaywright(); } } diff --git a/src/test/java/io/github/mfaisalkhatri/api/restfulbooker/tests/RestfulBookerEndToEndTests.java b/src/test/java/io/github/mfaisalkhatri/api/restfulbooker/tests/RestfulBookerEndToEndTests.java index 38df2c3..16e3ceb 100644 --- a/src/test/java/io/github/mfaisalkhatri/api/restfulbooker/tests/RestfulBookerEndToEndTests.java +++ b/src/test/java/io/github/mfaisalkhatri/api/restfulbooker/tests/RestfulBookerEndToEndTests.java @@ -21,101 +21,102 @@ **/ public class RestfulBookerEndToEndTests extends BaseTest { - private int bookingId; + private int bookingId; private BookingData bookingData; - private String token; + private String token; @BeforeClass - public void setupTest () { - bookingData = getBookingData (); + public void setupTest() { + bookingData = getBookingData(); } @Test - public void createBookingTest () { - APIResponse response = manager.postRequest ("/booking", RequestOptions.create () - .setData (bookingData)); + public void createBookingTest() { + APIResponse response = manager.postRequest("/booking", RequestOptions.create() + .setData(bookingData)); - JSONObject responseObject = new JSONObject (response.text ()); - JSONObject bookingObject = responseObject.getJSONObject ("booking"); - JSONObject bookingDatesObject = bookingObject.getJSONObject ("bookingdates"); + assertEquals(response.status(), 200); + JSONObject responseObject = new JSONObject(response.text()); assertNotNull(responseObject.get("bookingid")); - assertEquals (response.status (), 200); - assertEquals (bookingData.getFirstname (), bookingObject.get ("firstname")); - assertEquals (bookingData.getBookingdates () - .getCheckin (), bookingDatesObject.get ("checkin")); - bookingId = responseObject.getInt ("bookingid"); + JSONObject bookingObject = responseObject.getJSONObject("booking"); + JSONObject bookingDatesObject = bookingObject.getJSONObject("bookingdates"); + assertEquals(bookingData.getFirstname(), bookingObject.get("firstname")); + assertEquals(bookingData.getBookingdates() + .getCheckin(), bookingDatesObject.get("checkin")); + bookingId = responseObject.getInt("bookingid"); } @Test - public void getBookingTest () { - APIResponse response = manager.getRequest ("/booking/" + bookingId); - assertEquals (response.status (), 200); + public void getBookingTest() { + APIResponse response = manager.getRequest("/booking/" + bookingId); + assertEquals(response.status(), 200); - JSONObject responseObject = new JSONObject (response.text ()); - JSONObject bookingDatesObject = responseObject.getJSONObject ("bookingdates"); + JSONObject responseObject = new JSONObject(response.text()); + JSONObject bookingDatesObject = responseObject.getJSONObject("bookingdates"); - assertEquals (bookingData.getFirstname (), responseObject.get ("firstname")); - assertEquals (bookingData.getBookingdates () - .getCheckin (), bookingDatesObject.get ("checkin")); + assertEquals(bookingData.getFirstname(), responseObject.get("firstname")); + assertEquals(bookingData.getBookingdates() + .getCheckin(), bookingDatesObject.get("checkin")); } @Test - public void updateBookingTest () { - BookingData updateBookingData = getBookingData (); - APIResponse response = manager.putRequest ("/booking/" + bookingId, RequestOptions.create () - .setData (updateBookingData) - .setHeader ("Cookie", "token=" + token)); - assertEquals (response.status (), 200); - - JSONObject responseObject = new JSONObject (response.text ()); - JSONObject bookingDatesObject = responseObject.getJSONObject ("bookingdates"); - - assertEquals (updateBookingData.getFirstname (), responseObject.get ("firstname")); - assertEquals (updateBookingData.getBookingdates () - .getCheckout (), bookingDatesObject.get ("checkout")); + public void updateBookingTest() { + BookingData updateBookingData = getBookingData(); + APIResponse response = manager.putRequest("/booking/" + bookingId, RequestOptions.create() + .setData(updateBookingData) + .setHeader("Cookie", "token=" + token)); + assertEquals(response.status(), 200); + + JSONObject responseObject = new JSONObject(response.text()); + JSONObject bookingDatesObject = responseObject.getJSONObject("bookingdates"); + + assertEquals(updateBookingData.getFirstname(), responseObject.get("firstname")); + assertEquals(updateBookingData.getBookingdates() + .getCheckout(), bookingDatesObject.get("checkout")); } @Test - public void generateTokenTest () { - Tokencreds tokenData = getToken (); - APIResponse response = manager.postRequest ("/auth", RequestOptions.create () - .setData (tokenData)); - assertEquals (response.status (), 200); - JSONObject responseObject = new JSONObject (response.text ()); - String tokenValue = responseObject.getString ("token"); - assertNotNull (tokenValue); + public void generateTokenTest() { + Tokencreds tokenData = getToken(); + APIResponse response = manager.postRequest("/auth", RequestOptions.create() + .setData(tokenData)); + assertEquals(response.status(), 200); + + JSONObject responseObject = new JSONObject(response.text()); + String tokenValue = responseObject.getString("token"); + assertNotNull(tokenValue); token = tokenValue; } @Test - public void updatePartialBookingTest () { - PartialBookingData partialBookingData = getPartialBookingData (); + public void updatePartialBookingTest() { + PartialBookingData partialBookingData = getPartialBookingData(); - APIResponse response = manager.patchRequest ("/booking/" + bookingId, RequestOptions.create () - .setData (partialBookingData) - .setHeader ("Cookie", "token=" + token)); + APIResponse response = manager.patchRequest("/booking/" + bookingId, RequestOptions.create() + .setData(partialBookingData) + .setHeader("Cookie", "token=" + token)); - assertEquals (response.status (), 200); - JSONObject responseObject = new JSONObject (response.text ()); + assertEquals(response.status(), 200); + JSONObject responseObject = new JSONObject(response.text()); - assertEquals (partialBookingData.getFirstname (), responseObject.get ("firstname")); + assertEquals(partialBookingData.getFirstname(), responseObject.get("firstname")); assertEquals(partialBookingData.getTotalprice(), responseObject.get("totalprice")); } @Test - public void deleteBookingTest () { - APIResponse response = manager.deleteRequest ("/booking/" + bookingId, RequestOptions.create () - .setHeader ("Cookie", "token=" + token)); + public void deleteBookingTest() { + APIResponse response = manager.deleteRequest("/booking/" + bookingId, RequestOptions.create() + .setHeader("Cookie", "token=" + token)); - assertEquals (response.status (), 201); + assertEquals(response.status(), 201); } @Test - public void testBookingDeleted () { - APIResponse response = manager.getRequest ("/booking/" + bookingId); - assertEquals (response.status (), 404); + public void testBookingDeleted() { + APIResponse response = manager.getRequest("/booking/" + bookingId); + assertEquals(response.status(), 404); } }