From cc337d349a30d59b2535e53e32043ee8709c7111 Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Thu, 8 Jul 2010 09:27:17 +0000
Subject: [PATCH] LMS-1615 adapt to changed role set names
SVN: 16935
---
.../plugin/phosphonetx/client/api/v1/RawDataApiFacade.java | 2 +-
.../phosphonetx/client/api/v1/RawDataApiFacadeTest.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/api/v1/RawDataApiFacade.java b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/api/v1/RawDataApiFacade.java
index 29b9631f2a2..6840abef472 100644
--- a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/api/v1/RawDataApiFacade.java
+++ b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/api/v1/RawDataApiFacade.java
@@ -36,7 +36,7 @@ import ch.systemsx.cisd.openbis.plugin.phosphonetx.shared.api.v1.dto.MsInjection
*/
class RawDataApiFacade implements IRawDataApiFacade
{
- private static final String USER_ROLE_SET = "USER";
+ private static final String USER_ROLE_SET = "SPACE_USER";
private final IRawDataService service;
private final IGeneralInformationService generalInfoService;
private final String sessionToken;
diff --git a/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/api/v1/RawDataApiFacadeTest.java b/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/api/v1/RawDataApiFacadeTest.java
index df0f329ec33..c396731b465 100644
--- a/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/api/v1/RawDataApiFacadeTest.java
+++ b/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/api/v1/RawDataApiFacadeTest.java
@@ -156,7 +156,7 @@ public class RawDataApiFacadeTest extends AssertJUnit
fail("IllegalStateException expected");
} catch (IllegalStateException ex)
{
- assertEquals("Role set USER not known.", ex.getMessage());
+ assertEquals("Role set SPACE_USER not known.", ex.getMessage());
}
context.assertIsSatisfied();
@@ -173,7 +173,7 @@ public class RawDataApiFacadeTest extends AssertJUnit
HashSet<Role> set = new HashSet<Role>();
set.add(new Role("R1", true));
set.add(new Role("R2", false));
- sets.put("USER", set);
+ sets.put("SPACE_USER", set);
will(returnValue(sets));
one(generalInfoService).listSpacesWithProjectsAndRoleAssignments(SESSION_TOKEN, null);
--
GitLab