diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/rest/api/server/action/management/v1/ActionsFailureTest.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/rest/api/server/action/management/v1/ActionsFailureTest.java index ba3094bada..f0afa43a54 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/rest/api/server/action/management/v1/ActionsFailureTest.java +++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/rest/api/server/action/management/v1/ActionsFailureTest.java @@ -44,8 +44,6 @@ */ public class ActionsFailureTest extends ActionsTestBase { - private static final String TEST_USERNAME_INVALID_AUTH_PROPERTY = "invalidUsername"; - private static final String TEST_ACTION_INVALID_ID = "invalid_id"; private static ActionModel action1; private static ActionModel action2; private static String testActionId2; @@ -222,18 +220,6 @@ public void testDeactivateActionWithInvalidID() { .assertThat() .statusCode(HttpStatus.SC_NOT_FOUND) .body("description", equalTo("No Action is configured on the given Action Type and Id.")); - } - - @Test(dependsOnMethods = {"testDeactivateActionWithInvalidID"}) - public void testDeleteActionWithInvalidID() { - - getResponseOfDelete(ACTION_MANAGEMENT_API_BASE_PATH + PRE_ISSUE_ACCESS_TOKEN_PATH + - "/" + TEST_ACTION_INVALID_ID) - .then() - .log().ifValidationFails() - .assertThat() - .statusCode(HttpStatus.SC_NOT_FOUND) - .body("description", equalTo("No Action is configured on the given Action Type and Id.")); // Delete, created action. deleteAction(PRE_ISSUE_ACCESS_TOKEN_PATH , testActionId2); diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/rest/api/server/action/management/v1/ActionsSuccessTest.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/rest/api/server/action/management/v1/ActionsSuccessTest.java index 6211f02cd3..37d92be1e5 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/rest/api/server/action/management/v1/ActionsSuccessTest.java +++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/rest/api/server/action/management/v1/ActionsSuccessTest.java @@ -389,6 +389,17 @@ public void testDeleteAction() { } @Test(dependsOnMethods = {"testDeleteAction"}) + public void testDeleteNonExistingAction() { + + getResponseOfDelete(ACTION_MANAGEMENT_API_BASE_PATH + PRE_ISSUE_ACCESS_TOKEN_PATH + + "/" + TEST_ACTION_INVALID_ID) + .then() + .log().ifValidationFails() + .assertThat() + .statusCode(HttpStatus.SC_NO_CONTENT); + } + + @Test(dependsOnMethods = {"testDeleteNonExistingAction"}) public void testCreateActionWithExtraEndpointAuthProperties() { action = new ActionModel() diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/rest/api/server/action/management/v1/ActionsTestBase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/rest/api/server/action/management/v1/ActionsTestBase.java index 3832d2f4a7..4f0eed13d6 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/rest/api/server/action/management/v1/ActionsTestBase.java +++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/rest/api/server/action/management/v1/ActionsTestBase.java @@ -70,6 +70,8 @@ public class ActionsTestBase extends RESTAPIServerTestBase { protected static final String TEST_APIKEY_HEADER_AUTH_PROPERTY_VALUE = "key"; protected static final String TEST_APIKEY_VALUE_AUTH_PROPERTY = "value"; protected static final String TEST_APIKEY_VALUE_AUTH_PROPERTY_VALUE = "secret"; + protected static final String TEST_USERNAME_INVALID_AUTH_PROPERTY = "invalidUsername"; + protected static final String TEST_ACTION_INVALID_ID = "invalid_id"; protected static final Set NOT_IMPLEMENTED_ACTION_TYPE_PATHS = new HashSet<>(); diff --git a/pom.xml b/pom.xml index 1d35e69a00..ecdf0306a4 100755 --- a/pom.xml +++ b/pom.xml @@ -2356,7 +2356,7 @@ - 7.7.30 + 7.7.33 [5.14.67, 8.0.0)