From ed3cda14b98a2a1e626ef5d1d3a98b9e195b2fcd Mon Sep 17 00:00:00 2001
From: buczekp <buczekp>
Date: Wed, 7 Jul 2010 12:22:18 +0000
Subject: [PATCH] [LMS-1603] removed unnecessary cascade for authorization
group role assignments; fixed dao tests
SVN: 16923
---
.../openbis/generic/shared/dto/AuthorizationGroupPE.java | 3 +--
.../server/dataaccess/db/RoleAssignmentDAOTest.java | 9 ++++-----
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AuthorizationGroupPE.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AuthorizationGroupPE.java
index c452f2171e6..12a50836df0 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AuthorizationGroupPE.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AuthorizationGroupPE.java
@@ -21,7 +21,6 @@ import java.util.Date;
import java.util.HashSet;
import java.util.Set;
-import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
@@ -149,7 +148,7 @@ public class AuthorizationGroupPE extends HibernateAbstractRegistrationHolder im
this.modificationDate = versionDate;
}
- @OneToMany(fetch = FetchType.LAZY, mappedBy = "authorizationGroupInternal", cascade = CascadeType.ALL)
+ @OneToMany(fetch = FetchType.LAZY, mappedBy = "authorizationGroupInternal")
private Set<RoleAssignmentPE> getRoleAssignmentsInternal()
{
return roleAssignments;
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/RoleAssignmentDAOTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/RoleAssignmentDAOTest.java
index 8d60d67eb29..6afd53fa8a4 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/RoleAssignmentDAOTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/RoleAssignmentDAOTest.java
@@ -39,8 +39,6 @@ public class RoleAssignmentDAOTest extends AbstractDAOTest
private static final String AUTH_GROUP_ID = "rivia";
- @Test(groups = "broken")
- // FIXME
public void testAddGroupAdminRoleToUser() throws Exception
{
String userId = USER_ID;
@@ -57,13 +55,12 @@ public class RoleAssignmentDAOTest extends AbstractDAOTest
roleAssignment.setRegistrator(getSystemPerson());
user.addRoleAssignment(roleAssignment);
- AssertJUnit.assertEquals(1, daoFactory.getPersonDAO().tryFindPersonByUserId(userId)
- .getRoleAssignments().size());
+
+ daoFactory.getRoleAssignmentDAO().createRoleAssignment(roleAssignment);
AssertJUnit.assertEquals(1, daoFactory.getRoleAssignmentDAO().listRoleAssignmentsByPerson(
user).size());
}
- @Test
public void testAddGroupAdminRoleToAuthorizationGroup() throws Exception
{
String code = AUTH_GROUP_ID;
@@ -78,6 +75,8 @@ public class RoleAssignmentDAOTest extends AbstractDAOTest
roleAssignment.setRegistrator(getSystemPerson());
authGroup.addRoleAssignment(roleAssignment);
+
+ daoFactory.getRoleAssignmentDAO().createRoleAssignment(roleAssignment);
AssertJUnit.assertEquals(1, daoFactory.getRoleAssignmentDAO()
.listRoleAssignmentsByAuthorizationGroup(authGroup).size());
}
--
GitLab