From 5073060571c34fc9c0e023f3b57ad7fa314d5139 Mon Sep 17 00:00:00 2001
From: buczekp <buczekp>
Date: Tue, 29 Sep 2009 08:00:59 +0000
Subject: [PATCH] [LMS-1163] extended validator tests
SVN: 12747
---
.../validator/FilterValidatorTest.java | 19 ++++++++++++++++---
1 file changed, 16 insertions(+), 3 deletions(-)
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/authorization/validator/FilterValidatorTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/authorization/validator/FilterValidatorTest.java
index f90dbac2c1b..341f60674ff 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/authorization/validator/FilterValidatorTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/authorization/validator/FilterValidatorTest.java
@@ -46,10 +46,9 @@ public final class FilterValidatorTest extends AuthorizationTestCase
}
@Test
- public final void testWithRegistrator()
+ public final void testWithTheRightRegistrator()
{
- // TODO 2009-09-22, Piotr Buczek: test failure when validation is improved;
- // (registrators are equal when they have the same userId AND db instance)
+ // registrators are equal when they have the same userId AND db instance
final DatabaseInstancePE instance = createDatabaseInstance();
final PersonPE person = createPerson("A", instance);
final PersonPE registrator = person;
@@ -59,6 +58,20 @@ public final class FilterValidatorTest extends AuthorizationTestCase
assertEquals(true, validator.isValid(person, FilterTranslator.translate(filter)));
}
+ @Test
+ public final void testWithTheWrongRegistrator()
+ {
+ // registrators that have the same userId BUT different db instance are not the same
+ final DatabaseInstancePE instance = createDatabaseInstance();
+ final DatabaseInstancePE anotherInstance = createAnotherDatabaseInstance();
+ final PersonPE person = createPerson("A", anotherInstance);
+ final PersonPE registrator = createPerson("A", instance);
+ final boolean isPublic = false;
+ final FilterPE filter = createFilter(instance, registrator, isPublic);
+ final FilterValidator validator = new FilterValidator();
+ assertEquals(false, validator.isValid(person, FilterTranslator.translate(filter)));
+ }
+
@Test
public final void testWithTheRightInstanceAdmin()
{
--
GitLab