From 8002ee9bccc6db46ee5349441e67d34ddfb32810 Mon Sep 17 00:00:00 2001 From: adibmbrk Date: Fri, 8 Nov 2024 11:16:02 +0530 Subject: [PATCH] Remove XACML configs and tests --- modules/distribution/pom.xml | 1 - .../registry_config_change.xml.j2 | 13 - .../tests-common/extensions/pom.xml | 41 -- .../src/test/resources/instrumentation.txt | 2 - .../resources/artifacts/IS/IIA001Policy.xml | 68 ---- .../resources/artifacts/IS/IIA001Request.xml | 29 -- .../resources/artifacts/IS/IIA003Policy.xml | 70 ---- .../resources/artifacts/IS/IIA003Request.xml | 27 -- .../artifacts/IS/default-identity.xml | 4 - .../entitlementNotificationEnabled.properties | 67 ---- ...tlement_custom_attribute_finder.properties | 63 --- .../config/entitlement_default.properties | 63 --- .../IS/entitlement/policies/policy1.xml | 25 -- .../identity-original-530-cache-disabled.xml | 4 - .../identity-identitymgtlistener-enabled.xml | 1 - .../identity-ssoservice-entityid-changed.xml | 1 - .../entitlementNotificationMgt.properties | 20 - .../IS/notification-mgt/templates/entitlement | 1 - .../IS/oauth/IDENTITY6777-identity.xml | 1 - ...t-decrypt-persistence-enabled-identity.xml | 5 - .../IS/openId/identity-skipuserconsent.xml | 1 - .../IS/saml/identity-mgt-listener-enabled.xml | 1 - .../resources/artifacts/IS/saml/registry.xml | 5 - .../saml-assertion-query-enabled-identity.xml | 5 - .../artifacts/IS/xacml_scope_validator.toml | 32 -- .../src/test/resources/backupIdentity.xml | 1 - .../entitlement/json/complexMDPRequest.json | 68 ---- .../entitlement/json/complexMDPResponse.json | 368 ------------------ .../entitlement/json/simpleMDPRequest.json | 63 --- .../entitlement/json/simpleMDPResponse.json | 280 ------------- .../entitlement/json/simpleRequest.json | 35 -- .../entitlement/json/simpleResponse.json | 54 --- .../src/test/resources/identity.xml | 1 - .../management/v1/oidc-metadata.json | 3 +- .../src/test/resources/spFile/TestServer.xml | 1 - .../policy/ui/SimplePolicyEditorTestCase.java | 93 ----- .../resources/artifacts/IS/IIA001Policy.xml | 68 ---- .../resources/artifacts/IS/IIA001Request.xml | 29 -- .../resources/artifacts/IS/IIA003Policy.xml | 70 ---- .../resources/artifacts/IS/IIA003Request.xml | 27 -- .../IS/entitlement/policies/policy1.xml | 25 -- .../artifacts/IS/openId/identity-default.xml | 1 - .../IS/openId/identity-skipuserconsent.xml | 1 - .../src/test/resources/instrumentation.txt | 2 - .../src/test/resources/testng.xml | 1 - 45 files changed, 1 insertion(+), 1740 deletions(-) delete mode 100644 modules/integration/tests-common/extensions/pom.xml delete mode 100644 modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/IIA001Policy.xml delete mode 100644 modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/IIA001Request.xml delete mode 100644 modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/IIA003Policy.xml delete mode 100644 modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/IIA003Request.xml delete mode 100644 modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/entitlement/config/entitlementNotificationEnabled.properties delete mode 100644 modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/entitlement/config/entitlement_custom_attribute_finder.properties delete mode 100644 modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/entitlement/config/entitlement_default.properties delete mode 100644 modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/entitlement/policies/policy1.xml delete mode 100644 modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/notification-mgt/config/entitlementNotificationMgt.properties delete mode 100644 modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/notification-mgt/templates/entitlement delete mode 100644 modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/xacml_scope_validator.toml delete mode 100644 modules/integration/tests-integration/tests-backend/src/test/resources/entitlement/json/complexMDPRequest.json delete mode 100644 modules/integration/tests-integration/tests-backend/src/test/resources/entitlement/json/complexMDPResponse.json delete mode 100644 modules/integration/tests-integration/tests-backend/src/test/resources/entitlement/json/simpleMDPRequest.json delete mode 100644 modules/integration/tests-integration/tests-backend/src/test/resources/entitlement/json/simpleMDPResponse.json delete mode 100644 modules/integration/tests-integration/tests-backend/src/test/resources/entitlement/json/simpleRequest.json delete mode 100644 modules/integration/tests-integration/tests-backend/src/test/resources/entitlement/json/simpleResponse.json delete mode 100644 modules/integration/tests-ui-integration/src/test/java/org/wso2/identity/ui/integration/test/policy/ui/SimplePolicyEditorTestCase.java delete mode 100644 modules/integration/tests-ui-integration/src/test/resources/artifacts/IS/IIA001Policy.xml delete mode 100644 modules/integration/tests-ui-integration/src/test/resources/artifacts/IS/IIA001Request.xml delete mode 100644 modules/integration/tests-ui-integration/src/test/resources/artifacts/IS/IIA003Policy.xml delete mode 100644 modules/integration/tests-ui-integration/src/test/resources/artifacts/IS/IIA003Request.xml delete mode 100644 modules/integration/tests-ui-integration/src/test/resources/artifacts/IS/entitlement/policies/policy1.xml diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 6addbf693fc..260f29e9d31 100755 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -208,7 +208,6 @@ - diff --git a/modules/distribution/registry_config_change.xml.j2 b/modules/distribution/registry_config_change.xml.j2 index 726adf857cd..52fc7fa923a 100644 --- a/modules/distribution/registry_config_change.xml.j2 +++ b/modules/distribution/registry_config_change.xml.j2 @@ -51,17 +51,4 @@ ]]> - - - //wso2registry/staticConfiguration - - - - application/xacml-policy+xml - - - ]]> - - diff --git a/modules/integration/tests-common/extensions/pom.xml b/modules/integration/tests-common/extensions/pom.xml deleted file mode 100644 index 5a78447b776..00000000000 --- a/modules/integration/tests-common/extensions/pom.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - org.wso2.is - identity-integration-tests - 7.1.0-m5-SNAPSHOT - ../../pom.xml - - - 4.0.0 - Custom Attribute Finder - org.wso2.carbon.identity.custom.pip - jar - - - - org.wso2.carbon.identity.framework - org.wso2.carbon.identity.entitlement - - - - diff --git a/modules/integration/tests-cypress-integration/tests-identity-apps/src/test/resources/instrumentation.txt b/modules/integration/tests-cypress-integration/tests-identity-apps/src/test/resources/instrumentation.txt index 4bd93d2dfbb..fddfc506bee 100644 --- a/modules/integration/tests-cypress-integration/tests-identity-apps/src/test/resources/instrumentation.txt +++ b/modules/integration/tests-cypress-integration/tests-identity-apps/src/test/resources/instrumentation.txt @@ -25,8 +25,6 @@ org.wso2.carbon.identity.authenticator.saml2.sso.common* org.wso2.carbon.identity.authorization.core* org.wso2.carbon.identity.base* org.wso2.carbon.identity.core* -org.wso2.carbon.identity.entitlement* -org.wso2.carbon.identity.entitlement.common* org.wso2.carbon.identity.mgt* org.wso2.carbon.identity.oauth* org.wso2.carbon.identity.oauth.common* diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/IIA001Policy.xml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/IIA001Policy.xml deleted file mode 100644 index f40f0c208af..00000000000 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/IIA001Policy.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - Policy for Conformance Test IIA001. - - - - - Julius Hibbert can read or write Bart Simpson's medical record. - - - - - - Julius Hibbert - - - - - - - - http://medico.com/record/patient/BartSimpson - - - - - - - - read - - - - - - write - - - - - - - diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/IIA001Request.xml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/IIA001Request.xml deleted file mode 100644 index 5414b78b65b..00000000000 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/IIA001Request.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - Julius Hibbert - - - - - http://medico.com/record/patient/BartSimpson - - - - - read - - - - diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/IIA003Policy.xml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/IIA003Policy.xml deleted file mode 100644 index f4829fa597a..00000000000 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/IIA003Policy.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - Policy for Conformance Test IIA003. - - - - - A subject with a "bogus" attribute with a value of - "Physician" can read or write Bart Simpson's medical - record. - - - - - - Physician - - - - - - - - http://medico.com/record/patient/BartSimpson - - - - - - - - read - - - - - - write - - - - - - - diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/IIA003Request.xml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/IIA003Request.xml deleted file mode 100644 index 2dc5861db12..00000000000 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/IIA003Request.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - Julius Hibbert - - - - - http://medico.com/record/patient/BartSimpson - - - - - read - - diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/default-identity.xml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/default-identity.xml index ead58e5c6ca..033d1fc9803 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/default-identity.xml +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/default-identity.xml @@ -296,7 +296,6 @@ - - @@ -503,9 +502,6 @@ /permission/admin/manage/identity/applicationmgt/view - - /permission/admin/manage/identity/pep - /permission/admin/manage/identity/usermgt diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identityMgt/identity-identitymgtlistener-enabled.xml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identityMgt/identity-identitymgtlistener-enabled.xml index e3bb536820d..4a18c4b8350 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identityMgt/identity-identitymgtlistener-enabled.xml +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identityMgt/identity-identitymgtlistener-enabled.xml @@ -302,7 +302,6 @@ - diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identityMgt/identity-ssoservice-entityid-changed.xml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identityMgt/identity-ssoservice-entityid-changed.xml index a231d36d05c..ebce83e2a81 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identityMgt/identity-ssoservice-entityid-changed.xml +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/identityMgt/identity-ssoservice-entityid-changed.xml @@ -195,7 +195,6 @@ - diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/notification-mgt/config/entitlementNotificationMgt.properties b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/notification-mgt/config/entitlementNotificationMgt.properties deleted file mode 100644 index 971d06129c1..00000000000 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/notification-mgt/config/entitlementNotificationMgt.properties +++ /dev/null @@ -1,20 +0,0 @@ -#Wed Dec 16 17:42:44 IST 2015 -json.subscription.policyUpdate.endpoint.pepEndpoint1.username=admin -email.subscription.userOperation.endpoint.privateMail.subject=User operation change information to private mail -json.subscription.policyUpdate.jsonContentTemplate=/Users/johann/product-is/modules/integration/tests-integration/tests-backend/src/test/resources//artifacts/IS/notification-mgt/templates/entitlement -json.subscription.1=policyUpdate -json.subscription.policyUpdate.endpoint.pepEndpoint1.AuthenticationRequired=true -email.subscription.1=userOperation -email.subscription.userOperation.salutation=Admin -email.subscription.userOperation.endpoint.1=privateMail -email.subscription.userOperation.endpoint.privateMail.address=privatemail@gmail.com -email.subscription.userOperation.endpoint.privateMail.salutation=Admin private mail -module.name.2=email -json.subscription.policyUpdate.endpoint.1=pepEndpoint1 -module.name.1=json -email.subscription.userOperation.template=templatePath/template1 -json.subscription.policyUpdate.jsonId=3232 -threadPool.size=10 -email.subscription.userOperation.subject=User operation change information -json.subscription.policyUpdate.endpoint.pepEndpoint1.password=admin -json.subscription.policyUpdate.endpoint.pepEndpoint1.address=https\://localhost\:9853/wso2/scim/Users diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/notification-mgt/templates/entitlement b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/notification-mgt/templates/entitlement deleted file mode 100644 index 93435cba425..00000000000 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/notification-mgt/templates/entitlement +++ /dev/null @@ -1 +0,0 @@ -{"schemas":[],"name":{"familyName":"(action)","givenName":"(action)"},"userName":"(action)","password":"hasinitg","emails":[{"primary":true,"value":"hasini_home.com","type":"home"},{"value":"hasini_work.com","type":"work"}]} \ No newline at end of file diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/IDENTITY6777-identity.xml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/IDENTITY6777-identity.xml index feaa3103420..69e2ce6ad2a 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/IDENTITY6777-identity.xml +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/IDENTITY6777-identity.xml @@ -263,7 +263,6 @@ - diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/encrypt-decrypt-persistence-enabled-identity.xml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/encrypt-decrypt-persistence-enabled-identity.xml index 808ed6fee21..9f660dcd74b 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/encrypt-decrypt-persistence-enabled-identity.xml +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/oauth/encrypt-decrypt-persistence-enabled-identity.xml @@ -289,7 +289,6 @@ - @@ -517,9 +516,6 @@ /permission/admin/manage/identity/applicationmgt/view - - /permission/admin/manage/identity/pep - /permission/admin/manage/identity/usermgt @@ -568,7 +564,6 @@ /api/identity/recovery/v0.9/ /oauth2/ /scim2/ - /api/identity/entitlement/ /api/identity/oauth2/dcr/v1.1/ diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/openId/identity-skipuserconsent.xml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/openId/identity-skipuserconsent.xml index 2f21a0fd86b..c8b7448a3d4 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/openId/identity-skipuserconsent.xml +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/openId/identity-skipuserconsent.xml @@ -195,7 +195,6 @@ - diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/identity-mgt-listener-enabled.xml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/identity-mgt-listener-enabled.xml index b30b9dec2e7..ea17b5195f9 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/identity-mgt-listener-enabled.xml +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/identity-mgt-listener-enabled.xml @@ -302,7 +302,6 @@ - diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/registry.xml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/registry.xml index f618b50895e..c25a2adfeb0 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/registry.xml +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/registry.xml @@ -33,11 +33,6 @@ jdbc/WSO2CarbonDB - - - application/xacml-policy+xml - - - @@ -501,9 +500,6 @@ /permission/admin/manage/identity/applicationmgt/view - - /permission/admin/manage/identity/pep - /permission/admin/manage/identity/usermgt @@ -552,7 +548,6 @@ /api/identity/recovery/v0.9/ /oauth2/ /scim2/ - /api/identity/entitlement/ /api/identity/oauth2/dcr/v1.1/ diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/xacml_scope_validator.toml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/xacml_scope_validator.toml deleted file mode 100644 index 12abe763689..00000000000 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/xacml_scope_validator.toml +++ /dev/null @@ -1,32 +0,0 @@ -[server] -hostname = "localhost" -node_ip = "127.0.0.1" -base_path = "https://$ref{server.hostname}:${carbon.management.port}" - -[super_admin] -username = "admin" -password = "admin" -create_admin_account = true - -[user_store] -type = "database_unique_id" - -[database.identity_db] -driver = "$env{IDENTITY_DATABASE_DRIVER}" -url = "$env{IDENTITY_DATABASE_URL}" -username = "$env{IDENTITY_DATABASE_USERNAME}" -password = "$env{IDENTITY_DATABASE_PASSWORD}" - -[database.shared_db] -driver = "$env{SHARED_DATABASE_DRIVER}" -url = "$env{SHARED_DATABASE_URL}" -username = "$env{SHARED_DATABASE_USERNAME}" -password = "$env{SHARED_DATABASE_PASSWORD}" - -[keystore.primary] -file_name = "wso2carbon.p12" -password = "wso2carbon" - -[oauth] -drop_unregistered_scopes= false -allowed_scopes= [] diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/backupIdentity.xml b/modules/integration/tests-integration/tests-backend/src/test/resources/backupIdentity.xml index 5164247b571..bd2d322a7d0 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/backupIdentity.xml +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/backupIdentity.xml @@ -187,7 +187,6 @@ - diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/entitlement/json/complexMDPRequest.json b/modules/integration/tests-integration/tests-backend/src/test/resources/entitlement/json/complexMDPRequest.json deleted file mode 100644 index 8fa5397be6a..00000000000 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/entitlement/json/complexMDPRequest.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "Request": { - "http://wso2.org/identity/user": [ - { - "Attribute": [ - { - "AttributeId": "http://wso2.org/identity/user/username", - "Value": "adminUser", - "IncludeInResult": true, - "DataType": "string" - } - ] - },{ - "Attribute": [ - { - "AttributeId": "http://wso2.org/identity/user/username", - "Value": "publicUser", - "IncludeInResult": true, - "DataType": "string" - } - ] - } ], - - "Resource": { - "Attribute": [ - { - "AttributeId": "urn:oasis:names:tc:xacml:1.0:resource:resource-id", - "Value": "index.jsp", - "IncludeInResult": true, - "DataType": "http://www.w3.org/2001/XMLSchema#string" - } - ] - }, - "Action": [{ - "Attribute": [{ - "AttributeId": "urn:oasis:names:tc:xacml:1.0:action:action-id", - "Value": "view-welcome", - "IncludeInResult": true, - "DataType": "http://www.w3.org/2001/XMLSchema#string" - } - ] - },{ - "Attribute": [{ - "AttributeId": "urn:oasis:names:tc:xacml:1.0:action:action-id", - "Value": "view-status", - "IncludeInResult": true, - "DataType": "http://www.w3.org/2001/XMLSchema#string" - } - ] - },{ - "Attribute": [{ - "AttributeId": "urn:oasis:names:tc:xacml:1.0:action:action-id", - "Value": "view-summary", - "IncludeInResult": true, - "DataType": "http://www.w3.org/2001/XMLSchema#string" - } - ] - },{ - "Attribute": [{ - "AttributeId": "urn:oasis:names:tc:xacml:1.0:action:action-id", - "Value": "modify-welcome", - "IncludeInResult": true, - "DataType": "http://www.w3.org/2001/XMLSchema#string" - } - ] - } ] - } -} diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/entitlement/json/complexMDPResponse.json b/modules/integration/tests-integration/tests-backend/src/test/resources/entitlement/json/complexMDPResponse.json deleted file mode 100644 index 13aa99d0afd..00000000000 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/entitlement/json/complexMDPResponse.json +++ /dev/null @@ -1,368 +0,0 @@ -{ - "Response": [ - { - "Decision": "Permit", - "Status": { - "StatusCode": { - "Value": "urn:oasis:names:tc:xacml:1.0:status:ok" - } - }, - "Action": { - "Attribute": [ - { - "AttributeId": "urn:oasis:names:tc:xacml:1.0:action:action-id", - "Value": "view-summary", - "IncludeInResult": "true", - "DataType": "http://www.w3.org/2001/XMLSchema#string" - } - ] - }, - "http://wso2.org/identity/user": { - "Attribute": [ - { - "AttributeId": "http://wso2.org/identity/user/username", - "Value": "publicUser", - "IncludeInResult": "true", - "DataType": "http://www.w3.org/2001/XMLSchema#string" - } - ] - }, - "Resource": { - "Attribute": [ - { - "AttributeId": "urn:oasis:names:tc:xacml:1.0:resource:resource-id", - "Value": "index.jsp", - "IncludeInResult": "true", - "DataType": "http://www.w3.org/2001/XMLSchema#string" - } - ] - } - }, - { - "Decision": "Permit", - "Status": { - "StatusCode": { - "Value": "urn:oasis:names:tc:xacml:1.0:status:ok" - } - }, - "Action": { - "Attribute": [ - { - "AttributeId": "urn:oasis:names:tc:xacml:1.0:action:action-id", - "Value": "modify-welcome", - "IncludeInResult": "true", - "DataType": "http://www.w3.org/2001/XMLSchema#string" - } - ] - }, - "Resource": { - "Attribute": [ - { - "AttributeId": "urn:oasis:names:tc:xacml:1.0:resource:resource-id", - "Value": "index.jsp", - "IncludeInResult": "true", - "DataType": "http://www.w3.org/2001/XMLSchema#string" - } - ] - }, - "http://wso2.org/identity/user": { - "Attribute": [ - { - "AttributeId": "http://wso2.org/identity/user/username", - "Value": "adminUser", - "IncludeInResult": "true", - "DataType": "http://www.w3.org/2001/XMLSchema#string" - } - ] - } - }, - { - "Decision": "Deny", - "Status": { - "StatusCode": { - "Value": "urn:oasis:names:tc:xacml:1.0:status:ok" - } - }, - "Obligations": [ - { - "Id": "fail_to_permit", - "AttributeAssignments": [ - { - "AttributeId": "obligation-id", - "Value": "You can access the resource index.jsp", - "DataType": "http://www.w3.org/2001/XMLSchema#string" - } - ] - } - ], - "Resource": { - "Attribute": [ - { - "AttributeId": "urn:oasis:names:tc:xacml:1.0:resource:resource-id", - "Value": "index.jsp", - "IncludeInResult": "true", - "DataType": "http://www.w3.org/2001/XMLSchema#string" - } - ] - }, - "Action": { - "Attribute": [ - { - "AttributeId": "urn:oasis:names:tc:xacml:1.0:action:action-id", - "Value": "view-status", - "IncludeInResult": "true", - "DataType": "http://www.w3.org/2001/XMLSchema#string" - } - ] - }, - "http://wso2.org/identity/user": { - "Attribute": [ - { - "AttributeId": "http://wso2.org/identity/user/username", - "Value": "adminUser", - "IncludeInResult": "true", - "DataType": "http://www.w3.org/2001/XMLSchema#string" - } - ] - } - }, - { - "Decision": "Permit", - "Status": { - "StatusCode": { - "Value": "urn:oasis:names:tc:xacml:1.0:status:ok" - } - }, - "Action": { - "Attribute": [ - { - "AttributeId": "urn:oasis:names:tc:xacml:1.0:action:action-id", - "Value": "view-welcome", - "IncludeInResult": "true", - "DataType": "http://www.w3.org/2001/XMLSchema#string" - } - ] - }, - "Resource": { - "Attribute": [ - { - "AttributeId": "urn:oasis:names:tc:xacml:1.0:resource:resource-id", - "Value": "index.jsp", - "IncludeInResult": "true", - "DataType": "http://www.w3.org/2001/XMLSchema#string" - } - ] - }, - "http://wso2.org/identity/user": { - "Attribute": [ - { - "AttributeId": "http://wso2.org/identity/user/username", - "Value": "publicUser", - "IncludeInResult": "true", - "DataType": "http://www.w3.org/2001/XMLSchema#string" - } - ] - } - }, - { - "Decision": "Deny", - "Status": { - "StatusCode": { - "Value": "urn:oasis:names:tc:xacml:1.0:status:ok" - } - }, - "Obligations": [ - { - "Id": "fail_to_permit", - "AttributeAssignments": [ - { - "AttributeId": "obligation-id", - "Value": "You can access the resource index.jsp", - "DataType": "http://www.w3.org/2001/XMLSchema#string" - } - ] - } - ], - "Action": { - "Attribute": [ - { - "AttributeId": "urn:oasis:names:tc:xacml:1.0:action:action-id", - "Value": "view-summary", - "IncludeInResult": "true", - "DataType": "http://www.w3.org/2001/XMLSchema#string" - } - ] - }, - "Resource": { - "Attribute": [ - { - "AttributeId": "urn:oasis:names:tc:xacml:1.0:resource:resource-id", - "Value": "index.jsp", - "IncludeInResult": "true", - "DataType": "http://www.w3.org/2001/XMLSchema#string" - } - ] - }, - "http://wso2.org/identity/user": { - "Attribute": [ - { - "AttributeId": "http://wso2.org/identity/user/username", - "Value": "adminUser", - "IncludeInResult": "true", - "DataType": "http://www.w3.org/2001/XMLSchema#string" - } - ] - } - }, - { - "Decision": "Deny", - "Status": { - "StatusCode": { - "Value": "urn:oasis:names:tc:xacml:1.0:status:ok" - } - }, - "Obligations": [ - { - "Id": "fail_to_permit", - "AttributeAssignments": [ - { - "AttributeId": "obligation-id", - "Value": "You can access the resource index.jsp", - "DataType": "http://www.w3.org/2001/XMLSchema#string" - } - ] - } - ], - "http://wso2.org/identity/user": { - "Attribute": [ - { - "AttributeId": "http://wso2.org/identity/user/username", - "Value": "publicUser", - "IncludeInResult": "true", - "DataType": "http://www.w3.org/2001/XMLSchema#string" - } - ] - }, - "Action": { - "Attribute": [ - { - "AttributeId": "urn:oasis:names:tc:xacml:1.0:action:action-id", - "Value": "view-status", - "IncludeInResult": "true", - "DataType": "http://www.w3.org/2001/XMLSchema#string" - } - ] - }, - "Resource": { - "Attribute": [ - { - "AttributeId": "urn:oasis:names:tc:xacml:1.0:resource:resource-id", - "Value": "index.jsp", - "IncludeInResult": "true", - "DataType": "http://www.w3.org/2001/XMLSchema#string" - } - ] - } - }, - { - "Decision": "Deny", - "Status": { - "StatusCode": { - "Value": "urn:oasis:names:tc:xacml:1.0:status:ok" - } - }, - "Obligations": [ - { - "Id": "fail_to_permit", - "AttributeAssignments": [ - { - "AttributeId": "obligation-id", - "Value": "You can access the resource index.jsp", - "DataType": "http://www.w3.org/2001/XMLSchema#string" - } - ] - } - ], - "Resource": { - "Attribute": [ - { - "AttributeId": "urn:oasis:names:tc:xacml:1.0:resource:resource-id", - "Value": "index.jsp", - "IncludeInResult": "true", - "DataType": "http://www.w3.org/2001/XMLSchema#string" - } - ] - }, - "http://wso2.org/identity/user": { - "Attribute": [ - { - "AttributeId": "http://wso2.org/identity/user/username", - "Value": "adminUser", - "IncludeInResult": "true", - "DataType": "http://www.w3.org/2001/XMLSchema#string" - } - ] - }, - "Action": { - "Attribute": [ - { - "AttributeId": "urn:oasis:names:tc:xacml:1.0:action:action-id", - "Value": "view-welcome", - "IncludeInResult": "true", - "DataType": "http://www.w3.org/2001/XMLSchema#string" - } - ] - } - }, - { - "Decision": "Deny", - "Status": { - "StatusCode": { - "Value": "urn:oasis:names:tc:xacml:1.0:status:ok" - } - }, - "Obligations": [ - { - "Id": "fail_to_permit", - "AttributeAssignments": [ - { - "AttributeId": "obligation-id", - "Value": "You can access the resource index.jsp", - "DataType": "http://www.w3.org/2001/XMLSchema#string" - } - ] - } - ], - "Action": { - "Attribute": [ - { - "AttributeId": "urn:oasis:names:tc:xacml:1.0:action:action-id", - "Value": "modify-welcome", - "IncludeInResult": "true", - "DataType": "http://www.w3.org/2001/XMLSchema#string" - } - ] - }, - "Resource": { - "Attribute": [ - { - "AttributeId": "urn:oasis:names:tc:xacml:1.0:resource:resource-id", - "Value": "index.jsp", - "IncludeInResult": "true", - "DataType": "http://www.w3.org/2001/XMLSchema#string" - } - ] - }, - "http://wso2.org/identity/user": { - "Attribute": [ - { - "AttributeId": "http://wso2.org/identity/user/username", - "Value": "publicUser", - "IncludeInResult": "true", - "DataType": "http://www.w3.org/2001/XMLSchema#string" - } - ] - } - } - ] -} diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/entitlement/json/simpleMDPRequest.json b/modules/integration/tests-integration/tests-backend/src/test/resources/entitlement/json/simpleMDPRequest.json deleted file mode 100644 index d690d4a7f72..00000000000 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/entitlement/json/simpleMDPRequest.json +++ /dev/null @@ -1,63 +0,0 @@ -{ - "Request": { - "http://wso2.org/identity/user": [ - { - "Attribute": [ - { - "AttributeId": "http://wso2.org/identity/user/username", - "Value": "adminUser", - "IncludeInResult": true, - "DataType": "string" - } - ] - },{ - "Attribute": [ - { - "AttributeId": "http://wso2.org/identity/user/username", - "Value": "internalUser", - "IncludeInResult": true, - "DataType": "string" - } - ] - } ], - - "Resource": { - "Attribute": [ - { - "AttributeId": "resource-id", - "Value": "index.jsp", - "IncludeInResult": false - } - ] - }, - "Action": [{ - "Attribute": [{ - "AttributeId": "action-id", - "Value": "view-welcome", - "IncludeInResult": true - } - ] - },{ - "Attribute": [{ - "AttributeId": "action-id", - "Value": "view-status", - "IncludeInResult": false - } - ] - },{ - "Attribute": [{ - "AttributeId": "action-id", - "Value": "view-summary", - "IncludeInResult": true - } - ] - },{ - "Attribute": [{ - "AttributeId": "action-id", - "Value": "modify-welcome", - "IncludeInResult": true - } - ] - } ] - } -} diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/entitlement/json/simpleMDPResponse.json b/modules/integration/tests-integration/tests-backend/src/test/resources/entitlement/json/simpleMDPResponse.json deleted file mode 100644 index 9c5072a2c7f..00000000000 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/entitlement/json/simpleMDPResponse.json +++ /dev/null @@ -1,280 +0,0 @@ -{ - "Response": [ - { - "Decision": "Deny", - "Status": { - "StatusCode": { - "Value": "urn:oasis:names:tc:xacml:1.0:status:ok" - } - }, - "Obligations": [ - { - "Id": "fail_to_permit", - "AttributeAssignments": [ - { - "AttributeId": "obligation-id", - "Value": "You can access the resource index.jsp", - "DataType": "http://www.w3.org/2001/XMLSchema#string" - } - ] - } - ], - "http://wso2.org/identity/user": { - "Attribute": [ - { - "AttributeId": "http://wso2.org/identity/user/username", - "Value": "internalUser", - "IncludeInResult": "true", - "DataType": "http://www.w3.org/2001/XMLSchema#string" - } - ] - }, - "Action": { - "Attribute": [ - { - "AttributeId": "urn:oasis:names:tc:xacml:1.0:action:action-id", - "Value": "view-welcome", - "IncludeInResult": "true", - "DataType": "http://www.w3.org/2001/XMLSchema#string" - } - ] - } - }, - { - "Decision": "Permit", - "Status": { - "StatusCode": { - "Value": "urn:oasis:names:tc:xacml:1.0:status:ok" - } - }, - "http://wso2.org/identity/user": { - "Attribute": [ - { - "AttributeId": "http://wso2.org/identity/user/username", - "Value": "internalUser", - "IncludeInResult": "true", - "DataType": "http://www.w3.org/2001/XMLSchema#string" - } - ] - } - }, - { - "Decision": "Deny", - "Status": { - "StatusCode": { - "Value": "urn:oasis:names:tc:xacml:1.0:status:ok" - } - }, - "Obligations": [ - { - "Id": "fail_to_permit", - "AttributeAssignments": [ - { - "AttributeId": "obligation-id", - "Value": "You can access the resource index.jsp", - "DataType": "http://www.w3.org/2001/XMLSchema#string" - } - ] - } - ], - "Action": { - "Attribute": [ - { - "AttributeId": "urn:oasis:names:tc:xacml:1.0:action:action-id", - "Value": "view-summary", - "IncludeInResult": "true", - "DataType": "http://www.w3.org/2001/XMLSchema#string" - } - ] - }, - "http://wso2.org/identity/user": { - "Attribute": [ - { - "AttributeId": "http://wso2.org/identity/user/username", - "Value": "adminUser", - "IncludeInResult": "true", - "DataType": "http://www.w3.org/2001/XMLSchema#string" - } - ] - } - }, - { - "Decision": "Deny", - "Status": { - "StatusCode": { - "Value": "urn:oasis:names:tc:xacml:1.0:status:ok" - } - }, - "Obligations": [ - { - "Id": "fail_to_permit", - "AttributeAssignments": [ - { - "AttributeId": "obligation-id", - "Value": "You can access the resource index.jsp", - "DataType": "http://www.w3.org/2001/XMLSchema#string" - } - ] - } - ], - "Action": { - "Attribute": [ - { - "AttributeId": "urn:oasis:names:tc:xacml:1.0:action:action-id", - "Value": "view-summary", - "IncludeInResult": "true", - "DataType": "http://www.w3.org/2001/XMLSchema#string" - } - ] - }, - "http://wso2.org/identity/user": { - "Attribute": [ - { - "AttributeId": "http://wso2.org/identity/user/username", - "Value": "internalUser", - "IncludeInResult": "true", - "DataType": "http://www.w3.org/2001/XMLSchema#string" - } - ] - } - }, - { - "Decision": "Deny", - "Status": { - "StatusCode": { - "Value": "urn:oasis:names:tc:xacml:1.0:status:ok" - } - }, - "Obligations": [ - { - "Id": "fail_to_permit", - "AttributeAssignments": [ - { - "AttributeId": "obligation-id", - "Value": "You can access the resource index.jsp", - "DataType": "http://www.w3.org/2001/XMLSchema#string" - } - ] - } - ], - "http://wso2.org/identity/user": { - "Attribute": [ - { - "AttributeId": "http://wso2.org/identity/user/username", - "Value": "adminUser", - "IncludeInResult": "true", - "DataType": "http://www.w3.org/2001/XMLSchema#string" - } - ] - }, - "Action": { - "Attribute": [ - { - "AttributeId": "urn:oasis:names:tc:xacml:1.0:action:action-id", - "Value": "view-welcome", - "IncludeInResult": "true", - "DataType": "http://www.w3.org/2001/XMLSchema#string" - } - ] - } - }, - { - "Decision": "Deny", - "Status": { - "StatusCode": { - "Value": "urn:oasis:names:tc:xacml:1.0:status:ok" - } - }, - "Obligations": [ - { - "Id": "fail_to_permit", - "AttributeAssignments": [ - { - "AttributeId": "obligation-id", - "Value": "You can access the resource index.jsp", - "DataType": "http://www.w3.org/2001/XMLSchema#string" - } - ] - } - ], - "http://wso2.org/identity/user": { - "Attribute": [ - { - "AttributeId": "http://wso2.org/identity/user/username", - "Value": "internalUser", - "IncludeInResult": "true", - "DataType": "http://www.w3.org/2001/XMLSchema#string" - } - ] - }, - "Action": { - "Attribute": [ - { - "AttributeId": "urn:oasis:names:tc:xacml:1.0:action:action-id", - "Value": "modify-welcome", - "IncludeInResult": "true", - "DataType": "http://www.w3.org/2001/XMLSchema#string" - } - ] - } - }, - { - "Decision": "Permit", - "Status": { - "StatusCode": { - "Value": "urn:oasis:names:tc:xacml:1.0:status:ok" - } - }, - "http://wso2.org/identity/user": { - "Attribute": [ - { - "AttributeId": "http://wso2.org/identity/user/username", - "Value": "adminUser", - "IncludeInResult": "true", - "DataType": "http://www.w3.org/2001/XMLSchema#string" - } - ] - }, - "Action": { - "Attribute": [ - { - "AttributeId": "urn:oasis:names:tc:xacml:1.0:action:action-id", - "Value": "modify-welcome", - "IncludeInResult": "true", - "DataType": "http://www.w3.org/2001/XMLSchema#string" - } - ] - } - }, - { - "Decision": "Deny", - "Status": { - "StatusCode": { - "Value": "urn:oasis:names:tc:xacml:1.0:status:ok" - } - }, - "Obligations": [ - { - "Id": "fail_to_permit", - "AttributeAssignments": [ - { - "AttributeId": "obligation-id", - "Value": "You can access the resource index.jsp", - "DataType": "http://www.w3.org/2001/XMLSchema#string" - } - ] - } - ], - "http://wso2.org/identity/user": { - "Attribute": [ - { - "AttributeId": "http://wso2.org/identity/user/username", - "Value": "adminUser", - "IncludeInResult": "true", - "DataType": "http://www.w3.org/2001/XMLSchema#string" - } - ] - } - } - ] -} diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/entitlement/json/simpleRequest.json b/modules/integration/tests-integration/tests-backend/src/test/resources/entitlement/json/simpleRequest.json deleted file mode 100644 index 6f42054a9a2..00000000000 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/entitlement/json/simpleRequest.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "Request": { - "http://wso2.org/identity/user": { - "Attribute": [ - { - "AttributeId": "http://wso2.org/identity/user/username", - "Value": "adminUser", - "DataType": "string", - "IncludeInResult": true - } - ] - }, - - "Resource": { - "Attribute": [ - { - "AttributeId": "resource-id", - "Value": "index.jsp", - "DataType": "string", - "IncludeInResult": true - } - ] - }, - "Action": { - "Attribute": [{ - "AttributeId": "action-id", - "Value": "view-welcome", - "DataType": "string", - "IncludeInResult": true - } - ] - } - - } -} diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/entitlement/json/simpleResponse.json b/modules/integration/tests-integration/tests-backend/src/test/resources/entitlement/json/simpleResponse.json deleted file mode 100644 index b007152e9b1..00000000000 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/entitlement/json/simpleResponse.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "Response": [ - { - "Decision": "Deny", - "Status": { - "StatusCode": { - "Value": "urn:oasis:names:tc:xacml:1.0:status:ok" - } - }, - "Obligations": [ - { - "Id": "fail_to_permit", - "AttributeAssignments": [ - { - "AttributeId": "obligation-id", - "Value": "You can access the resource index.jsp", - "DataType": "http://www.w3.org/2001/XMLSchema#string" - } - ] - } - ], - "http://wso2.org/identity/user": { - "Attribute": [ - { - "AttributeId": "http://wso2.org/identity/user/username", - "Value": "adminUser", - "IncludeInResult": "true", - "DataType": "http://www.w3.org/2001/XMLSchema#string" - } - ] - }, - "Action": { - "Attribute": [ - { - "AttributeId": "urn:oasis:names:tc:xacml:1.0:action:action-id", - "Value": "view-welcome", - "IncludeInResult": "true", - "DataType": "http://www.w3.org/2001/XMLSchema#string" - } - ] - }, - "Resource": { - "Attribute": [ - { - "AttributeId": "urn:oasis:names:tc:xacml:1.0:resource:resource-id", - "Value": "index.jsp", - "IncludeInResult": "true", - "DataType": "http://www.w3.org/2001/XMLSchema#string" - } - ] - } - } - ] -} diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/identity.xml b/modules/integration/tests-integration/tests-backend/src/test/resources/identity.xml index d2efc4a04cc..822db2edbc9 100755 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/identity.xml +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/identity.xml @@ -100,7 +100,6 @@ - diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/org/wso2/identity/integration/test/rest/api/server/application/management/v1/oidc-metadata.json b/modules/integration/tests-integration/tests-backend/src/test/resources/org/wso2/identity/integration/test/rest/api/server/application/management/v1/oidc-metadata.json index cb0fe21e917..2449617dd60 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/org/wso2/identity/integration/test/rest/api/server/application/management/v1/oidc-metadata.json +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/org/wso2/identity/integration/test/rest/api/server/application/management/v1/oidc-metadata.json @@ -74,8 +74,7 @@ }, "scopeValidators": { "options": [ - "Role based scope validator", - "XACML Scope Validator" + "Role based scope validator" ] }, "accessTokenType": { diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/spFile/TestServer.xml b/modules/integration/tests-integration/tests-backend/src/test/resources/spFile/TestServer.xml index 6b990ae12ac..01de5f25e52 100644 --- a/modules/integration/tests-integration/tests-backend/src/test/resources/spFile/TestServer.xml +++ b/modules/integration/tests-integration/tests-backend/src/test/resources/spFile/TestServer.xml @@ -77,7 +77,6 @@ refresh_token urn:ietf:params:oauth:grant-type:saml2-bearer implicit password client_credentials iwa:ntlm authorization_code urn:ietf:params:oauth:grant-type:jwt-bearer Role based scope validator - XACML Scope Validator true false diff --git a/modules/integration/tests-ui-integration/src/test/java/org/wso2/identity/ui/integration/test/policy/ui/SimplePolicyEditorTestCase.java b/modules/integration/tests-ui-integration/src/test/java/org/wso2/identity/ui/integration/test/policy/ui/SimplePolicyEditorTestCase.java deleted file mode 100644 index 7cad26a5f5b..00000000000 --- a/modules/integration/tests-ui-integration/src/test/java/org/wso2/identity/ui/integration/test/policy/ui/SimplePolicyEditorTestCase.java +++ /dev/null @@ -1,93 +0,0 @@ -package org.wso2.identity.ui.integration.test.policy.ui; - -import org.openqa.selenium.By; -import org.openqa.selenium.WebDriver; -import org.openqa.selenium.WebElement; -import org.openqa.selenium.support.ui.Select; -import org.testng.Assert; -import org.testng.annotations.AfterClass; -import org.testng.annotations.BeforeClass; -import org.testng.annotations.Test; -import org.wso2.carbon.automation.extensions.selenium.BrowserManager; -import org.wso2.identity.integration.common.ui.page.LoginPage; -import org.wso2.identity.integration.common.ui.page.util.UIElementMapper; -import org.wso2.identity.integration.common.utils.ISIntegrationUITest; - -/** - * - */ - -/** - * @author wso2 - * - */ -public class SimplePolicyEditorTestCase extends ISIntegrationUITest { - - private WebDriver driver; - private UIElementMapper uiElementMapper; - - @BeforeClass(alwaysRun = true) - public void setUp() throws Exception { - super.init(); - driver = BrowserManager.getWebDriver(); - - driver.get(getLoginURL()); - //ToDO migrate to new test environment -// EnvironmentBuilder builder = new EnvironmentBuilder().is(5); -// EnvironmentVariables environment =builder.build().getIs(); - - } - - @Test(groups = "wso2.is", description = "verify last deny rule in simple policy editor") - public void testPolicyCreate() throws Exception { - - LoginPage test = new LoginPage(driver); - test.loginAs("admin", "admin"); - - System.out.println(" *********** Running test policy create ********** "); - this.uiElementMapper = UIElementMapper.getInstance(); - - driver.findElement(By.linkText("Policy Administration")).click(); - driver.findElement(By.linkText("Add New Entitlement Policy")).click(); - driver.findElement(By.linkText("Simple Policy Editor")).click(); - - driver.findElement(By.id("policyId")).sendKeys("policy1"); - driver.findElement(By.id("policyDescription")).sendKeys("Test Description"); - - WebElement dropDownListBox = driver.findElement(By.id("policyApplied")); - Select clickThis = new Select(dropDownListBox); - clickThis.selectByVisibleText("Subject"); - - WebElement dropDownListBox2 = driver.findElement(By.id("userAttributeId")); - Select clickThis2 = new Select(dropDownListBox2); - clickThis2.selectByVisibleText("Role"); - - driver.findElement(By.id("userAttributeValue")).sendKeys("testRole"); - driver.findElement(By.id("actionRuleValue_0")).sendKeys("read"); - driver.findElement(By.id("resourceRuleValue_0")).sendKeys("Res1"); - - driver.findElement(By.xpath("//*[@id=\"mainTable\"]/tbody/tr[6]/td/input[1]")).click(); - - // click ok button of message box - driver.findElement(By.xpath("/html/body/div[3]/div[2]/button")).click(); - - // View policies... - driver.findElement(By.linkText("Policy Administration")).click(); - driver.findElement(By.linkText("policy1")).click(); - Thread.sleep(3000); - - // Check for Deny-Rule - WebElement frame = driver.findElement(By.xpath("//*[@id=\"frame_raw-policy\"]")); - driver.switchTo().frame(frame); - String contentText = driver.findElement(By.id("content_highlight")).getText(); - Assert.assertNotNull(contentText); - Assert.assertTrue(contentText.contains("")); - driver.close(); - - } - - @AfterClass(alwaysRun = true) - public void tearDown() throws Exception { - driver.quit(); - } -} diff --git a/modules/integration/tests-ui-integration/src/test/resources/artifacts/IS/IIA001Policy.xml b/modules/integration/tests-ui-integration/src/test/resources/artifacts/IS/IIA001Policy.xml deleted file mode 100644 index f40f0c208af..00000000000 --- a/modules/integration/tests-ui-integration/src/test/resources/artifacts/IS/IIA001Policy.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - Policy for Conformance Test IIA001. - - - - - Julius Hibbert can read or write Bart Simpson's medical record. - - - - - - Julius Hibbert - - - - - - - - http://medico.com/record/patient/BartSimpson - - - - - - - - read - - - - - - write - - - - - - - diff --git a/modules/integration/tests-ui-integration/src/test/resources/artifacts/IS/IIA001Request.xml b/modules/integration/tests-ui-integration/src/test/resources/artifacts/IS/IIA001Request.xml deleted file mode 100644 index 5414b78b65b..00000000000 --- a/modules/integration/tests-ui-integration/src/test/resources/artifacts/IS/IIA001Request.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - Julius Hibbert - - - - - http://medico.com/record/patient/BartSimpson - - - - - read - - - - diff --git a/modules/integration/tests-ui-integration/src/test/resources/artifacts/IS/IIA003Policy.xml b/modules/integration/tests-ui-integration/src/test/resources/artifacts/IS/IIA003Policy.xml deleted file mode 100644 index f4829fa597a..00000000000 --- a/modules/integration/tests-ui-integration/src/test/resources/artifacts/IS/IIA003Policy.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - Policy for Conformance Test IIA003. - - - - - A subject with a "bogus" attribute with a value of - "Physician" can read or write Bart Simpson's medical - record. - - - - - - Physician - - - - - - - - http://medico.com/record/patient/BartSimpson - - - - - - - - read - - - - - - write - - - - - - - diff --git a/modules/integration/tests-ui-integration/src/test/resources/artifacts/IS/IIA003Request.xml b/modules/integration/tests-ui-integration/src/test/resources/artifacts/IS/IIA003Request.xml deleted file mode 100644 index 2dc5861db12..00000000000 --- a/modules/integration/tests-ui-integration/src/test/resources/artifacts/IS/IIA003Request.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - Julius Hibbert - - - - - http://medico.com/record/patient/BartSimpson - - - - - read - - diff --git a/modules/integration/tests-ui-integration/src/test/resources/artifacts/IS/entitlement/policies/policy1.xml b/modules/integration/tests-ui-integration/src/test/resources/artifacts/IS/entitlement/policies/policy1.xml deleted file mode 100644 index 0b8a8be97b4..00000000000 --- a/modules/integration/tests-ui-integration/src/test/resources/artifacts/IS/entitlement/policies/policy1.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - testRole - - - - - - - - - - - read - - - - - - - \ No newline at end of file diff --git a/modules/integration/tests-ui-integration/src/test/resources/artifacts/IS/openId/identity-default.xml b/modules/integration/tests-ui-integration/src/test/resources/artifacts/IS/openId/identity-default.xml index 4d8e3c8842e..5acc7be717f 100644 --- a/modules/integration/tests-ui-integration/src/test/resources/artifacts/IS/openId/identity-default.xml +++ b/modules/integration/tests-ui-integration/src/test/resources/artifacts/IS/openId/identity-default.xml @@ -195,7 +195,6 @@ - diff --git a/modules/integration/tests-ui-integration/src/test/resources/artifacts/IS/openId/identity-skipuserconsent.xml b/modules/integration/tests-ui-integration/src/test/resources/artifacts/IS/openId/identity-skipuserconsent.xml index 169c1725c1f..eda1280af85 100644 --- a/modules/integration/tests-ui-integration/src/test/resources/artifacts/IS/openId/identity-skipuserconsent.xml +++ b/modules/integration/tests-ui-integration/src/test/resources/artifacts/IS/openId/identity-skipuserconsent.xml @@ -195,7 +195,6 @@ - diff --git a/modules/integration/tests-ui-integration/src/test/resources/instrumentation.txt b/modules/integration/tests-ui-integration/src/test/resources/instrumentation.txt index c92960be910..cdbd61dc8c3 100644 --- a/modules/integration/tests-ui-integration/src/test/resources/instrumentation.txt +++ b/modules/integration/tests-ui-integration/src/test/resources/instrumentation.txt @@ -9,8 +9,6 @@ org.wso2.carbon.identity.authorization.core_ org.wso2.carbon.identity.base_ org.wso2.carbon.identity.certificateauthority_ org.wso2.carbon.identity.core_ -org.wso2.carbon.identity.entitlement_ -org.wso2.carbon.identity.entitlement.common_ org.wso2.carbon.identity.mgt_ org.wso2.carbon.identity.oauth_ org.wso2.carbon.identity.oauth.common_ diff --git a/modules/integration/tests-ui-integration/src/test/resources/testng.xml b/modules/integration/tests-ui-integration/src/test/resources/testng.xml index e739b29cf6f..faa3bc5900d 100644 --- a/modules/integration/tests-ui-integration/src/test/resources/testng.xml +++ b/modules/integration/tests-ui-integration/src/test/resources/testng.xml @@ -16,7 +16,6 @@ -