Skip to content

refactored tests and reformatted classes #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 11, 2023
Merged

refactored tests and reformatted classes #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 31 additions & 31 deletions src/test/java/io/github/mfaisalkhatri/api/manager/RequestManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<String, String> headers) {
apiRequestContext = playwright.request ()
.newContext (new APIRequest.NewContextOptions ().setBaseURL (baseUrl)
.setExtraHTTPHeaders (headers));
public void setApiRequestContext(String baseUrl, Map<String, String> 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();
}

}
16 changes: 8 additions & 8 deletions src/test/java/io/github/mfaisalkhatri/api/reqres/data/EmployeeDataBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();

}
}
82 changes: 41 additions & 41 deletions src/test/java/io/github/mfaisalkhatri/api/reqres/tests/ApiTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

}
18 changes: 9 additions & 9 deletions src/test/java/io/github/mfaisalkhatri/api/reqres/tests/BaseTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<String, String> headers = new HashMap<> ();
headers.put ("content-type", "application/json");
manager.setApiRequestContext (baseUrl, headers);
Map<String, String> 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();
}
}
8 changes: 4 additions & 4 deletions src/test/java/io/github/mfaisalkhatri/api/restfulbooker/data/BookingData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

}
52 changes: 26 additions & 26 deletions src/test/java/io/github/mfaisalkhatri/api/restfulbooker/data/BookingDataBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
}
2 changes: 1 addition & 1 deletion src/test/java/io/github/mfaisalkhatri/api/restfulbooker/data/PartialBookingData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@
@Builder
public class PartialBookingData {
String firstname;
int totalprice;
int totalprice;
}
10 changes: 5 additions & 5 deletions src/test/java/io/github/mfaisalkhatri/api/restfulbooker/data/TokenBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
}
20 changes: 10 additions & 10 deletions src/test/java/io/github/mfaisalkhatri/api/restfulbooker/tests/BaseTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<String, String> headers = new HashMap<> ();
headers.put ("content-type", "application/json");
headers.put ("Accept", "application/json");
manager.setApiRequestContext (baseUrl, headers);
Map<String, String> 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();
}
}
Loading