Removed Portal class and almost everything related to portals and flags for NIHVIVO-2248

This commit is contained in:
brianjlowe 2011-05-03 19:01:15 +00:00
parent de5c5ff7de
commit eb00f1cd43
189 changed files with 928 additions and 6859 deletions

View file

@ -21,8 +21,6 @@ import edu.cornell.mannlib.vitro.webapp.beans.IndividualImpl;
import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement;
import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatementImpl;
import edu.cornell.mannlib.vitro.webapp.dao.filtering.BaseFiltering;
import edu.cornell.mannlib.vitro.webapp.dao.filtering.tabFactory.TabEntityFactoryFiltering;
import edu.cornell.mannlib.vitro.webapp.utils.FlagMathUtils;
public class VitroFiltersFactoryTest {
@ -192,11 +190,7 @@ public class VitroFiltersFactoryTest {
List<Individual> filteredEnts = bf.filter(ents,vf.getIndividualFilter());
Assert.assertNotNull(filteredEnts);
Assert.assertEquals("did not filter correctly", 2, filteredEnts.size());
}
private int portalId2Numeric(long i) {
return (int)FlagMathUtils.portalId2Numeric( i);
}
}
public void checkFilterForNull(VitroFilters vf){
Assert.assertNotNull("filter was null", vf);

View file

@ -9,7 +9,6 @@ import edu.cornell.mannlib.vitro.webapp.beans.IndividualImpl;
import edu.cornell.mannlib.vitro.webapp.beans.Link;
import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
import edu.cornell.mannlib.vitro.webapp.beans.Ontology;
import edu.cornell.mannlib.vitro.webapp.beans.Portal;
import edu.cornell.mannlib.vitro.webapp.beans.PropertyGroup;
import edu.cornell.mannlib.vitro.webapp.beans.Tab;
import edu.cornell.mannlib.vitro.webapp.beans.User;
@ -20,7 +19,6 @@ import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao;
import edu.cornell.mannlib.vitro.webapp.dao.InsertException;
import edu.cornell.mannlib.vitro.webapp.dao.ObjectPropertyDao;
import edu.cornell.mannlib.vitro.webapp.dao.OntologyDao;
import edu.cornell.mannlib.vitro.webapp.dao.PortalDao;
import edu.cornell.mannlib.vitro.webapp.dao.PropertyGroupDao;
import edu.cornell.mannlib.vitro.webapp.dao.TabDao;
import edu.cornell.mannlib.vitro.webapp.dao.UserDao;
@ -36,7 +34,6 @@ import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
public class OntModelSegementationTest {
private WebappDaoFactoryJena wadf;
@org.junit.Before
public void setUpWebappDaoFactoryJena() {
wadf = new WebappDaoFactoryJena(new SimpleOntModelSelector());
@ -78,6 +75,7 @@ public class OntModelSegementationTest {
}
/*
@org.junit.Test
public void testApplicationMetadataModel() throws InsertException {
@ -87,7 +85,7 @@ public class OntModelSegementationTest {
PropertyGroupDao pgdao = wadf.getPropertyGroupDao();
OntModelSelector oms = wadf.getOntModelSelector();
this.assertAllModelsEmpty(oms);
this.assertAllModelsExceptAppMetadataAreEmpty(oms);
//insert a portal
Portal portal = new Portal();
@ -134,14 +132,14 @@ public class OntModelSegementationTest {
pgdao.updatePropertyGroup(pgroup);
this.assertMetadataModelNonemptyAndAllOtherModelsAreEmpty(oms);
pdao.deletePortal(portal);
tdao.deleteTab(tab);
vcgdao.deleteVClassGroup(group);
pgdao.deletePropertyGroup(pgroup);
this.assertAllModelsEmpty(oms);
this.assertAllModelsExceptAppMetadataAreEmpty(oms);
}
*/
@org.junit.Test
public void testTBoxModel() throws InsertException {
@ -194,7 +192,7 @@ public class OntModelSegementationTest {
dpDao.deleteDataProperty(dp);
oDao.deleteOntology(o);
this.assertAllModelsEmpty(oms);
this.assertAllModelsExceptAppMetadataAreEmpty(oms);
}
@ -213,18 +211,19 @@ public class OntModelSegementationTest {
this.assertABoxModelNonemptyAndAllOtherModelsAreEmpty(oms);
iDao.deleteIndividual(ind);
this.assertAllModelsEmpty(oms);
this.assertAllModelsExceptAppMetadataAreEmpty(oms);
}
private void assertAllModelsEmpty(OntModelSelector oms) {
Assert.assertTrue(oms.getApplicationMetadataModel().size() == 0);
private void assertAllModelsExceptAppMetadataAreEmpty(OntModelSelector oms) {
//Assert.assertTrue(oms.getApplicationMetadataModel().size() == 0);
Assert.assertTrue(oms.getFullModel().size() == 0);
Assert.assertTrue(oms.getABoxModel().size() == 0);
Assert.assertTrue(oms.getTBoxModel().size() == 0);
Assert.assertTrue(oms.getUserAccountsModel().size() == 0);
}
/*
private void assertMetadataModelNonemptyAndAllOtherModelsAreEmpty(OntModelSelector oms) {
Assert.assertTrue(oms.getApplicationMetadataModel().size() > 0);
Assert.assertTrue(oms.getFullModel().size() == oms.getApplicationMetadataModel().size());
@ -232,6 +231,7 @@ public class OntModelSegementationTest {
Assert.assertTrue(oms.getTBoxModel().size() == 0);
Assert.assertTrue(oms.getUserAccountsModel().size() == 0);
}
*/
private void assertTBoxModelNonemptyAndAllOtherModelsAreEmpty(OntModelSelector oms) {
Assert.assertTrue(oms.getTBoxModel().size() > 0);

View file

@ -26,12 +26,9 @@ public class URLRewritingHttpServletResponseTest {
URLRewritingHttpServletResponse urhsr = new URLRewritingHttpServletResponse();
List<String>externalNamespaces = new ArrayList();
externalNamespaces.add("http://vivo.med.cornell.edu/individual/");
PortalPickerFilter portalPickerFilter = new PortalPickerFilter();
externalNamespaces.add("http://vivo.med.cornell.edu/individual/");
String actual = urhsr.encodeForVitro(urlToEncode, "UTF-8",
new PortalPickerFilter(),
String actual = urhsr.encodeForVitro(urlToEncode, "UTF-8",
true, 1,
getMockNamespaceMapper(),
"http://vivo.cornell.edu/individual/",
@ -47,12 +44,9 @@ public class URLRewritingHttpServletResponseTest {
URLRewritingHttpServletResponse urhsr = new URLRewritingHttpServletResponse();
List<String>externalNamespaces = new ArrayList();
externalNamespaces.add("http://vivo.med.cornell.edu/individual/");
PortalPickerFilter portalPickerFilter = new PortalPickerFilter();
externalNamespaces.add("http://vivo.med.cornell.edu/individual/");
String actual = urhsr.encodeForVitro(urlToEncode, "UTF-8",
new PortalPickerFilter(),
true, 0,
getMockNamespaceMapper(),
"http://vivo.cornell.edu/individual/",
@ -89,7 +83,7 @@ public class URLRewritingHttpServletResponseTest {
"/vivo/js/tiny_mce/tiny_mce.js", "/vivo/js/tiny_mce/tiny_mce.js"); }
@Test
public void test41133(){ urlEncodingStyleA(
"/vivo/entityEdit?home=1&uri=http%3a%2f%2fbogus.com%2findividual%2fn3671",
"/vivo/entityEdit?uri=http%3a%2f%2fbogus.com%2findividual%2fn3671",
"/vivo/entityEdit?uri=http%3A%2F%2Fbogus.com%2Findividual%2Fn3671"); }
@Test
public void test41464(){ urlEncodingStyleA(
@ -106,157 +100,157 @@ public class URLRewritingHttpServletResponseTest {
"/vivo/js/imageUpload/imageUploadUtils.js"); }
@Test
public void test57982(){ urlEncodingStyleA(
"entityEdit?home=1&uri=http%3a%2f%2fxmlns.com%2ffoaf%2f0.1%2fAgent",
"entityEdit?home=1&uri=http%3A%2F%2Fxmlns.com%2Ffoaf%2F0.1%2FAgent");
"entityEdit?uri=http%3a%2f%2fxmlns.com%2ffoaf%2f0.1%2fAgent",
"entityEdit?uri=http%3A%2F%2Fxmlns.com%2Ffoaf%2F0.1%2FAgent");
}
@Test
public void test57983(){ urlEncodingStyleA(
"/vivo/vclassEdit?home=1&uri=http%3a%2f%2fxmlns.com%2ffoaf%2f0.1%2fAgent",
"/vivo/vclassEdit?uri=http%3a%2f%2fxmlns.com%2ffoaf%2f0.1%2fAgent",
"/vivo/vclassEdit?uri=http%3A%2F%2Fxmlns.com%2Ffoaf%2F0.1%2FAgent"); }
@Test
public void test57986(){ urlEncodingStyleA(
"entityEdit?home=1&uri=http%3a%2f%2fxmlns.com%2ffoaf%2f0.1%2fPerson",
"entityEdit?home=1&uri=http%3A%2F%2Fxmlns.com%2Ffoaf%2F0.1%2FPerson");
"entityEdit?uri=http%3a%2f%2fxmlns.com%2ffoaf%2f0.1%2fPerson",
"entityEdit?uri=http%3A%2F%2Fxmlns.com%2Ffoaf%2F0.1%2FPerson");
}
@Test
public void test57987(){ urlEncodingStyleA(
"/vivo/vclassEdit?home=1&uri=http%3a%2f%2fxmlns.com%2ffoaf%2f0.1%2fPerson",
"/vivo/vclassEdit?uri=http%3a%2f%2fxmlns.com%2ffoaf%2f0.1%2fPerson",
"/vivo/vclassEdit?uri=http%3A%2F%2Fxmlns.com%2Ffoaf%2F0.1%2FPerson");
}
@Test
public void test57988(){ urlEncodingStyleA(
"entityEdit?home=1&uri=http%3a%2f%2fwww.w3.org%2f2002%2f07%2fowl%23Thing",
"entityEdit?home=1&uri=http%3A%2F%2Fwww.w3.org%2F2002%2F07%2Fowl%23Thing");
"entityEdit?uri=http%3a%2f%2fwww.w3.org%2f2002%2f07%2fowl%23Thing",
"entityEdit?uri=http%3A%2F%2Fwww.w3.org%2F2002%2F07%2Fowl%23Thing");
}
@Test
public void test57989(){ urlEncodingStyleA(
"/vivo/vclassEdit?home=1&uri=http%3a%2f%2fwww.w3.org%2f2002%2f07%2fowl%23Thing",
"/vivo/vclassEdit?uri=http%3a%2f%2fwww.w3.org%2f2002%2f07%2fowl%23Thing",
"/vivo/vclassEdit?uri=http%3A%2F%2Fwww.w3.org%2F2002%2F07%2Fowl%23Thing");
}
@Test
public void test42083(){ urlEncodingStyleA(
"vclassEdit?home=1&uri=http%3a%2f%2fvivoweb.org%2fontology%2fcore%23Address",
"vclassEdit?home=1&uri=http%3A%2F%2Fvivoweb.org%2Fontology%2Fcore%23Address");
"vclassEdit?uri=http%3a%2f%2fvivoweb.org%2fontology%2fcore%23Address",
"vclassEdit?uri=http%3A%2F%2Fvivoweb.org%2Fontology%2Fcore%23Address");
}
@Test
public void test42084(){ urlEncodingStyleA(
"vclassEdit?home=1&uri=http%3a%2f%2fvivoweb.org%2fontology%2fcore%23DateTimeInterval",
"vclassEdit?home=1&uri=http%3A%2F%2Fvivoweb.org%2Fontology%2Fcore%23DateTimeInterval");
"vclassEdit?uri=http%3a%2f%2fvivoweb.org%2fontology%2fcore%23DateTimeInterval",
"vclassEdit?uri=http%3A%2F%2Fvivoweb.org%2Fontology%2Fcore%23DateTimeInterval");
}
@Test
public void test42085(){ urlEncodingStyleA(
"vclassEdit?home=1&uri=http%3a%2f%2fvivoweb.org%2fontology%2fcore%23URLLink",
"vclassEdit?home=1&uri=http%3A%2F%2Fvivoweb.org%2Fontology%2Fcore%23URLLink");
"vclassEdit?uri=http%3a%2f%2fvivoweb.org%2fontology%2fcore%23URLLink",
"vclassEdit?uri=http%3A%2F%2Fvivoweb.org%2Fontology%2Fcore%23URLLink");
}
@Test
public void test42086(){ urlEncodingStyleA(
"vclassEdit?home=1&uri=http%3a%2f%2fvivoweb.org%2fontology%2fcore%23AcademicDegree",
"vclassEdit?home=1&uri=http%3A%2F%2Fvivoweb.org%2Fontology%2Fcore%23AcademicDegree");
"vclassEdit?uri=http%3a%2f%2fvivoweb.org%2fontology%2fcore%23AcademicDegree",
"vclassEdit?uri=http%3A%2F%2Fvivoweb.org%2Fontology%2Fcore%23AcademicDegree");
}
@Test
public void test42087(){ urlEncodingStyleA(
"vclassEdit?home=1&uri=http%3a%2f%2fpurl.org%2fontology%2fbibo%2fDocumentStatus",
"vclassEdit?home=1&uri=http%3A%2F%2Fpurl.org%2Fontology%2Fbibo%2FDocumentStatus");
"vclassEdit?uri=http%3a%2f%2fpurl.org%2fontology%2fbibo%2fDocumentStatus",
"vclassEdit?uri=http%3A%2F%2Fpurl.org%2Fontology%2Fbibo%2FDocumentStatus");
}
@Test
public void test42088(){ urlEncodingStyleA(
"vclassEdit?home=1&uri=http%3a%2f%2fvivoweb.org%2fontology%2fcore%23DateTimeValuePrecision",
"vclassEdit?home=1&uri=http%3A%2F%2Fvivoweb.org%2Fontology%2Fcore%23DateTimeValuePrecision");
"vclassEdit?uri=http%3a%2f%2fvivoweb.org%2fontology%2fcore%23DateTimeValuePrecision",
"vclassEdit?uri=http%3A%2F%2Fvivoweb.org%2Fontology%2Fcore%23DateTimeValuePrecision");
}
@Test
public void test42089(){ urlEncodingStyleA(
"vclassEdit?home=1&uri=http%3a%2f%2fvivoweb.org%2fontology%2fcore%23DateTimeValue",
"vclassEdit?home=1&uri=http%3A%2F%2Fvivoweb.org%2Fontology%2Fcore%23DateTimeValue");
"vclassEdit?uri=http%3a%2f%2fvivoweb.org%2fontology%2fcore%23DateTimeValue",
"vclassEdit?uri=http%3A%2F%2Fvivoweb.org%2Fontology%2Fcore%23DateTimeValue");
}
@Test
public void test42090(){ urlEncodingStyleA(
"vclassEdit?home=1&uri=http%3a%2f%2fvivoweb.org%2fontology%2fcore%23Award",
"vclassEdit?home=1&uri=http%3A%2F%2Fvivoweb.org%2Fontology%2Fcore%23Award");
"vclassEdit?uri=http%3a%2f%2fvivoweb.org%2fontology%2fcore%23Award",
"vclassEdit?uri=http%3A%2F%2Fvivoweb.org%2Fontology%2Fcore%23Award");
}
@Test
public void test42091(){ urlEncodingStyleA(
"vclassEdit?home=1&uri=http%3a%2f%2fvivoweb.org%2fontology%2fcore%23Authorship",
"vclassEdit?home=1&uri=http%3A%2F%2Fvivoweb.org%2Fontology%2Fcore%23Authorship");
"vclassEdit?uri=http%3a%2f%2fvivoweb.org%2fontology%2fcore%23Authorship",
"vclassEdit?uri=http%3A%2F%2Fvivoweb.org%2Fontology%2Fcore%23Authorship");
}
@Test
public void test48256(){ urlEncodingStyleA(
"vclassEdit?home=1&uri=http%3a%2f%2fxmlns.com%2ffoaf%2f0.1%2fPerson",
"vclassEdit?home=1&uri=http%3A%2F%2Fxmlns.com%2Ffoaf%2F0.1%2FPerson");
"vclassEdit?uri=http%3a%2f%2fxmlns.com%2ffoaf%2f0.1%2fPerson",
"vclassEdit?uri=http%3A%2F%2Fxmlns.com%2Ffoaf%2F0.1%2FPerson");
}
@Test
public void test11309(){ urlEncodingStyleA(
"vclassEdit?home=1&uri=http%3a%2f%2fvitro.mannlib.cornell.edu%2fns%2fbnode%23-43882498%3a12c1825c819%3a-7df6",
"vclassEdit?home=1&uri=http%3A%2F%2Fvitro.mannlib.cornell.edu%2Fns%2Fbnode%23-43882498%3A12c1825c819%3A-7df6");
"vclassEdit?uri=http%3a%2f%2fvitro.mannlib.cornell.edu%2fns%2fbnode%23-43882498%3a12c1825c819%3a-7df6",
"vclassEdit?uri=http%3A%2F%2Fvitro.mannlib.cornell.edu%2Fns%2Fbnode%23-43882498%3A12c1825c819%3A-7df6");
}
@Test
public void test11310(){ urlEncodingStyleA(
"vclassEdit?home=1&uri=http%3a%2f%2fvitro.mannlib.cornell.edu%2fns%2fbnode%23-43882498%3a12c1825c819%3a-7e02",
"vclassEdit?home=1&uri=http%3A%2F%2Fvitro.mannlib.cornell.edu%2Fns%2Fbnode%23-43882498%3A12c1825c819%3A-7e02");
"vclassEdit?uri=http%3a%2f%2fvitro.mannlib.cornell.edu%2fns%2fbnode%23-43882498%3a12c1825c819%3a-7e02",
"vclassEdit?uri=http%3A%2F%2Fvitro.mannlib.cornell.edu%2Fns%2Fbnode%23-43882498%3A12c1825c819%3A-7e02");
}
@Test
public void test11311(){ urlEncodingStyleA(
"vclassEdit?home=1&uri=http%3a%2f%2fvitro.mannlib.cornell.edu%2fns%2fbnode%23-43882498%3a12c1825c819%3a-7e09",
"vclassEdit?home=1&uri=http%3A%2F%2Fvitro.mannlib.cornell.edu%2Fns%2Fbnode%23-43882498%3A12c1825c819%3A-7e09");
"vclassEdit?uri=http%3a%2f%2fvitro.mannlib.cornell.edu%2fns%2fbnode%23-43882498%3a12c1825c819%3a-7e09",
"vclassEdit?uri=http%3A%2F%2Fvitro.mannlib.cornell.edu%2Fns%2Fbnode%23-43882498%3A12c1825c819%3A-7e09");
}
@Test
public void test11312(){ urlEncodingStyleA(
"vclassEdit?home=1&uri=http%3a%2f%2fvitro.mannlib.cornell.edu%2fns%2fbnode%23-43882498%3a12c1825c819%3a-7df5",
"vclassEdit?home=1&uri=http%3A%2F%2Fvitro.mannlib.cornell.edu%2Fns%2Fbnode%23-43882498%3A12c1825c819%3A-7df5");
"vclassEdit?uri=http%3a%2f%2fvitro.mannlib.cornell.edu%2fns%2fbnode%23-43882498%3a12c1825c819%3a-7df5",
"vclassEdit?uri=http%3A%2F%2Fvitro.mannlib.cornell.edu%2Fns%2Fbnode%23-43882498%3A12c1825c819%3A-7df5");
}
@Test
public void test11313(){ urlEncodingStyleA(
"vclassEdit?home=1&uri=http%3a%2f%2fvitro.mannlib.cornell.edu%2fns%2fbnode%23-43882498%3a12c1825c819%3a-7df4",
"vclassEdit?home=1&uri=http%3A%2F%2Fvitro.mannlib.cornell.edu%2Fns%2Fbnode%23-43882498%3A12c1825c819%3A-7df4");
"vclassEdit?uri=http%3a%2f%2fvitro.mannlib.cornell.edu%2fns%2fbnode%23-43882498%3a12c1825c819%3a-7df4",
"vclassEdit?uri=http%3A%2F%2Fvitro.mannlib.cornell.edu%2Fns%2Fbnode%23-43882498%3A12c1825c819%3A-7df4");
}
@Test
public void test11314(){ urlEncodingStyleA(
"vclassEdit?home=1&uri=http%3a%2f%2fvitro.mannlib.cornell.edu%2fns%2fbnode%23-43882498%3a12c1825c819%3a-7df9",
"vclassEdit?home=1&uri=http%3A%2F%2Fvitro.mannlib.cornell.edu%2Fns%2Fbnode%23-43882498%3A12c1825c819%3A-7df9");
"vclassEdit?uri=http%3a%2f%2fvitro.mannlib.cornell.edu%2fns%2fbnode%23-43882498%3a12c1825c819%3a-7df9",
"vclassEdit?uri=http%3A%2F%2Fvitro.mannlib.cornell.edu%2Fns%2Fbnode%23-43882498%3A12c1825c819%3A-7df9");
}
@Test
public void test11315(){ urlEncodingStyleA(
"vclassEdit?home=1&uri=http%3a%2f%2fvitro.mannlib.cornell.edu%2fns%2fbnode%23-43882498%3a12c1825c819%3a-7df8",
"vclassEdit?home=1&uri=http%3A%2F%2Fvitro.mannlib.cornell.edu%2Fns%2Fbnode%23-43882498%3A12c1825c819%3A-7df8");
"vclassEdit?uri=http%3a%2f%2fvitro.mannlib.cornell.edu%2fns%2fbnode%23-43882498%3a12c1825c819%3a-7df8",
"vclassEdit?uri=http%3A%2F%2Fvitro.mannlib.cornell.edu%2Fns%2Fbnode%23-43882498%3A12c1825c819%3A-7df8");
}
@Test
public void test11317(){ urlEncodingStyleA(
"vclassEdit?home=1&uri=http%3a%2f%2fvitro.mannlib.cornell.edu%2fns%2fbnode%23-43882498%3a12c1825c819%3a-7df7",
"vclassEdit?home=1&uri=http%3A%2F%2Fvitro.mannlib.cornell.edu%2Fns%2Fbnode%23-43882498%3A12c1825c819%3A-7df7");
"vclassEdit?uri=http%3a%2f%2fvitro.mannlib.cornell.edu%2fns%2fbnode%23-43882498%3a12c1825c819%3a-7df7",
"vclassEdit?uri=http%3A%2F%2Fvitro.mannlib.cornell.edu%2Fns%2Fbnode%23-43882498%3A12c1825c819%3A-7df7");
}
@Test
public void test11318(){ urlEncodingStyleA(
"vclassEdit?home=1&uri=http%3a%2f%2fxmlns.com%2ffoaf%2f0.1%2fAgent",
"vclassEdit?home=1&uri=http%3A%2F%2Fxmlns.com%2Ffoaf%2F0.1%2FAgent");
"vclassEdit?uri=http%3a%2f%2fxmlns.com%2ffoaf%2f0.1%2fAgent",
"vclassEdit?uri=http%3A%2F%2Fxmlns.com%2Ffoaf%2F0.1%2FAgent");
}
@Test
public void test11319(){ urlEncodingStyleA(
"vclassEdit?home=1&uri=http%3a%2f%2fvivoweb.org%2fontology%2fcore%23Librarian",
"vclassEdit?home=1&uri=http%3A%2F%2Fvivoweb.org%2Fontology%2Fcore%23Librarian");
"vclassEdit?uri=http%3a%2f%2fvivoweb.org%2fontology%2fcore%23Librarian",
"vclassEdit?uri=http%3A%2F%2Fvivoweb.org%2Fontology%2Fcore%23Librarian");
}
@Test
public void test11320(){ urlEncodingStyleA(
"vclassEdit?home=1&uri=http%3a%2f%2fvivoweb.org%2fontology%2fcore%23Student",
"vclassEdit?home=1&uri=http%3A%2F%2Fvivoweb.org%2Fontology%2Fcore%23Student");
"vclassEdit?uri=http%3a%2f%2fvivoweb.org%2fontology%2fcore%23Student",
"vclassEdit?uri=http%3A%2F%2Fvivoweb.org%2Fontology%2Fcore%23Student");
}
@Test
public void test11321(){ urlEncodingStyleA(
"vclassEdit?home=1&uri=http%3a%2f%2fvivoweb.org%2fontology%2fcore%23NonAcademic",
"vclassEdit?home=1&uri=http%3A%2F%2Fvivoweb.org%2Fontology%2Fcore%23NonAcademic");
"vclassEdit?uri=http%3a%2f%2fvivoweb.org%2fontology%2fcore%23NonAcademic",
"vclassEdit?uri=http%3A%2F%2Fvivoweb.org%2Fontology%2Fcore%23NonAcademic");
}
@Test
public void test11322(){ urlEncodingStyleA(
"vclassEdit?home=1&uri=http%3a%2f%2fvivoweb.org%2fontology%2fcore%23NonFacultyAcademic",
"vclassEdit?home=1&uri=http%3A%2F%2Fvivoweb.org%2Fontology%2Fcore%23NonFacultyAcademic");
"vclassEdit?uri=http%3a%2f%2fvivoweb.org%2fontology%2fcore%23NonFacultyAcademic",
"vclassEdit?uri=http%3A%2F%2Fvivoweb.org%2Fontology%2Fcore%23NonFacultyAcademic");
}
@Test
public void test113222(){ urlEncodingStyleA(
"vclassEdit?home=1&uri=http%3a%2f%2fvivoweb.org%2fontology%2fcore%23FacultyMember",
"vclassEdit?home=1&uri=http%3A%2F%2Fvivoweb.org%2Fontology%2Fcore%23FacultyMember");
"vclassEdit?uri=http%3a%2f%2fvivoweb.org%2fontology%2fcore%23FacultyMember",
"vclassEdit?uri=http%3A%2F%2Fvivoweb.org%2Fontology%2Fcore%23FacultyMember");
}
@Test
public void test11323(){ urlEncodingStyleA(
"vclassEdit?home=1&uri=http%3a%2f%2fvivoweb.org%2fontology%2fcore%23EmeritusProfessor",
"vclassEdit?home=1&uri=http%3A%2F%2Fvivoweb.org%2Fontology%2Fcore%23EmeritusProfessor");
"vclassEdit?uri=http%3a%2f%2fvivoweb.org%2fontology%2fcore%23EmeritusProfessor",
"vclassEdit?uri=http%3A%2F%2Fvivoweb.org%2Fontology%2Fcore%23EmeritusProfessor");
}
@Test
public void test53543(){ urlEncodingStyleA(
@ -334,7 +328,7 @@ public class URLRewritingHttpServletResponseTest {
"/vivo/js/tiny_mce/tiny_mce.js", "/vivo/js/tiny_mce/tiny_mce.js"); }
@Test
public void test14999(){ urlEncodingStyleA(
"/vivo/entityEdit?home=1&uri=http%3a%2f%2fbogus.com%2findividual%2fn3671",
"/vivo/entityEdit?uri=http%3a%2f%2fbogus.com%2findividual%2fn3671",
"/vivo/entityEdit?uri=http%3A%2F%2Fbogus.com%2Findividual%2Fn3671"); }
@Test
public void test15011(){ urlEncodingStyleA(
@ -628,7 +622,7 @@ public class URLRewritingHttpServletResponseTest {
"/js/tiny_mce/tiny_mce.js", "/js/tiny_mce/tiny_mce.js"); }
@Test
public void test37150(){ urlEncodingStyleB(
"/entityEdit?home=1&uri=http%3a%2f%2fbogus.com%2findividual%2fn3671",
"/entityEdit?uri=http%3a%2f%2fbogus.com%2findividual%2fn3671",
"/entityEdit?uri=http%3A%2F%2Fbogus.com%2Findividual%2Fn3671"); }
@Test
public void test37402(){ urlEncodingStyleB(
@ -645,126 +639,126 @@ public class URLRewritingHttpServletResponseTest {
"/js/imageUpload/imageUploadUtils.js"); }
@Test
public void test47087(){ urlEncodingStyleB(
"entityEdit?home=1&uri=http%3a%2f%2fxmlns.com%2ffoaf%2f0.1%2fAgent",
"entityEdit?home=1&uri=http%3A%2F%2Fxmlns.com%2Ffoaf%2F0.1%2FAgent");
"entityEdit?uri=http%3a%2f%2fxmlns.com%2ffoaf%2f0.1%2fAgent",
"entityEdit?uri=http%3A%2F%2Fxmlns.com%2Ffoaf%2F0.1%2FAgent");
}
@Test
public void test47088(){ urlEncodingStyleB(
"/vclassEdit?home=1&uri=http%3a%2f%2fxmlns.com%2ffoaf%2f0.1%2fAgent",
"/vclassEdit?uri=http%3a%2f%2fxmlns.com%2ffoaf%2f0.1%2fAgent",
"/vclassEdit?uri=http%3A%2F%2Fxmlns.com%2Ffoaf%2F0.1%2FAgent"); }
@Test
public void test470910(){ urlEncodingStyleB(
"entityEdit?home=1&uri=http%3a%2f%2fxmlns.com%2ffoaf%2f0.1%2fPerson",
"entityEdit?home=1&uri=http%3A%2F%2Fxmlns.com%2Ffoaf%2F0.1%2FPerson");
"entityEdit?uri=http%3a%2f%2fxmlns.com%2ffoaf%2f0.1%2fPerson",
"entityEdit?uri=http%3A%2F%2Fxmlns.com%2Ffoaf%2F0.1%2FPerson");
}
@Test
public void test47091(){ urlEncodingStyleB(
"/vclassEdit?home=1&uri=http%3a%2f%2fxmlns.com%2ffoaf%2f0.1%2fPerson",
"/vclassEdit?uri=http%3a%2f%2fxmlns.com%2ffoaf%2f0.1%2fPerson",
"/vclassEdit?uri=http%3A%2F%2Fxmlns.com%2Ffoaf%2F0.1%2FPerson"); }
@Test
public void test470930(){ urlEncodingStyleB(
"entityEdit?home=1&uri=http%3a%2f%2fwww.w3.org%2f2002%2f07%2fowl%23Thing",
"entityEdit?home=1&uri=http%3A%2F%2Fwww.w3.org%2F2002%2F07%2Fowl%23Thing");
"entityEdit?uri=http%3a%2f%2fwww.w3.org%2f2002%2f07%2fowl%23Thing",
"entityEdit?uri=http%3A%2F%2Fwww.w3.org%2F2002%2F07%2Fowl%23Thing");
}
@Test
public void test47093(){ urlEncodingStyleB(
"/vclassEdit?home=1&uri=http%3a%2f%2fwww.w3.org%2f2002%2f07%2fowl%23Thing",
"/vclassEdit?uri=http%3a%2f%2fwww.w3.org%2f2002%2f07%2fowl%23Thing",
"/vclassEdit?uri=http%3A%2F%2Fwww.w3.org%2F2002%2F07%2Fowl%23Thing");
}
@Test
public void test04993(){ urlEncodingStyleB(
"vclassEdit?home=1&uri=http%3a%2f%2fvitro.mannlib.cornell.edu%2fns%2fbnode%23-20981c46%3a12c18866689%3a-7d2e",
"vclassEdit?home=1&uri=http%3A%2F%2Fvitro.mannlib.cornell.edu%2Fns%2Fbnode%23-20981c46%3A12c18866689%3A-7d2e");
"vclassEdit?uri=http%3a%2f%2fvitro.mannlib.cornell.edu%2fns%2fbnode%23-20981c46%3a12c18866689%3a-7d2e",
"vclassEdit?uri=http%3A%2F%2Fvitro.mannlib.cornell.edu%2Fns%2Fbnode%23-20981c46%3A12c18866689%3A-7d2e");
}
@Test
public void test04994(){ urlEncodingStyleB(
"vclassEdit?home=1&uri=http%3a%2f%2fvitro.mannlib.cornell.edu%2fns%2fbnode%23-20981c46%3a12c18866689%3a-7dad",
"vclassEdit?home=1&uri=http%3A%2F%2Fvitro.mannlib.cornell.edu%2Fns%2Fbnode%23-20981c46%3A12c18866689%3A-7dad");
"vclassEdit?uri=http%3a%2f%2fvitro.mannlib.cornell.edu%2fns%2fbnode%23-20981c46%3a12c18866689%3a-7dad",
"vclassEdit?uri=http%3A%2F%2Fvitro.mannlib.cornell.edu%2Fns%2Fbnode%23-20981c46%3A12c18866689%3A-7dad");
}
@Test
public void test04995(){ urlEncodingStyleB(
"vclassEdit?home=1&uri=http%3a%2f%2fvitro.mannlib.cornell.edu%2fns%2fbnode%23-20981c46%3a12c18866689%3a-7d31",
"vclassEdit?home=1&uri=http%3A%2F%2Fvitro.mannlib.cornell.edu%2Fns%2Fbnode%23-20981c46%3A12c18866689%3A-7d31");
"vclassEdit?uri=http%3a%2f%2fvitro.mannlib.cornell.edu%2fns%2fbnode%23-20981c46%3a12c18866689%3a-7d31",
"vclassEdit?uri=http%3A%2F%2Fvitro.mannlib.cornell.edu%2Fns%2Fbnode%23-20981c46%3A12c18866689%3A-7d31");
}
@Test
public void test04996(){ urlEncodingStyleB(
"vclassEdit?home=1&uri=http%3a%2f%2fvitro.mannlib.cornell.edu%2fns%2fbnode%23-20981c46%3a12c18866689%3a-7db7",
"vclassEdit?home=1&uri=http%3A%2F%2Fvitro.mannlib.cornell.edu%2Fns%2Fbnode%23-20981c46%3A12c18866689%3A-7db7");
"vclassEdit?uri=http%3a%2f%2fvitro.mannlib.cornell.edu%2fns%2fbnode%23-20981c46%3a12c18866689%3a-7db7",
"vclassEdit?uri=http%3A%2F%2Fvitro.mannlib.cornell.edu%2Fns%2Fbnode%23-20981c46%3A12c18866689%3A-7db7");
}
@Test
public void test04997(){ urlEncodingStyleB(
"vclassEdit?home=1&uri=http%3a%2f%2fvitro.mannlib.cornell.edu%2fns%2fbnode%23-20981c46%3a12c18866689%3a-7df2",
"vclassEdit?home=1&uri=http%3A%2F%2Fvitro.mannlib.cornell.edu%2Fns%2Fbnode%23-20981c46%3A12c18866689%3A-7df2");
"vclassEdit?uri=http%3a%2f%2fvitro.mannlib.cornell.edu%2fns%2fbnode%23-20981c46%3a12c18866689%3a-7df2",
"vclassEdit?uri=http%3A%2F%2Fvitro.mannlib.cornell.edu%2Fns%2Fbnode%23-20981c46%3A12c18866689%3A-7df2");
}
@Test
public void test04999(){ urlEncodingStyleB(
"vclassEdit?home=1&uri=http%3a%2f%2fxmlns.com%2ffoaf%2f0.1%2fOrganization",
"vclassEdit?home=1&uri=http%3A%2F%2Fxmlns.com%2Ffoaf%2F0.1%2FOrganization");
"vclassEdit?uri=http%3a%2f%2fxmlns.com%2ffoaf%2f0.1%2fOrganization",
"vclassEdit?uri=http%3A%2F%2Fxmlns.com%2Ffoaf%2F0.1%2FOrganization");
}
@Test
public void test05000(){ urlEncodingStyleB(
"vclassEdit?home=1&uri=http%3a%2f%2fxmlns.com%2ffoaf%2f0.1%2fPerson",
"vclassEdit?home=1&uri=http%3A%2F%2Fxmlns.com%2Ffoaf%2F0.1%2FPerson");
"vclassEdit?uri=http%3a%2f%2fxmlns.com%2ffoaf%2f0.1%2fPerson",
"vclassEdit?uri=http%3A%2F%2Fxmlns.com%2Ffoaf%2F0.1%2FPerson");
}
@Test
public void test13898(){ urlEncodingStyleB(
"entityEdit?home=1&uri=http%3a%2f%2fvitro.mannlib.cornell.edu%2fns%2fvitro%2fpublic%23File",
"entityEdit?home=1&uri=http%3A%2F%2Fvitro.mannlib.cornell.edu%2Fns%2Fvitro%2Fpublic%23File");
"entityEdit?uri=http%3a%2f%2fvitro.mannlib.cornell.edu%2fns%2fvitro%2fpublic%23File",
"entityEdit?uri=http%3A%2F%2Fvitro.mannlib.cornell.edu%2Fns%2Fvitro%2Fpublic%23File");
}
@Test
public void test13899(){ urlEncodingStyleB(
"/vclassEdit?home=1&uri=http%3a%2f%2fvitro.mannlib.cornell.edu%2fns%2fvitro%2fpublic%23File",
"/vclassEdit?uri=http%3a%2f%2fvitro.mannlib.cornell.edu%2fns%2fvitro%2fpublic%23File",
"/vclassEdit?uri=http%3A%2F%2Fvitro.mannlib.cornell.edu%2Fns%2Fvitro%2Fpublic%23File");
}
@Test
public void test28454(){ urlEncodingStyleB(
"entityEdit?home=1&uri=http%3a%2f%2fwww.w3.org%2f2002%2f07%2fowl%23Thing",
"entityEdit?home=1&uri=http%3A%2F%2Fwww.w3.org%2F2002%2F07%2Fowl%23Thing");
"entityEdit?uri=http%3a%2f%2fwww.w3.org%2f2002%2f07%2fowl%23Thing",
"entityEdit?uri=http%3A%2F%2Fwww.w3.org%2F2002%2F07%2Fowl%23Thing");
}
@Test
public void test28458(){ urlEncodingStyleB(
"/vclassEdit?home=1&uri=http%3a%2f%2fwww.w3.org%2f2002%2f07%2fowl%23Thing",
"/vclassEdit?uri=http%3a%2f%2fwww.w3.org%2f2002%2f07%2fowl%23Thing",
"/vclassEdit?uri=http%3A%2F%2Fwww.w3.org%2F2002%2F07%2Fowl%23Thing");
}
@Test
public void test38687(){ urlEncodingStyleB(
"vclassEdit?home=1&uri=http%3a%2f%2fvitro.mannlib.cornell.edu%2fns%2fbnode%23-20981c46%3a12c18866689%3a-7d75",
"vclassEdit?home=1&uri=http%3A%2F%2Fvitro.mannlib.cornell.edu%2Fns%2Fbnode%23-20981c46%3A12c18866689%3A-7d75");
"vclassEdit?uri=http%3a%2f%2fvitro.mannlib.cornell.edu%2fns%2fbnode%23-20981c46%3a12c18866689%3a-7d75",
"vclassEdit?uri=http%3A%2F%2Fvitro.mannlib.cornell.edu%2Fns%2Fbnode%23-20981c46%3A12c18866689%3A-7d75");
}
@Test
public void test38693(){ urlEncodingStyleB(
"vclassEdit?home=1&uri=http%3a%2f%2fvitro.mannlib.cornell.edu%2fns%2fbnode%23-20981c46%3a12c18866689%3a-7d76",
"vclassEdit?home=1&uri=http%3A%2F%2Fvitro.mannlib.cornell.edu%2Fns%2Fbnode%23-20981c46%3A12c18866689%3A-7d76");
"vclassEdit?uri=http%3a%2f%2fvitro.mannlib.cornell.edu%2fns%2fbnode%23-20981c46%3a12c18866689%3a-7d76",
"vclassEdit?uri=http%3A%2F%2Fvitro.mannlib.cornell.edu%2Fns%2Fbnode%23-20981c46%3A12c18866689%3A-7d76");
}
@Test
public void test38694(){ urlEncodingStyleB(
"vclassEdit?home=1&uri=http%3a%2f%2fvivoweb.org%2fontology%2fcore%23AbstractInformation",
"vclassEdit?home=1&uri=http%3A%2F%2Fvivoweb.org%2Fontology%2Fcore%23AbstractInformation");
"vclassEdit?uri=http%3a%2f%2fvivoweb.org%2fontology%2fcore%23AbstractInformation",
"vclassEdit?uri=http%3A%2F%2Fvivoweb.org%2Fontology%2Fcore%23AbstractInformation");
}
@Test
public void test38695(){ urlEncodingStyleB(
"vclassEdit?home=1&uri=http%3a%2f%2fvitro.mannlib.cornell.edu%2fns%2fbnode%23-20981c46%3a12c18866689%3a-7d77",
"vclassEdit?home=1&uri=http%3A%2F%2Fvitro.mannlib.cornell.edu%2Fns%2Fbnode%23-20981c46%3A12c18866689%3A-7d77");
"vclassEdit?uri=http%3a%2f%2fvitro.mannlib.cornell.edu%2fns%2fbnode%23-20981c46%3a12c18866689%3a-7d77",
"vclassEdit?uri=http%3A%2F%2Fvitro.mannlib.cornell.edu%2Fns%2Fbnode%23-20981c46%3A12c18866689%3A-7d77");
}
@Test
public void test38696(){ urlEncodingStyleB(
"vclassEdit?home=1&uri=http%3a%2f%2fpurl.org%2fontology%2fbibo%2fThesisDegree",
"vclassEdit?home=1&uri=http%3A%2F%2Fpurl.org%2Fontology%2Fbibo%2FThesisDegree");
"vclassEdit?uri=http%3a%2f%2fpurl.org%2fontology%2fbibo%2fThesisDegree",
"vclassEdit?uri=http%3A%2F%2Fpurl.org%2Fontology%2Fbibo%2FThesisDegree");
}
@Test
public void test43123(){ urlEncodingStyleB(
"vclassEdit?home=1&uri=http%3a%2f%2fxmlns.com%2ffoaf%2f0.1%2fPerson",
"vclassEdit?home=1&uri=http%3A%2F%2Fxmlns.com%2Ffoaf%2F0.1%2FPerson");
"vclassEdit?uri=http%3a%2f%2fxmlns.com%2ffoaf%2f0.1%2fPerson",
"vclassEdit?uri=http%3A%2F%2Fxmlns.com%2Ffoaf%2F0.1%2FPerson");
}
@Test
public void test43124(){ urlEncodingStyleB(
"vclassEdit?home=1&uri=http%3a%2f%2fvivoweb.org%2fontology%2fcore%23Postdoc",
"vclassEdit?home=1&uri=http%3A%2F%2Fvivoweb.org%2Fontology%2Fcore%23Postdoc");
"vclassEdit?uri=http%3a%2f%2fvivoweb.org%2fontology%2fcore%23Postdoc",
"vclassEdit?uri=http%3A%2F%2Fvivoweb.org%2Fontology%2Fcore%23Postdoc");
}
@Test
public void test59983(){ urlEncodingStyleB(
"propertyEdit?home=1&uri=http%3a%2f%2fpurl.org%2fdc%2fterms%2fcontributor",
"propertyEdit?home=1&uri=http%3A%2F%2Fpurl.org%2Fdc%2Fterms%2Fcontributor");
"propertyEdit?uri=http%3a%2f%2fpurl.org%2fdc%2fterms%2fcontributor",
"propertyEdit?uri=http%3A%2F%2Fpurl.org%2Fdc%2Fterms%2Fcontributor");
}
@Test
public void test17004(){ urlEncodingStyleB(

View file

@ -1,124 +0,0 @@
/* $This file is distributed under the terms of the license in /doc/license.txt$ */
package edu.cornell.mannlib.vitro.webapp.utils;
import static edu.cornell.mannlib.vitro.webapp.utils.FlagMathUtils.bits2Numeric;
import static edu.cornell.mannlib.vitro.webapp.utils.FlagMathUtils.numeric2Portalid;
import static edu.cornell.mannlib.vitro.webapp.utils.FlagMathUtils.numeric2numerics;
import static edu.cornell.mannlib.vitro.webapp.utils.FlagMathUtils.portalId2Numeric;
import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertTrue;
import static junit.framework.Assert.fail;
import java.util.Arrays;
import org.junit.Test;
import edu.cornell.mannlib.vitro.testing.AbstractTestClass;
/**
* @author jeb228
*/
public class FlagMathUtilsTest extends AbstractTestClass {
@Test
public void testBits2Num() {
boolean[] bits = { false, false, false, false };
assertEquals(0, bits2Numeric(bits));
boolean[] bits2 = { true, false, false, false };
assertEquals(1, bits2Numeric(bits2));
boolean[] bits3 = { true, true, false, false };
assertEquals(3, bits2Numeric(bits3));
boolean[] bits4 = { true, false, false, true };
assertEquals(1 + 8, bits2Numeric(bits4));
boolean[] bits5 = { false, false, false, true };
assertEquals(8, bits2Numeric(bits5));
boolean[] bits6 = { true, true, true, true };
assertEquals(1 + 2 + 4 + 8, bits2Numeric(bits6));
}
@Test
public void testNumeric2numerics() {
Long[] num0 = { new Long(1), new Long(2), new Long(4), new Long(8) };
assertTrue(Arrays.equals(num0, numeric2numerics(1 + 2 + 4 + 8)));
Long[] num1 = { new Long(1) };
assertTrue(Arrays.equals(num1, numeric2numerics(1)));
Long[] num2 = {};
assertTrue(Arrays.equals(num2, numeric2numerics(0)));
Long[] num3 = { new Long(1), new Long(8) };
assertTrue(Arrays.equals(num3, numeric2numerics(1 + 8)));
Long[] num4 = { new Long(4), new Long(8) };
assertTrue(Arrays.equals(num4, numeric2numerics(4 + 8)));
Long[] num5 = { new Long(8) };
assertTrue(Arrays.equals(num5, numeric2numerics(8)));
Long[] num6 = { new Long(2), new Long(4) };
assertTrue(Arrays.equals(num6, numeric2numerics(2 + 4)));
}
@Test
public void testNumeric2Portalid() {
assertEquals(0, numeric2Portalid(1));
assertEquals(1, numeric2Portalid(2));
assertEquals(2, numeric2Portalid(4));
assertEquals(3, numeric2Portalid(8));
assertEquals(4, numeric2Portalid(16));
assertEquals(5, numeric2Portalid(32));
assertEquals(6, numeric2Portalid(64));
assertEquals(7, numeric2Portalid(128));
assertEquals(8, numeric2Portalid(256));
// make sure we throw errors on bad inputs
try {
numeric2Portalid(0);
fail("should have thrown Error");
} catch (Throwable e) {
}
try {
numeric2Portalid(3);
fail("should have thrown Error");
} catch (Throwable e) {
}
try {
numeric2Portalid(15);
fail("should have thrown Error");
} catch (Throwable e) {
}
try {
numeric2Portalid(21);
fail("should have thrown Error");
} catch (Throwable e) {
}
}
@Test
public void testPortalId2Num() {
assertEquals(2, portalId2Numeric(1));
assertEquals(4, portalId2Numeric(2));
assertEquals(8, portalId2Numeric(3));
assertEquals(16, portalId2Numeric(4));
assertEquals(32, portalId2Numeric(5));
assertEquals(64, portalId2Numeric(6));
assertEquals(128, portalId2Numeric(7));
}
@Test
public void testBackAndForth() {
for (long i = 1; i < Long.SIZE - 1; i++) {
long num = portalId2Numeric(i);
int portal = numeric2Portalid(num);
assertEquals(i, portal);
}
}
}

View file

@ -24,7 +24,6 @@ import edu.cornell.mannlib.vitro.webapp.dao.ObjectPropertyDao;
import edu.cornell.mannlib.vitro.webapp.dao.ObjectPropertyStatementDao;
import edu.cornell.mannlib.vitro.webapp.dao.OntologyDao;
import edu.cornell.mannlib.vitro.webapp.dao.PageDao;
import edu.cornell.mannlib.vitro.webapp.dao.PortalDao;
import edu.cornell.mannlib.vitro.webapp.dao.PropertyGroupDao;
import edu.cornell.mannlib.vitro.webapp.dao.PropertyInstanceDao;
import edu.cornell.mannlib.vitro.webapp.dao.TabDao;
@ -193,12 +192,6 @@ public class WebappDaoFactoryStub implements WebappDaoFactory {
"WebappDaoFactory.getApplicationDao() not implemented.");
}
@Override
public PortalDao getPortalDao() {
throw new RuntimeException(
"WebappDaoFactory.getPortalDao() not implemented.");
}
@Override
public TabDao getTabDao() {
throw new RuntimeException(