Skip to content

Commit 04e719f

Browse files
BimsaraBodaragamaBimsaraBodaragama
committed
addressed SonarLint warns.
1 parent 18a813e commit 04e719f

File tree

1 file changed

+25
-45
lines changed
  • modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/rest/api/server/user/sharing/management/v1

1 file changed

+25
-45
lines changed

‎modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/identity/integration/test/rest/api/server/user/sharing/management/v1/UserSharingFailureTest.java

+25-45
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848

4949
import static org.hamcrest.CoreMatchers.equalTo;
5050
import static org.wso2.identity.integration.test.rest.api.server.user.sharing.management.v1.model.UserShareRequestBodyOrganizations.PolicyEnum.SELECTED_ORG_ONLY;
51+
import static org.wso2.identity.integration.test.rest.api.server.user.sharing.management.v1.model.UserShareRequestBodyOrganizations.PolicyEnum.SELECTED_ORG_WITH_ALL_EXISTING_AND_FUTURE_CHILDREN;
5152
import static org.wso2.identity.integration.test.rest.api.server.user.sharing.management.v1.model.UserShareRequestBodyOrganizations.PolicyEnum.SELECTED_ORG_WITH_ALL_EXISTING_CHILDREN_ONLY;
5253
import static org.wso2.identity.integration.test.rest.api.server.user.sharing.management.v1.model.UserShareRequestBodyOrganizations.PolicyEnum.SELECTED_ORG_WITH_EXISTING_IMMEDIATE_AND_FUTURE_CHILDREN;
5354
import static org.wso2.identity.integration.test.rest.api.server.user.sharing.management.v1.model.UserShareRequestBodyOrganizations.PolicyEnum.SELECTED_ORG_WITH_EXISTING_IMMEDIATE_CHILDREN_ONLY;
@@ -452,7 +453,7 @@ public Object[][] generalUserSharingWithReSharingDataProvider() {
452453
setExpectedResultsForGeneralUserSharingWithValidDetailsTestCase1();
453454
Map<String, Object> reSharingSubOrgDetailsForTestCase1 = orgDetails.get(L1_ORG_1_NAME);
454455
Map<String, Object> expectedResultsForTestCase1 =
455-
setExpectedResultsForGenealUserSharingWithReSharingTestCase1();
456+
setExpectedResultsForGeneralUserSharingWithReSharingTestCase1();
456457

457458
return new Object[][]{
458459
{userIdsForTestCase1, policyWithRolesForTestCase1, expectedSharedResultsForTestCase1,
@@ -665,16 +666,7 @@ private Map<String, Map<String, Object>> setOrganizationsForSelectiveUserSharing
665666

666667
private Map<String, Object> setExpectedResultsForSelectiveUserSharingWithInvalidDetailsTestCase3() {
667668

668-
Map<String, Object> expectedResults = new HashMap<>();
669-
670-
expectedResults.put(MAP_KEY_EXPECTED_ORG_COUNT, 0);
671-
expectedResults.put(MAP_KEY_EXPECTED_ORG_IDS, Collections.emptyList());
672-
expectedResults.put(MAP_KEY_EXPECTED_ORG_NAMES, Collections.emptyList());
673-
674-
Map<String, List<RoleWithAudience>> expectedRolesPerExpectedOrg = new HashMap<>();
675-
expectedResults.put(MAP_KEY_EXPECTED_ROLES_PER_EXPECTED_ORG, expectedRolesPerExpectedOrg);
676-
677-
return expectedResults;
669+
return setExpectedResultsForEmptySharedResult();
678670
}
679671

680672
private Map<String, Map<String, Object>> setOrganizationsForSelectiveUserSharingWithInvalidDetailsTestCase4() {
@@ -749,7 +741,7 @@ private Map<String, Map<String, Object>> setOrganizationsForSelectiveUserSharing
749741
org2.put(MAP_KEY_SELECTIVE_POLICY, SELECTED_ORG_WITH_EXISTING_IMMEDIATE_AND_FUTURE_CHILDREN);
750742
org2.put(MAP_KEY_SELECTIVE_ROLES, Arrays.asList(
751743
createRoleWithAudience(APP_ROLE_1, APP_1_NAME, APPLICATION_AUDIENCE),
752-
createRoleWithAudience(ORG_ROLE_1, ROOT_ORG_NAME, ORGANIZATION_AUDIENCE)));
744+
createRoleWithAudience(ORG_ROLE_2, ROOT_ORG_NAME, ORGANIZATION_AUDIENCE)));
753745

754746
organizations.put(L1_ORG_2_NAME, org2);
755747

@@ -767,10 +759,10 @@ private Map<String, Object> setExpectedResultsForSelectiveUserSharingWithInvalid
767759
Map<String, List<RoleWithAudience>> expectedRolesPerExpectedOrg = new HashMap<>();
768760
expectedRolesPerExpectedOrg.put(getOrgId(L1_ORG_2_NAME),
769761
Arrays.asList(createRoleWithAudience(APP_ROLE_1, APP_1_NAME, APPLICATION_AUDIENCE),
770-
createRoleWithAudience(ORG_ROLE_1, L1_ORG_2_NAME, ORGANIZATION_AUDIENCE)));
762+
createRoleWithAudience(ORG_ROLE_2, L1_ORG_2_NAME, ORGANIZATION_AUDIENCE)));
771763
expectedRolesPerExpectedOrg.put(getOrgId(L2_ORG_3_NAME),
772764
Arrays.asList(createRoleWithAudience(APP_ROLE_1, APP_1_NAME, APPLICATION_AUDIENCE),
773-
createRoleWithAudience(ORG_ROLE_1, L2_ORG_3_NAME, ORGANIZATION_AUDIENCE)));
765+
createRoleWithAudience(ORG_ROLE_2, L2_ORG_3_NAME, ORGANIZATION_AUDIENCE)));
774766

775767
expectedResults.put(MAP_KEY_EXPECTED_ROLES_PER_EXPECTED_ORG, expectedRolesPerExpectedOrg);
776768

@@ -788,7 +780,7 @@ private Map<String, Object> setPolicyWithRolesForGeneralUserSharingWithInvalidDe
788780
createRoleWithAudience(INVALID_APP_ROLE_2, APP_1_NAME, APPLICATION_AUDIENCE),
789781
createRoleWithAudience(INVALID_ORG_ROLE_1, ROOT_ORG_NAME, ORGANIZATION_AUDIENCE),
790782
createRoleWithAudience(INVALID_ORG_ROLE_2, INVALID_ORG_1_NAME, ORGANIZATION_AUDIENCE),
791-
createRoleWithAudience(APP_ROLE_1, APP_1_NAME, APPLICATION_AUDIENCE)));
783+
createRoleWithAudience(APP_ROLE_2, APP_1_NAME, APPLICATION_AUDIENCE)));
792784

793785
return policyWithRoles;
794786
}
@@ -808,19 +800,19 @@ private Map<String, Object> setExpectedResultsForGeneralUserSharingWithInvalidDe
808800

809801
Map<String, List<RoleWithAudience>> expectedRolesPerExpectedOrg = new HashMap<>();
810802
expectedRolesPerExpectedOrg.put(getOrgId(L1_ORG_1_NAME),
811-
Collections.singletonList(createRoleWithAudience(APP_ROLE_1, APP_1_NAME, APPLICATION_AUDIENCE)));
803+
Collections.singletonList(createRoleWithAudience(APP_ROLE_2, APP_1_NAME, APPLICATION_AUDIENCE)));
812804
expectedRolesPerExpectedOrg.put(getOrgId(L2_ORG_1_NAME),
813-
Collections.singletonList(createRoleWithAudience(APP_ROLE_1, APP_1_NAME, APPLICATION_AUDIENCE)));
805+
Collections.singletonList(createRoleWithAudience(APP_ROLE_2, APP_1_NAME, APPLICATION_AUDIENCE)));
814806
expectedRolesPerExpectedOrg.put(getOrgId(L2_ORG_2_NAME),
815-
Collections.singletonList(createRoleWithAudience(APP_ROLE_1, APP_1_NAME, APPLICATION_AUDIENCE)));
807+
Collections.singletonList(createRoleWithAudience(APP_ROLE_2, APP_1_NAME, APPLICATION_AUDIENCE)));
816808
expectedRolesPerExpectedOrg.put(getOrgId(L3_ORG_1_NAME),
817-
Collections.singletonList(createRoleWithAudience(APP_ROLE_1, APP_1_NAME, APPLICATION_AUDIENCE)));
809+
Collections.singletonList(createRoleWithAudience(APP_ROLE_2, APP_1_NAME, APPLICATION_AUDIENCE)));
818810
expectedRolesPerExpectedOrg.put(getOrgId(L1_ORG_2_NAME),
819-
Collections.singletonList(createRoleWithAudience(APP_ROLE_1, APP_1_NAME, APPLICATION_AUDIENCE)));
811+
Collections.singletonList(createRoleWithAudience(APP_ROLE_2, APP_1_NAME, APPLICATION_AUDIENCE)));
820812
expectedRolesPerExpectedOrg.put(getOrgId(L2_ORG_3_NAME),
821-
Collections.singletonList(createRoleWithAudience(APP_ROLE_1, APP_1_NAME, APPLICATION_AUDIENCE)));
813+
Collections.singletonList(createRoleWithAudience(APP_ROLE_2, APP_1_NAME, APPLICATION_AUDIENCE)));
822814
expectedRolesPerExpectedOrg.put(getOrgId(L1_ORG_3_NAME),
823-
Collections.singletonList(createRoleWithAudience(APP_ROLE_1, APP_1_NAME, APPLICATION_AUDIENCE)));
815+
Collections.singletonList(createRoleWithAudience(APP_ROLE_2, APP_1_NAME, APPLICATION_AUDIENCE)));
824816

825817
expectedResults.put(MAP_KEY_EXPECTED_ROLES_PER_EXPECTED_ORG, expectedRolesPerExpectedOrg);
826818

@@ -841,16 +833,7 @@ private Map<String, Object> setPolicyWithRolesForGeneralUserSharingWithInvalidDe
841833

842834
private Map<String, Object> setExpectedResultsForGeneralUserSharingWithInvalidDetailsTestCase2() {
843835

844-
Map<String, Object> expectedResults = new HashMap<>();
845-
846-
expectedResults.put(MAP_KEY_EXPECTED_ORG_COUNT, 0);
847-
expectedResults.put(MAP_KEY_EXPECTED_ORG_IDS, Collections.emptyList());
848-
expectedResults.put(MAP_KEY_EXPECTED_ORG_NAMES, Collections.emptyList());
849-
850-
Map<String, List<RoleWithAudience>> expectedRolesPerExpectedOrg = new HashMap<>();
851-
expectedResults.put(MAP_KEY_EXPECTED_ROLES_PER_EXPECTED_ORG, expectedRolesPerExpectedOrg);
852-
853-
return expectedResults;
836+
return setExpectedResultsForEmptySharedResult();
854837
}
855838

856839
private Map<String, Object> setPolicyWithRolesForGeneralUserSharingWithInvalidDetailsTestCase3() {
@@ -891,7 +874,7 @@ private Map<String, Map<String, Object>> setOrganizationsForSelectiveUserSharing
891874
Map<String, Object> org1 = new HashMap<>();
892875
org1.put(MAP_KEY_SELECTIVE_ORG_ID, getOrgId(L1_ORG_1_NAME));
893876
org1.put(MAP_KEY_SELECTIVE_ORG_NAME, L1_ORG_1_NAME);
894-
org1.put(MAP_KEY_SELECTIVE_POLICY, SELECTED_ORG_WITH_ALL_EXISTING_CHILDREN_ONLY);
877+
org1.put(MAP_KEY_SELECTIVE_POLICY, SELECTED_ORG_WITH_ALL_EXISTING_AND_FUTURE_CHILDREN);
895878
org1.put(MAP_KEY_SELECTIVE_ROLES,
896879
Collections.singletonList(createRoleWithAudience(APP_ROLE_1, APP_1_NAME, APPLICATION_AUDIENCE)));
897880

@@ -913,7 +896,8 @@ private Map<String, Map<String, Object>> setOrganizationsForSelectiveUserSharing
913896
org3.put(MAP_KEY_SELECTIVE_ORG_ID, getOrgId(L1_ORG_3_NAME));
914897
org3.put(MAP_KEY_SELECTIVE_ORG_NAME, L1_ORG_3_NAME);
915898
org3.put(MAP_KEY_SELECTIVE_POLICY, SELECTED_ORG_ONLY);
916-
org3.put(MAP_KEY_SELECTIVE_ROLES, Collections.emptyList());
899+
org3.put(MAP_KEY_SELECTIVE_ROLES,
900+
Collections.singletonList(createRoleWithAudience(APP_ROLE_2, APP_1_NAME, APPLICATION_AUDIENCE)));
917901

918902
organizations.put(L1_ORG_3_NAME, org3);
919903

@@ -948,7 +932,8 @@ private Map<String, Object> setExpectedResultsForSelectiveUserSharingWithValidDe
948932
expectedRolesPerExpectedOrg.put(getOrgId(L2_ORG_3_NAME),
949933
Arrays.asList(createRoleWithAudience(APP_ROLE_1, APP_1_NAME, APPLICATION_AUDIENCE),
950934
createRoleWithAudience(ORG_ROLE_1, L2_ORG_3_NAME, ORGANIZATION_AUDIENCE)));
951-
expectedRolesPerExpectedOrg.put(getOrgId(L1_ORG_3_NAME), Collections.emptyList());
935+
expectedRolesPerExpectedOrg.put(getOrgId(L1_ORG_3_NAME),
936+
Collections.singletonList(createRoleWithAudience(APP_ROLE_2, APP_1_NAME, APPLICATION_AUDIENCE)));
952937

953938
expectedResults.put(MAP_KEY_EXPECTED_ROLES_PER_EXPECTED_ORG, expectedRolesPerExpectedOrg);
954939

@@ -1116,20 +1101,15 @@ private Map<String, Map<String, Object>> setOrganizationsForSelectiveUserSharing
11161101

11171102
private Map<String, Object> setExpectedResultsForSelectiveUserSharingWithReSharingTestCase1() {
11181103

1119-
Map<String, Object> expectedResults = new HashMap<>();
1120-
1121-
expectedResults.put(MAP_KEY_EXPECTED_ORG_COUNT, 0);
1122-
expectedResults.put(MAP_KEY_EXPECTED_ORG_IDS, Collections.emptyList());
1123-
expectedResults.put(MAP_KEY_EXPECTED_ORG_NAMES, Collections.emptyList());
1104+
return setExpectedResultsForEmptySharedResult();
1105+
}
11241106

1125-
Map<String, List<RoleWithAudience>> expectedRolesPerExpectedOrg = new HashMap<>();
1107+
private Map<String, Object> setExpectedResultsForGeneralUserSharingWithReSharingTestCase1() {
11261108

1127-
expectedResults.put(MAP_KEY_EXPECTED_ROLES_PER_EXPECTED_ORG, expectedRolesPerExpectedOrg);
1128-
1129-
return expectedResults;
1109+
return setExpectedResultsForEmptySharedResult();
11301110
}
11311111

1132-
private Map<String, Object> setExpectedResultsForGenealUserSharingWithReSharingTestCase1() {
1112+
private Map<String, Object> setExpectedResultsForEmptySharedResult() {
11331113

11341114
Map<String, Object> expectedResults = new HashMap<>();
11351115

0 commit comments

Comments
 (0)