SSDM-6019 : Project Authorization - modify @RolesAllowed annotations at...

SSDM-6019 : Project Authorization - modify @RolesAllowed annotations at non-entity related methods - fix openbis tests

SVN: 39047

openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/validator/AbstractCollectionValidator.java

@@ -40,6 +40,7 @@ public abstract class AbstractCollectionValidator<T> implements ICollectionValid
     @Override
     public boolean isValid(PersonPE person, T value)
     {
+        assert person != null;
         Collection<T> valid = getValid(person, Arrays.asList(value));
         return false == valid.isEmpty();
     }

openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/DefaultAccessControllerTest.java

@@ -116,9 +116,12 @@ public final class DefaultAccessControllerTest
         context.checking(new Expectations()
             {
                 {
+                    allowing(authorizationConfig).isProjectLevelEnabled();
+                    will(returnValue(false));
+                    
                     allowing(daoFactory).getAuthorizationConfig();
                     will(returnValue(authorizationConfig));
-
+                    
                     allowing(daoFactory).getProjectDAO();
                     will(returnValue(projectDAO));
 

openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/GridCustomFilterDAOTest.java

@@ -16,6 +16,7 @@
 
 package ch.systemsx.cisd.openbis.generic.server.dataaccess.db;
 
+import java.util.Collections;
 import java.util.List;
 
 import org.testng.AssertJUnit;
@@ -48,12 +49,13 @@ public final class GridCustomFilterDAOTest extends AbstractDAOTest
     @Test
     public void testCreateFilter() throws Exception
     {
-        AssertJUnit.assertEquals(0, daoFactory.getGridCustomFilterDAO().listAllEntities().size());
+        AssertJUnit.assertEquals(1, daoFactory.getGridCustomFilterDAO().listAllEntities().size());
         GridCustomFilterPE filter =
                 createFilter(NAME, GRID, DESCRIPTION, EXPRESSION, PUBLIC, getSystemPerson());
         daoFactory.getGridCustomFilterDAO().createFilter(filter);
         List<GridCustomFilterPE> filters = daoFactory.getGridCustomFilterDAO().listAllEntities();
-        AssertJUnit.assertEquals(1, filters.size());
+        Collections.sort(filters);
+        AssertJUnit.assertEquals(2, filters.size());
         AssertJUnit.assertEquals(filter, filters.get(0));
     }
 

openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/authorization/ProjectAuthorizationMigrationTest.java

@@ -179,6 +179,7 @@ public class ProjectAuthorizationMigrationTest extends SystemTestCase
     private static IAuthSessionProvider createSessionWithRoles(RoleWithHierarchy... roles)
     {
         PersonPE person = new PersonPE();
+        person.setUserId("some_user_with_pa_on");
 
         for (RoleWithHierarchy role : roles)
         {