Address review comments

wso2 · Sep 20, 2023 · 177717a · 177717a
1 parent cbf82c5
commit 177717a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/...end/src/test/java/org/wso2/identity/integration/test/rest/api/common/B2BRESTTestBase.java b/...end/src/test/java/org/wso2/identity/integration/test/rest/api/common/B2BRESTTestBase.java
@@ -92,6 +92,7 @@ protected Response getResponseOfGet(String endpointUri) {
      * @return Response of post request.
      */
     protected Response getResponseOfPost(String endpointUri, String body) {
+
         return given().auth().preemptive().basic(authenticatingUserName, authenticatingCredential)
                 .contentType(ContentType.JSON)
                 .header(HttpHeaders.ACCEPT, ContentType.JSON)
@@ -140,7 +141,7 @@ protected void validateErrorResponse(Response response, int httpStatusCode, Stri
     }
 
     /**
-     * Validate http status code of the response
+     * Validate http status code of the response.
      *
      * @param response       Response.
      * @param httpStatusCode Expected status code.
@@ -155,7 +156,7 @@ protected void validateHttpStatusCode(Response response, int httpStatusCode) {
     }
 
     /**
-     * Validate error description of the response, if an entry is available in RESTAPIErrors.properties
+     * Validate error description of the response, if an entry is available in RESTAPIErrors.properties.
      *
      * @param response     Response.
      * @param errorCode    Error code.
@@ -179,7 +180,7 @@ private void validateErrorMessage(Response response, String errorCode) {
     }
 
     /**
-     * Validate elements in error response against entries in RESTAPIErrors.properties
+     * Validate elements in error response against entries in RESTAPIErrors.properties.
      *
      * @param response          Response.
      * @param errorCode         API error code.

diff --git a/...ation/test/rest/api/server/organization/management/v1/OrganizationManagementBaseTest.java b/...ation/test/rest/api/server/organization/management/v1/OrganizationManagementBaseTest.java
@@ -86,7 +86,7 @@ public void init(ITestContext context) throws Exception {
             orgId = SUPER_ORGANIZATION_ID;
         }
         this.subOrganizationId = orgId;
-        if (this.organizationType.name().equals("SUPER_ORGANIZATION")) {
+        if (OrganizationType.SUPER_ORGANIZATION.equals(this.organizationType)) {
             super.testInitWithoutTenantQualifiedPath(API_VERSION, swaggerDefinition);
         } else {
             this.tenant = subOrganizationId;

diff --git a/...on/test/rest/api/server/organization/management/v1/OrganizationManagementFailureTest.java b/...on/test/rest/api/server/organization/management/v1/OrganizationManagementFailureTest.java
@@ -19,6 +19,7 @@
 package org.wso2.identity.integration.test.rest.api.server.organization.management.v1;
 
 import io.restassured.response.Response;
+import org.apache.commons.lang.StringUtils;
 import org.apache.http.HttpStatus;
 import org.json.JSONObject;
 import org.testng.annotations.AfterMethod;
@@ -52,7 +53,7 @@ public void testCreateOrganizationWithoutRequiredField() throws Exception {
         JSONObject organizationObject = new JSONObject();
         String parentId;
 
-        if (organizationType.name().equals("SUPER_ORGANIZATION")) {
+        if (OrganizationType.SUPER_ORGANIZATION.equals(this.organizationType)) {
             parentId = SUPER_ORGANIZATION_NAME;
         } else {
             parentId = subOrganizationId;
@@ -70,12 +71,12 @@ public void testCreateOrganizationWithABlankName() throws Exception {
         JSONObject organizationObject = new JSONObject();
         String parentId;
 
-        if (organizationType.name().equals("SUPER_ORGANIZATION")) {
+        if (OrganizationType.SUPER_ORGANIZATION.equals(this.organizationType)) {
             parentId = SUPER_ORGANIZATION_NAME;
         } else {
             parentId = subOrganizationId;
         }
-        organizationObject.put(ORGANIZATION_NAME, "");
+        organizationObject.put(ORGANIZATION_NAME, StringUtils.EMPTY);
         organizationObject.put(ORGANIZATION_PARENT_ID, parentId);
         String payload = organizationObject.toString();
 

diff --git a/...on/test/rest/api/server/organization/management/v1/OrganizationManagementSuccessTest.java b/...on/test/rest/api/server/organization/management/v1/OrganizationManagementSuccessTest.java
@@ -70,7 +70,7 @@ public void createOrganization() throws Exception {
         String org;
         String parentId;
 
-        if (organizationType.name().equals("SUPER_ORGANIZATION")) {
+        if (OrganizationType.SUPER_ORGANIZATION.equals(this.organizationType)) {
             org = "Level1Org";
             parentId = SUPER_ORGANIZATION_NAME;
         } else {