From 50bbb4313cc637d1ea10d0f3a33d2a7f381dcff2 Mon Sep 17 00:00:00 2001
From: pkupczyk <pkupczyk>
Date: Sat, 22 Jul 2017 19:42:01 +0000
Subject: [PATCH] SSDM-5416 : Project Authorization - sample predicates and
validators - fix unit tests
SVN: 38568
---
.../BasicEntityDescriptionPredicateTest.java | 8 ++++++++
.../SampleUpdatesCollectionPredicateTest.java | 19 +++++++++++++++++++
2 files changed, 27 insertions(+)
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/BasicEntityDescriptionPredicateTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/BasicEntityDescriptionPredicateTest.java
index 14469a33ede..f4e0a1a6a18 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/BasicEntityDescriptionPredicateTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/BasicEntityDescriptionPredicateTest.java
@@ -87,6 +87,14 @@ public class BasicEntityDescriptionPredicateTest extends AuthorizationTestCase
prepareProvider(createSpaces());
predicate.init(provider);
+ context.checking(new Expectations()
+ {
+ {
+ allowing(provider).getAuthorizationConfig();
+ will(returnValue(new TestAuthorizationConfig(false, false)));
+ }
+ });
+
Status status = predicate.doEvaluation(createPerson(), createRoles(false), entityDescription);
assertEquals("ERROR: \"User 'megapixel' does not have enough privileges.\"", status.toString());
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SampleUpdatesCollectionPredicateTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SampleUpdatesCollectionPredicateTest.java
index 5334b53b2d9..f1854bb92e9 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SampleUpdatesCollectionPredicateTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SampleUpdatesCollectionPredicateTest.java
@@ -24,6 +24,7 @@ import org.testng.annotations.Test;
import ch.systemsx.cisd.common.exceptions.Status;
import ch.systemsx.cisd.openbis.generic.server.authorization.AuthorizationTestCase;
+import ch.systemsx.cisd.openbis.generic.server.authorization.TestAuthorizationConfig;
import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
import ch.systemsx.cisd.openbis.generic.shared.dto.SampleAccessPE;
import ch.systemsx.cisd.openbis.generic.shared.dto.SampleUpdatesDTO;
@@ -57,6 +58,9 @@ public class SampleUpdatesCollectionPredicateTest extends AuthorizationTestCase
context.checking(new Expectations()
{
{
+ allowing(provider).getAuthorizationConfig();
+ will(returnValue(new TestAuthorizationConfig(false, false)));
+
one(provider).getSampleCollectionAccessData(TechId.createList(42L, 43L, 44L));
will(returnValue(Collections.singleton(sampleAccess)));
}
@@ -91,6 +95,9 @@ public class SampleUpdatesCollectionPredicateTest extends AuthorizationTestCase
context.checking(new Expectations()
{
{
+ allowing(provider).getAuthorizationConfig();
+ will(returnValue(new TestAuthorizationConfig(false, false)));
+
one(provider).getSampleCollectionAccessData(TechId.createList(42L, 43L, 44L));
will(returnValue(Collections.singleton(sampleAccess)));
}
@@ -117,6 +124,15 @@ public class SampleUpdatesCollectionPredicateTest extends AuthorizationTestCase
new SampleUpdatesDTO(new TechId(44L), null, null, null, null, 0,
SampleIdentifierFactory.parse("/" + SPACE_CODE + "/S1"), null, null);
prepareProvider(createSpaces());
+
+ context.checking(new Expectations()
+ {
+ {
+ allowing(provider).getAuthorizationConfig();
+ will(returnValue(new TestAuthorizationConfig(false, false)));
+ }
+ });
+
SampleUpdatesCollectionPredicate predicate = new SampleUpdatesCollectionPredicate();
predicate.init(provider);
@@ -152,6 +168,9 @@ public class SampleUpdatesCollectionPredicateTest extends AuthorizationTestCase
context.checking(new Expectations()
{
{
+ allowing(provider).getAuthorizationConfig();
+ will(returnValue(new TestAuthorizationConfig(false, false)));
+
one(provider).getSampleCollectionAccessData(TechId.createList(42L, 43L, 44L));
will(returnValue(Collections.singleton(sampleAccess)));
}
--
GitLab