You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2011/04/26 08:05:17 UTC
svn commit: r1096668 - in /wicket/trunk:
wicket-core/src/test/java/org/apache/wicket/request/cycle/UrlRendererTest.java
wicket-request/src/main/java/org/apache/wicket/request/UrlRenderer.java
Author: mgrigorov
Date: Tue Apr 26 06:05:16 2011
New Revision: 1096668
URL: http://svn.apache.org/viewvc?rev=1096668&view=rev
Log:
WICKET-3641 UrlRenderer should not always add "." to url
Render '.' only when the url to render has no segments.
Modified:
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/cycle/UrlRendererTest.java
wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/UrlRenderer.java
Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/cycle/UrlRendererTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/cycle/UrlRendererTest.java?rev=1096668&r1=1096667&r2=1096668&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/cycle/UrlRendererTest.java (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/cycle/UrlRendererTest.java Tue Apr 26 06:05:16 2011
@@ -33,8 +33,8 @@ public class UrlRendererTest extends Tes
public void test1()
{
UrlRenderer r1 = new UrlRenderer(new MockWebRequest(Url.parse("foo/bar/baz?a=b")));
- assertEquals("./xyz?x=y", r1.renderUrl(Url.parse("foo/bar/xyz?x=y")));
- assertEquals("./baz/xyz?x=y", r1.renderUrl(Url.parse("foo/bar/baz/xyz?x=y")));
+ assertEquals("xyz?x=y", r1.renderUrl(Url.parse("foo/bar/xyz?x=y")));
+ assertEquals("baz/xyz?x=y", r1.renderUrl(Url.parse("foo/bar/baz/xyz?x=y")));
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")));
}
@@ -64,7 +64,7 @@ public class UrlRendererTest extends Tes
public void test5()
{
UrlRenderer r1 = new UrlRenderer(new MockWebRequest(Url.parse("url")));
- assertEquals("./url?1", r1.renderUrl(Url.parse("url?1")));
+ assertEquals("url?1", r1.renderUrl(Url.parse("url?1")));
}
/**
@@ -73,7 +73,7 @@ public class UrlRendererTest extends Tes
public void test6()
{
UrlRenderer r1 = new UrlRenderer(new MockWebRequest(Url.parse("url/")));
- assertEquals("./x?1", r1.renderUrl(Url.parse("url/x?1")));
+ assertEquals("x?1", r1.renderUrl(Url.parse("url/x?1")));
}
/**
@@ -93,7 +93,7 @@ public class UrlRendererTest extends Tes
{
UrlRenderer r1 = new UrlRenderer(new MockWebRequest(
Url.parse("en/first-test-page?16-1.ILinkListener-l1")));
- assertEquals("./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")));
}
Modified: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/UrlRenderer.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/UrlRenderer.java?rev=1096668&r1=1096667&r2=1096668&view=diff
==============================================================================
--- wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/UrlRenderer.java (original)
+++ wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/UrlRenderer.java Tue Apr 26 06:05:16 2011
@@ -217,7 +217,7 @@ public class UrlRenderer
}
int baseUrlSize = baseUrlSegments.size();
- if (common + 1 == baseUrlSize)
+ if (common + 1 == baseUrlSize && urlSegments.isEmpty())
{
newSegments.add(".");
}