[LMS-1603] removed unnecessary cascade for authorization group role assignments; fixed dao tests

SVN: 16923

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;

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());
     }