Skip to content

Commit 7b178f1

Browse files
mfaisalkhatrimfaisalkhatri
authored
refactored tests and reformatted classes (#13)
1 parent b813164 commit 7b178f1

File tree

10 files changed

+195
-194
lines changed

10 files changed

+195
-194
lines changed

‎src/test/java/io/github/mfaisalkhatri/api/manager/RequestManager.java‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -14,67 +14,67 @@
1414
**/
1515
public class RequestManager {
1616

17-
private Playwright playwright;
17+
private Playwright playwright;
1818
private APIRequestContext apiRequestContext;
1919

20-
public void createPlaywright () {
21-
playwright = Playwright.create ();
20+
public void createPlaywright() {
21+
playwright = Playwright.create();
2222

2323
}
2424

25-
public void setApiRequestContext (String baseUrl, Map<String, String> headers) {
26-
apiRequestContext = playwright.request ()
27-
.newContext (new APIRequest.NewContextOptions ().setBaseURL (baseUrl)
28-
.setExtraHTTPHeaders (headers));
25+
public void setApiRequestContext(String baseUrl, Map<String, String> headers) {
26+
apiRequestContext = playwright.request()
27+
.newContext(new APIRequest.NewContextOptions().setBaseURL(baseUrl)
28+
.setExtraHTTPHeaders(headers));
2929
}
3030

31-
public APIResponse getRequest (String endpoint) {
32-
return apiRequestContext.get (endpoint);
31+
public APIResponse getRequest(String endpoint) {
32+
return apiRequestContext.get(endpoint);
3333
}
3434

35-
public APIResponse getRequest (String endpoint, RequestOptions options) {
36-
return apiRequestContext.get (endpoint, options);
35+
public APIResponse getRequest(String endpoint, RequestOptions options) {
36+
return apiRequestContext.get(endpoint, options);
3737
}
3838

39-
public APIResponse postRequest (String endpoint) {
40-
return apiRequestContext.post (endpoint);
39+
public APIResponse postRequest(String endpoint) {
40+
return apiRequestContext.post(endpoint);
4141
}
4242

43-
public APIResponse postRequest (String endpoint, RequestOptions options) {
44-
return apiRequestContext.post (endpoint, options);
43+
public APIResponse postRequest(String endpoint, RequestOptions options) {
44+
return apiRequestContext.post(endpoint, options);
4545
}
4646

47-
public APIResponse putRequest (String endpoint) {
48-
return apiRequestContext.put (endpoint);
47+
public APIResponse putRequest(String endpoint) {
48+
return apiRequestContext.put(endpoint);
4949
}
5050

51-
public APIResponse putRequest (String endpoint, RequestOptions options) {
52-
return apiRequestContext.put (endpoint, options);
51+
public APIResponse putRequest(String endpoint, RequestOptions options) {
52+
return apiRequestContext.put(endpoint, options);
5353
}
5454

55-
public APIResponse patchRequest (String endpoint) {
56-
return apiRequestContext.patch (endpoint);
55+
public APIResponse patchRequest(String endpoint) {
56+
return apiRequestContext.patch(endpoint);
5757
}
5858

59-
public APIResponse patchRequest (String endpoint, RequestOptions options) {
60-
return apiRequestContext.patch (endpoint, options);
59+
public APIResponse patchRequest(String endpoint, RequestOptions options) {
60+
return apiRequestContext.patch(endpoint, options);
6161

6262
}
6363

64-
public APIResponse deleteRequest (String endpoint) {
65-
return apiRequestContext.delete (endpoint);
64+
public APIResponse deleteRequest(String endpoint) {
65+
return apiRequestContext.delete(endpoint);
6666
}
6767

68-
public APIResponse deleteRequest (String endpoint, RequestOptions options) {
69-
return apiRequestContext.delete (endpoint, options);
68+
public APIResponse deleteRequest(String endpoint, RequestOptions options) {
69+
return apiRequestContext.delete(endpoint, options);
7070
}
7171

72-
public void disposeAPIRequestContext () {
73-
apiRequestContext.dispose ();
72+
public void disposeAPIRequestContext() {
73+
apiRequestContext.dispose();
7474
}
7575

76-
public void closePlaywright () {
77-
playwright.close ();
76+
public void closePlaywright() {
77+
playwright.close();
7878
}
7979

8080
}

‎src/test/java/io/github/mfaisalkhatri/api/reqres/data/EmployeeDataBuilder.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
**/
99
public class EmployeeDataBuilder {
1010

11-
public static EmployeeData getEmployeeData () {
12-
Faker faker = new Faker ();
13-
return EmployeeData.builder ()
14-
.name (faker.name ()
15-
.firstName ())
16-
.job (faker.job ()
17-
.title ())
18-
.build ();
11+
public static EmployeeData getEmployeeData() {
12+
Faker faker = new Faker();
13+
return EmployeeData.builder()
14+
.name(faker.name()
15+
.firstName())
16+
.job(faker.job()
17+
.title())
18+
.build();
1919

2020
}
2121
}

‎src/test/java/io/github/mfaisalkhatri/api/reqres/tests/ApiTests.java‎

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -16,64 +16,64 @@
1616
**/
1717
public class ApiTests extends BaseTest {
1818
@Test
19-
public void testGetAPI () {
20-
APIResponse response = manager.getRequest ("/api/users/4");
21-
assertEquals (response.status (), 200);
19+
public void testGetAPI() {
20+
APIResponse response = manager.getRequest("/api/users/4");
21+
assertEquals(response.status(), 200);
2222

23-
JSONObject jsonObject = new JSONObject (response.text ());
24-
JSONObject dataObject = jsonObject.getJSONObject ("data");
23+
JSONObject jsonObject = new JSONObject(response.text());
24+
JSONObject dataObject = jsonObject.getJSONObject("data");
2525

26-
assertEquals (dataObject.get ("email")
27-
.toString (), "eve.holt@reqres.in");
28-
assertEquals (dataObject.get ("first_name")
29-
.toString (), "Eve");
26+
assertEquals(dataObject.get("email")
27+
.toString(), "eve.holt@reqres.in");
28+
assertEquals(dataObject.get("first_name")
29+
.toString(), "Eve");
3030
}
3131

3232
@Test
33-
public void testPostAPI () {
34-
EmployeeData employeeData = getEmployeeData ();
35-
APIResponse response = manager.postRequest ("/api/users", RequestOptions.create ()
36-
.setData (employeeData));
37-
assertEquals (response.status (), 201);
33+
public void testPostAPI() {
34+
EmployeeData employeeData = getEmployeeData();
35+
APIResponse response = manager.postRequest("/api/users", RequestOptions.create()
36+
.setData(employeeData));
37+
assertEquals(response.status(), 201);
3838

39-
JSONObject jsonObject = new JSONObject (response.text ());
40-
assertNotNull (jsonObject.get ("id"));
41-
assertEquals (jsonObject.get ("name"), employeeData.getName ());
42-
assertEquals (jsonObject.get ("job"), employeeData.getJob ());
39+
JSONObject jsonObject = new JSONObject(response.text());
40+
assertNotNull(jsonObject.get("id"));
41+
assertEquals(jsonObject.get("name"), employeeData.getName());
42+
assertEquals(jsonObject.get("job"), employeeData.getJob());
4343
}
4444

4545
@Test
46-
public void testPutAPI () {
47-
EmployeeData employeeData = getEmployeeData ();
48-
APIResponse response = manager.putRequest ("/api/users/2", RequestOptions.create ()
49-
.setData (employeeData));
50-
assertEquals (response.status (), 200);
46+
public void testPutAPI() {
47+
EmployeeData employeeData = getEmployeeData();
48+
APIResponse response = manager.putRequest("/api/users/2", RequestOptions.create()
49+
.setData(employeeData));
50+
assertEquals(response.status(), 200);
5151

52-
JSONObject jsonObject = new JSONObject (response.text ());
53-
assertNotNull (jsonObject.get ("updatedAt"));
54-
assertEquals (jsonObject.get ("name"), employeeData.getName ());
55-
assertEquals (jsonObject.get ("job"), employeeData.getJob ());
52+
JSONObject jsonObject = new JSONObject(response.text());
53+
assertNotNull(jsonObject.get("updatedAt"));
54+
assertEquals(jsonObject.get("name"), employeeData.getName());
55+
assertEquals(jsonObject.get("job"), employeeData.getJob());
5656
}
5757

5858
@Test
59-
public void testPatchAPI () {
60-
EmployeeData employeeData = getEmployeeData ();
61-
APIResponse response = manager.patchRequest ("/api/users/2", RequestOptions.create ()
62-
.setData (employeeData));
63-
assertEquals (response.status (), 200);
59+
public void testPatchAPI() {
60+
EmployeeData employeeData = getEmployeeData();
61+
APIResponse response = manager.patchRequest("/api/users/2", RequestOptions.create()
62+
.setData(employeeData));
63+
assertEquals(response.status(), 200);
6464

65-
JSONObject jsonObject = new JSONObject (response.text ());
66-
assertNotNull (jsonObject.get ("updatedAt"));
67-
assertEquals (jsonObject.get ("name"), employeeData.getName ());
68-
assertEquals (jsonObject.get ("job"), employeeData.getJob ());
65+
JSONObject jsonObject = new JSONObject(response.text());
66+
assertNotNull(jsonObject.get("updatedAt"));
67+
assertEquals(jsonObject.get("name"), employeeData.getName());
68+
assertEquals(jsonObject.get("job"), employeeData.getJob());
6969
}
7070

7171
@Test
72-
public void testDeleteAPI () {
73-
EmployeeData employeeData = getEmployeeData ();
74-
APIResponse response = manager.deleteRequest ("/api/users/2", RequestOptions.create ()
75-
.setData (employeeData));
76-
assertEquals (response.status (), 204);
72+
public void testDeleteAPI() {
73+
EmployeeData employeeData = getEmployeeData();
74+
APIResponse response = manager.deleteRequest("/api/users/2", RequestOptions.create()
75+
.setData(employeeData));
76+
assertEquals(response.status(), 204);
7777
}
7878

7979
}

‎src/test/java/io/github/mfaisalkhatri/api/reqres/tests/BaseTest.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,18 @@ public class BaseTest {
1616
protected RequestManager manager;
1717

1818
@BeforeClass
19-
public void setup () {
20-
manager = new RequestManager ();
21-
manager.createPlaywright ();
19+
public void setup() {
20+
manager = new RequestManager();
21+
manager.createPlaywright();
2222
String baseUrl = "https://reqres.in";
23-
Map<String, String> headers = new HashMap<> ();
24-
headers.put ("content-type", "application/json");
25-
manager.setApiRequestContext (baseUrl, headers);
23+
Map<String, String> headers = new HashMap<>();
24+
headers.put("content-type", "application/json");
25+
manager.setApiRequestContext(baseUrl, headers);
2626
}
2727

2828
@AfterClass
29-
public void tearDown () {
30-
manager.disposeAPIRequestContext ();
31-
manager.closePlaywright ();
29+
public void tearDown() {
30+
manager.disposeAPIRequestContext();
31+
manager.closePlaywright();
3232
}
3333
}

‎src/test/java/io/github/mfaisalkhatri/api/restfulbooker/data/BookingData.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
@Getter
1111
@Builder
1212
public class BookingData {
13-
private String firstname;
14-
private String lastname;
15-
private int totalprice;
13+
private String firstname;
14+
private String lastname;
15+
private int totalprice;
1616
private boolean depositpaid;
1717
private BookingDates bookingdates;
18-
private String additionalneeds;
18+
private String additionalneeds;
1919

2020
}

‎src/test/java/io/github/mfaisalkhatri/api/restfulbooker/data/BookingDataBuilder.java‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -11,35 +11,35 @@
1111
**/
1212
public class BookingDataBuilder {
1313

14-
private static final Faker FAKER = new Faker ();
14+
private static final Faker FAKER = new Faker();
1515

16-
public static BookingData getBookingData () {
17-
SimpleDateFormat formatter = new SimpleDateFormat ("YYYY-MM-dd");
18-
return BookingData.builder ()
19-
.firstname (FAKER.name ()
20-
.firstName ())
21-
.lastname (FAKER.name ()
22-
.lastName ())
23-
.totalprice (FAKER.number ()
24-
.numberBetween (1, 2000))
25-
.depositpaid (true)
26-
.bookingdates (BookingDates.builder ()
27-
.checkin (formatter.format (FAKER.date ()
28-
.past (20, TimeUnit.DAYS)))
29-
.checkout (formatter.format (FAKER.date ()
30-
.future (5, TimeUnit.DAYS)))
31-
.build ())
32-
.additionalneeds ("Breakfast")
33-
.build ();
16+
public static BookingData getBookingData() {
17+
SimpleDateFormat formatter = new SimpleDateFormat("YYYY-MM-dd");
18+
return BookingData.builder()
19+
.firstname(FAKER.name()
20+
.firstName())
21+
.lastname(FAKER.name()
22+
.lastName())
23+
.totalprice(FAKER.number()
24+
.numberBetween(1, 2000))
25+
.depositpaid(true)
26+
.bookingdates(BookingDates.builder()
27+
.checkin(formatter.format(FAKER.date()
28+
.past(20, TimeUnit.DAYS)))
29+
.checkout(formatter.format(FAKER.date()
30+
.future(5, TimeUnit.DAYS)))
31+
.build())
32+
.additionalneeds("Breakfast")
33+
.build();
3434

3535
}
3636

37-
public static PartialBookingData getPartialBookingData () {
38-
return PartialBookingData.builder ()
39-
.firstname (FAKER.name ()
40-
.firstName ())
41-
.totalprice (FAKER.number ()
42-
.numberBetween (100, 5000))
43-
.build ();
37+
public static PartialBookingData getPartialBookingData() {
38+
return PartialBookingData.builder()
39+
.firstname(FAKER.name()
40+
.firstName())
41+
.totalprice(FAKER.number()
42+
.numberBetween(100, 5000))
43+
.build();
4444
}
4545
}

‎src/test/java/io/github/mfaisalkhatri/api/restfulbooker/data/PartialBookingData.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@
1111
@Builder
1212
public class PartialBookingData {
1313
String firstname;
14-
int totalprice;
14+
int totalprice;
1515
}

‎src/test/java/io/github/mfaisalkhatri/api/restfulbooker/data/TokenBuilder.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
**/
77
public class TokenBuilder {
88

9-
public static Tokencreds getToken () {
10-
return Tokencreds.builder ()
11-
.username ("admin")
12-
.password ("password123")
13-
.build ();
9+
public static Tokencreds getToken() {
10+
return Tokencreds.builder()
11+
.username("admin")
12+
.password("password123")
13+
.build();
1414
}
1515
}

‎src/test/java/io/github/mfaisalkhatri/api/restfulbooker/tests/BaseTest.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,19 @@ public class BaseTest {
1616
protected RequestManager manager;
1717

1818
@BeforeTest
19-
public void setupBase () {
20-
manager = new RequestManager ();
21-
manager.createPlaywright ();
19+
public void setupBase() {
20+
manager = new RequestManager();
21+
manager.createPlaywright();
2222
final String baseUrl = "http://localhost:3001";
23-
Map<String, String> headers = new HashMap<> ();
24-
headers.put ("content-type", "application/json");
25-
headers.put ("Accept", "application/json");
26-
manager.setApiRequestContext (baseUrl, headers);
23+
Map<String, String> headers = new HashMap<>();
24+
headers.put("content-type", "application/json");
25+
headers.put("Accept", "application/json");
26+
manager.setApiRequestContext(baseUrl, headers);
2727
}
2828

2929
@AfterTest
30-
public void tearDown () {
31-
manager.disposeAPIRequestContext ();
32-
manager.closePlaywright ();
30+
public void tearDown() {
31+
manager.disposeAPIRequestContext();
32+
manager.closePlaywright();
3333
}
3434
}

0 commit comments

Comments
 (0)