[gatein-commits] gatein SVN: r4951 - portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router.

[do-not-reply at jboss.org]

Author: julien_viet
Date: 2010-11-04 23:34:32 -0400 (Thu, 04 Nov 2010)
New Revision: 4951

Modified:
   portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/AbstractTestController.java
   portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestMatch.java
Log:
add testing


Modified: portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/AbstractTestController.java
===================================================================
--- portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/AbstractTestController.java	2010-11-05 02:54:23 UTC (rev 4950)
+++ portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/AbstractTestController.java	2010-11-05 03:34:32 UTC (rev 4951)
@@ -35,7 +35,7 @@
 {
    public void assertEquals(Map<QualifiedName, String> expectedParameters, Map<QualifiedName, String> parameters)
    {
-      assertNotNull(parameters);
+      assertNotNull("Was not expecting a null parameter set", parameters);
       Assert.assertEquals(expectedParameters.keySet(), parameters.keySet());
       for (Map.Entry<QualifiedName, String> expectedEntry : expectedParameters.entrySet())
       {

Modified: portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestMatch.java
===================================================================
--- portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestMatch.java	2010-11-05 02:54:23 UTC (rev 4950)
+++ portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestMatch.java	2010-11-05 03:34:32 UTC (rev 4951)
@@ -127,6 +127,17 @@
       assertEquals(Collections.singletonMap(QualifiedName.create("p"), "/"), router.route("/~"));
    }
 
+   public void testPreservePath() throws Exception
+   {
+      RouterDescriptor routerMD = new RouterDescriptor();
+      routerMD.addRoute(new RouteDescriptor("/{p}").addPathParam(QualifiedName.parse("p"), "[^/]+", EncodingMode.PRESERVE_PATH));
+      Router router = new Router(routerMD);
+
+      //
+      assertEquals(Collections.singletonMap(QualifiedName.create("p"), "~"), router.route("/~"));
+      assertNull(router.route("//"));
+   }
+
    public void testSimplePattern() throws Exception
    {
       RouterDescriptor routerMD = new RouterDescriptor();