adjusted more hard-coded urls in test code
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/d97b7011 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/d97b7011 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/d97b7011 Branch: refs/heads/request_listener_simplification Commit: d97b7011662cd8c4c94ba07b51de62aba4cb7bea Parents: 4513b13 Author: Sven Meier <[email protected]> Authored: Mon Mar 28 23:54:06 2016 +0200 Committer: Sven Meier <[email protected]> Committed: Mon Mar 28 23:54:06 2016 +0200 ---------------------------------------------------------------------- .../wicket/ajax/AjaxCallbackFunctionTest.java | 28 ++++++++++---------- .../request/mapper/BookmarkableMapperTest.java | 8 +++--- .../markup/html/link/MountedPageLinkTest.java | 4 +-- 3 files changed, 20 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/d97b7011/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxCallbackFunctionTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxCallbackFunctionTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxCallbackFunctionTest.java index a4f1d79..776b484 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxCallbackFunctionTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxCallbackFunctionTest.java @@ -33,7 +33,7 @@ public class AjaxCallbackFunctionTest extends WicketTestCase AjaxCallbackPage page = tester.startPage(AjaxCallbackPage.class); assertEquals(// "function () {\n" // - + "var attrs = {\"u\":\"./wicket/bookmarkable/org.apache.wicket.ajax.AjaxCallbackPage?0-1.IBehaviorListener.0-\"};\n" // + + "var attrs = {\"u\":\"./wicket/bookmarkable/org.apache.wicket.ajax.AjaxCallbackPage?0-1.0-\"};\n" // + "var params = [];\n" // + "attrs.ep = params.concat(attrs.ep || []);\n" // + "Wicket.Ajax.ajax(attrs);\n" // @@ -42,7 +42,7 @@ public class AjaxCallbackFunctionTest extends WicketTestCase assertEquals(// "function () {\n" // - + "var attrs = {\"u\":\"./wicket/bookmarkable/org.apache.wicket.ajax.AjaxCallbackPage?0-1.IBehaviorListener.1-\"," // + + "var attrs = {\"u\":\"./wicket/bookmarkable/org.apache.wicket.ajax.AjaxCallbackPage?0-1.1-\"," // + "\"ep\":[{\"name\":\"param1\",\"value\":123},{\"name\":\"param2\",\"value\":\"zh_CN\"}]};\n" // + "var params = [];\n" // + "attrs.ep = params.concat(attrs.ep || []);\n" // @@ -57,7 +57,7 @@ public class AjaxCallbackFunctionTest extends WicketTestCase AjaxCallbackPage page = tester.startPage(AjaxCallbackPage.class); assertEquals(// "function (context) {\n" // - + "var attrs = {\"u\":\"./wicket/bookmarkable/org.apache.wicket.ajax.AjaxCallbackPage?0-1.IBehaviorListener.0-\"};\n" // + + "var attrs = {\"u\":\"./wicket/bookmarkable/org.apache.wicket.ajax.AjaxCallbackPage?0-1.0-\"};\n" // + "var params = [];\n" // + "attrs.ep = params.concat(attrs.ep || []);\n" // + "Wicket.Ajax.ajax(attrs);\n" // @@ -66,7 +66,7 @@ public class AjaxCallbackFunctionTest extends WicketTestCase assertEquals(// "function (context) {\n" // - + "var attrs = {\"u\":\"./wicket/bookmarkable/org.apache.wicket.ajax.AjaxCallbackPage?0-1.IBehaviorListener.1-\"," // + + "var attrs = {\"u\":\"./wicket/bookmarkable/org.apache.wicket.ajax.AjaxCallbackPage?0-1.1-\"," // + "\"ep\":[{\"name\":\"param1\",\"value\":123},{\"name\":\"param2\",\"value\":\"zh_CN\"}]};\n" // + "var params = [];\n" // + "attrs.ep = params.concat(attrs.ep || []);\n" // @@ -81,7 +81,7 @@ public class AjaxCallbackFunctionTest extends WicketTestCase AjaxCallbackPage page = tester.startPage(AjaxCallbackPage.class); assertEquals(// "function (explicit) {\n" // - + "var attrs = {\"u\":\"./wicket/bookmarkable/org.apache.wicket.ajax.AjaxCallbackPage?0-1.IBehaviorListener.0-\"};\n" // + + "var attrs = {\"u\":\"./wicket/bookmarkable/org.apache.wicket.ajax.AjaxCallbackPage?0-1.0-\"};\n" // + "var params = [{\"name\":\"explicit\",\"value\":explicit}];\n" // + "attrs.ep = params.concat(attrs.ep || []);\n" // + "Wicket.Ajax.ajax(attrs);\n" // @@ -90,7 +90,7 @@ public class AjaxCallbackFunctionTest extends WicketTestCase assertEquals(// "function (explicit) {\n" // - + "var attrs = {\"u\":\"./wicket/bookmarkable/org.apache.wicket.ajax.AjaxCallbackPage?0-1.IBehaviorListener.1-\",\"ep\":[{\"name\":\"param1\",\"value\":123},{\"name\":\"param2\",\"value\":\"zh_CN\"}]};\n" // + + "var attrs = {\"u\":\"./wicket/bookmarkable/org.apache.wicket.ajax.AjaxCallbackPage?0-1.1-\",\"ep\":[{\"name\":\"param1\",\"value\":123},{\"name\":\"param2\",\"value\":\"zh_CN\"}]};\n" // + "var params = [{\"name\":\"explicit\",\"value\":explicit}];\n" // + "attrs.ep = params.concat(attrs.ep || []);\n" // + "Wicket.Ajax.ajax(attrs);\n" // @@ -104,7 +104,7 @@ public class AjaxCallbackFunctionTest extends WicketTestCase AjaxCallbackPage page = tester.startPage(AjaxCallbackPage.class); assertEquals(// "function () {\n" // - + "var attrs = {\"u\":\"./wicket/bookmarkable/org.apache.wicket.ajax.AjaxCallbackPage?0-1.IBehaviorListener.0-\"};\n" // + + "var attrs = {\"u\":\"./wicket/bookmarkable/org.apache.wicket.ajax.AjaxCallbackPage?0-1.0-\"};\n" // + "var params = [{\"name\":\"resolved\",\"value\":window.location.href}];\n" // + "attrs.ep = params.concat(attrs.ep || []);\n" // + "Wicket.Ajax.ajax(attrs);\n" // @@ -115,7 +115,7 @@ public class AjaxCallbackFunctionTest extends WicketTestCase assertEquals(// "function () {\n" // - + "var attrs = {\"u\":\"./wicket/bookmarkable/org.apache.wicket.ajax.AjaxCallbackPage?0-1.IBehaviorListener.1-\"," // + + "var attrs = {\"u\":\"./wicket/bookmarkable/org.apache.wicket.ajax.AjaxCallbackPage?0-1.1-\"," // + "\"ep\":[{\"name\":\"param1\",\"value\":123},{\"name\":\"param2\",\"value\":\"zh_CN\"}]};\n" // + "var params = [{\"name\":\"resolved\",\"value\":window.location.href}];\n" // + "attrs.ep = params.concat(attrs.ep || []);\n" // @@ -133,7 +133,7 @@ public class AjaxCallbackFunctionTest extends WicketTestCase assertEquals( // "function (converted) {\n" // - + "var attrs = {\"u\":\"./wicket/bookmarkable/org.apache.wicket.ajax.AjaxCallbackPage?0-1.IBehaviorListener.0-\"};\n" // + + "var attrs = {\"u\":\"./wicket/bookmarkable/org.apache.wicket.ajax.AjaxCallbackPage?0-1.0-\"};\n" // + "var params = [{\"name\":\"converted\",\"value\":converted.substring(0, 3)}];\n" // + "attrs.ep = params.concat(attrs.ep || []);\n" // + "Wicket.Ajax.ajax(attrs);\n" // @@ -145,7 +145,7 @@ public class AjaxCallbackFunctionTest extends WicketTestCase assertEquals( // "function (converted) {\n" // - + "var attrs = {\"u\":\"./wicket/bookmarkable/org.apache.wicket.ajax.AjaxCallbackPage?0-1.IBehaviorListener.1-\"," // + + "var attrs = {\"u\":\"./wicket/bookmarkable/org.apache.wicket.ajax.AjaxCallbackPage?0-1.1-\"," // + "\"ep\":[{\"name\":\"param1\",\"value\":123},{\"name\":\"param2\",\"value\":\"zh_CN\"}]};\n" // + "var params = [{\"name\":\"converted\",\"value\":converted.substring(0, 3)}];\n" // + "attrs.ep = params.concat(attrs.ep || []);\n" // @@ -163,7 +163,7 @@ public class AjaxCallbackFunctionTest extends WicketTestCase assertEquals( // "function (context,explicit,converted) {\n" // - + "var attrs = {\"u\":\"./wicket/bookmarkable/org.apache.wicket.ajax.AjaxCallbackPage?0-1.IBehaviorListener.0-\"};\n" // + + "var attrs = {\"u\":\"./wicket/bookmarkable/org.apache.wicket.ajax.AjaxCallbackPage?0-1.0-\"};\n" // + "var params = [{\"name\":\"explicit\",\"value\":explicit}," + "{\"name\":\"resolved\",\"value\":window.location.href}," + "{\"name\":\"converted\",\"value\":converted.substring(0, 3)}];\n" // @@ -179,7 +179,7 @@ public class AjaxCallbackFunctionTest extends WicketTestCase assertEquals( // "function (context,explicit,converted) {\n" // - + "var attrs = {\"u\":\"./wicket/bookmarkable/org.apache.wicket.ajax.AjaxCallbackPage?0-1.IBehaviorListener.1-\"," // + + "var attrs = {\"u\":\"./wicket/bookmarkable/org.apache.wicket.ajax.AjaxCallbackPage?0-1.1-\"," // + "\"ep\":[{\"name\":\"param1\",\"value\":123},{\"name\":\"param2\",\"value\":\"zh_CN\"}]};\n" // + "var params = [{\"name\":\"explicit\",\"value\":explicit}," + "{\"name\":\"resolved\",\"value\":window.location.href}," @@ -201,7 +201,7 @@ public class AjaxCallbackFunctionTest extends WicketTestCase assertEquals( // "function (event,ui) {\n" // - + "var attrs = {\"u\":\"./wicket/bookmarkable/org.apache.wicket.ajax.AjaxCallbackPage?0-1.IBehaviorListener.0-\"};\n" // + + "var attrs = {\"u\":\"./wicket/bookmarkable/org.apache.wicket.ajax.AjaxCallbackPage?0-1.0-\"};\n" // + "var params = [{\"name\":\"sortIndex\",\"value\":$(this).find(':data(sortable-item)').index(ui.item)}," // + "{\"name\":\"sortItemId\",\"value\":$(ui.item).attr('id')}," // + "{\"name\":\"sortSenderId\",\"value\":$(ui.sender).attr('id')}];\n" // @@ -218,7 +218,7 @@ public class AjaxCallbackFunctionTest extends WicketTestCase assertEquals( // "function (event,ui) {\n" // - + "var attrs = {\"u\":\"./wicket/bookmarkable/org.apache.wicket.ajax.AjaxCallbackPage?0-1.IBehaviorListener.1-\"," // + + "var attrs = {\"u\":\"./wicket/bookmarkable/org.apache.wicket.ajax.AjaxCallbackPage?0-1.1-\"," // + "\"ep\":[{\"name\":\"param1\",\"value\":123},{\"name\":\"param2\",\"value\":\"zh_CN\"}]};\n" // + "var params = [{\"name\":\"sortIndex\",\"value\":$(this).find(':data(sortable-item)').index(ui.item)}," // + "{\"name\":\"sortItemId\",\"value\":$(ui.item).attr('id')}," // http://git-wip-us.apache.org/repos/asf/wicket/blob/d97b7011/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 3e90cb1..5ee7dd2 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-ILinkListener-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-ILinkListener-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)); @@ -612,7 +612,7 @@ public class BookmarkableMapperTest extends AbstractMapperTest Url url = encoder.mapHandler(handler); assertEquals("wicket/bookmarkable/" + PAGE_CLASS_NAME - + "/i1/i2?15-0.ILinkListener-foo-bar&a=b&b=c", url.toString()); + + "/i1/i2?15-0.-foo-bar&a=b&b=c", url.toString()); } /** @@ -640,7 +640,7 @@ public class BookmarkableMapperTest extends AbstractMapperTest Url url = encoder.mapHandler(handler); assertEquals("wicket/bookmarkable/" + PAGE_CLASS_NAME - + "/i1/i2?15-0.ILinkListener.4-foo-bar&a=b&b=c", url.toString()); + + "/i1/i2?15-0.4-foo-bar&a=b&b=c", url.toString()); } /** http://git-wip-us.apache.org/repos/asf/wicket/blob/d97b7011/wicket-core/src/test/java/org/apache/wicket/markup/html/link/MountedPageLinkTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/MountedPageLinkTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/MountedPageLinkTest.java index 0c89a9d..704b10b 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/MountedPageLinkTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/MountedPageLinkTest.java @@ -113,7 +113,7 @@ public class MountedPageLinkTest extends WicketTestCase new PageParameters().add("param", "value", INamedParameters.Type.MANUAL)); Link<?> link = (Link<?>)page.get("link"); String url = link.getURL().toString(); - assertEquals("./wicket/page?0-1.ILinkListener-link", url); + assertEquals("./wicket/page?0-1.-link", url); tester.executeUrl(url); } @@ -128,7 +128,7 @@ public class MountedPageLinkTest extends WicketTestCase new PageParameters().add("param", "value", INamedParameters.Type.MANUAL)); Link<?> link = (Link<?>)page.get("link"); String url = link.getURL().toString(); - assertEquals("./wicket/page?0-1.ILinkListener-link", url); + assertEquals("./wicket/page?0-1.-link", url); // simulate a page expiry url = url.replace("page?0", "page?3"); tester.executeUrl(url);
