svn commit: r911283 - in /wicket/trunk/wicket/src: main/java/org/apache/wicket/ng/request/cycle/UrlRenderer.java test/java/org/apache/wicket/ng/request/cycle/UrlRendererTest.java

[ivaynberg]

Author: ivaynberg
Date: Thu Feb 18 08:45:23 2010
New Revision: 911283

URL: http://svn.apache.org/viewvc?rev=911283&view=rev
Log:
fix for url renderer

Modified:
    
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/cycle/UrlRenderer.java
    
wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/cycle/UrlRendererTest.java

Modified: 
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/cycle/UrlRenderer.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/cycle/UrlRenderer.java?rev=911283&r1=911282&r2=911283&view=diff
==============================================================================
--- 
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/cycle/UrlRenderer.java
 (original)
+++ 
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/cycle/UrlRenderer.java
 Thu Feb 18 08:45:23 2010
@@ -113,6 +113,10 @@
                                        ++common;
                                        last = urlSegments.remove(0);
                                }
+                               else
+                               {
+                                       break;
+                               }
                        }
 
                        // we want the new URL to have at least one segment 
(other than possible ../)

Modified: 
wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/cycle/UrlRendererTest.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/cycle/UrlRendererTest.java?rev=911283&r1=911282&r2=911283&view=diff
==============================================================================
--- 
wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/cycle/UrlRendererTest.java
 (original)
+++ 
wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/cycle/UrlRendererTest.java
 Thu Feb 18 08:45:23 2010
@@ -36,7 +36,7 @@
                assertEquals("../aaa/xyz?x=y", 
r1.renderUrl(Url.parse("foo/aaa/xyz?x=y")));
                assertEquals("../../bbb/aaa/xyz?x=y", 
r1.renderUrl(Url.parse("bbb/aaa/xyz?x=y")));
        }
-       
+
        /**
         * 
         */
@@ -46,7 +46,7 @@
                assertEquals("../../foo?x=y", 
r1.renderUrl(Url.parse("foo?x=y")));
                assertEquals("../../aaa?x=y", 
r1.renderUrl(Url.parse("aaa?x=y")));
        }
-       
+
        /**
         * 
         */
@@ -55,16 +55,16 @@
                UrlRenderer r1 = new UrlRenderer(Url.parse("?a=b"));
                assertEquals("a/b/c?x=y", r1.renderUrl(Url.parse("a/b/c?x=y")));
        }
-       
+
        /**
         * 
         */
        public void test5()
        {
                UrlRenderer r1 = new UrlRenderer(Url.parse("url"));
-               assertEquals("url?1", r1.renderUrl(Url.parse("url?1")));        
+               assertEquals("url?1", r1.renderUrl(Url.parse("url?1")));
        }
-       
+
        /**
         * 
         */
@@ -73,22 +73,34 @@
                UrlRenderer r1 = new UrlRenderer(Url.parse("url/"));
                assertEquals("x?1", r1.renderUrl(Url.parse("url/x?1")));
        }
-       
+
        /**
         * 
         */
        public void test7()
        {
-               UrlRenderer r1 = new 
UrlRenderer(Url.parse("MyTestPage/indexed1/indexed2/indexed3?10-27.ILinkListener-l2&p1=v1"));
+               UrlRenderer r1 = new UrlRenderer(
+                       
Url.parse("MyTestPage/indexed1/indexed2/indexed3?10-27.ILinkListener-l2&p1=v1"));
                assertEquals("../../../MyTestPage?10", 
r1.renderUrl(Url.parse("MyTestPage?10")));
        }
-       
+
        /**
         * 
         */
        public void test8()
        {
                UrlRenderer r1 = new 
UrlRenderer(Url.parse("en/first-test-page?16-1.ILinkListener-l1"));
-               
assertEquals("first-test-page/indexed1/indexed2/indexed3?p1=v1", 
r1.renderUrl(Url.parse("en/first-test-page/indexed1/indexed2/indexed3?p1=v1")));
+               assertEquals("first-test-page/indexed1/indexed2/indexed3?p1=v1",
+                       
r1.renderUrl(Url.parse("en/first-test-page/indexed1/indexed2/indexed3?p1=v1")));
        }
+
+       /**
+        * 
+        */
+       public void test9()
+       {
+               UrlRenderer r1 = new UrlRenderer(Url.parse("a/b/q/d/e"));
+               assertEquals("../../../q/c/d/e", 
r1.renderUrl(Url.parse("a/q/c/d/e")));
+       }
+
 }