From 7c4765ed1d35d7744b6dc9d92b8d14e8dca0094b Mon Sep 17 00:00:00 2001
From: buczekp <buczekp>
Date: Thu, 8 Jul 2010 08:59:25 +0000
Subject: [PATCH] [LMS-1625] fixed expectations of authorization tests
SVN: 16933
---
.../application/AuthorizationManagementConsolTest.java | 5 +++--
.../application/sample/GenericSampleRegistrationTest.java | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/AuthorizationManagementConsolTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/AuthorizationManagementConsolTest.java
index 58e0cf2222c..014b35f7866 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/AuthorizationManagementConsolTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/AuthorizationManagementConsolTest.java
@@ -97,7 +97,8 @@ public class AuthorizationManagementConsolTest extends AbstractGWTTestCase
remoteConsole.prepare(new OpenRoleAssignmentDialog());
remoteConsole.prepare(FillRoleAssignmentForm.fillAuthorizationGroupRole(TEST_GROUP
- .toUpperCase(), TestConstants.ADMINS_GROUP, RoleWithHierarchy.SPACE_OBSERVER.toString()));
+ .toUpperCase(), TestConstants.ADMINS_GROUP, RoleWithHierarchy.SPACE_OBSERVER
+ .toString()));
final CheckRoleAssignmentTable table = new CheckRoleAssignmentTable();
table.expectedRow(RoleAssignmentRow.authorizationGroupRoleRow(TEST_GROUP.toUpperCase(),
ADMINS_GROUP, RoleWithHierarchy.SPACE_OBSERVER.toString()));
@@ -114,7 +115,7 @@ public class AuthorizationManagementConsolTest extends AbstractGWTTestCase
FailureExpectation failureExpectation =
new FailureExpectation(
(Class<? extends AsyncCallback<?>>) AbstractBrowserGrid.ListEntitiesCallback.class)
- .with("Authorization failure: None of method roles '[INSTANCE.ADMIN]' "
+ .with("Authorization failure: None of method roles '[INSTANCE_ADMIN]' "
+ "could be found in roles of user 'o'.");
remoteConsole.prepare(failureExpectation);
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 a8124afe9b6..b0ff1449818 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 "
- + "'[SPACE.USER, SPACE.POWER_USER, SPACE.ADMIN, INSTANCE.ADMIN]' "
+ + "'[INSTANCE_ADMIN, SPACE_ADMIN, SPACE_USER, SPACE_POWER_USER]' "
+ "could be found in roles of user 'observer'.");
remoteConsole.prepare(failureExpectation);
launchTest();
--
GitLab