From aea8c3304c743d825b16d601b92474efc2a7883c Mon Sep 17 00:00:00 2001
From: pkupczyk <pkupczyk>
Date: Fri, 5 Oct 2012 07:18:03 +0000
Subject: [PATCH] BIS-222 - Make STORAGE_CONFIRMED available in dataset search
for admins - fix junits
SVN: 27056
---
.../cisd/openbis/generic/server/AbstractServerTest.java | 4 +++-
.../cisd/openbis/generic/server/CommonServerTest.java | 5 ++++-
.../plugin/query/server/api/v1/QueryApiServerTest.java | 8 +++++++-
3 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/AbstractServerTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/AbstractServerTest.java
index f02ab1f1468..a2dc7982876 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/AbstractServerTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/AbstractServerTest.java
@@ -35,6 +35,7 @@ import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDAOFactory;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.IPersonDAO;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.IRoleAssignmentDAO;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.RoleWithHierarchy.RoleCode;
+import ch.systemsx.cisd.openbis.generic.shared.dto.DatabaseInstancePE;
import ch.systemsx.cisd.openbis.generic.shared.dto.PersonPE;
import ch.systemsx.cisd.openbis.generic.shared.dto.RoleAssignmentPE;
import ch.systemsx.cisd.openbis.generic.shared.dto.Session;
@@ -98,7 +99,7 @@ public class AbstractServerTest extends AssertJUnit
will(returnValue(roleAssigmentDAO));
allowing(daoFactory).getHomeDatabaseInstance();
- will(returnValue(null));
+ will(returnValue(new DatabaseInstancePE()));
}
});
}
@@ -220,6 +221,7 @@ public class AbstractServerTest extends AssertJUnit
PersonPE person = new PersonPE();
person.setUserId(username);
+ person.setDatabaseInstance(daoFactory.getHomeDatabaseInstance());
one(personDAO).createPerson(person);
allowing(personDAO).tryFindPersonByUserId(PersonPE.SYSTEM_USER_ID);
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/CommonServerTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/CommonServerTest.java
index f98dfbe6219..d1597f2ea89 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/CommonServerTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/CommonServerTest.java
@@ -496,7 +496,10 @@ public final class CommonServerTest extends AbstractServerTestCase
{
// users without any roles cannot login
Set<RoleAssignmentPE> rolesAssignments = new HashSet<RoleAssignmentPE>();
- rolesAssignments.add(new RoleAssignmentPE());
+ RoleAssignmentPE roleAssignment = new RoleAssignmentPE();
+ roleAssignment.setRole(RoleCode.ADMIN);
+ roleAssignment.setDatabaseInstance(new DatabaseInstancePE());
+ rolesAssignments.add(roleAssignment);
person.setRoleAssignments(rolesAssignments);
}
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/query/server/api/v1/QueryApiServerTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/query/server/api/v1/QueryApiServerTest.java
index 7de88c8dee6..9bfe012643b 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/query/server/api/v1/QueryApiServerTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/query/server/api/v1/QueryApiServerTest.java
@@ -40,10 +40,12 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DoubleTableCell;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.IntegerTableCell;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.QueryType;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ReportingPluginType;
+import ch.systemsx.cisd.openbis.generic.shared.basic.dto.RoleWithHierarchy.RoleCode;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.StringTableCell;
import ch.systemsx.cisd.openbis.generic.shared.dto.DataSetTypePE;
import ch.systemsx.cisd.openbis.generic.shared.dto.DataStorePE;
import ch.systemsx.cisd.openbis.generic.shared.dto.DataStoreServicePE;
+import ch.systemsx.cisd.openbis.generic.shared.dto.DatabaseInstancePE;
import ch.systemsx.cisd.openbis.generic.shared.dto.PersonPE;
import ch.systemsx.cisd.openbis.generic.shared.dto.RoleAssignmentPE;
import ch.systemsx.cisd.openbis.generic.shared.dto.Session;
@@ -94,10 +96,14 @@ public class QueryApiServerTest extends AbstractServerTestCase
one(sessionManager).getSession(SESSION_TOKEN);
will(returnValue(session));
+ RoleAssignmentPE roleAssignment = new RoleAssignmentPE();
+ roleAssignment.setRole(RoleCode.ADMIN);
+ roleAssignment.setDatabaseInstance(new DatabaseInstancePE());
+
PersonPE person = new PersonPE();
person.setUserId("Albert");
person.setRoleAssignments(new HashSet<RoleAssignmentPE>(Arrays
- .asList(new RoleAssignmentPE())));
+ .asList(roleAssignment)));
person.setActive(true);
one(personDAO).tryFindPersonByUserId(session.getUserName());
will(returnValue(person));
--
GitLab