WICKET-6137 dot is unnecessary when no render count and no behaviorId in listener
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/421181e7 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/421181e7 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/421181e7 Branch: refs/heads/request_listener_simplification Commit: 421181e74de9ea77dc8a97e63000dce863023845 Parents: 2abf434 Author: Sven Meier <[email protected]> Authored: Wed Apr 20 09:24:52 2016 +0200 Committer: Sven Meier <[email protected]> Committed: Wed Apr 20 09:24:52 2016 +0200 ---------------------------------------------------------------------- .../wicket/core/request/mapper/BookmarkableMapperTest.java | 4 ++-- .../apache/wicket/core/request/mapper/MountedMapperTest.java | 4 ++-- .../apache/wicket/core/request/mapper/PackageMapperTest.java | 4 ++-- .../wicket/core/request/mapper/PageInstanceMapperTest.java | 4 ++-- .../org/apache/wicket/stateless/StatelessDynmicLinksTest.java | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/421181e7/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/BookmarkableMapperTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/BookmarkableMapperTest.java b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/BookmarkableMapperTest.java index 5ee7dd2..f4fc1aa 100644 --- a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/BookmarkableMapperTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/BookmarkableMapperTest.java @@ -174,7 +174,7 @@ public class BookmarkableMapperTest extends AbstractMapperTest @Test public void decode5() { - Url url = Url.parse("wicket/bookmarkable/" + PAGE_CLASS_NAME + "?15-.-foo-bar"); + Url url = Url.parse("wicket/bookmarkable/" + PAGE_CLASS_NAME + "?15--foo-bar"); IRequestHandler handler = encoder.mapRequest(getRequest(url)); assertThat(handler, instanceOf(ListenerInterfaceRequestHandler.class)); @@ -195,7 +195,7 @@ public class BookmarkableMapperTest extends AbstractMapperTest public void decode6() { Url url = Url.parse("wicket/bookmarkable/" + PAGE_CLASS_NAME - + "/i1/i2?15-.-foo-bar&a=b&b=c"); + + "/i1/i2?15--foo-bar&a=b&b=c"); IRequestHandler handler = encoder.mapRequest(getRequest(url)); assertThat(handler, instanceOf(ListenerInterfaceRequestHandler.class)); http://git-wip-us.apache.org/repos/asf/wicket/blob/421181e7/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/MountedMapperTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/MountedMapperTest.java b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/MountedMapperTest.java index 37823ac..d92cc83 100644 --- a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/MountedMapperTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/MountedMapperTest.java @@ -207,7 +207,7 @@ public class MountedMapperTest extends AbstractMapperTest @Test public void decode5() { - Url url = Url.parse("some/mount/path?15-.-foo-bar"); + Url url = Url.parse("some/mount/path?15--foo-bar"); IRequestHandler handler = encoder.mapRequest(getRequest(url)); assertThat(handler, instanceOf(ListenerInterfaceRequestHandler.class)); @@ -227,7 +227,7 @@ public class MountedMapperTest extends AbstractMapperTest @Test public void decode6() { - Url url = Url.parse("some/mount/path/i1/i2?15-.-foo-bar&a=b&b=c"); + Url url = Url.parse("some/mount/path/i1/i2?15--foo-bar&a=b&b=c"); IRequestHandler handler = encoder.mapRequest(getRequest(url)); assertThat(handler, instanceOf(ListenerInterfaceRequestHandler.class)); http://git-wip-us.apache.org/repos/asf/wicket/blob/421181e7/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PackageMapperTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PackageMapperTest.java b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PackageMapperTest.java index e1e3cca..6a620ad 100644 --- a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PackageMapperTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PackageMapperTest.java @@ -240,7 +240,7 @@ public class PackageMapperTest extends AbstractMapperTest @Test public void decode5() { - Url url = Url.parse(MOUNT_PATH + '/' + PAGE_CLASS_NAME + "?15-.-foo-bar"); + Url url = Url.parse(MOUNT_PATH + '/' + PAGE_CLASS_NAME + "?15--foo-bar"); IRequestHandler handler = encoder.mapRequest(getRequest(url)); assertThat(handler, instanceOf(ListenerInterfaceRequestHandler.class)); @@ -260,7 +260,7 @@ public class PackageMapperTest extends AbstractMapperTest @Test public void decode6() { - Url url = Url.parse(MOUNT_PATH + '/' + PAGE_CLASS_NAME + "/i1/i2?15-.-foo-bar&a=b&b=c"); + Url url = Url.parse(MOUNT_PATH + '/' + PAGE_CLASS_NAME + "/i1/i2?15--foo-bar&a=b&b=c"); IRequestHandler handler = encoder.mapRequest(getRequest(url)); assertThat(handler, instanceOf(ListenerInterfaceRequestHandler.class)); http://git-wip-us.apache.org/repos/asf/wicket/blob/421181e7/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PageInstanceMapperTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PageInstanceMapperTest.java b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PageInstanceMapperTest.java index 97ebd52..9a2eaf0 100644 --- a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PageInstanceMapperTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PageInstanceMapperTest.java @@ -87,7 +87,7 @@ public class PageInstanceMapperTest extends AbstractMapperTest @Test public void decode3() { - Url url = Url.parse("wicket/page?4-.-a-b-c"); + Url url = Url.parse("wicket/page?4--a-b-c"); IRequestHandler handler = encoder.mapRequest(getRequest(url)); assertThat(handler, instanceOf(ListenerInterfaceRequestHandler.class)); @@ -104,7 +104,7 @@ public class PageInstanceMapperTest extends AbstractMapperTest @Test public void decode4() { - Url url = Url.parse("wickett/pagee?4-.-a:b-c"); + Url url = Url.parse("wickett/pagee?4--a:b-c"); IRequestHandler handler = encoder.mapRequest(getRequest(url)); assertNull(handler); http://git-wip-us.apache.org/repos/asf/wicket/blob/421181e7/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessDynmicLinksTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessDynmicLinksTest.java b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessDynmicLinksTest.java index 4968d96..f5f5284 100644 --- a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessDynmicLinksTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessDynmicLinksTest.java @@ -36,15 +36,15 @@ public class StatelessDynmicLinksTest extends WicketTestCase tester.startPage(StatelessPageWithDynamicLinks.class); assertTrue(tester.getLastResponseAsString().contains("LINK-1")); - tester.getRequest().setUrl(Url.parse("stateless?-.-links:1")); + tester.getRequest().setUrl(Url.parse("stateless?--links:1")); tester.processRequest(); assertTrue(tester.getLastResponseAsString().contains("LINK-2")); - tester.getRequest().setUrl(Url.parse("stateless?-.-links:2")); + tester.getRequest().setUrl(Url.parse("stateless?--links:2")); tester.processRequest(); assertTrue(tester.getLastResponseAsString().contains("LINK-3")); - tester.getRequest().setUrl(Url.parse("stateless?-.-links:3")); + tester.getRequest().setUrl(Url.parse("stateless?--links:3")); tester.processRequest(); assertTrue(tester.getLastResponseAsString().contains("LINK-4")); }
