litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-2254 Add "open" properties and classes to test.

Browse source
This commit is contained in:
j2blake 2011-04-04 15:33:42 +00:00
parent 34f4f8c611
commit 412d25e800
3 changed files with 83 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
webapp/test/edu/cornell/mannlib/vitro/webapp/dao/filtering/IndividualFilteringTest-Abox.n3
View file

@ -11,6 +11,7 @@
mydomain:bozo mydomain:bozo
a mydomain:publicClass ; a mydomain:publicClass ;
mydomain:openDataProperty "open info" ;
mydomain:publicDataProperty "public info" ; mydomain:publicDataProperty "public info" ;
mydomain:selfDataProperty "self info" ; mydomain:selfDataProperty "self info" ;
mydomain:editorDataProperty "editor info" ; mydomain:editorDataProperty "editor info" ;
@ -18,6 +19,15 @@ mydomain:bozo
mydomain:dbaDataProperty "dba info" ; mydomain:dbaDataProperty "dba info" ;
mydomain:hiddenDataProperty "hidden info" ; mydomain:hiddenDataProperty "hidden info" ;
mydomain:openObjectProperty mydomain:openObject ;
mydomain:openObjectProperty mydomain:publicObject ;
mydomain:openObjectProperty mydomain:selfObject ;
mydomain:openObjectProperty mydomain:editorObject ;
mydomain:openObjectProperty mydomain:curatorObject ;
mydomain:openObjectProperty mydomain:dbaObject ;
mydomain:openObjectProperty mydomain:hiddenObject ;
mydomain:publicObjectProperty mydomain:openObject ;
mydomain:publicObjectProperty mydomain:publicObject ; mydomain:publicObjectProperty mydomain:publicObject ;
mydomain:publicObjectProperty mydomain:selfObject ; mydomain:publicObjectProperty mydomain:selfObject ;
mydomain:publicObjectProperty mydomain:editorObject ; mydomain:publicObjectProperty mydomain:editorObject ;
@ -25,6 +35,7 @@ mydomain:bozo
mydomain:publicObjectProperty mydomain:dbaObject ; mydomain:publicObjectProperty mydomain:dbaObject ;
mydomain:publicObjectProperty mydomain:hiddenObject ; mydomain:publicObjectProperty mydomain:hiddenObject ;
mydomain:selfObjectProperty mydomain:openObject ;
mydomain:selfObjectProperty mydomain:publicObject ; mydomain:selfObjectProperty mydomain:publicObject ;
mydomain:selfObjectProperty mydomain:selfObject ; mydomain:selfObjectProperty mydomain:selfObject ;
mydomain:selfObjectProperty mydomain:editorObject ; mydomain:selfObjectProperty mydomain:editorObject ;
@ -32,6 +43,7 @@ mydomain:bozo
mydomain:selfObjectProperty mydomain:dbaObject ; mydomain:selfObjectProperty mydomain:dbaObject ;
mydomain:selfObjectProperty mydomain:hiddenObject ; mydomain:selfObjectProperty mydomain:hiddenObject ;
mydomain:editorObjectProperty mydomain:openObject ;
mydomain:editorObjectProperty mydomain:publicObject ; mydomain:editorObjectProperty mydomain:publicObject ;
mydomain:editorObjectProperty mydomain:selfObject ; mydomain:editorObjectProperty mydomain:selfObject ;
mydomain:editorObjectProperty mydomain:editorObject ; mydomain:editorObjectProperty mydomain:editorObject ;
@ -39,6 +51,7 @@ mydomain:bozo
mydomain:editorObjectProperty mydomain:dbaObject ; mydomain:editorObjectProperty mydomain:dbaObject ;
mydomain:editorObjectProperty mydomain:hiddenObject ; mydomain:editorObjectProperty mydomain:hiddenObject ;
mydomain:curatorObjectProperty mydomain:openObject ;
mydomain:curatorObjectProperty mydomain:publicObject ; mydomain:curatorObjectProperty mydomain:publicObject ;
mydomain:curatorObjectProperty mydomain:selfObject ; mydomain:curatorObjectProperty mydomain:selfObject ;
mydomain:curatorObjectProperty mydomain:editorObject ; mydomain:curatorObjectProperty mydomain:editorObject ;
@ -46,6 +59,7 @@ mydomain:bozo
mydomain:curatorObjectProperty mydomain:dbaObject ; mydomain:curatorObjectProperty mydomain:dbaObject ;
mydomain:curatorObjectProperty mydomain:hiddenObject ; mydomain:curatorObjectProperty mydomain:hiddenObject ;
mydomain:dbaObjectProperty mydomain:openObject ;
mydomain:dbaObjectProperty mydomain:publicObject ; mydomain:dbaObjectProperty mydomain:publicObject ;
mydomain:dbaObjectProperty mydomain:selfObject ; mydomain:dbaObjectProperty mydomain:selfObject ;
mydomain:dbaObjectProperty mydomain:editorObject ; mydomain:dbaObjectProperty mydomain:editorObject ;
@ -53,6 +67,7 @@ mydomain:bozo
mydomain:dbaObjectProperty mydomain:dbaObject ; mydomain:dbaObjectProperty mydomain:dbaObject ;
mydomain:dbaObjectProperty mydomain:hiddenObject ; mydomain:dbaObjectProperty mydomain:hiddenObject ;
mydomain:hiddenObjectProperty mydomain:openObject ;
mydomain:hiddenObjectProperty mydomain:publicObject ; mydomain:hiddenObjectProperty mydomain:publicObject ;
mydomain:hiddenObjectProperty mydomain:selfObject ; mydomain:hiddenObjectProperty mydomain:selfObject ;
mydomain:hiddenObjectProperty mydomain:editorObject ; mydomain:hiddenObjectProperty mydomain:editorObject ;
@ -64,6 +79,10 @@ mydomain:bozo
# #
# Objects of object properties # Objects of object properties
# #
mydomain:openObject
a mydomain:openClass ;
rdfs:label "open file" ;
.
mydomain:publicObject mydomain:publicObject
a mydomain:publicClass ; a mydomain:publicClass ;
rdfs:label "public file" ; rdfs:label "public file" ;

20
webapp/test/edu/cornell/mannlib/vitro/webapp/dao/filtering/IndividualFilteringTest-TBoxAnnotations.n3
View file

@ -11,6 +11,10 @@
# #
# create the data properties # create the data properties
# #
mydomain:openDataProperty
a owl:DatatypeProperty ;
.
mydomain:publicDataProperty mydomain:publicDataProperty
a owl:DatatypeProperty ; a owl:DatatypeProperty ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
@ -44,31 +48,29 @@ mydomain:hiddenDataProperty
# #
# create the object properties # create the object properties
# #
mydomain:openObjectProperty
a owl:ObjectProperty ;
.
mydomain:publicObjectProperty mydomain:publicObjectProperty
a owl:ObjectProperty ; a owl:ObjectProperty ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
. .
mydomain:selfObjectProperty mydomain:selfObjectProperty
a owl:ObjectProperty ; a owl:ObjectProperty ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:selfEditor ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:selfEditor ;
. .
mydomain:editorObjectProperty mydomain:editorObjectProperty
a owl:ObjectProperty ; a owl:ObjectProperty ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:editor ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:editor ;
. .
mydomain:curatorObjectProperty mydomain:curatorObjectProperty
a owl:ObjectProperty ; a owl:ObjectProperty ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:curator ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:curator ;
. .
mydomain:dbaObjectProperty mydomain:dbaObjectProperty
a owl:ObjectProperty ; a owl:ObjectProperty ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:dbAdmin ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:dbAdmin ;
. .
mydomain:hiddenObjectProperty mydomain:hiddenObjectProperty
a owl:ObjectProperty ; a owl:ObjectProperty ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:nobody ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:nobody ;
@ -77,31 +79,29 @@ mydomain:hiddenObjectProperty
# #
# create the object classes # create the object classes
# #
mydomain:openClass
a owl:Class ;
.
mydomain:publicClass mydomain:publicClass
a owl:Class ; a owl:Class ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
. .
mydomain:selfClass mydomain:selfClass
a owl:Class ; a owl:Class ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:selfEditor ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:selfEditor ;
. .
mydomain:editorClass mydomain:editorClass
a owl:Class ; a owl:Class ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:editor ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:editor ;
. .
mydomain:curatorClass mydomain:curatorClass
a owl:Class ; a owl:Class ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:curator ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:curator ;
. .
mydomain:dbaClass mydomain:dbaClass
a owl:Class ; a owl:Class ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:dbAdmin ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:dbAdmin ;
. .
mydomain:hiddenClass mydomain:hiddenClass
a owl:Class ; a owl:Class ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:nobody ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:nobody ;

97
webapp/test/edu/cornell/mannlib/vitro/webapp/dao/filtering/IndividualFilteringTest.java
View file

@ -52,10 +52,11 @@ import edu.cornell.mannlib.vitro.webapp.dao.jena.WebappDaoFactoryJena;
* Test the filtering of IndividualFiltering. * Test the filtering of IndividualFiltering.
* *
* There are 6 levels of data hiding - public, selfEditor, editor, curator, * There are 6 levels of data hiding - public, selfEditor, editor, curator,
* dbAdmin and nobody. * dbAdmin and nobody. We add a 7th case for data which has no explicit hiding
* level - it should be treated as public.
* *
* The data files for this test describe an Individual with 6 data properties, * The data files for this test describe an Individual with 7 data properties,
* each with a different hiding level, and 36 object properties, showing all * each with a different hiding level, and 49 object properties, showing all
* combinations of hiding levels for the property and for the class of the * combinations of hiding levels for the property and for the class of the
* object. * object.
* *
@ -95,95 +96,105 @@ public class IndividualFilteringTest extends AbstractTestClass {
/** /**
* Data properties to look for. * Data properties to look for.
*/ */
private static final String OPEN_DATA_PROPERTY = mydomain("openDataProperty");
private static final String PUBLIC_DATA_PROPERTY = mydomain("publicDataProperty"); private static final String PUBLIC_DATA_PROPERTY = mydomain("publicDataProperty");
private static final String SELF_DATA_PROPERTY = mydomain("selfDataProperty"); private static final String SELF_DATA_PROPERTY = mydomain("selfDataProperty");
private static final String EDITOR_DATA_PROPERTY = mydomain("editorDataProperty"); private static final String EDITOR_DATA_PROPERTY = mydomain("editorDataProperty");
private static final String CURATOR_DATA_PROPERTY = mydomain("curatorDataProperty"); private static final String CURATOR_DATA_PROPERTY = mydomain("curatorDataProperty");
private static final String DBA_DATA_PROPERTY = mydomain("dbaDataProperty"); private static final String DBA_DATA_PROPERTY = mydomain("dbaDataProperty");
private static final String HIDDEN_DATA_PROPERTY = mydomain("hiddenDataProperty"); private static final String HIDDEN_DATA_PROPERTY = mydomain("hiddenDataProperty");
private static final String[] DATA_PROPERTIES = { PUBLIC_DATA_PROPERTY, private static final String[] DATA_PROPERTIES = { OPEN_DATA_PROPERTY,
SELF_DATA_PROPERTY, EDITOR_DATA_PROPERTY, CURATOR_DATA_PROPERTY, PUBLIC_DATA_PROPERTY, SELF_DATA_PROPERTY, EDITOR_DATA_PROPERTY,
DBA_DATA_PROPERTY, HIDDEN_DATA_PROPERTY }; CURATOR_DATA_PROPERTY, DBA_DATA_PROPERTY, HIDDEN_DATA_PROPERTY };
/** /**
* Object properties to look for. * Object properties to look for.
*/ */
private static final String OPEN_OBJECT_PROPERTY = mydomain("openObjectProperty");
private static final String PUBLIC_OBJECT_PROPERTY = mydomain("publicObjectProperty"); private static final String PUBLIC_OBJECT_PROPERTY = mydomain("publicObjectProperty");
private static final String SELF_OBJECT_PROPERTY = mydomain("selfObjectProperty"); private static final String SELF_OBJECT_PROPERTY = mydomain("selfObjectProperty");
private static final String EDITOR_OBJECT_PROPERTY = mydomain("editorObjectProperty"); private static final String EDITOR_OBJECT_PROPERTY = mydomain("editorObjectProperty");
private static final String CURATOR_OBJECT_PROPERTY = mydomain("curatorObjectProperty"); private static final String CURATOR_OBJECT_PROPERTY = mydomain("curatorObjectProperty");
private static final String DBA_OBJECT_PROPERTY = mydomain("dbaObjectProperty"); private static final String DBA_OBJECT_PROPERTY = mydomain("dbaObjectProperty");
private static final String HIDDEN_OBJECT_PROPERTY = mydomain("hiddenObjectProperty"); private static final String HIDDEN_OBJECT_PROPERTY = mydomain("hiddenObjectProperty");
private static final String[] OBJECT_PROPERTIES = { PUBLIC_OBJECT_PROPERTY, private static final String[] OBJECT_PROPERTIES = { OPEN_OBJECT_PROPERTY,
SELF_OBJECT_PROPERTY, EDITOR_OBJECT_PROPERTY, PUBLIC_OBJECT_PROPERTY, SELF_OBJECT_PROPERTY,
CURATOR_OBJECT_PROPERTY, DBA_OBJECT_PROPERTY, EDITOR_OBJECT_PROPERTY, CURATOR_OBJECT_PROPERTY,
HIDDEN_OBJECT_PROPERTY }; DBA_OBJECT_PROPERTY, HIDDEN_OBJECT_PROPERTY };
/** /**
* Objects to look for. * Objects to look for.
*/ */
private static final String OPEN_OBJECT = mydomain("openObject");
private static final String PUBLIC_OBJECT = mydomain("publicObject"); private static final String PUBLIC_OBJECT = mydomain("publicObject");
private static final String SELF_OBJECT = mydomain("selfObject"); private static final String SELF_OBJECT = mydomain("selfObject");
private static final String EDITOR_OBJECT = mydomain("editorObject"); private static final String EDITOR_OBJECT = mydomain("editorObject");
private static final String CURATOR_OBJECT = mydomain("curatorObject"); private static final String CURATOR_OBJECT = mydomain("curatorObject");
private static final String DBA_OBJECT = mydomain("dbaObject"); private static final String DBA_OBJECT = mydomain("dbaObject");
private static final String HIDDEN_OBJECT = mydomain("hiddenObject"); private static final String HIDDEN_OBJECT = mydomain("hiddenObject");
private static final String[] OBJECTS = { PUBLIC_OBJECT, SELF_OBJECT, private static final String[] OBJECTS = { OPEN_OBJECT, PUBLIC_OBJECT,
EDITOR_OBJECT, CURATOR_OBJECT, DBA_OBJECT, HIDDEN_OBJECT }; SELF_OBJECT, EDITOR_OBJECT, CURATOR_OBJECT, DBA_OBJECT,
HIDDEN_OBJECT };
private static TestData publicTestData() {
TestData data = new TestData(PUBLIC);
data.addExpectedDataProperties(PUBLIC_DATA_PROPERTY);
data.addExpectedObjectProperties(PUBLIC_OBJECT_PROPERTY);
data.addExpectedObjects(PUBLIC_OBJECT);
return data;
}
private static String mydomain(String localname) { private static String mydomain(String localname) {
return NS + localname; return NS + localname;
} }
private static TestData publicTestData() {
TestData data = new TestData(PUBLIC);
data.addExpectedDataProperties(OPEN_DATA_PROPERTY, PUBLIC_DATA_PROPERTY);
data.addExpectedObjectProperties(OPEN_OBJECT_PROPERTY,
PUBLIC_OBJECT_PROPERTY);
data.addExpectedObjects(OPEN_OBJECT, PUBLIC_OBJECT);
return data;
}
private static TestData selfTestData() { private static TestData selfTestData() {
TestData data = new TestData(SELF); TestData data = new TestData(SELF);
data.addExpectedDataProperties(PUBLIC_DATA_PROPERTY, SELF_DATA_PROPERTY); data.addExpectedDataProperties(OPEN_DATA_PROPERTY,
data.addExpectedObjectProperties(PUBLIC_OBJECT_PROPERTY, PUBLIC_DATA_PROPERTY, SELF_DATA_PROPERTY);
SELF_OBJECT_PROPERTY); data.addExpectedObjectProperties(OPEN_OBJECT_PROPERTY,
data.addExpectedObjects(PUBLIC_OBJECT, SELF_OBJECT); PUBLIC_OBJECT_PROPERTY, SELF_OBJECT_PROPERTY);
data.addExpectedObjects(OPEN_OBJECT, PUBLIC_OBJECT, SELF_OBJECT);
return data; return data;
} }
private static TestData editorTestData() { private static TestData editorTestData() {
TestData data = new TestData(EDITOR); TestData data = new TestData(EDITOR);
data.addExpectedDataProperties(PUBLIC_DATA_PROPERTY, data.addExpectedDataProperties(OPEN_DATA_PROPERTY,
SELF_DATA_PROPERTY, EDITOR_DATA_PROPERTY); PUBLIC_DATA_PROPERTY, SELF_DATA_PROPERTY, EDITOR_DATA_PROPERTY);
data.addExpectedObjectProperties(PUBLIC_OBJECT_PROPERTY, data.addExpectedObjectProperties(OPEN_OBJECT_PROPERTY,
SELF_OBJECT_PROPERTY, EDITOR_OBJECT_PROPERTY); PUBLIC_OBJECT_PROPERTY, SELF_OBJECT_PROPERTY,
data.addExpectedObjects(PUBLIC_OBJECT, SELF_OBJECT, EDITOR_OBJECT); EDITOR_OBJECT_PROPERTY);
data.addExpectedObjects(OPEN_OBJECT, PUBLIC_OBJECT, SELF_OBJECT,
EDITOR_OBJECT);
return data; return data;
} }
private static TestData curatorTestData() { private static TestData curatorTestData() {
TestData data = new TestData(CURATOR); TestData data = new TestData(CURATOR);
data.addExpectedDataProperties(PUBLIC_DATA_PROPERTY, data.addExpectedDataProperties(OPEN_DATA_PROPERTY,
SELF_DATA_PROPERTY, EDITOR_DATA_PROPERTY, CURATOR_DATA_PROPERTY); PUBLIC_DATA_PROPERTY, SELF_DATA_PROPERTY, EDITOR_DATA_PROPERTY,
data.addExpectedObjectProperties(PUBLIC_OBJECT_PROPERTY, CURATOR_DATA_PROPERTY);
SELF_OBJECT_PROPERTY, EDITOR_OBJECT_PROPERTY, data.addExpectedObjectProperties(OPEN_OBJECT_PROPERTY,
CURATOR_OBJECT_PROPERTY); PUBLIC_OBJECT_PROPERTY, SELF_OBJECT_PROPERTY,
data.addExpectedObjects(PUBLIC_OBJECT, SELF_OBJECT, EDITOR_OBJECT, EDITOR_OBJECT_PROPERTY, CURATOR_OBJECT_PROPERTY);
CURATOR_OBJECT); data.addExpectedObjects(OPEN_OBJECT, PUBLIC_OBJECT, SELF_OBJECT,
EDITOR_OBJECT, CURATOR_OBJECT);
return data; return data;
} }
private static TestData dbaTestData() { private static TestData dbaTestData() {
TestData data = new TestData(DB_ADMIN); TestData data = new TestData(DB_ADMIN);
data.addExpectedDataProperties(PUBLIC_DATA_PROPERTY, data.addExpectedDataProperties(OPEN_DATA_PROPERTY,
SELF_DATA_PROPERTY, EDITOR_DATA_PROPERTY, PUBLIC_DATA_PROPERTY, SELF_DATA_PROPERTY, EDITOR_DATA_PROPERTY,
CURATOR_DATA_PROPERTY, DBA_DATA_PROPERTY); CURATOR_DATA_PROPERTY, DBA_DATA_PROPERTY);
data.addExpectedObjectProperties(PUBLIC_OBJECT_PROPERTY, data.addExpectedObjectProperties(OPEN_OBJECT_PROPERTY,
SELF_OBJECT_PROPERTY, EDITOR_OBJECT_PROPERTY, PUBLIC_OBJECT_PROPERTY, SELF_OBJECT_PROPERTY,
CURATOR_OBJECT_PROPERTY, DBA_OBJECT_PROPERTY); EDITOR_OBJECT_PROPERTY, CURATOR_OBJECT_PROPERTY,
data.addExpectedObjects(PUBLIC_OBJECT, SELF_OBJECT, EDITOR_OBJECT, DBA_OBJECT_PROPERTY);
CURATOR_OBJECT, DBA_OBJECT); data.addExpectedObjects(OPEN_OBJECT, PUBLIC_OBJECT, SELF_OBJECT,
EDITOR_OBJECT, CURATOR_OBJECT, DBA_OBJECT);
return data; return data;
} }