From bc4dd7af7ebd15812efa11df1cafd179c0c22629 Mon Sep 17 00:00:00 2001
From: buczekp <buczekp>
Date: Thu, 8 Jul 2010 13:05:32 +0000
Subject: [PATCH] [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/generic/shared/basic/dto/RoleWithHierarchy.java | 3 ++-
.../application/sample/GenericSampleRegistrationTest.java | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/RoleWithHierarchy.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/RoleWithHierarchy.java
index f4a7d235222..67a406a5255 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/RoleWithHierarchy.java
+++ b/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;
}
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleRegistrationTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleRegistrationTest.java
index b0ff1449818..15cb62cb379 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleRegistrationTest.java
+++ b/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();
--
GitLab