From fd2eceac07ce9ac8d58e412e84230b423fda8989 Mon Sep 17 00:00:00 2001 From: lakith Date: Mon, 11 Mar 2024 16:00:47 +0530 Subject: [PATCH] Fix test cases to stop creating DCR apps from the same app name --- .../api/lifecycle/AddEndPointSecurityPerTypeTestCase.java | 5 +++-- .../api/lifecycle/ChangeEndPointSecurityPerTypeTestCase.java | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/AddEndPointSecurityPerTypeTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/AddEndPointSecurityPerTypeTestCase.java index ed98d1d4c2..64e16bf257 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/AddEndPointSecurityPerTypeTestCase.java +++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/AddEndPointSecurityPerTypeTestCase.java @@ -66,6 +66,7 @@ import java.util.Arrays; import java.util.HashMap; import java.util.Map; +import java.util.UUID; /** * Add APIs with the endpoint security and invoke. Endpoint application was developed to return thr security token in @@ -132,10 +133,10 @@ public void initialize() throws Exception { sandboxApplication = restAPIStore .generateKeys(applicationID, "3600", null, ApplicationKeyGenerateRequestDTO.KeyTypeEnum.SANDBOX, null, grantTypes); - DCRParamRequest oauthAppProduction = new DCRParamRequest("dummyapp--production", null, null, + DCRParamRequest oauthAppProduction = new DCRParamRequest(UUID.randomUUID().toString(), null, null, user.getUserName(), "password client_credentials", dcrURL, user.getUserName(), user.getPassword(), null); - DCRParamRequest oauthAppSandbox = new DCRParamRequest("dummyapp--sandbox", null, null, user.getUserName(), + DCRParamRequest oauthAppSandbox = new DCRParamRequest(UUID.randomUUID().toString(), null, null, user.getUserName(), "password client_credentials", dcrURL, user.getUserName(), user.getPassword(), null); applicationKeyBeanProduction = ClientAuthenticator.makeDCRRequest(oauthAppProduction); applicationKeyBeanSandbox = ClientAuthenticator.makeDCRRequest(oauthAppSandbox); diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/ChangeEndPointSecurityPerTypeTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/ChangeEndPointSecurityPerTypeTestCase.java index 9b37054b4e..cc914477c7 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/ChangeEndPointSecurityPerTypeTestCase.java +++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/ChangeEndPointSecurityPerTypeTestCase.java @@ -65,6 +65,7 @@ import java.util.Arrays; import java.util.HashMap; import java.util.Map; +import java.util.UUID; /** * Change the endpoint security of APi and invoke. Endpoint application was developed to return thr security token in @@ -148,10 +149,10 @@ public void initialize() throws Exception { sandboxApplication = restAPIStore .generateKeys(applicationID, "3600", null, ApplicationKeyGenerateRequestDTO.KeyTypeEnum.SANDBOX, null, grantTypes); - DCRParamRequest oauthAppProduction = new DCRParamRequest("dummyapp--production", null, null, + DCRParamRequest oauthAppProduction = new DCRParamRequest(UUID.randomUUID().toString(), null, null, user.getUserName(), "password client_credentials", dcrURL, user.getUserName(), user.getPassword(), null); - DCRParamRequest oauthAppSandbox = new DCRParamRequest("dummyapp--sandbox", null, null, user.getUserName(), + DCRParamRequest oauthAppSandbox = new DCRParamRequest(UUID.randomUUID().toString(), null, null, user.getUserName(), "password client_credentials", dcrURL, user.getUserName(), user.getPassword(), null); applicationKeyBeanProduction = ClientAuthenticator.makeDCRRequest(oauthAppProduction); applicationKeyBeanSandbox = ClientAuthenticator.makeDCRRequest(oauthAppSandbox);