Improve integration tests

wso2 · Oct 9, 2023 · f4920b1 · f4920b1
1 parent 5816fd6
commit f4920b1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/...api/server/branding/preference/management/v1/BrandingPreferenceManagementFailureTest.java b/...api/server/branding/preference/management/v1/BrandingPreferenceManagementFailureTest.java
@@ -252,6 +252,9 @@ public void testDeleteNotExistingCustomTextPreference() {
 
         Response response = getResponseOfDelete(CUSTOM_TEXT_API_BASE_PATH + QUERY_PARAM_SEPARATOR +
                 String.format(SCREEN_QUERY_PARAM, LOGIN_SCREEN));
-        validateErrorResponse(response, HttpStatus.SC_NOT_FOUND, "BPM-60006");
+        response.then()
+                .log().ifValidationFails()
+                .assertThat()
+                .statusCode(HttpStatus.SC_NO_CONTENT);
     }
 }
diff --git a/...api/server/branding/preference/management/v1/BrandingPreferenceManagementSuccessTest.java b/...api/server/branding/preference/management/v1/BrandingPreferenceManagementSuccessTest.java
@@ -333,12 +333,11 @@ public void testAddCustomTextPreference() throws IOException, JSONException {
         String location = response.getHeader(HttpHeaders.LOCATION);
         assertNotNull(location);
 
-        JSONObject expectedPreference = new JSONObject(new JSONObject(readResource("add-custom-text.json")).
-                get("preference").toString());
+        JSONObject expectedPreference = new JSONObject(new JSONObject(body).get("preference").toString());
         JSONObject receivedPreference = new JSONObject(new JSONObject(response.asString()).
                 get("preference").toString());
         Assert.assertTrue(areJSONObjectsEqual(expectedPreference, receivedPreference),
-                "The custom text preference schema of the Response is incorrect");
+                "The custom text preference schema of the Response is incorrect.");
     }
 
     @Test(dependsOnMethods = {"testAddCustomTextPreference"})
@@ -360,7 +359,7 @@ public void testGetCustomTextPreference() throws IOException, JSONException {
         JSONObject receivedPreference = new JSONObject(new JSONObject(response.asString()).
                 get("preference").toString());
         Assert.assertTrue(areJSONObjectsEqual(expectedPreference, receivedPreference),
-                "The custom text preference schema of the Response is incorrect");
+                "The custom text preference schema of the Response is incorrect.");
     }
 
     @Test(dependsOnMethods = {"testGetCustomTextPreference"})
@@ -400,8 +399,7 @@ public void testUpdateCustomTextPreference() throws IOException, JSONException {
                 .body("screen", equalTo(LOGIN_SCREEN))
                 .body("locale", equalTo(DEFAULT_LOCALE));
 
-        JSONObject expectedPreference = new JSONObject(new JSONObject(readResource("update-custom-text.json")).
-                get("preference").toString());
+        JSONObject expectedPreference = new JSONObject(new JSONObject(body).get("preference").toString());
         JSONObject receivedPreference = new JSONObject(new JSONObject(response.asString()).
                 get("preference").toString());
         Assert.assertTrue(areJSONObjectsEqual(expectedPreference, receivedPreference),