Updated Branches: refs/heads/master 2c4533924 -> 571f555da
TODO testing removeLeadingSegments() and prependLeadingSegments() Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/311bbca1 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/311bbca1 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/311bbca1 Branch: refs/heads/master Commit: 311bbca15cbb4b628dd8a38db3af57fb3b33fc85 Parents: 2c45339 Author: svenmeier <[email protected]> Authored: Tue Jun 19 08:23:51 2012 +0200 Committer: svenmeier <[email protected]> Committed: Tue Jun 19 08:30:17 2012 +0200 ---------------------------------------------------------------------- .../java/org/apache/wicket/request/UrlTest.java | 95 ++++++++++++++- 1 files changed, 90 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/311bbca1/wicket-request/src/test/java/org/apache/wicket/request/UrlTest.java ---------------------------------------------------------------------- diff --git a/wicket-request/src/test/java/org/apache/wicket/request/UrlTest.java b/wicket-request/src/test/java/org/apache/wicket/request/UrlTest.java index 1ecc9cd..220f09b 100644 --- a/wicket-request/src/test/java/org/apache/wicket/request/UrlTest.java +++ b/wicket-request/src/test/java/org/apache/wicket/request/UrlTest.java @@ -23,6 +23,7 @@ import java.io.ObjectOutputStream; import java.nio.charset.Charset; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.List; import org.apache.wicket.request.Url.QueryParameter; @@ -34,8 +35,6 @@ import org.junit.Test; * @author Matej Knopp * @author Igor Vaynberg */ - -// TODO test removeleadingsegments,prependleadingsegments public class UrlTest extends Assert { private void checkSegments(Url url, String... segments) @@ -739,9 +738,8 @@ public class UrlTest extends Assert } /** - * https://issues.apache.org/jira/browse/WICKET-4387 - * Parse uri with '://' in it should consider it as absolute only if there are - * no slashes earlier in the string. + * https://issues.apache.org/jira/browse/WICKET-4387 Parse uri with '://' in it should consider + * it as absolute only if there are no slashes earlier in the string. */ @Test public void parseHttpSlashSlashColon() @@ -763,4 +761,91 @@ public class UrlTest extends Assert assertEquals(Integer.valueOf(9090), url.getPort()); } + + /** + * + */ + @Test + public void prependLeadingSegments1() + { + Url url = Url.parse("a"); + + url.prependLeadingSegments(Arrays.asList("x", "y")); + + assertEquals("x/y/a", url.toString()); + } + + /** + * + */ + @Test + public void prependLeadingSegments2() + { + Url url = Url.parse("a"); + + url.prependLeadingSegments(Arrays.asList("x")); + + assertEquals("x/a", url.toString()); + } + + /** + * + */ + @Test + public void prependLeadingSegments3() + { + Url url = Url.parse("a"); + + url.prependLeadingSegments(Collections.<String> emptyList()); + + assertEquals("a", url.toString()); + } + + /** + * + */ + @Test + public void prependLeadingSegments4() + { + Url url = new Url(); + + url.prependLeadingSegments(Arrays.asList("x")); + + assertEquals("x", url.toString()); + } + + /** + * + */ + @Test + public void removeLeadingSegments1() + { + Url url = Url.parse("a/b"); + + url.removeLeadingSegments(1); + assertEquals("b", url.toString()); + } + + /** + * + */ + @Test + public void removeLeadingSegments2() + { + Url url = Url.parse("a/b"); + + url.removeLeadingSegments(2); + assertEquals("", url.toString()); + } + + /** + * + */ + @Test(expected = IllegalArgumentException.class) + public void removeLeadingSegments3() + { + Url url = Url.parse("a/b"); + + url.removeLeadingSegments(3); + } }
