LMS-1222 Fix bug in test

SVN: 12938

openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/PredicateExecutor.java

@@ -77,6 +77,17 @@ public final class PredicateExecutor
     {
         PredicateExecutor.authorizationDataProvider = new AuthorizationDataProvider(daoFactory);
     }
+    
+
+    static final IAuthorizationDataProvider getAuthorizationDataProvider()
+    {
+        return authorizationDataProvider;
+    }
+
+    static final void setAuthorizationDataProvider(IAuthorizationDataProvider authorizationDataProvider)
+    {
+        PredicateExecutor.authorizationDataProvider = authorizationDataProvider;
+    }
 
     /**
      * Creates, casts and ensures that the returned {@link IPredicate} is not <code>null</code>.

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

@@ -57,6 +57,8 @@ public final class PredicateExecutorTest extends AuthorizationTestCase
 
     private IPredicateFactory previousFactory;
 
+    private IAuthorizationDataProvider previousProvider;
+
     private List<RoleWithIdentifier> createAllowedRoles()
     {
         return Collections.singletonList(createGroupRole(RoleCode.USER,
@@ -86,6 +88,7 @@ public final class PredicateExecutorTest extends AuthorizationTestCase
                 will(returnValue(Collections.EMPTY_LIST));
             }
         });
+        previousProvider = PredicateExecutor.getAuthorizationDataProvider();
         PredicateExecutor.setDAOFactory(daoFactory);
     }
 
@@ -93,6 +96,7 @@ public final class PredicateExecutorTest extends AuthorizationTestCase
     @AfterMethod
     public void tearDown()
     {
+        PredicateExecutor.setAuthorizationDataProvider(previousProvider);
         PredicateExecutor.setPredicateFactory(previousFactory);
         super.tearDown();
     }