diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
index cfce9f0..979cc57 100644
--- a/src/main/resources/log4j2.xml
+++ b/src/main/resources/log4j2.xml
@@ -13,4 +13,12 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/test/java/io/github/mfaisalkhatri/api/restfulecommerce/BaseTest.java b/src/test/java/io/github/mfaisalkhatri/api/restfulecommerce/BaseTest.java
index 1898a5e..8cdb887 100644
--- a/src/test/java/io/github/mfaisalkhatri/api/restfulecommerce/BaseTest.java
+++ b/src/test/java/io/github/mfaisalkhatri/api/restfulecommerce/BaseTest.java
@@ -1,14 +1,15 @@
package io.github.mfaisalkhatri.api.restfulecommerce;
+import java.util.HashMap;
+import java.util.Map;
+
import com.microsoft.playwright.APIRequest;
import com.microsoft.playwright.APIRequestContext;
+import com.microsoft.playwright.APIResponse;
import com.microsoft.playwright.Playwright;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
-import java.util.HashMap;
-import java.util.Map;
-
public class BaseTest {
protected Playwright playwright;
@@ -29,32 +30,36 @@ public void tearDown() {
}
private void createPlaywright() {
- playwright = Playwright.create();
+ this.playwright = Playwright.create ();
}
private void createAPIRequestContext() {
- Map headers = new HashMap<>();
+ final Map headers = new HashMap<> ();
headers.put("Content-Type", "application/json");
- request = playwright.request().newContext(new APIRequest.NewContextOptions()
+ this.request = this.playwright.request ()
+ .newContext (new APIRequest.NewContextOptions ()
.setBaseURL(BASE_URL)
.setExtraHTTPHeaders(headers));
}
private void closePlaywright() {
- if (playwright != null) {
- playwright.close();
- playwright = null;
+ if (this.playwright != null) {
+ this.playwright.close ();
+ this.playwright = null;
}
}
private void disposeAPIRequestContext() {
- if (request != null) {
- request.dispose();
- request = null;
+ if (this.request != null) {
+ this.request.dispose ();
+ this.request = null;
}
}
-
+ protected void logResponse (final APIResponse response) {
+ final Logger logger = new Logger (response);
+ logger.logResponseDetails ();
+ }
}
diff --git a/src/test/java/io/github/mfaisalkhatri/api/restfulecommerce/HappyPathTests.java b/src/test/java/io/github/mfaisalkhatri/api/restfulecommerce/HappyPathTests.java
index 3d9bb6a..6123bdc 100644
--- a/src/test/java/io/github/mfaisalkhatri/api/restfulecommerce/HappyPathTests.java
+++ b/src/test/java/io/github/mfaisalkhatri/api/restfulecommerce/HappyPathTests.java
@@ -1,22 +1,25 @@
package io.github.mfaisalkhatri.api.restfulecommerce;
+import static io.github.mfaisalkhatri.api.restfulecommerce.testdata.OrderDataBuilder.getNewOrder;
+import static io.github.mfaisalkhatri.api.restfulecommerce.testdata.OrderDataBuilder.getPartialUpdatedOrder;
+import static io.github.mfaisalkhatri.api.restfulecommerce.testdata.OrderDataBuilder.getUpdatedOrder;
+import static io.github.mfaisalkhatri.api.restfulecommerce.testdata.TokenBuilder.getCredentials;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+
+import java.util.ArrayList;
+import java.util.List;
import com.microsoft.playwright.APIResponse;
import com.microsoft.playwright.options.RequestOptions;
import io.github.mfaisalkhatri.api.restfulecommerce.testdata.OrderData;
+import lombok.extern.slf4j.Slf4j;
import org.json.JSONArray;
import org.json.JSONObject;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
-import java.util.ArrayList;
-import java.util.List;
-
-import static io.github.mfaisalkhatri.api.restfulecommerce.testdata.OrderDataBuilder.*;
-import static io.github.mfaisalkhatri.api.restfulecommerce.testdata.TokenBuilder.getCredentials;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-
+@Slf4j
public class HappyPathTests extends BaseTest{
private List orderList;
@@ -33,9 +36,7 @@ public void testSetup() {
public void testShouldPerformHealthCheckOfServer() {
final APIResponse response = this.request.get("/health");
- final Logger logger = new Logger(response);
- logger.logResponseDetails();
-
+ logResponse (response);
final JSONObject responseObject = new JSONObject(response.text());
assertEquals(response.status(), 200);
@@ -54,6 +55,8 @@ public void testShouldCreateNewOrders() {
final APIResponse response = this.request.post("/addOrder", RequestOptions.create()
.setData(this.orderList));
+ logResponse (response);
+
final JSONObject responseObject = new JSONObject(response.text());
final JSONArray ordersArray = responseObject.getJSONArray("orders");
@@ -68,7 +71,6 @@ public void testShouldCreateNewOrders() {
this.userId =ordersArray.getJSONObject(0).getString("user_id");
this.productId =ordersArray.getJSONObject(0).getString("product_id");
-
}
@Test
@@ -76,8 +78,7 @@ public void testShouldGetAllOrders() {
final APIResponse response = this.request.get("/getAllOrders");
- final Logger logger = new Logger(response);
- logger.logResponseDetails();
+ logResponse (response);
final JSONObject responseObject = new JSONObject(response.text());
final JSONArray ordersArray = responseObject.getJSONArray("orders");
@@ -92,10 +93,10 @@ public void testShouldGetAllOrders() {
@Test
public void testShouldGetOrderUsingOrderId() {
final int orderId = 1;
- final APIResponse response = this.request.get("/getOrder", RequestOptions.create().setQueryParam("id", orderId));
+ final APIResponse response = this.request.get ("/getOrder", RequestOptions.create ()
+ .setQueryParam ("id", orderId));
- final Logger logger = new Logger(response);
- logger.logResponseDetails();
+ logResponse (response);
final JSONObject responseObject = new JSONObject(response.text());
final JSONArray ordersArray = responseObject.getJSONArray("orders");
@@ -109,10 +110,10 @@ public void testShouldGetOrderUsingOrderId() {
@Test
public void testShouldGetOrdersUsingUserId() {
- final APIResponse response = this.request.get("/getOrder", RequestOptions.create().setQueryParam("user_id", this.userId));
+ final APIResponse response = this.request.get ("/getOrder", RequestOptions.create ()
+ .setQueryParam ("user_id", this.userId));
- final Logger logger = new Logger(response);
- logger.logResponseDetails();
+ logResponse (response);
final JSONObject responseObject = new JSONObject(response.text());
final JSONArray ordersArray = responseObject.getJSONArray("orders");
@@ -126,10 +127,10 @@ public void testShouldGetOrdersUsingUserId() {
@Test
public void testShouldGetOrdersUsingProductId() {
- final APIResponse response = this.request.get("/getOrder", RequestOptions.create().setQueryParam("product_id", this.productId));
+ final APIResponse response = this.request.get ("/getOrder", RequestOptions.create ()
+ .setQueryParam ("product_id", this.productId));
- final Logger logger = new Logger(response);
- logger.logResponseDetails();
+ logResponse (response);
final JSONObject responseObject = new JSONObject(response.text());
final JSONArray ordersArray = responseObject.getJSONArray("orders");
@@ -148,12 +149,10 @@ public void testShouldGetOrdersUsingOrderIdProductIdAndUserId() {
.setQueryParam("product_id", this.productId)
.setQueryParam("user_id", this.userId));
- final Logger logger = new Logger(response);
- logger.logResponseDetails();
+ logResponse (response);
assertEquals(response.status(), 200);
-
final JSONObject responseObject = new JSONObject(response.text());
final JSONArray ordersArray = responseObject.getJSONArray("orders");
@@ -167,10 +166,10 @@ public void testShouldGetOrdersUsingOrderIdProductIdAndUserId() {
@Test
public void testTokenGeneration() {
- final APIResponse response = this.request.post("/auth", RequestOptions.create().setData(getCredentials()));
+ final APIResponse response = this.request.post ("/auth", RequestOptions.create ()
+ .setData (getCredentials ()));
- final Logger logger = new Logger(response);
- logger.logResponseDetails();
+ logResponse (response);
final JSONObject responseObject = new JSONObject(response.text());
@@ -182,7 +181,10 @@ public void testTokenGeneration() {
@Test
public void testShouldUpdateTheOrderUsingPut() {
- final APIResponse authResponse = this.request.post("/auth", RequestOptions.create().setData(getCredentials()));
+ final APIResponse authResponse = this.request.post ("/auth", RequestOptions.create ()
+ .setData (getCredentials ()));
+
+ logResponse (authResponse);
final JSONObject authResponseObject = new JSONObject(authResponse.text());
final String token = authResponseObject.get("token").toString();
@@ -194,6 +196,8 @@ public void testShouldUpdateTheOrderUsingPut() {
.setHeader("Authorization", token)
.setData(updatedOrder));
+ logResponse (response);
+
final JSONObject updateOrderResponseObject = new JSONObject(response.text());
final JSONObject orderObject = updateOrderResponseObject.getJSONObject("order");
@@ -212,6 +216,8 @@ public void testShouldPartialUpdateTheOrderUsingPatch() {
final APIResponse authResponse = this.request.post("/auth", RequestOptions.create().setData(getCredentials()));
+ logResponse (authResponse);
+
final JSONObject authResponseObject = new JSONObject(authResponse.text());
final String token = authResponseObject.get("token").toString();
@@ -221,9 +227,11 @@ public void testShouldPartialUpdateTheOrderUsingPatch() {
final APIResponse response = this.request.patch("/partialUpdateOrder/" + orderId, RequestOptions.create()
.setHeader("Authorization", token)
.setData(partialUpdatedOrder));
-
+
+ logResponse (response);
+
final JSONObject updateOrderResponseObject = new JSONObject(response.text());
- final JSONObject orderObject = updateOrderResponseObject.getJSONObject("order");
+ final JSONObject orderObject = updateOrderResponseObject.getJSONObject ("order");
assertEquals(response.status(), 200);
assertEquals(updateOrderResponseObject.get("message"), "Order updated successfully!");
@@ -235,7 +243,10 @@ public void testShouldPartialUpdateTheOrderUsingPatch() {
@Test
public void testShouldDeleteTheOrder() {
- final APIResponse authResponse = this.request.post("/auth", RequestOptions.create().setData(getCredentials()));
+ final APIResponse authResponse = this.request.post ("/auth", RequestOptions.create ()
+ .setData (getCredentials ()));
+
+ logResponse (authResponse);
final JSONObject authResponseObject = new JSONObject(authResponse.text());
final String token = authResponseObject.get("token").toString();
@@ -245,19 +256,17 @@ public void testShouldDeleteTheOrder() {
final APIResponse response = this.request.delete("/deleteOrder/" + orderId, RequestOptions.create()
.setHeader("Authorization", token));
- final Logger logger = new Logger(response);
- logger.logResponseDetails();
-
+ logResponse (response);
assertEquals(response.status(), 204);
}
@Test
public void testShouldNotRetrieveDeletedOrder() {
final int orderId = 1;
- final APIResponse response = this.request.get("/getOrder", RequestOptions.create().setQueryParam("id", orderId));
+ final APIResponse response = this.request.get ("/getOrder", RequestOptions.create ()
+ .setQueryParam ("id", orderId));
- final Logger logger = new Logger(response);
- logger.logResponseDetails();
+ logResponse (response);
assertEquals(response.status(), 404);
diff --git a/src/test/java/io/github/mfaisalkhatri/api/restfulecommerce/Logger.java b/src/test/java/io/github/mfaisalkhatri/api/restfulecommerce/Logger.java
index ac9de72..a621bfa 100644
--- a/src/test/java/io/github/mfaisalkhatri/api/restfulecommerce/Logger.java
+++ b/src/test/java/io/github/mfaisalkhatri/api/restfulecommerce/Logger.java
@@ -8,39 +8,41 @@
public class Logger {
- private APIResponse response;
- private org.apache.logging.log4j.Logger log;
+ private final APIResponse response;
+ private final org.apache.logging.log4j.Logger log;
- public Logger(APIResponse response) {
+ public Logger (final APIResponse response) {
this.response = response;
- log = LogManager.getLogger(getClass());
+ this.log = LogManager.getLogger (getClass ());
}
public void logResponseDetails() {
-
- log.info("Response Headers: \n{}",response.headers());
- log.info("Status Code: {}", response.status());
- if(response.text()!=null && !response.text().isEmpty() && !response.text().isBlank()) {
- log.info("Response Body: \n{}", prettyPrintJson(response.text()));
+ this.log.trace ("Logging Response Details.....");
+
+ this.log.info ("Response Headers: \n{}", this.response.headers ());
+ this.log.info ("Status Code: {}", this.response.status ());
+ if (this.response.text () != null && !this.response.text ()
+ .isEmpty () && !this.response.text ()
+ .isBlank ()) {
+ this.log.info ("Response Body: \n{}", prettyPrintJson (this.response.text ()));
}
-
+ this.log.trace ("End of Logs!");
}
- private String prettyPrintJson(String text) {
+ private String prettyPrintJson (final String text) {
String prettyPrintJson = "";
if (text != null && !text.isBlank() && !text.isEmpty()) {
try {
- ObjectMapper objectMapper = new ObjectMapper();
- Object jsonObject = objectMapper.readValue(text, Object.class);
+ final ObjectMapper objectMapper = new ObjectMapper ();
+ final Object jsonObject = objectMapper.readValue (text, Object.class);
prettyPrintJson = objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(jsonObject);
return prettyPrintJson;
- } catch (JsonProcessingException e) {
- log.error("Error Printing Pretty Json : {}", e.getMessage());
+ } catch (final JsonProcessingException e) {
+ this.log.error ("Error Printing Pretty Json : {}", e.getMessage ());
}
}
-
- log.info("No response body generated!");
+ this.log.info ("No response body generated!");
return null;
}
diff --git a/src/test/java/io/github/mfaisalkhatri/api/restfulecommerce/SadPathTests.java b/src/test/java/io/github/mfaisalkhatri/api/restfulecommerce/SadPathTests.java
index 03ea29f..e5e2c0b 100644
--- a/src/test/java/io/github/mfaisalkhatri/api/restfulecommerce/SadPathTests.java
+++ b/src/test/java/io/github/mfaisalkhatri/api/restfulecommerce/SadPathTests.java
@@ -13,9 +13,11 @@
import com.microsoft.playwright.APIResponse;
import com.microsoft.playwright.options.RequestOptions;
import io.github.mfaisalkhatri.api.restfulecommerce.testdata.OrderData;
+import lombok.extern.slf4j.Slf4j;
import org.json.JSONObject;
import org.testng.annotations.Test;
+@Slf4j
public class SadPathTests extends BaseTest {
@@ -28,10 +30,12 @@ public void testShouldNotCreateOrder_WhenProductIdFieldIsMissing() {
final APIResponse response = this.request.post("/addOrder",
RequestOptions.create().setData(orderList));
+ logResponse (response);
+
final JSONObject responseObject = new JSONObject(response.text());
assertEquals(response.status(), 400);
- assertEquals(responseObject.get("message"), "Each order must have user_id, product_id, product_name, product_amount, qty, tax_amt, and total_amt!");
-
+ assertEquals (responseObject.get ("message"),
+ "Each order must have user_id, product_id, product_name, product_amount, qty, tax_amt, and total_amt!");
}
@@ -41,9 +45,12 @@ public void testShouldNotCreateOrder_WhenOrderListIsNotArray() {
final APIResponse response = this.request.post("/addOrder",
RequestOptions.create().setData(getNewOrder()));
+ logResponse (response);
+
final JSONObject responseObject = new JSONObject(response.text());
+
assertEquals(response.status(), 400);
- assertEquals(responseObject.get("message"), "Request Payload must be an array of orders!");
+ assertEquals (responseObject.get ("message"), "Request Payload must be an array of orders!");
}
@Test
@@ -51,9 +58,7 @@ public void testShouldNotFetchOrder_WhenNoOrderExists() {
final APIResponse response = this.request.get("/getAllOrders");
- final Logger logger = new Logger(response);
- logger.logResponseDetails();
-
+ logResponse (response);
final JSONObject responseObject = new JSONObject(response.text());
assertEquals(response.status(), 404);
@@ -64,10 +69,10 @@ public void testShouldNotFetchOrder_WhenNoOrderExists() {
public void testShouldNotFetchOrder_WhenNoOrderExistsForOrderId() {
final int orderId = 90;
- final APIResponse response = this.request.get("/getOrder", RequestOptions.create().setQueryParam("id", orderId));
+ final APIResponse response = this.request.get ("/getOrder", RequestOptions.create ()
+ .setQueryParam ("id", orderId));
- final Logger logger = new Logger(response);
- logger.logResponseDetails();
+ logResponse (response);
final JSONObject responseObject = new JSONObject(response.text());
@@ -79,10 +84,10 @@ public void testShouldNotFetchOrder_WhenNoOrderExistsForOrderId() {
public void testShouldNotFetchOrder_WhenNoOrderExistsForUserId() {
final String userId = "20";
- final APIResponse response = this.request.get("/getOrder", RequestOptions.create().setQueryParam("user_id", userId));
+ final APIResponse response = this.request.get ("/getOrder", RequestOptions.create ()
+ .setQueryParam ("user_id", userId));
- final Logger logger = new Logger(response);
- logger.logResponseDetails();
+ logResponse (response);
final JSONObject responseObject = new JSONObject(response.text());
@@ -95,10 +100,10 @@ public void testShouldNotFetchOrder_WhenNoOrderExistsForUserId() {
public void testShouldNotFetchOrder_WhenNoOrderExistsForProductId() {
final String productId = "987";
- final APIResponse response = this.request.get("/getOrder", RequestOptions.create().setQueryParam("product_id", productId));
+ final APIResponse response = this.request.get ("/getOrder", RequestOptions.create ()
+ .setQueryParam ("product_id", productId));
- final Logger logger = new Logger(response);
- logger.logResponseDetails();
+ logResponse (response);
final JSONObject responseObject = new JSONObject(response.text());
@@ -113,9 +118,11 @@ public void testShouldNotUpdateOrder_WhenTokenIsMissing() {
final OrderData updatedOrder = getUpdatedOrder();
- final APIResponse response = this.request.put("/updateOrder/" + orderId, RequestOptions.create()
+ final APIResponse response = this.request.put ("/updateOrder/" + orderId, RequestOptions.create ()
.setData(updatedOrder));
+ logResponse (response);
+
final JSONObject responseObject = new JSONObject(response.text());
assertEquals(response.status(), 403);
@@ -124,7 +131,10 @@ public void testShouldNotUpdateOrder_WhenTokenIsMissing() {
@Test
public void testShouldNotUpdateOrder_WhenOrderIdIsNotFound() {
- final APIResponse authResponse = this.request.post("/auth", RequestOptions.create().setData(getCredentials()));
+ final APIResponse authResponse = this.request.post ("/auth", RequestOptions.create ()
+ .setData (getCredentials ()));
+
+ logResponse (authResponse);
final JSONObject authResponseObject = new JSONObject(authResponse.text());
final String token = authResponseObject.get("token").toString();
@@ -137,6 +147,7 @@ public void testShouldNotUpdateOrder_WhenOrderIdIsNotFound() {
.setHeader("Authorization", token)
.setData(updatedOrder));
+ logResponse (response);
final JSONObject responseObject = new JSONObject(response.text());
@@ -147,7 +158,10 @@ public void testShouldNotUpdateOrder_WhenOrderIdIsNotFound() {
@Test
public void testShouldNotUpdateOrder_WhenOrderDetailsAreNotProvided() {
- final APIResponse authResponse = this.request.post("/auth", RequestOptions.create().setData(getCredentials()));
+ final APIResponse authResponse = this.request.post ("/auth", RequestOptions.create ()
+ .setData (getCredentials ()));
+
+ logResponse (authResponse);
final JSONObject authResponseObject = new JSONObject(authResponse.text());
final String token = authResponseObject.get("token").toString();
@@ -157,6 +171,8 @@ public void testShouldNotUpdateOrder_WhenOrderDetailsAreNotProvided() {
final APIResponse response = this.request.put("/updateOrder/" + orderId, RequestOptions.create()
.setHeader("Authorization", token));
+ logResponse (response);
+
final JSONObject responseObject = new JSONObject(response.text());
assertEquals(response.status(), 400);
@@ -170,6 +186,8 @@ public void testShouldNotUpdateOrderWithInvalidToken() {
final APIResponse response = this.request.put("/updateOrder/" + orderId, RequestOptions.create()
.setHeader("Authorization", "token273678"));
+ logResponse (response);
+
final JSONObject responseObject = new JSONObject(response.text());
assertEquals(response.status(), 400);
@@ -183,9 +201,11 @@ public void testShouldNotPartialUpdateOrder_WhenTokenIsMissing() {
final OrderData partialUpdatedOrder = getPartialUpdatedOrder();
- final APIResponse response = this.request.patch("/partialUpdateOrder/" + orderId, RequestOptions.create()
+ final APIResponse response = this.request.patch ("/partialUpdateOrder/" + orderId, RequestOptions.create ()
.setData(partialUpdatedOrder));
+ logResponse (response);
+
final JSONObject responseObject = new JSONObject(response.text());
assertEquals(response.status(), 403);
@@ -194,7 +214,10 @@ public void testShouldNotPartialUpdateOrder_WhenTokenIsMissing() {
@Test
public void testShouldNotPartialUpdateOrder_WhenOrderIdIsNotFound() {
- final APIResponse authResponse = this.request.post("/auth", RequestOptions.create().setData(getCredentials()));
+ final APIResponse authResponse = this.request.post ("/auth", RequestOptions.create ()
+ .setData (getCredentials ()));
+
+ logResponse (authResponse);
final JSONObject authResponseObject = new JSONObject(authResponse.text());
final String token = authResponseObject.get("token").toString();
@@ -203,10 +226,11 @@ public void testShouldNotPartialUpdateOrder_WhenOrderIdIsNotFound() {
final int orderId = 90;
- final APIResponse response = this.request.patch("/partialUpdateOrder/" + orderId, RequestOptions.create()
+ final APIResponse response = this.request.patch ("/partialUpdateOrder/" + orderId, RequestOptions.create ()
.setHeader("Authorization", token)
.setData(updatedOrder));
+ logResponse (response);
final JSONObject responseObject = new JSONObject(response.text());
@@ -217,7 +241,10 @@ public void testShouldNotPartialUpdateOrder_WhenOrderIdIsNotFound() {
@Test
public void testShouldNotPartialUpdateOrder_WhenOrderDetailsAreNotProvided() {
- final APIResponse authResponse = this.request.post("/auth", RequestOptions.create().setData(getCredentials()));
+ final APIResponse authResponse = this.request.post ("/auth", RequestOptions.create ()
+ .setData (getCredentials ()));
+
+ logResponse (authResponse);
final JSONObject authResponseObject = new JSONObject(authResponse.text());
final String token = authResponseObject.get("token").toString();
@@ -227,6 +254,8 @@ public void testShouldNotPartialUpdateOrder_WhenOrderDetailsAreNotProvided() {
final APIResponse response = this.request.patch("/partialUpdateOrder/" + orderId, RequestOptions.create()
.setHeader("Authorization", token));
+ logResponse (response);
+
final JSONObject responseObject = new JSONObject(response.text());
assertEquals(response.status(), 400);
@@ -237,9 +266,11 @@ public void testShouldNotPartialUpdateOrder_WhenOrderDetailsAreNotProvided() {
public void testShouldNotPartialUpdateOrderWithInvalidToken() {
final int orderId = 2;
- final APIResponse response = this.request.patch("/partialUpdateOrder/" + orderId, RequestOptions.create()
+ final APIResponse response = this.request.patch ("/partialUpdateOrder/" + orderId, RequestOptions.create ()
.setHeader("Authorization", "token273678"));
+ logResponse (response);
+
final JSONObject responseObject = new JSONObject(response.text());
assertEquals(response.status(), 400);
@@ -253,6 +284,8 @@ public void testShouldNotDeleteOrder_WhenTokenIsMissing () {
final APIResponse response = this.request.delete ("/deleteOrder/" + orderId);
+ logResponse (response);
+
final JSONObject responseObject = new JSONObject (response.text ());
assertEquals (response.status (), 403);
@@ -264,6 +297,8 @@ public void testShouldNotDeleteOrder_WhenOrderIdIsNotFound () {
final APIResponse authResponse = this.request.post ("/auth", RequestOptions.create ()
.setData (getCredentials ()));
+ logResponse (authResponse);
+
final JSONObject authResponseObject = new JSONObject (authResponse.text ());
final String token = authResponseObject.get ("token")
.toString ();
@@ -273,6 +308,8 @@ public void testShouldNotDeleteOrder_WhenOrderIdIsNotFound () {
final APIResponse response = this.request.delete ("/deleteOrder/" + orderId, RequestOptions.create ()
.setHeader ("Authorization", token));
+ logResponse (response);
+
final JSONObject responseObject = new JSONObject (response.text ());
assertEquals (response.status (), 404);
@@ -286,6 +323,8 @@ public void testShouldNotDeleteOrderWithInvalidToken () {
final APIResponse response = this.request.delete ("/deleteOrder/" + orderId, RequestOptions.create ()
.setHeader ("Authorization", "token273678"));
+ logResponse (response);
+
final JSONObject responseObject = new JSONObject (response.text ());
assertEquals (response.status (), 400);
diff --git a/src/test/java/io/github/mfaisalkhatri/api/restfulecommerce/testdata/OrderData.java b/src/test/java/io/github/mfaisalkhatri/api/restfulecommerce/testdata/OrderData.java
index 1ec228e..46bbd6b 100644
--- a/src/test/java/io/github/mfaisalkhatri/api/restfulecommerce/testdata/OrderData.java
+++ b/src/test/java/io/github/mfaisalkhatri/api/restfulecommerce/testdata/OrderData.java
@@ -22,5 +22,4 @@ public class OrderData {
private int taxAmt;
@SerializedName("total_amt")
private int totalAmt;
-
}
diff --git a/src/test/java/io/github/mfaisalkhatri/api/restfulecommerce/testdata/OrderDataBuilder.java b/src/test/java/io/github/mfaisalkhatri/api/restfulecommerce/testdata/OrderDataBuilder.java
index 5bc6795..302878a 100644
--- a/src/test/java/io/github/mfaisalkhatri/api/restfulecommerce/testdata/OrderDataBuilder.java
+++ b/src/test/java/io/github/mfaisalkhatri/api/restfulecommerce/testdata/OrderDataBuilder.java
@@ -7,12 +7,12 @@ public class OrderDataBuilder {
private static final Faker FAKER = new Faker();
public static OrderData getNewOrder() {
- int userId = FAKER.number().numberBetween(2, 4);
- int productId = FAKER.number().numberBetween(331,333);
- int productAmount = FAKER.number().numberBetween(400, 903);
- int quantity = FAKER.number().numberBetween(1, 5);
- int taxAmount = FAKER.number().numberBetween(10,50);
- int totalAmount = (productAmount*quantity)+taxAmount;
+ final int userId = FAKER.number().numberBetween(2, 4);
+ final int productId = FAKER.number().numberBetween(331,333);
+ final int productAmount = FAKER.number().numberBetween(400, 903);
+ final int quantity = FAKER.number().numberBetween(1, 5);
+ final int taxAmount = FAKER.number().numberBetween(10,50);
+ final int totalAmount = (productAmount*quantity)+taxAmount;
return OrderData.builder()
@@ -27,11 +27,11 @@ public static OrderData getNewOrder() {
}
public static OrderData getOrderDataWithMissingProductId() {
- int userId = FAKER.number().numberBetween(2, 4);
- int productAmount = FAKER.number().numberBetween(400, 903);
- int quantity = FAKER.number().numberBetween(1, 5);
- int taxAmount = FAKER.number().numberBetween(10,50);
- int totalAmount = (productAmount*quantity)+taxAmount;
+ final int userId = FAKER.number().numberBetween(2, 4);
+ final int productAmount = FAKER.number().numberBetween(400, 903);
+ final int quantity = FAKER.number().numberBetween(1, 5);
+ final int taxAmount = FAKER.number().numberBetween(10,50);
+ final int totalAmount = (productAmount*quantity)+taxAmount;
return OrderData.builder()
@@ -47,12 +47,12 @@ public static OrderData getOrderDataWithMissingProductId() {
}
public static OrderData getUpdatedOrder() {
- int userId = FAKER.number().numberBetween(4, 5);
- int productId = FAKER.number().numberBetween(335,337);
- int productAmount = FAKER.number().numberBetween(510, 515);
- int quantity = FAKER.number().numberBetween(1, 2);
- int taxAmount = FAKER.number().numberBetween(35,45);
- int totalAmount = (productAmount*quantity)+taxAmount;
+ final int userId = FAKER.number().numberBetween(4, 5);
+ final int productId = FAKER.number().numberBetween(335,337);
+ final int productAmount = FAKER.number().numberBetween(510, 515);
+ final int quantity = FAKER.number().numberBetween(1, 2);
+ final int taxAmount = FAKER.number().numberBetween(35,45);
+ final int totalAmount = (productAmount*quantity)+taxAmount;
return OrderData.builder()
diff --git a/src/test/java/io/github/mfaisalkhatri/api/restfulecommerce/testdata/TokenBuilder.java b/src/test/java/io/github/mfaisalkhatri/api/restfulecommerce/testdata/TokenBuilder.java
index a947453..d6c4284 100644
--- a/src/test/java/io/github/mfaisalkhatri/api/restfulecommerce/testdata/TokenBuilder.java
+++ b/src/test/java/io/github/mfaisalkhatri/api/restfulecommerce/testdata/TokenBuilder.java
@@ -3,8 +3,9 @@
public class TokenBuilder {
public static TokenData getCredentials() {
- return TokenData.builder().username("admin")
- .password("secretPass123")
- .build();
+ return TokenData.builder ()
+ .username ("admin")
+ .password ("secretPass123")
+ .build ();
}
}
diff --git a/test-suite/testng-restfulbooker.xml b/test-suite/testng-restfulbooker.xml
index 3d707e7..3f55393 100644
--- a/test-suite/testng-restfulbooker.xml
+++ b/test-suite/testng-restfulbooker.xml
@@ -16,4 +16,4 @@
-
\ No newline at end of file
+
\ No newline at end of file