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

Moved url utility methods into Routes class

Browse source
This commit is contained in:
rjy7 2010-05-26 16:04:46 +00:00
parent b7d2027da4
commit f6b3acd831
9 changed files with 131 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

34
webapp/test/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreeMarkerHttpServletTest.java → webapp/test/edu/cornell/mannlib/vitro/webapp/controller/freemarker/RoutesTest.java
View file

@ -13,41 +13,53 @@ import edu.cornell.mannlib.vitro.testing.AbstractTestClass;
import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreeMarkerHttpServlet;
import freemarker.template.Configuration;
public class FreeMarkerHttpServletTest extends AbstractTestClass {
static {
Configuration cfg = new Configuration();
FreeMarkerHttpServlet.config = cfg;
FreeMarkerHttpServlet.contextPath = "/vivo";
}
public class RoutesTest extends AbstractTestClass {
@Test
public void testGetUrl() {
Routes.contextPath = "/vivo";
String path1 = "/individual";
Assert.assertEquals("/vivo/individual", FreeMarkerHttpServlet.getUrl(path1));
Assert.assertEquals("/vivo/individual", Routes.getUrl(path1));
int portalId = 1;
String path2 = "/individual?home=" + portalId;
Assert.assertEquals("/vivo/individual?home=1", FreeMarkerHttpServlet.getUrl(path2));
Assert.assertEquals("/vivo/individual?home=1", Routes.getUrl(path2));
}
@Test
public void testGetUrlWithEmptyContext() {
Routes.contextPath = "";
String path = "/individual";
Assert.assertEquals(path, Routes.getUrl(path));
}
@Test
public void testGetUrlWithParams() {
Routes.contextPath = "/vivo";
String path = "/individual";
Map<String, String> params = new HashMap<String, String>();
int portalId = 1;
params.put("home", "" + portalId);
params.put("name", "Tom");
Assert.assertEquals("/vivo/individual?home=1&name=Tom", FreeMarkerHttpServlet.getUrl(path, params));
Assert.assertEquals("/vivo/individual?home=1&name=Tom", Routes.getUrl(path, params));
}
@Test
public void testEncodeUrl() {
Routes.contextPath = "/vivo";
String path = "/individuallist";
Map<String, String> params = new HashMap<String, String>();
String vClassUri = "http://vivoweb.org/ontology/core#FacultyMember";
params.put("vclassId", vClassUri);
Assert.assertEquals("/vivo/individuallist?vclassId=http%3A%2F%2Fvivoweb.org%2Fontology%2Fcore%23FacultyMember", FreeMarkerHttpServlet.getUrl(path, params));
Assert.assertEquals("/vivo/individuallist?vclassId=http%3A%2F%2Fvivoweb.org%2Fontology%2Fcore%23FacultyMember", Routes.getUrl(path, params));
}
@Test
public void testDecodeUrl() {
String vClassUri = "http://vivoweb.org/ontology/core#FacultyMember";
String vClassUriEncoded = "http%3A%2F%2Fvivoweb.org%2Fontology%2Fcore%23FacultyMember";
Assert.assertEquals(vClassUri, Routes.urlDecode(vClassUriEncoded));
}
}