diff --git a/src/test/java/org/gcube/portlets/user/workspace/EditPermissionsTest.java b/src/test/java/org/gcube/portlets/user/workspace/EditPermissionsTest.java index 1074d83..e371c9b 100644 --- a/src/test/java/org/gcube/portlets/user/workspace/EditPermissionsTest.java +++ b/src/test/java/org/gcube/portlets/user/workspace/EditPermissionsTest.java @@ -52,8 +52,7 @@ public class EditPermissionsTest { .getHome(TEST_USER) .getWorkspace(); -// a65d0c7a-5ef3-4e61-b12f-715146368b6b shared folder name: My Data owner pasquale.pagano isVRE false ACLOwner: {ADMINISTRATOR=[pasquale.pagano], WRITE_OWNER=[leonardo.candela, francesco.mangiacrapa, giancarlo.panichi]} AclUser: WRITE_OWNER - WorkspaceFolder sharedFolder = (WorkspaceFolder) ws.getItem("a65d0c7a-5ef3-4e61-b12f-715146368b6b"); + WorkspaceFolder sharedFolder = (WorkspaceFolder) ws.getItem("bd5fa899-225d-4547-a3c5-79b5333cde20"); System.out.println(sharedFolder.getACLOwner()); @@ -103,34 +102,31 @@ public class EditPermissionsTest { } for (String username : listLogins) { - System.out.println("Checking username: "+username); + System.out.println("\nChecking username: "+username); for (ACLType aclHL : mapACL.keySet()) { - if(!aclHL.equals(ACLType.ADMINISTRATOR)){ - List loginsHL = mapACL.get(aclHL); - System.out.println("to ACLType: "+aclHL +", logins found: "+loginsHL); - - if(loginsHL.contains(username)){ - int cmp = comparator.compare(settingACL, aclHL); - System.out.println("Compare result between "+aclHL + " and "+settingACL +": "+cmp); - if(cmp==-1){ - System.out.println("Reject ACL: "+settingACL+ " to "+username); - //CHANGE ACL IS NOT VALID - }else if(cmp==1){ - //CHANGE ACL IS VALID - System.out.println("Set ACL: "+settingACL+ " to "+username); - }else if(cmp==0){ - //SAME ACL - System.out.println("Skipping ACL: "+settingACL+ " to "+username); - } - }else{ - //CHANGE ACL IS VALID - System.out.println("[Login not found], Set ACL: "+settingACL+ " to "+username); - } - } - - } + List loginsHL = mapACL.get(aclHL); + System.out.println("to ACLType: "+aclHL +", logins found: "+loginsHL); + + if(loginsHL.contains(username)){ + int cmp = comparator.compare(settingACL, aclHL); + System.out.println("Compare result between "+aclHL + " and "+settingACL +": "+cmp); + if(cmp==-1){ + System.out.println("Reject ACL: "+settingACL+ " to "+username); + //CHANGE ACL IS NOT VALID + }else if(cmp==1){ + //CHANGE ACL IS VALID + System.out.println("Set ACL: "+settingACL+ " to "+username); + }else if(cmp==0){ + //SAME ACL + System.out.println("Skipping ACL: "+settingACL+ " to "+username); + } + }else{ + //CHANGE ACL IS VALID + System.out.println("[Login not found], Set ACL: "+settingACL+ " to "+username); + } + } } } catch (InternalErrorException e) { // TODO Auto-generated catch block