Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Modify Action Management Rest Api tests for not implemented action types #21057

Merged
merged 2 commits into from
Sep 4, 2024
Merged

Modify Action Management Rest Api tests for not implemented action types #21057

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a415f75
Modify Action Management Rest Api tests for not implemented action types
ashanthamara Sep 4, 2024
ad9a8d4
Merge remote-tracking branch 'upstream/master' into test
ashanthamara Sep 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 15 additions & 42 deletions ...o2/identity/integration/test/rest/api/server/action/management/v1/ActionsFailureTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,21 @@ public void testCreateActionAfterReachingMaxActionCount() {
}

@Test(dependsOnMethods = {"testCreateActionAfterReachingMaxActionCount"})
public void testCreateActionWithNotImplementedActionTypes() {

for (String actionTypePath : NOT_IMPLEMENTED_ACTION_TYPE_PATHS) {
String body = toJSONString(action1);
Response responseOfPost = getResponseOfPost(ACTION_MANAGEMENT_API_BASE_PATH +
actionTypePath, body);
responseOfPost.then()
.log().ifValidationFails()
.assertThat().statusCode(HttpStatus.SC_NOT_IMPLEMENTED)
.body("description", equalTo("The requested action type is not currently " +
"supported by the server."));
}
}

@Test(dependsOnMethods = {"testCreateActionWithNotImplementedActionTypes"})
public void testUpdateActionWithInvalidID() {

// Update Action basic information with an invalid action id.
Expand All @@ -173,14 +188,6 @@ public void testUpdateActionWithInvalidID() {
.assertThat().statusCode(HttpStatus.SC_NOT_FOUND)
.body("description", equalTo("No Action is configured on the given Action Type and Id."));

// Update Action basic information with correct Id and different action type.
getResponseOfPatch = getResponseOfPatch(ACTION_MANAGEMENT_API_BASE_PATH +
PRE_UPDATE_PASSWORD_PATH + "/" + testActionId2, body);
getResponseOfPatch.then()
.log().ifValidationFails()
.assertThat().statusCode(HttpStatus.SC_NOT_FOUND)
.body("description", equalTo("No Action is configured on the given Action Type and Id."));

// Update Action Endpoint Authentication Properties with an invalid action id.
AuthenticationTypeProperties authenticationType = new AuthenticationTypeProperties()
.properties(new HashMap<String, Object>() {{
Expand All @@ -194,14 +201,6 @@ public void testUpdateActionWithInvalidID() {
.log().ifValidationFails()
.assertThat().statusCode(HttpStatus.SC_NOT_FOUND)
.body("description", equalTo("No Action is configured on the given Action Type and Id."));

// Update Action Endpoint Authentication Properties with correct Id and different action type.
responseOfPut = getResponseOfPut(ACTION_MANAGEMENT_API_BASE_PATH +
PRE_UPDATE_PASSWORD_PATH + "/" + testActionId2 + ACTION_BEARER_AUTH_PATH, body);
responseOfPut.then()
.log().ifValidationFails()
.assertThat().statusCode(HttpStatus.SC_NOT_FOUND)
.body("description", equalTo("No Action is configured on the given Action Type and Id."));
}

@Test(dependsOnMethods = {"testUpdateActionWithInvalidID"})
Expand Down Expand Up @@ -251,15 +250,6 @@ public void testActivateActionWithInvalidID() {
.assertThat()
.statusCode(HttpStatus.SC_NOT_FOUND)
.body("description", equalTo("No Action is configured on the given Action Type and Id."));

// With correct Id and different action type.
getResponseOfPost(ACTION_MANAGEMENT_API_BASE_PATH + PRE_UPDATE_PASSWORD_PATH +
"/" + testActionId2 + ACTION_ACTIVATE_PATH, "")
.then()
.log().ifValidationFails()
.assertThat()
.statusCode(HttpStatus.SC_NOT_FOUND)
.body("description", equalTo("No Action is configured on the given Action Type and Id."));
}

@Test(dependsOnMethods = {"testActivateActionWithInvalidID"})
Expand All @@ -272,15 +262,6 @@ public void testDeactivateActionWithInvalidID() {
.assertThat()
.statusCode(HttpStatus.SC_NOT_FOUND)
.body("description", equalTo("No Action is configured on the given Action Type and Id."));

// With correct Id and different action type.
getResponseOfPost(ACTION_MANAGEMENT_API_BASE_PATH + PRE_UPDATE_PASSWORD_PATH +
"/" + testActionId2 + ACTION_DEACTIVATE_PATH, "")
.then()
.log().ifValidationFails()
.assertThat()
.statusCode(HttpStatus.SC_NOT_FOUND)
.body("description", equalTo("No Action is configured on the given Action Type and Id."));
}

@Test(dependsOnMethods = {"testDeactivateActionWithInvalidID"})
Expand All @@ -294,14 +275,6 @@ public void testDeleteActionWithInvalidID() {
.statusCode(HttpStatus.SC_NOT_FOUND)
.body("description", equalTo("No Action is configured on the given Action Type and Id."));

getResponseOfDelete(ACTION_MANAGEMENT_API_BASE_PATH + PRE_UPDATE_PASSWORD_PATH +
"/" + testActionId2)
.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);
}
Expand Down
9 changes: 1 addition & 8 deletions ...o2/identity/integration/test/rest/api/server/action/management/v1/ActionsSuccessTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,14 +145,7 @@ public void testGetActions() {
notNullValue())
.body( "find { it.type == '" + PRE_ISSUE_ACCESS_TOKEN_ACTION_TYPE + "' }.count",
equalTo(1))
.body( "find { it.type == '" + PRE_ISSUE_ACCESS_TOKEN_ACTION_TYPE + "' }.self", notNullValue())
.body( "find { it.type == '" + PRE_UPDATE_PASSWORD_ACTION_TYPE + "' }.displayName",
notNullValue())
.body( "find { it.type == '" + PRE_UPDATE_PASSWORD_ACTION_TYPE + "' }.description",
notNullValue())
.body( "find { it.type == '" + PRE_UPDATE_PASSWORD_ACTION_TYPE + "' }.count",
equalTo(0))
.body( "find { it.type == '" + PRE_UPDATE_PASSWORD_ACTION_TYPE + "' }.self", notNullValue());
.body( "find { it.type == '" + PRE_ISSUE_ACCESS_TOKEN_ACTION_TYPE + "' }.self", notNullValue());
}

@Test(dependsOnMethods = {"testGetActions"})
Expand Down
11 changes: 9 additions & 2 deletions .../wso2/identity/integration/test/rest/api/server/action/management/v1/ActionsTestBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@
import org.wso2.identity.integration.test.rest.api.server.common.RESTAPIServerTestBase;

import java.io.IOException;
import java.util.HashSet;
import java.util.Set;

public class ActionsTestBase extends RESTAPIServerTestBase {

Expand All @@ -40,14 +42,12 @@ public class ActionsTestBase extends RESTAPIServerTestBase {
protected static final String ACTION_MANAGEMENT_API_BASE_PATH = "/actions";
protected static final String TYPES_API_PATH = "/types";
protected static final String PRE_ISSUE_ACCESS_TOKEN_PATH = "/preIssueAccessToken";
protected static final String PRE_UPDATE_PASSWORD_PATH = "/preUpdatePassword";
protected static final String ACTION_DEACTIVATE_PATH = "/deactivate";
protected static final String ACTION_ACTIVATE_PATH = "/activate";
protected static final String ACTION_BEARER_AUTH_PATH = "/bearer";
protected static final String ACTION_BASIC_AUTH_PATH = "/basic";

protected static final String PRE_ISSUE_ACCESS_TOKEN_ACTION_TYPE = "PRE_ISSUE_ACCESS_TOKEN";
protected static final String PRE_UPDATE_PASSWORD_ACTION_TYPE = "PRE_UPDATE_PASSWORD";

protected static final String TEST_ACTION_NAME = "Access Token Pre Issue";
protected static final String TEST_ACTION_DESCRIPTION = "This is the configuration of pre-action for issuing access token.";
Expand All @@ -72,9 +72,16 @@ public class ActionsTestBase extends RESTAPIServerTestBase {
protected static final String TEST_APIKEY_VALUE_AUTH_PROPERTY = "value";
protected static final String TEST_APIKEY_VALUE_AUTH_PROPERTY_VALUE = "secret";

protected static final Set<String> NOT_IMPLEMENTED_ACTION_TYPE_PATHS = new HashSet<>();

protected static String swaggerDefinition;

static {
NOT_IMPLEMENTED_ACTION_TYPE_PATHS.add("/preUpdatePassword");
NOT_IMPLEMENTED_ACTION_TYPE_PATHS.add("/preUpdateProfile");
NOT_IMPLEMENTED_ACTION_TYPE_PATHS.add("/preRegistration");
NOT_IMPLEMENTED_ACTION_TYPE_PATHS.add("/authentication");

String API_PACKAGE_NAME = "org.wso2.carbon.identity.api.server.action.management.v1";
try {
swaggerDefinition = getAPISwaggerDefinition(API_PACKAGE_NAME, API_DEFINITION_NAME);
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2436,7 +2436,7 @@
<!-- Identity REST API feature -->
<identity.api.dispatcher.version>2.0.17</identity.api.dispatcher.version>
<identity.user.api.version>1.3.39</identity.user.api.version>
<identity.server.api.version>1.2.225</identity.server.api.version>
<identity.server.api.version>1.2.226</identity.server.api.version>

<identity.agent.sso.version>5.5.9</identity.agent.sso.version>
<identity.tool.samlsso.validator.version>5.5.9</identity.tool.samlsso.validator.version>
Expand Down