From 9aebc5ff9fce2a96490355b002ba0e70674fb56e Mon Sep 17 00:00:00 2001 From: Parashar Date: Sat, 4 Nov 2023 00:20:42 +0530 Subject: [PATCH 1/7] rest api framework --- .gitignore | 8 +-- pom.xml | 34 +++++++++ .../com/techorgx/api/CustomerServiceTest.java | 66 +++++++++++++++++ .../src/main/java/com/techorgx/api/Get.java | 61 ++++++++++++++++ .../com/techorgx/api/endpoints/Routes.java | 20 ++++++ .../techorgx/api/endpoints/UserEndPoints.java | 61 ++++++++++++++++ .../java/com/techorgx/api/payload/User.java | 72 +++++++++++++++++++ 7 files changed, 318 insertions(+), 4 deletions(-) create mode 100644 tests/smoke-tests/src/main/java/com/techorgx/api/CustomerServiceTest.java create mode 100644 tests/smoke-tests/src/main/java/com/techorgx/api/Get.java create mode 100644 tests/smoke-tests/src/main/java/com/techorgx/api/endpoints/Routes.java create mode 100644 tests/smoke-tests/src/main/java/com/techorgx/api/endpoints/UserEndPoints.java create mode 100644 tests/smoke-tests/src/main/java/com/techorgx/api/payload/User.java diff --git a/.gitignore b/.gitignore index 783ec2d..949baec 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,8 @@ HELP.md target/ !customer-service/.mvn/wrapper/maven-wrapper.jar -!**/src/main/**/target/ -!**/src/test/**/target/ +!tests/smoke-tests/src/main/**/target/ +!tests/smoke-tests/src/test/**/target/ .DS_Store ### STS ### @@ -27,8 +27,8 @@ target/ /nbdist/ /.nb-gradle/ build/ -!**/src/main/**/build/ -!**/src/test/**/build/ +!tests/smoke-tests/src/main/**/build/ +!tests/smoke-tests/src/test/**/build/ ### VS Code ### .vscode/ diff --git a/pom.xml b/pom.xml index 84cc150..fd4bd25 100644 --- a/pom.xml +++ b/pom.xml @@ -92,8 +92,42 @@ aws-java-sdk-sts ${amazonaws.version} + + io.rest-assured + rest-assured + 5.3.1 + + + org.apache.groovy + groovy-xml + + + + + com.beust + jcommander + 1.48 + + + com.google.code.gson + gson + 2.10.1 + + + org.codehaus.jackson + jackson-asl + 0.9.5 + + + + com.github.javafaker + javafaker + 1.0.2 + + + diff --git a/tests/smoke-tests/src/main/java/com/techorgx/api/CustomerServiceTest.java b/tests/smoke-tests/src/main/java/com/techorgx/api/CustomerServiceTest.java new file mode 100644 index 0000000..92fb85d --- /dev/null +++ b/tests/smoke-tests/src/main/java/com/techorgx/api/CustomerServiceTest.java @@ -0,0 +1,66 @@ +package com.techorgx.api; + +import com.github.javafaker.Faker; +import com.techorgx.api.endpoints.UserEndPoints; +import com.techorgx.api.payload.User; +import io.restassured.response.Response; +import org.testng.Assert; +import org.testng.annotations.BeforeClass; +import org.testng.annotations.Test; + +public class CustomerServiceTest { + Faker faker; + User userPayload; + + @BeforeClass + public void setupData() { + faker = new Faker(); + userPayload = new User(); + userPayload.setUsername(faker.name().username()); + userPayload.setFirstName(faker.name().firstName()); + userPayload.setLastName(faker.name().lastName()); + userPayload.setAddress(faker.address().streetAddress()); + userPayload.setCity(faker.address().city()); + userPayload.setPincode(faker.address().zipCode()); + userPayload.setEmail(faker.internet().safeEmailAddress()); + } + + @Test(priority = 1) + public void testPostUser() { + Response response = UserEndPoints.createUser(userPayload); + response.then().log().all(); + Assert.assertEquals(response.statusCode(), 202); + + + } + + @Test(priority = 2) + public void testGetUserByName() { + Response response = UserEndPoints.readUser(this.userPayload.getUsername()); + response.then().log().all(); + Assert.assertEquals(response.statusCode(), 200); + } + + @Test(priority = 3) + public void testUpdateUser() { + + userPayload.setFirstName(faker.name().firstName()); + userPayload.setLastName(faker.name().lastName()); + + Response response = UserEndPoints.updateUser(this.userPayload.getUsername(), userPayload); + response.then().log().all(); + Assert.assertEquals(response.statusCode(), 200); + + //Checking data after update + Response responseAfterUpdation=UserEndPoints.readUser (this.userPayload.getUsername()); + responseAfterUpdation.then().log().all(); + Assert.assertEquals(responseAfterUpdation.getStatusCode (), 200); + } + + @Test(priority = 4) + public void testDeleteUserByName() { + Response response = UserEndPoints.deleteUser(this.userPayload.getUsername()); + response.then().log().all(); + Assert.assertEquals(response.statusCode(), 200); + } +} \ No newline at end of file diff --git a/tests/smoke-tests/src/main/java/com/techorgx/api/Get.java b/tests/smoke-tests/src/main/java/com/techorgx/api/Get.java new file mode 100644 index 0000000..143f4dd --- /dev/null +++ b/tests/smoke-tests/src/main/java/com/techorgx/api/Get.java @@ -0,0 +1,61 @@ +package com.techorgx.api; + + +import com.google.gson.JsonObject; +import io.restassured.RestAssured; +import io.restassured.builder.RequestSpecBuilder; +import io.restassured.http.ContentType; +import io.restassured.http.Header; +import io.restassured.response.Response; +import io.restassured.response.ResponseBody; +import io.restassured.specification.RequestSpecification; +import org.apache.http.HttpStatus; +import org.codehaus.groovy.transform.SourceURIASTTransformation; +import org.testng.Assert; +import org.testng.annotations.Test; + +import java.util.HashMap; + +import static io.restassured.RestAssured.*; + + +public class Get { + @Test + void test1() + + { + RestAssured.baseURI = "http://localhost:7979/v1/customerservice/getcustomer"; + Response response = RestAssured.given().param("id","653ce5d043e4d487a291e893").header("client-id", "test").get(); + System.out.println("StatusCode " + response.getStatusCode()); + System.out.println("Body " + response.getBody().asString()); + + + + + } + @Test + void test2() { + RequestSpecification given = RestAssured.given(); + given + .header("client-id", "test") + .accept(ContentType.JSON) + .contentType(ContentType.JSON) + .and() + .body(""" + { "name" : "Johnwick ", "status": "Active", "email": "johndoe@example.com" } + """) + .when() + .post("http://localhost:7979/v1/customerservice/addcustomer") //hit the post end point + .then() + .assertThat() + .log() + .all() + .statusCode(HttpStatus.SC_ACCEPTED); + + + + + } +} + + diff --git a/tests/smoke-tests/src/main/java/com/techorgx/api/endpoints/Routes.java b/tests/smoke-tests/src/main/java/com/techorgx/api/endpoints/Routes.java new file mode 100644 index 0000000..12adfc1 --- /dev/null +++ b/tests/smoke-tests/src/main/java/com/techorgx/api/endpoints/Routes.java @@ -0,0 +1,20 @@ +package com.techorgx.api.endpoints; + +//Base url: http://localhost:7979/v1/customerservice + +//Create user(POST) : http://localhost:7979/v1/customerservice/addcustomer +//Get User (GET): http://localhost:7979/v1/customerservice/getcustomer?id= + +public class Routes { + + public final static String BASE_URL = "http://localhost:7979/v1/customerservice"; + //CustomerServiceModule + public final static String POST_URL = BASE_URL + "/addcustomer"; + public final static String GET_URL = BASE_URL + "/getcustomer"; + + public static String UPDATE_URL = BASE_URL + "/updatecustomer"; + + public static String DELETE_URL = BASE_URL + "/deletecustomer"; + + //public static String delete_url=base_url+"/user/{username}"; +} diff --git a/tests/smoke-tests/src/main/java/com/techorgx/api/endpoints/UserEndPoints.java b/tests/smoke-tests/src/main/java/com/techorgx/api/endpoints/UserEndPoints.java new file mode 100644 index 0000000..ead6f76 --- /dev/null +++ b/tests/smoke-tests/src/main/java/com/techorgx/api/endpoints/UserEndPoints.java @@ -0,0 +1,61 @@ +package com.techorgx.api.endpoints; + +// UserEndPints.java +// Created for perform Create, Read, Update, Delete requests t the user API + +import com.techorgx.api.payload.User; +import io.restassured.http.ContentType; +import io.restassured.response.Response; + +import static io.restassured.RestAssured.given; + +public class UserEndPoints { + + public static Response createUser(User payload) { + Response response = given() + .contentType(ContentType.JSON) + .accept(ContentType.JSON) + .header("client-id", "test") + .body(payload) + .when() + .post(Routes.POST_URL); + return response; + } + + public static Response readUser(String username) { + System.out.println("readUser " + username); + String id = username; + Response response = given() + .queryParam("id", username) + .header("client-id", "test") + .when() + .get(Routes.GET_URL); + + return response; + } + + public static Response updateUser (String username, User payload) + { + Response response=given() + .contentType(ContentType.JSON) + .accept(ContentType.JSON) + .queryParam("id" , username) + .header("client-id", "test") + .body (payload) + .when() + .put(Routes.UPDATE_URL); + return response; + } + + public static Response deleteUser (String username) + { + Response response=given() + .contentType(ContentType.JSON) + .accept(ContentType.JSON) + .queryParam("id" , username) + .header("client-id", "test") + .when() + .get(Routes.DELETE_URL); + return response; + } +} \ No newline at end of file diff --git a/tests/smoke-tests/src/main/java/com/techorgx/api/payload/User.java b/tests/smoke-tests/src/main/java/com/techorgx/api/payload/User.java new file mode 100644 index 0000000..618198e --- /dev/null +++ b/tests/smoke-tests/src/main/java/com/techorgx/api/payload/User.java @@ -0,0 +1,72 @@ +package com.techorgx.api.payload; + +public class User { + String city; + String pincode; + String email; + String username; + String firstName; + String lastName; + String address; + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public String getFirstName() { + return firstName; + } + + public void setFirstName(String firstName) { + this.firstName = firstName; + } + + public String getLastName() { + return lastName; + } + + public void setLastName(String lastName) { + this.lastName = lastName; + } + + public String getAddress() { + return address; + } + + public void setAddress(String address) { + this.address = address; + } + + public String getCity() { + return city; + } + + public void setCity(String city) { + this.city = city; + } + + public String getPincode() { + return pincode; + } + + public void setPincode(String pincode) { + this.pincode = pincode; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + + + + +} From aef3845cb79c95406de80cf05f9f2445a62b0955 Mon Sep 17 00:00:00 2001 From: Parashar Date: Tue, 7 Nov 2023 00:34:08 +0530 Subject: [PATCH 2/7] updated delete method and urls --- .../java/com/techorgx/api/endpoints/Routes.java | 17 ++++++++--------- .../techorgx/api/endpoints/UserEndPoints.java | 2 +- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/tests/smoke-tests/src/main/java/com/techorgx/api/endpoints/Routes.java b/tests/smoke-tests/src/main/java/com/techorgx/api/endpoints/Routes.java index 12adfc1..d203356 100644 --- a/tests/smoke-tests/src/main/java/com/techorgx/api/endpoints/Routes.java +++ b/tests/smoke-tests/src/main/java/com/techorgx/api/endpoints/Routes.java @@ -1,20 +1,19 @@ package com.techorgx.api.endpoints; -//Base url: http://localhost:7979/v1/customerservice +//Base url: http://localhost:7979/v1/customer-service -//Create user(POST) : http://localhost:7979/v1/customerservice/addcustomer -//Get User (GET): http://localhost:7979/v1/customerservice/getcustomer?id= +//Create user(POST) : http://localhost:7979/v1/customer-service/add-customer +//Get User (GET): http://localhost:7979/v1/customer-service/get-customer?id= public class Routes { - public final static String BASE_URL = "http://localhost:7979/v1/customerservice"; + public final static String BASE_URL = "http://localhost:7979/v1/customer-service"; //CustomerServiceModule - public final static String POST_URL = BASE_URL + "/addcustomer"; - public final static String GET_URL = BASE_URL + "/getcustomer"; + public final static String POST_URL = BASE_URL + "/add-customer"; + public final static String GET_URL = BASE_URL + "/get-customer"; - public static String UPDATE_URL = BASE_URL + "/updatecustomer"; + public static String UPDATE_URL = BASE_URL + "/update-customer"; - public static String DELETE_URL = BASE_URL + "/deletecustomer"; + public static String DELETE_URL = BASE_URL + "/delete-customer"; - //public static String delete_url=base_url+"/user/{username}"; } diff --git a/tests/smoke-tests/src/main/java/com/techorgx/api/endpoints/UserEndPoints.java b/tests/smoke-tests/src/main/java/com/techorgx/api/endpoints/UserEndPoints.java index ead6f76..f900ace 100644 --- a/tests/smoke-tests/src/main/java/com/techorgx/api/endpoints/UserEndPoints.java +++ b/tests/smoke-tests/src/main/java/com/techorgx/api/endpoints/UserEndPoints.java @@ -55,7 +55,7 @@ public static Response deleteUser (String username) .queryParam("id" , username) .header("client-id", "test") .when() - .get(Routes.DELETE_URL); + .delete(Routes.DELETE_URL); return response; } } \ No newline at end of file From 6bb5984f23e354eb20b859dd0064789f4df19d7b Mon Sep 17 00:00:00 2001 From: Parashar Date: Tue, 7 Nov 2023 00:51:44 +0530 Subject: [PATCH 3/7] updated formatting --- pom.xml | 3 --- .../com/techorgx/api/CustomerServiceTest.java | 2 -- .../src/main/java/com/techorgx/api/Get.java | 13 ------------- .../com/techorgx/api/endpoints/Routes.java | 7 ------- .../techorgx/api/endpoints/UserEndPoints.java | 8 -------- .../java/com/techorgx/api/payload/User.java | 19 ------------------- 6 files changed, 52 deletions(-) diff --git a/pom.xml b/pom.xml index fd4bd25..4acd308 100644 --- a/pom.xml +++ b/pom.xml @@ -124,10 +124,7 @@ javafaker 1.0.2 - - - diff --git a/tests/smoke-tests/src/main/java/com/techorgx/api/CustomerServiceTest.java b/tests/smoke-tests/src/main/java/com/techorgx/api/CustomerServiceTest.java index 92fb85d..c0d8032 100644 --- a/tests/smoke-tests/src/main/java/com/techorgx/api/CustomerServiceTest.java +++ b/tests/smoke-tests/src/main/java/com/techorgx/api/CustomerServiceTest.java @@ -30,8 +30,6 @@ public void testPostUser() { Response response = UserEndPoints.createUser(userPayload); response.then().log().all(); Assert.assertEquals(response.statusCode(), 202); - - } @Test(priority = 2) diff --git a/tests/smoke-tests/src/main/java/com/techorgx/api/Get.java b/tests/smoke-tests/src/main/java/com/techorgx/api/Get.java index 143f4dd..311675f 100644 --- a/tests/smoke-tests/src/main/java/com/techorgx/api/Get.java +++ b/tests/smoke-tests/src/main/java/com/techorgx/api/Get.java @@ -1,6 +1,5 @@ package com.techorgx.api; - import com.google.gson.JsonObject; import io.restassured.RestAssured; import io.restassured.builder.RequestSpecBuilder; @@ -13,12 +12,8 @@ import org.codehaus.groovy.transform.SourceURIASTTransformation; import org.testng.Assert; import org.testng.annotations.Test; - import java.util.HashMap; - import static io.restassured.RestAssured.*; - - public class Get { @Test void test1() @@ -28,10 +23,6 @@ void test1() Response response = RestAssured.given().param("id","653ce5d043e4d487a291e893").header("client-id", "test").get(); System.out.println("StatusCode " + response.getStatusCode()); System.out.println("Body " + response.getBody().asString()); - - - - } @Test void test2() { @@ -51,10 +42,6 @@ void test2() { .log() .all() .statusCode(HttpStatus.SC_ACCEPTED); - - - - } } diff --git a/tests/smoke-tests/src/main/java/com/techorgx/api/endpoints/Routes.java b/tests/smoke-tests/src/main/java/com/techorgx/api/endpoints/Routes.java index d203356..1644647 100644 --- a/tests/smoke-tests/src/main/java/com/techorgx/api/endpoints/Routes.java +++ b/tests/smoke-tests/src/main/java/com/techorgx/api/endpoints/Routes.java @@ -1,19 +1,12 @@ package com.techorgx.api.endpoints; //Base url: http://localhost:7979/v1/customer-service - //Create user(POST) : http://localhost:7979/v1/customer-service/add-customer //Get User (GET): http://localhost:7979/v1/customer-service/get-customer?id= - public class Routes { - public final static String BASE_URL = "http://localhost:7979/v1/customer-service"; - //CustomerServiceModule public final static String POST_URL = BASE_URL + "/add-customer"; public final static String GET_URL = BASE_URL + "/get-customer"; - public static String UPDATE_URL = BASE_URL + "/update-customer"; - public static String DELETE_URL = BASE_URL + "/delete-customer"; - } diff --git a/tests/smoke-tests/src/main/java/com/techorgx/api/endpoints/UserEndPoints.java b/tests/smoke-tests/src/main/java/com/techorgx/api/endpoints/UserEndPoints.java index f900ace..70a917e 100644 --- a/tests/smoke-tests/src/main/java/com/techorgx/api/endpoints/UserEndPoints.java +++ b/tests/smoke-tests/src/main/java/com/techorgx/api/endpoints/UserEndPoints.java @@ -2,15 +2,11 @@ // UserEndPints.java // Created for perform Create, Read, Update, Delete requests t the user API - import com.techorgx.api.payload.User; import io.restassured.http.ContentType; import io.restassured.response.Response; - import static io.restassured.RestAssured.given; - public class UserEndPoints { - public static Response createUser(User payload) { Response response = given() .contentType(ContentType.JSON) @@ -21,7 +17,6 @@ public static Response createUser(User payload) { .post(Routes.POST_URL); return response; } - public static Response readUser(String username) { System.out.println("readUser " + username); String id = username; @@ -30,10 +25,8 @@ public static Response readUser(String username) { .header("client-id", "test") .when() .get(Routes.GET_URL); - return response; } - public static Response updateUser (String username, User payload) { Response response=given() @@ -46,7 +39,6 @@ public static Response updateUser (String username, User payload) .put(Routes.UPDATE_URL); return response; } - public static Response deleteUser (String username) { Response response=given() diff --git a/tests/smoke-tests/src/main/java/com/techorgx/api/payload/User.java b/tests/smoke-tests/src/main/java/com/techorgx/api/payload/User.java index 618198e..c22244d 100644 --- a/tests/smoke-tests/src/main/java/com/techorgx/api/payload/User.java +++ b/tests/smoke-tests/src/main/java/com/techorgx/api/payload/User.java @@ -8,65 +8,46 @@ public class User { String firstName; String lastName; String address; - public String getUsername() { return username; } - public void setUsername(String username) { this.username = username; } - public String getFirstName() { return firstName; } - public void setFirstName(String firstName) { this.firstName = firstName; } - public String getLastName() { return lastName; } - public void setLastName(String lastName) { this.lastName = lastName; } - public String getAddress() { return address; } - public void setAddress(String address) { this.address = address; } - public String getCity() { return city; } - public void setCity(String city) { this.city = city; } - public String getPincode() { return pincode; } - public void setPincode(String pincode) { this.pincode = pincode; } - public String getEmail() { return email; } - public void setEmail(String email) { this.email = email; } - - - - - } From c1f831fce5d875f4937088b8dab6957fb07d3737 Mon Sep 17 00:00:00 2001 From: Parashar Date: Tue, 7 Nov 2023 01:22:14 +0530 Subject: [PATCH 4/7] updated the changes you asked --- pom.xml | 2 +- .../java/com/techorgx/api/CustomerServiceTest.java | 9 +++++---- .../java/com/techorgx/api/endpoints/UserEndPoints.java | 10 ++++++---- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index 4acd308..4599c5d 100644 --- a/pom.xml +++ b/pom.xml @@ -106,7 +106,7 @@ com.beust jcommander - 1.48 + 1.82 com.google.code.gson diff --git a/tests/smoke-tests/src/main/java/com/techorgx/api/CustomerServiceTest.java b/tests/smoke-tests/src/main/java/com/techorgx/api/CustomerServiceTest.java index c0d8032..03ddc8b 100644 --- a/tests/smoke-tests/src/main/java/com/techorgx/api/CustomerServiceTest.java +++ b/tests/smoke-tests/src/main/java/com/techorgx/api/CustomerServiceTest.java @@ -4,6 +4,7 @@ import com.techorgx.api.endpoints.UserEndPoints; import com.techorgx.api.payload.User; import io.restassured.response.Response; +import org.apache.http.HttpStatus; import org.testng.Assert; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -46,13 +47,13 @@ public void testUpdateUser() { userPayload.setLastName(faker.name().lastName()); Response response = UserEndPoints.updateUser(this.userPayload.getUsername(), userPayload); - response.then().log().all(); - Assert.assertEquals(response.statusCode(), 200); + response.then().log().all() + .statusCode(HttpStatus.SC_OK); //Checking data after update Response responseAfterUpdation=UserEndPoints.readUser (this.userPayload.getUsername()); - responseAfterUpdation.then().log().all(); - Assert.assertEquals(responseAfterUpdation.getStatusCode (), 200); + responseAfterUpdation.then().log().all() + .statusCode(HttpStatus.SC_OK); } @Test(priority = 4) diff --git a/tests/smoke-tests/src/main/java/com/techorgx/api/endpoints/UserEndPoints.java b/tests/smoke-tests/src/main/java/com/techorgx/api/endpoints/UserEndPoints.java index 70a917e..18b14de 100644 --- a/tests/smoke-tests/src/main/java/com/techorgx/api/endpoints/UserEndPoints.java +++ b/tests/smoke-tests/src/main/java/com/techorgx/api/endpoints/UserEndPoints.java @@ -7,11 +7,13 @@ import io.restassured.response.Response; import static io.restassured.RestAssured.given; public class UserEndPoints { + + private final static String CLIENT_ID = "test"; public static Response createUser(User payload) { Response response = given() .contentType(ContentType.JSON) .accept(ContentType.JSON) - .header("client-id", "test") + .header("client-id", CLIENT_ID) .body(payload) .when() .post(Routes.POST_URL); @@ -22,7 +24,7 @@ public static Response readUser(String username) { String id = username; Response response = given() .queryParam("id", username) - .header("client-id", "test") + .header("client-id", CLIENT_ID) .when() .get(Routes.GET_URL); return response; @@ -33,7 +35,7 @@ public static Response updateUser (String username, User payload) .contentType(ContentType.JSON) .accept(ContentType.JSON) .queryParam("id" , username) - .header("client-id", "test") + .header("client-id", CLIENT_ID) .body (payload) .when() .put(Routes.UPDATE_URL); @@ -45,7 +47,7 @@ public static Response deleteUser (String username) .contentType(ContentType.JSON) .accept(ContentType.JSON) .queryParam("id" , username) - .header("client-id", "test") + .header("client-id", CLIENT_ID) .when() .delete(Routes.DELETE_URL); return response; From 5b3d3209ba7a13a0a34c627be0112981aaedc403 Mon Sep 17 00:00:00 2001 From: Parashar Date: Tue, 7 Nov 2023 21:45:07 +0530 Subject: [PATCH 5/7] updated pom file --- pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pom.xml b/pom.xml index 4599c5d..fa1ebcf 100644 --- a/pom.xml +++ b/pom.xml @@ -23,6 +23,12 @@ 2.17.1 2.3 5.3.0 + 1.82 + 2.10.1 + 5.3.1 + 0.9.5 + 1.0.2 + From 861de6765d1ca30011f6c253ae45ff041d69997d Mon Sep 17 00:00:00 2001 From: Parashar Date: Wed, 8 Nov 2023 02:04:34 +0530 Subject: [PATCH 6/7] updated pom file with .version --- pom.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index fa1ebcf..5e7239f 100644 --- a/pom.xml +++ b/pom.xml @@ -23,11 +23,11 @@ 2.17.1 2.3 5.3.0 - 1.82 - 2.10.1 - 5.3.1 - 0.9.5 - 1.0.2 + 1.82 + 2.10.1 + 5.3.1 + 0.9.5 + 1.0.2 From 4825c59effa65e42771b21a95bfbefa6669ac224 Mon Sep 17 00:00:00 2001 From: Parashar Date: Wed, 8 Nov 2023 02:41:45 +0530 Subject: [PATCH 7/7] did the changes you asked except one --- .../com/techorgx/api/CustomerServiceTest.java | 13 +++-- .../src/main/java/com/techorgx/api/Get.java | 48 ------------------- .../java/com/techorgx/api/payload/User.java | 15 +++--- 3 files changed, 14 insertions(+), 62 deletions(-) delete mode 100644 tests/smoke-tests/src/main/java/com/techorgx/api/Get.java diff --git a/tests/smoke-tests/src/main/java/com/techorgx/api/CustomerServiceTest.java b/tests/smoke-tests/src/main/java/com/techorgx/api/CustomerServiceTest.java index 03ddc8b..ed5da07 100644 --- a/tests/smoke-tests/src/main/java/com/techorgx/api/CustomerServiceTest.java +++ b/tests/smoke-tests/src/main/java/com/techorgx/api/CustomerServiceTest.java @@ -5,7 +5,6 @@ import com.techorgx.api.payload.User; import io.restassured.response.Response; import org.apache.http.HttpStatus; -import org.testng.Assert; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -29,15 +28,15 @@ public void setupData() { @Test(priority = 1) public void testPostUser() { Response response = UserEndPoints.createUser(userPayload); - response.then().log().all(); - Assert.assertEquals(response.statusCode(), 202); + response.then().log().all() + .statusCode(HttpStatus.SC_ACCEPTED); } @Test(priority = 2) public void testGetUserByName() { Response response = UserEndPoints.readUser(this.userPayload.getUsername()); - response.then().log().all(); - Assert.assertEquals(response.statusCode(), 200); + response.then().log().all() + .statusCode(HttpStatus.SC_OK); } @Test(priority = 3) @@ -59,7 +58,7 @@ public void testUpdateUser() { @Test(priority = 4) public void testDeleteUserByName() { Response response = UserEndPoints.deleteUser(this.userPayload.getUsername()); - response.then().log().all(); - Assert.assertEquals(response.statusCode(), 200); + response.then().log().all() + .statusCode(HttpStatus.SC_OK); } } \ No newline at end of file diff --git a/tests/smoke-tests/src/main/java/com/techorgx/api/Get.java b/tests/smoke-tests/src/main/java/com/techorgx/api/Get.java deleted file mode 100644 index 311675f..0000000 --- a/tests/smoke-tests/src/main/java/com/techorgx/api/Get.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.techorgx.api; - -import com.google.gson.JsonObject; -import io.restassured.RestAssured; -import io.restassured.builder.RequestSpecBuilder; -import io.restassured.http.ContentType; -import io.restassured.http.Header; -import io.restassured.response.Response; -import io.restassured.response.ResponseBody; -import io.restassured.specification.RequestSpecification; -import org.apache.http.HttpStatus; -import org.codehaus.groovy.transform.SourceURIASTTransformation; -import org.testng.Assert; -import org.testng.annotations.Test; -import java.util.HashMap; -import static io.restassured.RestAssured.*; -public class Get { - @Test - void test1() - - { - RestAssured.baseURI = "http://localhost:7979/v1/customerservice/getcustomer"; - Response response = RestAssured.given().param("id","653ce5d043e4d487a291e893").header("client-id", "test").get(); - System.out.println("StatusCode " + response.getStatusCode()); - System.out.println("Body " + response.getBody().asString()); - } - @Test - void test2() { - RequestSpecification given = RestAssured.given(); - given - .header("client-id", "test") - .accept(ContentType.JSON) - .contentType(ContentType.JSON) - .and() - .body(""" - { "name" : "Johnwick ", "status": "Active", "email": "johndoe@example.com" } - """) - .when() - .post("http://localhost:7979/v1/customerservice/addcustomer") //hit the post end point - .then() - .assertThat() - .log() - .all() - .statusCode(HttpStatus.SC_ACCEPTED); - } -} - - diff --git a/tests/smoke-tests/src/main/java/com/techorgx/api/payload/User.java b/tests/smoke-tests/src/main/java/com/techorgx/api/payload/User.java index c22244d..32f7713 100644 --- a/tests/smoke-tests/src/main/java/com/techorgx/api/payload/User.java +++ b/tests/smoke-tests/src/main/java/com/techorgx/api/payload/User.java @@ -1,13 +1,14 @@ package com.techorgx.api.payload; public class User { - String city; - String pincode; - String email; - String username; - String firstName; - String lastName; - String address; + private String city; + private String pincode; + private String email; + private String username; + private String firstName; + private String lastName; + private String address; + public String getUsername() { return username; }