You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@wicket.apache.org by Martin Grigorov <mg...@apache.org> on 2016/03/30 09:32:50 UTC
Re: wicket git commit: more test fixes
Hi,
- Url url =
Url.parse("some/mount/path?15-ILinkListener-foo-bar");
+ Url url = Url.parse("some/mount/path?15-.-foo-bar");
"-.-" is looking a bit weird there.
I guess it is there to make it simpler to parse the behavior id. But since
it is optional we have "-.-".
Let's try to get rid of it once the rest of the tests are fixed. I think we
can craft a regex to parse all parts.
On Tue, Mar 29, 2016 at 11:13 PM, <sv...@apache.org> wrote:
> Repository: wicket
> Updated Branches:
> refs/heads/request_listener_simplification d97b70116 -> 76e175505
>
>
> more test fixes
>
>
> Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
> Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/76e17550
> Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/76e17550
> Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/76e17550
>
> Branch: refs/heads/request_listener_simplification
> Commit: 76e175505345787c83fb7cc872b36837a061ba0b
> Parents: d97b701
> Author: Sven Meier <sv...@apache.org>
> Authored: Tue Mar 29 23:13:09 2016 +0200
> Committer: Sven Meier <sv...@apache.org>
> Committed: Tue Mar 29 23:13:09 2016 +0200
>
> ----------------------------------------------------------------------
> .../wicket/markup/html/link/StatelessLink.java | 6 ------
> .../java/org/apache/wicket/MockComponent.java | 18 +++++++++++++++-
> .../core/request/mapper/MountedMapperTest.java | 22 ++++++++++----------
> .../core/request/mapper/PackageMapperTest.java | 14 ++++++-------
> .../request/mapper/PageInstanceMapperTest.java | 10 ++++-----
> .../mapper/info/PageComponentInfoTest.java | 7 +++----
> ...nentPageWithParams_indexed_mount_result.html | 2 +-
> ...essComponentPageWithParams_mount_result.html | 2 +-
> ...StatelessComponentPageWithParams_result.html | 2 +-
> .../StatelessComponentPage_mount_result.html | 2 +-
> .../StatelessComponentPage_result.html | 2 +-
> .../stateless/StatelessComponentTest.java | 6 +++---
> .../stateless/StatelessDynmicLinksTest.java | 6 +++---
> 13 files changed, 54 insertions(+), 45 deletions(-)
> ----------------------------------------------------------------------
>
>
>
> http://git-wip-us.apache.org/repos/asf/wicket/blob/76e17550/wicket-core/src/main/java/org/apache/wicket/markup/html/link/StatelessLink.java
> ----------------------------------------------------------------------
> diff --git
> a/wicket-core/src/main/java/org/apache/wicket/markup/html/link/StatelessLink.java
> b/wicket-core/src/main/java/org/apache/wicket/markup/html/link/StatelessLink.java
> index cdaba22..c0896ba 100644
> ---
> a/wicket-core/src/main/java/org/apache/wicket/markup/html/link/StatelessLink.java
> +++
> b/wicket-core/src/main/java/org/apache/wicket/markup/html/link/StatelessLink.java
> @@ -50,12 +50,6 @@ public abstract class StatelessLink<T> extends Link<T>
> }
>
> @Override
> - public boolean rendersPage()
> - {
> - return false;
> - }
> -
> - @Override
> protected CharSequence getURL()
> {
> return urlForListener(getPage().getPageParameters());
>
>
> http://git-wip-us.apache.org/repos/asf/wicket/blob/76e17550/wicket-core/src/test/java/org/apache/wicket/MockComponent.java
> ----------------------------------------------------------------------
> diff --git
> a/wicket-core/src/test/java/org/apache/wicket/MockComponent.java
> b/wicket-core/src/test/java/org/apache/wicket/MockComponent.java
> index f0046f2..61106e3 100644
> --- a/wicket-core/src/test/java/org/apache/wicket/MockComponent.java
> +++ b/wicket-core/src/test/java/org/apache/wicket/MockComponent.java
> @@ -26,7 +26,7 @@ import org.apache.wicket.util.string.Strings;
> *
> * @author Matej Knopp
> */
> -public class MockComponent implements IRequestableComponent
> +public class MockComponent implements IRequestableComponent,
> IRequestListener
> {
> private String markupId;
> private String id;
> @@ -173,6 +173,22 @@ public class MockComponent implements
> IRequestableComponent
> @Override
> public Behavior getBehaviorById(int id)
> {
> + if (id == 4) {
> + return new MockBehavior();
> + }
> return null;
> }
> +
> + @Override
> + public void onRequest()
> + {
> + }
> +
> + private class MockBehavior extends Behavior implements
> IRequestListener {
> +
> + @Override
> + public void onRequest()
> + {
> + }
> + }
> }
>
>
> http://git-wip-us.apache.org/repos/asf/wicket/blob/76e17550/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 a917d67..37823ac 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-ILinkListener-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-ILinkListener-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));
> @@ -250,7 +250,7 @@ public class MountedMapperTest extends
> AbstractMapperTest
> @Test
> public void decode7()
> {
> - Url url =
> Url.parse("some/mount/path?param1=value1&15-ILinkListener.4-foo-bar");
> + Url url =
> Url.parse("some/mount/path?param1=value1&15-.4-foo-bar");
> IRequestHandler handler =
> encoder.mapRequest(getRequest(url));
>
> assertThat(handler,
> instanceOf(ListenerInterfaceRequestHandler.class));
> @@ -270,7 +270,7 @@ public class MountedMapperTest extends
> AbstractMapperTest
> @Test
> public void decode8()
> {
> - Url url =
> Url.parse("some/mmount/path?15-ILinkListener.4-foo-bar");
> + Url url = Url.parse("some/mmount/path?15-.4-foo-bar");
> IRequestHandler handler =
> encoder.mapRequest(getRequest(url));
>
> assertNull(handler);
> @@ -294,7 +294,7 @@ public class MountedMapperTest extends
> AbstractMapperTest
> @Test
> public void decode10()
> {
> - Url url =
> Url.parse("some/mount/path?15-5.ILinkListener.4-foo-bar");
> + Url url = Url.parse("some/mount/path?15-5.4-foo-bar");
> context.setNextPageRenderCount(5);
> IRequestHandler handler =
> encoder.mapRequest(getRequest(url));
>
> @@ -312,7 +312,7 @@ public class MountedMapperTest extends
> AbstractMapperTest
> @Test(expected = StalePageException.class)
> public void decode11()
> {
> - Url url =
> Url.parse("some/mount/path?15-5.ILinkListener.4-foo-bar");
> + Url url = Url.parse("some/mount/path?15-5.4-foo-bar");
> context.setNextPageRenderCount(7);
>
> IRequestHandler handler =
> encoder.mapRequest(getRequest(url));
> @@ -326,7 +326,7 @@ public class MountedMapperTest extends
> AbstractMapperTest
> @Test
> public void decode12()
> {
> - Url url =
> Url.parse("some/mount/path/i1/i2?-1.ILinkListener-foo-bar&a=b&b=c");
> + Url url =
> Url.parse("some/mount/path/i1/i2?-1.-foo-bar&a=b&b=c");
> IRequestHandler handler =
> encoder.mapRequest(getRequest(url));
>
> assertThat(handler,
> instanceOf(ListenerInterfaceRequestHandler.class));
> @@ -466,7 +466,7 @@ public class MountedMapperTest extends
> AbstractMapperTest
>
> Url url = encoder.mapHandler(handler);
>
> -
> assertEquals("some/mount/path/i1/i2?15-4.ILinkListener-foo-bar&a=b&b=c",
> url.toString());
> +
> assertEquals("some/mount/path/i1/i2?15-4.-foo-bar&a=b&b=c",
> url.toString());
> }
>
> /**
> @@ -501,7 +501,7 @@ public class MountedMapperTest extends
> AbstractMapperTest
>
> Url url = encoder.mapHandler(handler);
>
> -
> assertEquals("some/mount/path/i1/i2?15-4.ILinkListener-foo-bar&a=b&b=c",
> url.toString());
> +
> assertEquals("some/mount/path/i1/i2?15-4.-foo-bar&a=b&b=c",
> url.toString());
> }
>
> /**
> @@ -529,7 +529,7 @@ public class MountedMapperTest extends
> AbstractMapperTest
>
> Url url = encoder.mapHandler(handler);
>
> -
> assertEquals("some/mount/path/i1/i2?15-5.ILinkListener.4-foo-bar&a=b&b=c",
> url.toString());
> +
> assertEquals("some/mount/path/i1/i2?15-5.4-foo-bar&a=b&b=c",
> url.toString());
> }
>
> /**
> @@ -559,7 +559,7 @@ public class MountedMapperTest extends
> AbstractMapperTest
>
> Url url = encoder.mapHandler(handler);
>
> -
> assertEquals("some/mount/path/i1/i2?15-5.ILinkListener.4-foo-bar&a=b&b=c",
> url.toString());
> +
> assertEquals("some/mount/path/i1/i2?15-5.4-foo-bar&a=b&b=c",
> url.toString());
> }
>
> /**
>
>
> http://git-wip-us.apache.org/repos/asf/wicket/blob/76e17550/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 f41ec26..e1e3cca 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-ILinkListener-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-ILinkListener-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));
> @@ -283,7 +283,7 @@ public class PackageMapperTest extends
> AbstractMapperTest
> @Test
> public void decode7()
> {
> - Url url = Url.parse(MOUNT_PATH + '/' + PAGE_CLASS_NAME +
> "?15-ILinkListener.4-foo-bar");
> + Url url = Url.parse(MOUNT_PATH + '/' + PAGE_CLASS_NAME +
> "?15-.4-foo-bar");
> IRequestHandler handler =
> encoder.mapRequest(getRequest(url));
>
> assertThat(handler,
> instanceOf(ListenerInterfaceRequestHandler.class));
> @@ -303,7 +303,7 @@ public class PackageMapperTest extends
> AbstractMapperTest
> @Test
> public void decode8()
> {
> - Url url = Url.parse(MOUNT_PATH + '/' + PAGE_CLASS_NAME +
> "/i1/i2?15-5.ILinkListener-foo-bar&a=b&b=c");
> + Url url = Url.parse(MOUNT_PATH + '/' + PAGE_CLASS_NAME +
> "/i1/i2?15-5.-foo-bar&a=b&b=c");
>
> context.setNextPageRenderCount(5);
>
> @@ -322,7 +322,7 @@ public class PackageMapperTest extends
> AbstractMapperTest
> @Test(expected = StalePageException.class)
> public void decode9()
> {
> - Url url = Url.parse(MOUNT_PATH + '/' + PAGE_CLASS_NAME +
> "/i1/i2?15-5.ILinkListener-foo-bar&a=b&b=c");
> + Url url = Url.parse(MOUNT_PATH + '/' + PAGE_CLASS_NAME +
> "/i1/i2?15-5.-foo-bar&a=b&b=c");
>
> context.setNextPageRenderCount(6);
>
> @@ -509,7 +509,7 @@ public class PackageMapperTest extends
> AbstractMapperTest
>
> Url url = encoder.mapHandler(handler);
>
> - assertEquals(MOUNT_PATH + '/' + PAGE_CLASS_NAME +
> "/i1/i2?15-0.ILinkListener-foo-bar&a=b&b=c", url.toString());
> + assertEquals(MOUNT_PATH + '/' + PAGE_CLASS_NAME +
> "/i1/i2?15-0.-foo-bar&a=b&b=c", url.toString());
> }
>
> /**
> @@ -536,7 +536,7 @@ public class PackageMapperTest extends
> AbstractMapperTest
>
> Url url = encoder.mapHandler(handler);
>
> - assertEquals(MOUNT_PATH + '/' + PAGE_CLASS_NAME +
> "/i1/i2?15-0.ILinkListener.4-foo-bar&a=b&b=c",
> + assertEquals(MOUNT_PATH + '/' + PAGE_CLASS_NAME +
> "/i1/i2?15-0.4-foo-bar&a=b&b=c",
> url.toString());
> }
>
>
>
> http://git-wip-us.apache.org/repos/asf/wicket/blob/76e17550/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 2bd8a57..97ebd52 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-ILinkListener-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-ILinkListener-a:b-c");
> + Url url = Url.parse("wickett/pagee?4-.-a:b-c");
>
> IRequestHandler handler =
> encoder.mapRequest(getRequest(url));
> assertNull(handler);
> @@ -145,7 +145,7 @@ public class PageInstanceMapperTest extends
> AbstractMapperTest
> @Test
> public void decode7()
> {
> - Url url =
> Url.parse("wicket/page?4-6.ILinkListener.5-a-b-c");
> + Url url = Url.parse("wicket/page?4-6.5-a-b-c");
>
> context.setNextPageRenderCount(6);
>
> @@ -162,7 +162,7 @@ public class PageInstanceMapperTest extends
> AbstractMapperTest
> @Test(expected = StalePageException.class)
> public void decode8()
> {
> - Url url =
> Url.parse("wicket/page?4-6.ILinkListener.5-a-b-c");
> + Url url = Url.parse("wicket/page?4-6.5-a-b-c");
>
> context.setNextPageRenderCount(8);
>
> @@ -290,7 +290,7 @@ public class PageInstanceMapperTest extends
> AbstractMapperTest
> IRequestHandler handler = new
> ListenerInterfaceRequestHandler(provider);
>
> Url url = encoder.mapHandler(handler);
> - assertEquals("wicket/page?15-5.ILinkListener-a-b-c",
> url.toString());
> + assertEquals("wicket/page?15-5.-a-b-c", url.toString());
> }
>
> }
>
>
> http://git-wip-us.apache.org/repos/asf/wicket/blob/76e17550/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/PageComponentInfoTest.java
> ----------------------------------------------------------------------
> diff --git
> a/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/PageComponentInfoTest.java
> b/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/PageComponentInfoTest.java
> index adeb089..823f834 100644
> ---
> a/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/PageComponentInfoTest.java
> +++
> b/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/PageComponentInfoTest.java
> @@ -35,8 +35,7 @@ public class PageComponentInfoTest extends TestCase
> assertEquals(pageId, info.getPageInfo().getPageId());
> }
>
> - private void testPageComponentInfo(PageComponentInfo info, Integer
> pageId, String listener,
> - String componentPath)
> + private void testPageComponentInfo(PageComponentInfo info, Integer
> pageId, String componentPath)
> {
> assertNotNull(info.getComponentInfo());
> assertNotNull(info.getPageInfo());
> @@ -52,9 +51,9 @@ public class PageComponentInfoTest extends TestCase
> @Test
> public void test1()
> {
> - String s = "2-click-foo-bar-baz";
> + String s = "2-.-foo-bar-baz";
> PageComponentInfo info = PageComponentInfo.parse(s);
> - testPageComponentInfo(info, 2, "click", "foo:bar:baz");
> + testPageComponentInfo(info, 2, "foo:bar:baz");
> assertEquals(s, info.toString());
> }
>
>
>
> http://git-wip-us.apache.org/repos/asf/wicket/blob/76e17550/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_indexed_mount_result.html
> ----------------------------------------------------------------------
> diff --git
> a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_indexed_mount_result.html
> b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_indexed_mount_result.html
> index 9ef2c2e..83e7ae6 100644
> ---
> a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_indexed_mount_result.html
> +++
> b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_indexed_mount_result.html
> @@ -1,5 +1,5 @@
> <html>
> <body>
> -<a href="./testValue2?-.-link" wicket:id="link">test</a>
> +<a href="./testValue2?-1.-link" wicket:id="link">test</a>
> </body>
> </html>
> \ No newline at end of file
>
>
> http://git-wip-us.apache.org/repos/asf/wicket/blob/76e17550/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_mount_result.html
> ----------------------------------------------------------------------
> diff --git
> a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_mount_result.html
> b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_mount_result.html
> index 01be322..7e4e9d4 100644
> ---
> a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_mount_result.html
> +++
> b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_mount_result.html
> @@ -1,5 +1,5 @@
> <html>
> <body>
> -<a
> href="./stateless?-.-link&testParam1=testValue1&testParam2=testValue2"
> wicket:id="link">test</a>
> +<a
> href="./stateless?-1.-link&testParam1=testValue1&testParam2=testValue2"
> wicket:id="link">test</a>
> </body>
> </html>
> \ No newline at end of file
>
>
> http://git-wip-us.apache.org/repos/asf/wicket/blob/76e17550/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_result.html
> ----------------------------------------------------------------------
> diff --git
> a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_result.html
> b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_result.html
> index bd3d46c..63b427ac 100644
> ---
> a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_result.html
> +++
> b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_result.html
> @@ -1,5 +1,5 @@
> <html>
> <body>
> -<a
> href="./org.apache.wicket.stateless.StatelessComponentPageWithParams?-.-link&testParam1=testValue1&testParam2=testValue2"
> wicket:id="link">test</a>
> +<a
> href="./org.apache.wicket.stateless.StatelessComponentPageWithParams?-1.-link&testParam1=testValue1&testParam2=testValue2"
> wicket:id="link">test</a>
> </body>
> </html>
> \ No newline at end of file
>
>
> http://git-wip-us.apache.org/repos/asf/wicket/blob/76e17550/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_mount_result.html
> ----------------------------------------------------------------------
> diff --git
> a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_mount_result.html
> b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_mount_result.html
> index 905d21e..ac5f821 100644
> ---
> a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_mount_result.html
> +++
> b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_mount_result.html
> @@ -1,5 +1,5 @@
> <html>
> <body>
> -<a href="./stateless?-.-link" wicket:id="link">test</a>
> +<a href="./stateless?-1.-link" wicket:id="link">test</a>
> </body>
> </html>
> \ No newline at end of file
>
>
> http://git-wip-us.apache.org/repos/asf/wicket/blob/76e17550/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_result.html
> ----------------------------------------------------------------------
> diff --git
> a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_result.html
> b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_result.html
> index 7c1f8f3..472458f 100644
> ---
> a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_result.html
> +++
> b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_result.html
> @@ -1,5 +1,5 @@
> <html>
> <body>
> -<a href="./org.apache.wicket.stateless.StatelessComponentPage?-.-link"
> wicket:id="link">test</a>
> +<a href="./org.apache.wicket.stateless.StatelessComponentPage?-1.-link"
> wicket:id="link">test</a>
> </body>
> </html>
> \ No newline at end of file
>
>
> http://git-wip-us.apache.org/repos/asf/wicket/blob/76e17550/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentTest.java
> ----------------------------------------------------------------------
> diff --git
> a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentTest.java
> b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentTest.java
> index 3d55c88..91d95e8 100644
> ---
> a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentTest.java
> +++
> b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentTest.java
> @@ -61,7 +61,7 @@ public class StatelessComponentTest extends
> WicketTestCase
> executeTest(StatelessComponentPage.class,
> "StatelessComponentPage_mount_result.html");
> tester.getRequest()
> .setUrl(
> -
> Url.parse("stateless?0-1.ILinkListener-link&testParam1=testValue1&testParam2=testValue2"));
> +
> Url.parse("stateless?0-1.-link&testParam1=testValue1&testParam2=testValue2"));
> try
> {
> tester.processRequest();
> @@ -88,7 +88,7 @@ public class StatelessComponentTest extends
> WicketTestCase
>
> tester.getRequest()
> .setUrl(
> -
> Url.parse("wicket/bookmarkable/org.apache.wicket.stateless.StatelessComponentPageWithParams?0-1.ILinkListener-link&testParam1=testValue1&testParam2=testValue2"));
> +
> Url.parse("wicket/bookmarkable/org.apache.wicket.stateless.StatelessComponentPageWithParams?0-1.-link&testParam1=testValue1&testParam2=testValue2"));
> try
> {
> tester.processRequest();
> @@ -142,7 +142,7 @@ public class StatelessComponentTest extends
> WicketTestCase
> executeTest(StatelessComponentPageWithParams.class, params,
>
> "StatelessComponentPageWithParams_indexed_mount_result.html");
> tester.getRequest().setUrl(
> -
> Url.parse("stateless/testValue1/testValue2?0-1.ILinkListener-link"));
> +
> Url.parse("stateless/testValue1/testValue2?0-1.-link"));
> try
> {
> tester.processRequest();
>
>
> http://git-wip-us.apache.org/repos/asf/wicket/blob/76e17550/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 6c096ab..4968d96 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?-0.ILinkListener-links:1"));
> +
> tester.getRequest().setUrl(Url.parse("stateless?-.-links:1"));
> tester.processRequest();
>
> assertTrue(tester.getLastResponseAsString().contains("LINK-2"));
>
> -
> tester.getRequest().setUrl(Url.parse("stateless?-0.ILinkListener-links:2"));
> +
> tester.getRequest().setUrl(Url.parse("stateless?-.-links:2"));
> tester.processRequest();
>
> assertTrue(tester.getLastResponseAsString().contains("LINK-3"));
>
> -
> tester.getRequest().setUrl(Url.parse("stateless?-0.ILinkListener-links:3"));
> +
> tester.getRequest().setUrl(Url.parse("stateless?-.-links:3"));
> tester.processRequest();
>
> assertTrue(tester.getLastResponseAsString().contains("LINK-4"));
> }
>
>
Re: wicket git commit: more test fixes
Posted by Sven Meier <sv...@meiers.net>.
Hi Martin,
> Let's try to get rid of it once the rest of the tests are fixed.
indeed, I wanted to start a discussion about the format anyway.
Sven
On 30.03.2016 09:32, Martin Grigorov wrote:
> Hi,
>
> - Url url =
> Url.parse("some/mount/path?15-ILinkListener-foo-bar");
> + Url url = Url.parse("some/mount/path?15-.-foo-bar");
>
> "-.-" is looking a bit weird there.
> I guess it is there to make it simpler to parse the behavior id. But since
> it is optional we have "-.-".
> Let's try to get rid of it once the rest of the tests are fixed. I think we
> can craft a regex to parse all parts.
>
> On Tue, Mar 29, 2016 at 11:13 PM, <sv...@apache.org> wrote:
>
>> Repository: wicket
>> Updated Branches:
>> refs/heads/request_listener_simplification d97b70116 -> 76e175505
>>
>>
>> more test fixes
>>
>>
>> Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
>> Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/76e17550
>> Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/76e17550
>> Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/76e17550
>>
>> Branch: refs/heads/request_listener_simplification
>> Commit: 76e175505345787c83fb7cc872b36837a061ba0b
>> Parents: d97b701
>> Author: Sven Meier <sv...@apache.org>
>> Authored: Tue Mar 29 23:13:09 2016 +0200
>> Committer: Sven Meier <sv...@apache.org>
>> Committed: Tue Mar 29 23:13:09 2016 +0200
>>
>> ----------------------------------------------------------------------
>> .../wicket/markup/html/link/StatelessLink.java | 6 ------
>> .../java/org/apache/wicket/MockComponent.java | 18 +++++++++++++++-
>> .../core/request/mapper/MountedMapperTest.java | 22 ++++++++++----------
>> .../core/request/mapper/PackageMapperTest.java | 14 ++++++-------
>> .../request/mapper/PageInstanceMapperTest.java | 10 ++++-----
>> .../mapper/info/PageComponentInfoTest.java | 7 +++----
>> ...nentPageWithParams_indexed_mount_result.html | 2 +-
>> ...essComponentPageWithParams_mount_result.html | 2 +-
>> ...StatelessComponentPageWithParams_result.html | 2 +-
>> .../StatelessComponentPage_mount_result.html | 2 +-
>> .../StatelessComponentPage_result.html | 2 +-
>> .../stateless/StatelessComponentTest.java | 6 +++---
>> .../stateless/StatelessDynmicLinksTest.java | 6 +++---
>> 13 files changed, 54 insertions(+), 45 deletions(-)
>> ----------------------------------------------------------------------
>>
>>
>>
>> http://git-wip-us.apache.org/repos/asf/wicket/blob/76e17550/wicket-core/src/main/java/org/apache/wicket/markup/html/link/StatelessLink.java
>> ----------------------------------------------------------------------
>> diff --git
>> a/wicket-core/src/main/java/org/apache/wicket/markup/html/link/StatelessLink.java
>> b/wicket-core/src/main/java/org/apache/wicket/markup/html/link/StatelessLink.java
>> index cdaba22..c0896ba 100644
>> ---
>> a/wicket-core/src/main/java/org/apache/wicket/markup/html/link/StatelessLink.java
>> +++
>> b/wicket-core/src/main/java/org/apache/wicket/markup/html/link/StatelessLink.java
>> @@ -50,12 +50,6 @@ public abstract class StatelessLink<T> extends Link<T>
>> }
>>
>> @Override
>> - public boolean rendersPage()
>> - {
>> - return false;
>> - }
>> -
>> - @Override
>> protected CharSequence getURL()
>> {
>> return urlForListener(getPage().getPageParameters());
>>
>>
>> http://git-wip-us.apache.org/repos/asf/wicket/blob/76e17550/wicket-core/src/test/java/org/apache/wicket/MockComponent.java
>> ----------------------------------------------------------------------
>> diff --git
>> a/wicket-core/src/test/java/org/apache/wicket/MockComponent.java
>> b/wicket-core/src/test/java/org/apache/wicket/MockComponent.java
>> index f0046f2..61106e3 100644
>> --- a/wicket-core/src/test/java/org/apache/wicket/MockComponent.java
>> +++ b/wicket-core/src/test/java/org/apache/wicket/MockComponent.java
>> @@ -26,7 +26,7 @@ import org.apache.wicket.util.string.Strings;
>> *
>> * @author Matej Knopp
>> */
>> -public class MockComponent implements IRequestableComponent
>> +public class MockComponent implements IRequestableComponent,
>> IRequestListener
>> {
>> private String markupId;
>> private String id;
>> @@ -173,6 +173,22 @@ public class MockComponent implements
>> IRequestableComponent
>> @Override
>> public Behavior getBehaviorById(int id)
>> {
>> + if (id == 4) {
>> + return new MockBehavior();
>> + }
>> return null;
>> }
>> +
>> + @Override
>> + public void onRequest()
>> + {
>> + }
>> +
>> + private class MockBehavior extends Behavior implements
>> IRequestListener {
>> +
>> + @Override
>> + public void onRequest()
>> + {
>> + }
>> + }
>> }
>>
>>
>> http://git-wip-us.apache.org/repos/asf/wicket/blob/76e17550/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 a917d67..37823ac 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-ILinkListener-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-ILinkListener-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));
>> @@ -250,7 +250,7 @@ public class MountedMapperTest extends
>> AbstractMapperTest
>> @Test
>> public void decode7()
>> {
>> - Url url =
>> Url.parse("some/mount/path?param1=value1&15-ILinkListener.4-foo-bar");
>> + Url url =
>> Url.parse("some/mount/path?param1=value1&15-.4-foo-bar");
>> IRequestHandler handler =
>> encoder.mapRequest(getRequest(url));
>>
>> assertThat(handler,
>> instanceOf(ListenerInterfaceRequestHandler.class));
>> @@ -270,7 +270,7 @@ public class MountedMapperTest extends
>> AbstractMapperTest
>> @Test
>> public void decode8()
>> {
>> - Url url =
>> Url.parse("some/mmount/path?15-ILinkListener.4-foo-bar");
>> + Url url = Url.parse("some/mmount/path?15-.4-foo-bar");
>> IRequestHandler handler =
>> encoder.mapRequest(getRequest(url));
>>
>> assertNull(handler);
>> @@ -294,7 +294,7 @@ public class MountedMapperTest extends
>> AbstractMapperTest
>> @Test
>> public void decode10()
>> {
>> - Url url =
>> Url.parse("some/mount/path?15-5.ILinkListener.4-foo-bar");
>> + Url url = Url.parse("some/mount/path?15-5.4-foo-bar");
>> context.setNextPageRenderCount(5);
>> IRequestHandler handler =
>> encoder.mapRequest(getRequest(url));
>>
>> @@ -312,7 +312,7 @@ public class MountedMapperTest extends
>> AbstractMapperTest
>> @Test(expected = StalePageException.class)
>> public void decode11()
>> {
>> - Url url =
>> Url.parse("some/mount/path?15-5.ILinkListener.4-foo-bar");
>> + Url url = Url.parse("some/mount/path?15-5.4-foo-bar");
>> context.setNextPageRenderCount(7);
>>
>> IRequestHandler handler =
>> encoder.mapRequest(getRequest(url));
>> @@ -326,7 +326,7 @@ public class MountedMapperTest extends
>> AbstractMapperTest
>> @Test
>> public void decode12()
>> {
>> - Url url =
>> Url.parse("some/mount/path/i1/i2?-1.ILinkListener-foo-bar&a=b&b=c");
>> + Url url =
>> Url.parse("some/mount/path/i1/i2?-1.-foo-bar&a=b&b=c");
>> IRequestHandler handler =
>> encoder.mapRequest(getRequest(url));
>>
>> assertThat(handler,
>> instanceOf(ListenerInterfaceRequestHandler.class));
>> @@ -466,7 +466,7 @@ public class MountedMapperTest extends
>> AbstractMapperTest
>>
>> Url url = encoder.mapHandler(handler);
>>
>> -
>> assertEquals("some/mount/path/i1/i2?15-4.ILinkListener-foo-bar&a=b&b=c",
>> url.toString());
>> +
>> assertEquals("some/mount/path/i1/i2?15-4.-foo-bar&a=b&b=c",
>> url.toString());
>> }
>>
>> /**
>> @@ -501,7 +501,7 @@ public class MountedMapperTest extends
>> AbstractMapperTest
>>
>> Url url = encoder.mapHandler(handler);
>>
>> -
>> assertEquals("some/mount/path/i1/i2?15-4.ILinkListener-foo-bar&a=b&b=c",
>> url.toString());
>> +
>> assertEquals("some/mount/path/i1/i2?15-4.-foo-bar&a=b&b=c",
>> url.toString());
>> }
>>
>> /**
>> @@ -529,7 +529,7 @@ public class MountedMapperTest extends
>> AbstractMapperTest
>>
>> Url url = encoder.mapHandler(handler);
>>
>> -
>> assertEquals("some/mount/path/i1/i2?15-5.ILinkListener.4-foo-bar&a=b&b=c",
>> url.toString());
>> +
>> assertEquals("some/mount/path/i1/i2?15-5.4-foo-bar&a=b&b=c",
>> url.toString());
>> }
>>
>> /**
>> @@ -559,7 +559,7 @@ public class MountedMapperTest extends
>> AbstractMapperTest
>>
>> Url url = encoder.mapHandler(handler);
>>
>> -
>> assertEquals("some/mount/path/i1/i2?15-5.ILinkListener.4-foo-bar&a=b&b=c",
>> url.toString());
>> +
>> assertEquals("some/mount/path/i1/i2?15-5.4-foo-bar&a=b&b=c",
>> url.toString());
>> }
>>
>> /**
>>
>>
>> http://git-wip-us.apache.org/repos/asf/wicket/blob/76e17550/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 f41ec26..e1e3cca 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-ILinkListener-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-ILinkListener-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));
>> @@ -283,7 +283,7 @@ public class PackageMapperTest extends
>> AbstractMapperTest
>> @Test
>> public void decode7()
>> {
>> - Url url = Url.parse(MOUNT_PATH + '/' + PAGE_CLASS_NAME +
>> "?15-ILinkListener.4-foo-bar");
>> + Url url = Url.parse(MOUNT_PATH + '/' + PAGE_CLASS_NAME +
>> "?15-.4-foo-bar");
>> IRequestHandler handler =
>> encoder.mapRequest(getRequest(url));
>>
>> assertThat(handler,
>> instanceOf(ListenerInterfaceRequestHandler.class));
>> @@ -303,7 +303,7 @@ public class PackageMapperTest extends
>> AbstractMapperTest
>> @Test
>> public void decode8()
>> {
>> - Url url = Url.parse(MOUNT_PATH + '/' + PAGE_CLASS_NAME +
>> "/i1/i2?15-5.ILinkListener-foo-bar&a=b&b=c");
>> + Url url = Url.parse(MOUNT_PATH + '/' + PAGE_CLASS_NAME +
>> "/i1/i2?15-5.-foo-bar&a=b&b=c");
>>
>> context.setNextPageRenderCount(5);
>>
>> @@ -322,7 +322,7 @@ public class PackageMapperTest extends
>> AbstractMapperTest
>> @Test(expected = StalePageException.class)
>> public void decode9()
>> {
>> - Url url = Url.parse(MOUNT_PATH + '/' + PAGE_CLASS_NAME +
>> "/i1/i2?15-5.ILinkListener-foo-bar&a=b&b=c");
>> + Url url = Url.parse(MOUNT_PATH + '/' + PAGE_CLASS_NAME +
>> "/i1/i2?15-5.-foo-bar&a=b&b=c");
>>
>> context.setNextPageRenderCount(6);
>>
>> @@ -509,7 +509,7 @@ public class PackageMapperTest extends
>> AbstractMapperTest
>>
>> Url url = encoder.mapHandler(handler);
>>
>> - assertEquals(MOUNT_PATH + '/' + PAGE_CLASS_NAME +
>> "/i1/i2?15-0.ILinkListener-foo-bar&a=b&b=c", url.toString());
>> + assertEquals(MOUNT_PATH + '/' + PAGE_CLASS_NAME +
>> "/i1/i2?15-0.-foo-bar&a=b&b=c", url.toString());
>> }
>>
>> /**
>> @@ -536,7 +536,7 @@ public class PackageMapperTest extends
>> AbstractMapperTest
>>
>> Url url = encoder.mapHandler(handler);
>>
>> - assertEquals(MOUNT_PATH + '/' + PAGE_CLASS_NAME +
>> "/i1/i2?15-0.ILinkListener.4-foo-bar&a=b&b=c",
>> + assertEquals(MOUNT_PATH + '/' + PAGE_CLASS_NAME +
>> "/i1/i2?15-0.4-foo-bar&a=b&b=c",
>> url.toString());
>> }
>>
>>
>>
>> http://git-wip-us.apache.org/repos/asf/wicket/blob/76e17550/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 2bd8a57..97ebd52 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-ILinkListener-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-ILinkListener-a:b-c");
>> + Url url = Url.parse("wickett/pagee?4-.-a:b-c");
>>
>> IRequestHandler handler =
>> encoder.mapRequest(getRequest(url));
>> assertNull(handler);
>> @@ -145,7 +145,7 @@ public class PageInstanceMapperTest extends
>> AbstractMapperTest
>> @Test
>> public void decode7()
>> {
>> - Url url =
>> Url.parse("wicket/page?4-6.ILinkListener.5-a-b-c");
>> + Url url = Url.parse("wicket/page?4-6.5-a-b-c");
>>
>> context.setNextPageRenderCount(6);
>>
>> @@ -162,7 +162,7 @@ public class PageInstanceMapperTest extends
>> AbstractMapperTest
>> @Test(expected = StalePageException.class)
>> public void decode8()
>> {
>> - Url url =
>> Url.parse("wicket/page?4-6.ILinkListener.5-a-b-c");
>> + Url url = Url.parse("wicket/page?4-6.5-a-b-c");
>>
>> context.setNextPageRenderCount(8);
>>
>> @@ -290,7 +290,7 @@ public class PageInstanceMapperTest extends
>> AbstractMapperTest
>> IRequestHandler handler = new
>> ListenerInterfaceRequestHandler(provider);
>>
>> Url url = encoder.mapHandler(handler);
>> - assertEquals("wicket/page?15-5.ILinkListener-a-b-c",
>> url.toString());
>> + assertEquals("wicket/page?15-5.-a-b-c", url.toString());
>> }
>>
>> }
>>
>>
>> http://git-wip-us.apache.org/repos/asf/wicket/blob/76e17550/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/PageComponentInfoTest.java
>> ----------------------------------------------------------------------
>> diff --git
>> a/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/PageComponentInfoTest.java
>> b/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/PageComponentInfoTest.java
>> index adeb089..823f834 100644
>> ---
>> a/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/PageComponentInfoTest.java
>> +++
>> b/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/PageComponentInfoTest.java
>> @@ -35,8 +35,7 @@ public class PageComponentInfoTest extends TestCase
>> assertEquals(pageId, info.getPageInfo().getPageId());
>> }
>>
>> - private void testPageComponentInfo(PageComponentInfo info, Integer
>> pageId, String listener,
>> - String componentPath)
>> + private void testPageComponentInfo(PageComponentInfo info, Integer
>> pageId, String componentPath)
>> {
>> assertNotNull(info.getComponentInfo());
>> assertNotNull(info.getPageInfo());
>> @@ -52,9 +51,9 @@ public class PageComponentInfoTest extends TestCase
>> @Test
>> public void test1()
>> {
>> - String s = "2-click-foo-bar-baz";
>> + String s = "2-.-foo-bar-baz";
>> PageComponentInfo info = PageComponentInfo.parse(s);
>> - testPageComponentInfo(info, 2, "click", "foo:bar:baz");
>> + testPageComponentInfo(info, 2, "foo:bar:baz");
>> assertEquals(s, info.toString());
>> }
>>
>>
>>
>> http://git-wip-us.apache.org/repos/asf/wicket/blob/76e17550/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_indexed_mount_result.html
>> ----------------------------------------------------------------------
>> diff --git
>> a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_indexed_mount_result.html
>> b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_indexed_mount_result.html
>> index 9ef2c2e..83e7ae6 100644
>> ---
>> a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_indexed_mount_result.html
>> +++
>> b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_indexed_mount_result.html
>> @@ -1,5 +1,5 @@
>> <html>
>> <body>
>> -<a href="./testValue2?-.-link" wicket:id="link">test</a>
>> +<a href="./testValue2?-1.-link" wicket:id="link">test</a>
>> </body>
>> </html>
>> \ No newline at end of file
>>
>>
>> http://git-wip-us.apache.org/repos/asf/wicket/blob/76e17550/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_mount_result.html
>> ----------------------------------------------------------------------
>> diff --git
>> a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_mount_result.html
>> b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_mount_result.html
>> index 01be322..7e4e9d4 100644
>> ---
>> a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_mount_result.html
>> +++
>> b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_mount_result.html
>> @@ -1,5 +1,5 @@
>> <html>
>> <body>
>> -<a
>> href="./stateless?-.-link&testParam1=testValue1&testParam2=testValue2"
>> wicket:id="link">test</a>
>> +<a
>> href="./stateless?-1.-link&testParam1=testValue1&testParam2=testValue2"
>> wicket:id="link">test</a>
>> </body>
>> </html>
>> \ No newline at end of file
>>
>>
>> http://git-wip-us.apache.org/repos/asf/wicket/blob/76e17550/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_result.html
>> ----------------------------------------------------------------------
>> diff --git
>> a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_result.html
>> b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_result.html
>> index bd3d46c..63b427ac 100644
>> ---
>> a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_result.html
>> +++
>> b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_result.html
>> @@ -1,5 +1,5 @@
>> <html>
>> <body>
>> -<a
>> href="./org.apache.wicket.stateless.StatelessComponentPageWithParams?-.-link&testParam1=testValue1&testParam2=testValue2"
>> wicket:id="link">test</a>
>> +<a
>> href="./org.apache.wicket.stateless.StatelessComponentPageWithParams?-1.-link&testParam1=testValue1&testParam2=testValue2"
>> wicket:id="link">test</a>
>> </body>
>> </html>
>> \ No newline at end of file
>>
>>
>> http://git-wip-us.apache.org/repos/asf/wicket/blob/76e17550/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_mount_result.html
>> ----------------------------------------------------------------------
>> diff --git
>> a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_mount_result.html
>> b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_mount_result.html
>> index 905d21e..ac5f821 100644
>> ---
>> a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_mount_result.html
>> +++
>> b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_mount_result.html
>> @@ -1,5 +1,5 @@
>> <html>
>> <body>
>> -<a href="./stateless?-.-link" wicket:id="link">test</a>
>> +<a href="./stateless?-1.-link" wicket:id="link">test</a>
>> </body>
>> </html>
>> \ No newline at end of file
>>
>>
>> http://git-wip-us.apache.org/repos/asf/wicket/blob/76e17550/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_result.html
>> ----------------------------------------------------------------------
>> diff --git
>> a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_result.html
>> b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_result.html
>> index 7c1f8f3..472458f 100644
>> ---
>> a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_result.html
>> +++
>> b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_result.html
>> @@ -1,5 +1,5 @@
>> <html>
>> <body>
>> -<a href="./org.apache.wicket.stateless.StatelessComponentPage?-.-link"
>> wicket:id="link">test</a>
>> +<a href="./org.apache.wicket.stateless.StatelessComponentPage?-1.-link"
>> wicket:id="link">test</a>
>> </body>
>> </html>
>> \ No newline at end of file
>>
>>
>> http://git-wip-us.apache.org/repos/asf/wicket/blob/76e17550/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentTest.java
>> ----------------------------------------------------------------------
>> diff --git
>> a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentTest.java
>> b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentTest.java
>> index 3d55c88..91d95e8 100644
>> ---
>> a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentTest.java
>> +++
>> b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentTest.java
>> @@ -61,7 +61,7 @@ public class StatelessComponentTest extends
>> WicketTestCase
>> executeTest(StatelessComponentPage.class,
>> "StatelessComponentPage_mount_result.html");
>> tester.getRequest()
>> .setUrl(
>> -
>> Url.parse("stateless?0-1.ILinkListener-link&testParam1=testValue1&testParam2=testValue2"));
>> +
>> Url.parse("stateless?0-1.-link&testParam1=testValue1&testParam2=testValue2"));
>> try
>> {
>> tester.processRequest();
>> @@ -88,7 +88,7 @@ public class StatelessComponentTest extends
>> WicketTestCase
>>
>> tester.getRequest()
>> .setUrl(
>> -
>> Url.parse("wicket/bookmarkable/org.apache.wicket.stateless.StatelessComponentPageWithParams?0-1.ILinkListener-link&testParam1=testValue1&testParam2=testValue2"));
>> +
>> Url.parse("wicket/bookmarkable/org.apache.wicket.stateless.StatelessComponentPageWithParams?0-1.-link&testParam1=testValue1&testParam2=testValue2"));
>> try
>> {
>> tester.processRequest();
>> @@ -142,7 +142,7 @@ public class StatelessComponentTest extends
>> WicketTestCase
>> executeTest(StatelessComponentPageWithParams.class, params,
>>
>> "StatelessComponentPageWithParams_indexed_mount_result.html");
>> tester.getRequest().setUrl(
>> -
>> Url.parse("stateless/testValue1/testValue2?0-1.ILinkListener-link"));
>> +
>> Url.parse("stateless/testValue1/testValue2?0-1.-link"));
>> try
>> {
>> tester.processRequest();
>>
>>
>> http://git-wip-us.apache.org/repos/asf/wicket/blob/76e17550/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 6c096ab..4968d96 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?-0.ILinkListener-links:1"));
>> +
>> tester.getRequest().setUrl(Url.parse("stateless?-.-links:1"));
>> tester.processRequest();
>>
>> assertTrue(tester.getLastResponseAsString().contains("LINK-2"));
>>
>> -
>> tester.getRequest().setUrl(Url.parse("stateless?-0.ILinkListener-links:2"));
>> +
>> tester.getRequest().setUrl(Url.parse("stateless?-.-links:2"));
>> tester.processRequest();
>>
>> assertTrue(tester.getLastResponseAsString().contains("LINK-3"));
>>
>> -
>> tester.getRequest().setUrl(Url.parse("stateless?-0.ILinkListener-links:3"));
>> +
>> tester.getRequest().setUrl(Url.parse("stateless?-.-links:3"));
>> tester.processRequest();
>>
>> assertTrue(tester.getLastResponseAsString().contains("LINK-4"));
>> }
>>
>>