Update formatting

wso2 · Sep 16, 2024 · b82f2a1 · b82f2a1
1 parent 0bc3ce5
commit b82f2a1
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/.../identity/integration/test/actions/PreIssueAccessTokenClientCredentialsGrantTestCase.java b/.../identity/integration/test/actions/PreIssueAccessTokenClientCredentialsGrantTestCase.java
@@ -197,16 +197,20 @@ protected boolean isRedirectable(String method) {
  @AfterClass(alwaysRun = true)
  public void atEnd() throws Exception {
 
+ actionsMockServer.startServer();
+
  deleteAction(PRE_ISSUE_ACCESS_TOKEN_API_PATH, actionId);
  deleteRole(roleId);
  deleteApp(applicationId);
  deleteDomainAPI(domainAPIId);
  scim2RestClient.deleteUser(userId);
- actionsMockServer.shutDownMockServer();
+
  restClient.closeHttpClient();
  scim2RestClient.closeHttpClient();
  actionsRestClient.closeHttpClient();
  client.close();
+
+ actionsMockServer = null;
  accessToken = null;
  jwtClaims = null;
  }

diff --git a/...java/org/wso2/identity/integration/test/actions/PreIssueAccessTokenCodeGrantTestCase.java b/...java/org/wso2/identity/integration/test/actions/PreIssueAccessTokenCodeGrantTestCase.java
@@ -195,16 +195,20 @@ protected boolean isRedirectable(String method) {
  @AfterClass(alwaysRun = true)
  public void atEnd() throws Exception {
 
+ actionsMockServer.startServer();
+
  deleteAction(PRE_ISSUE_ACCESS_TOKEN_API_PATH, actionId);
  deleteRole(roleId);
  deleteApp(applicationId);
  deleteDomainAPI(domainAPIId);
  scim2RestClient.deleteUser(userId);
- actionsMockServer.shutDownMockServer();
+
  restClient.closeHttpClient();
  scim2RestClient.closeHttpClient();
  actionsRestClient.closeHttpClient();
  client.close();
+
+ actionsMockServer = null;
  authorizationCode = null;
  accessToken = null;
  jwtClaims = null;
@@ -298,8 +302,8 @@ public void testTokenScopeOperations() throws Exception {
  Assert.assertTrue(ArrayUtils.contains(scopes, NEW_SCOPE_2));
  Assert.assertTrue(ArrayUtils.contains(scopes, NEW_SCOPE_3));
  Assert.assertTrue(ArrayUtils.contains(scopes, NEW_SCOPE_4));
- Assert.assertFalse(ArrayUtils.contains(scopes, CUSTOM_SCOPE_3)); // replace - 7
- Assert.assertFalse(ArrayUtils.contains(scopes, INTERNAL_ORG_USER_MANAGEMENT_CREATE)); // remove - 8
+ Assert.assertFalse(ArrayUtils.contains(scopes, CUSTOM_SCOPE_3));
+ Assert.assertFalse(ArrayUtils.contains(scopes, INTERNAL_ORG_USER_MANAGEMENT_CREATE));
  }
 
  @Test(groups = "wso2.is", description = "Verify that the access token contains the updated OIDC claims " +

diff --git a/...rc/test/java/org/wso2/identity/integration/test/actions/mockserver/ActionsMockServer.java b/...rc/test/java/org/wso2/identity/integration/test/actions/mockserver/ActionsMockServer.java
@@ -19,16 +19,13 @@
 package org.wso2.identity.integration.test.actions.mockserver;
 
 import com.github.tomakehurst.wiremock.WireMockServer;
-import com.github.tomakehurst.wiremock.client.WireMock;
 import com.github.tomakehurst.wiremock.core.WireMockConfiguration;
-import com.github.tomakehurst.wiremock.matching.RequestPatternBuilder;
 import com.github.tomakehurst.wiremock.verification.LoggedRequest;
 import org.apache.commons.lang.StringUtils;
 
 import java.util.List;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
-import static com.github.tomakehurst.wiremock.client.WireMock.equalToJson;
 import static com.github.tomakehurst.wiremock.client.WireMock.matching;
 import static com.github.tomakehurst.wiremock.client.WireMock.post;
 import static com.github.tomakehurst.wiremock.client.WireMock.postRequestedFor;