[LMS-1625] improved authorization error message (order roles in message...

[LMS-1625] improved authorization error message (order roles in message starging from required role, then enumerate stronger roles) and fixed expectations of authorization tests

SVN: 16941

openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/RoleWithHierarchy.java

@@ -139,8 +139,9 @@ public enum RoleWithHierarchy implements IsSerializable
 
     public Set<RoleWithHierarchy> getRoles()
     {
-        Set<RoleWithHierarchy> roles = new LinkedHashSet<RoleWithHierarchy>(strongerRoles);
+        Set<RoleWithHierarchy> roles = new LinkedHashSet<RoleWithHierarchy>();
         roles.add(this);
+        roles.addAll(strongerRoles);
         return roles;
     }
 

openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleRegistrationTest.java

@@ -110,7 +110,7 @@ public class GenericSampleRegistrationTest extends AbstractGWTTestCase
         FailureExpectation failureExpectation =
                 new FailureExpectation(GenericSampleRegistrationForm.RegisterSampleCallback.class)
                         .with("Authorization failure: None of method roles "
-                                + "'[INSTANCE_ADMIN, SPACE_ADMIN, SPACE_USER, SPACE_POWER_USER]' "
+                                + "'[SPACE_USER, SPACE_POWER_USER, SPACE_ADMIN, INSTANCE_ADMIN]' "
                                 + "could be found in roles of user 'observer'.");
         remoteConsole.prepare(failureExpectation);
         launchTest();