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

NIHVIVO-2254 Create some serious unit tests for HiddenFromDisplayBelowRoleLevelFilter, and fix the errors that they reveal.

Browse source
This commit is contained in:
j2blake 2011-03-29 20:31:41 +00:00
parent cb31463bb3
commit c5183dccf1
7 changed files with 1974 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

30
webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/filters/HiddenFromDisplayBelowRoleLevelFilter.java
View file

@ -142,18 +142,22 @@ public class HiddenFromDisplayBelowRoleLevelFilter extends VitroFiltersImpl {
log.debug("checking hidden status for data property statement \"" + dPropStmt.getDatapropURI() + "\"");
try {
String propUri = dPropStmt.getDatapropURI();
DataProperty prop = null;
if( dataPropertyMap.containsKey(propUri) ){
prop = dataPropertyMap.get(propUri);
}else{
prop = wdf.getDataPropertyDao().getDataPropertyByURI(propUri);
dataPropertyMap.put(propUri, prop);
}
if( prop == null ) {
if( ! canViewOddItems() ){ return false; }
}else{
if( sameLevelOrHigher( prop.getHiddenFromDisplayBelowRoleLevel() ) == false)
return false;
if (propUri == null) {
if ( ! canViewOddItems() ){ return false; }
} else {
DataProperty prop = null;
if( dataPropertyMap.containsKey(propUri) ){
prop = dataPropertyMap.get(propUri);
}else{
prop = wdf.getDataPropertyDao().getDataPropertyByURI(propUri);
dataPropertyMap.put(propUri, prop);
}
if( prop == null ) {
if( ! canViewOddItems() ){ return false; }
}else{
if( sameLevelOrHigher( prop.getHiddenFromDisplayBelowRoleLevel() ) == false)
return false;
}
}
Individual subject = dPropStmt.getIndividual();
@ -238,7 +242,7 @@ public class HiddenFromDisplayBelowRoleLevelFilter extends VitroFiltersImpl {
return false;
}
} else {
if (sameLevelOrHigher(subject
if (sameLevelOrHigher(object
.getHiddenFromDisplayBelowRoleLevel()) == false)
return false;
}