You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by jd...@apache.org on 2009/12/19 12:27:18 UTC
svn commit: r892463 [4/4] - in /wicket/trunk:
wicket-examples/src/main/webapp/WEB-INF/
wicket-examples/src/test/java/org/apache/wicket/examples/repeater/
wicket/src/main/java/org/apache/wicket/
wicket/src/main/java/org/apache/wicket/ng/ wicket/src/main...
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/BookmarkableEncoderTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/BookmarkableEncoderTest.java?rev=892463&r1=892462&r2=892463&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/BookmarkableEncoderTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/BookmarkableEncoderTest.java Sat Dec 19 11:27:15 2009
@@ -18,15 +18,15 @@
import org.apache.wicket.ng.MockPage;
import org.apache.wicket.ng.markup.html.link.ILinkListener;
-import org.apache.wicket.ng.request.RequestHandler;
+import org.apache.wicket.ng.request.IRequestHandler;
import org.apache.wicket.ng.request.Url;
import org.apache.wicket.ng.request.component.PageParametersNg;
-import org.apache.wicket.ng.request.component.RequestableComponent;
-import org.apache.wicket.ng.request.component.RequestablePage;
+import org.apache.wicket.ng.request.component.IRequestableComponent;
+import org.apache.wicket.ng.request.component.IRequestablePage;
import org.apache.wicket.ng.request.handler.PageAndComponentProvider;
import org.apache.wicket.ng.request.handler.DefaultPageProvider;
-import org.apache.wicket.ng.request.handler.PageProvider;
-import org.apache.wicket.ng.request.handler.PageRequestHandler;
+import org.apache.wicket.ng.request.handler.IPageProvider;
+import org.apache.wicket.ng.request.handler.IPageRequestHandler;
import org.apache.wicket.ng.request.handler.impl.BookmarkableListenerInterfaceRequestHandler;
import org.apache.wicket.ng.request.handler.impl.BookmarkablePageRequestHandler;
import org.apache.wicket.ng.request.handler.impl.ListenerInterfaceRequestHandler;
@@ -48,7 +48,7 @@
private BookmarkableMapper encoder = new BookmarkableMapper()
{
@Override
- protected MapperContext getContext()
+ protected IMapperContext getContext()
{
return context;
}
@@ -62,10 +62,10 @@
public void testDecode1()
{
Url url = Url.parse("wicket/bookmarkable/" + PAGE_CLASS_NAME);
- RequestHandler handler = encoder.mapRequest(getRequest(url));
+ IRequestHandler handler = encoder.mapRequest(getRequest(url));
assertTrue(handler instanceof RenderPageRequestHandler);
- RequestablePage page = ((RenderPageRequestHandler)handler).getPage();
+ IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
assertEquals(PAGE_CLASS_NAME, page.getClass().getName());
assertEquals(0, page.getPageParametersNg().getIndexedParamsCount());
assertTrue(page.getPageParametersNg().getNamedParameterKeys().isEmpty());
@@ -77,10 +77,10 @@
public void testDecode2()
{
Url url = Url.parse("wicket/bookmarkable/" + PAGE_CLASS_NAME + "/indexed1?a=b&b=c");
- RequestHandler handler = encoder.mapRequest(getRequest(url));
+ IRequestHandler handler = encoder.mapRequest(getRequest(url));
assertTrue(handler instanceof RenderPageRequestHandler);
- RequestablePage page = ((RenderPageRequestHandler)handler).getPage();
+ IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
assertEquals(PAGE_CLASS_NAME, page.getClass().getName());
PageParametersNg p = page.getPageParametersNg();
@@ -98,10 +98,10 @@
public void testDecode3()
{
Url url = Url.parse("wicket/bookmarkable/" + PAGE_CLASS_NAME + "?15");
- RequestHandler handler = encoder.mapRequest(getRequest(url));
+ IRequestHandler handler = encoder.mapRequest(getRequest(url));
assertTrue(handler instanceof RenderPageRequestHandler);
- RequestablePage page = ((RenderPageRequestHandler)handler).getPage();
+ IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
checkPage(page, 15);
}
@@ -111,10 +111,10 @@
public void testDecode4()
{
Url url = Url.parse("wicket/bookmarkable/" + PAGE_CLASS_NAME + "/i1/i2?15&a=b&b=c");
- RequestHandler handler = encoder.mapRequest(getRequest(url));
+ IRequestHandler handler = encoder.mapRequest(getRequest(url));
assertTrue(handler instanceof RenderPageRequestHandler);
- RequestablePage page = ((RenderPageRequestHandler)handler).getPage();
+ IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
checkPage(page, 15);
PageParametersNg p = page.getPageParametersNg();
@@ -133,13 +133,13 @@
public void testDecode5()
{
Url url = Url.parse("wicket/bookmarkable/" + PAGE_CLASS_NAME + "?15-ILinkListener-foo-bar");
- RequestHandler handler = encoder.mapRequest(getRequest(url));
+ IRequestHandler handler = encoder.mapRequest(getRequest(url));
assertTrue(handler instanceof ListenerInterfaceRequestHandler);
ListenerInterfaceRequestHandler h = (ListenerInterfaceRequestHandler)handler;
- RequestablePage page = h.getPage();
+ IRequestablePage page = h.getPage();
checkPage(page, 15);
assertEquals(ILinkListener.INTERFACE, h.getListenerInterface());
@@ -154,12 +154,12 @@
{
Url url = Url.parse("wicket/bookmarkable/" + PAGE_CLASS_NAME +
"/i1/i2?15-ILinkListener-foo-bar&a=b&b=c");
- RequestHandler handler = encoder.mapRequest(getRequest(url));
+ IRequestHandler handler = encoder.mapRequest(getRequest(url));
assertTrue(handler instanceof ListenerInterfaceRequestHandler);
ListenerInterfaceRequestHandler h = (ListenerInterfaceRequestHandler)handler;
- RequestablePage page = h.getPage();
+ IRequestablePage page = h.getPage();
checkPage(page, 15);
assertEquals(ILinkListener.INTERFACE, h.getListenerInterface());
@@ -182,13 +182,13 @@
{
Url url = Url.parse("wicket/bookmarkable/" + PAGE_CLASS_NAME +
"?15-ILinkListener.4-foo-bar");
- RequestHandler handler = encoder.mapRequest(getRequest(url));
+ IRequestHandler handler = encoder.mapRequest(getRequest(url));
assertTrue(handler instanceof ListenerInterfaceRequestHandler);
ListenerInterfaceRequestHandler h = (ListenerInterfaceRequestHandler)handler;
- RequestablePage page = h.getPage();
+ IRequestablePage page = h.getPage();
checkPage(page, 15);
assertEquals(ILinkListener.INTERFACE, h.getListenerInterface());
@@ -206,12 +206,12 @@
context.setNextPageRenderCount(5);
- RequestHandler handler = encoder.mapRequest(getRequest(url));
+ IRequestHandler handler = encoder.mapRequest(getRequest(url));
assertTrue(handler instanceof ListenerInterfaceRequestHandler);
ListenerInterfaceRequestHandler h = (ListenerInterfaceRequestHandler)handler;
- RequestablePage page = h.getPage();
+ IRequestablePage page = h.getPage();
assertEquals(page.getRenderCount(), 5);
}
@@ -227,9 +227,9 @@
try
{
- RequestHandler handler = encoder.mapRequest(getRequest(url));
+ IRequestHandler handler = encoder.mapRequest(getRequest(url));
- ((PageRequestHandler)handler).getPage();
+ ((IPageRequestHandler)handler).getPage();
// should never get here
assertFalse(true);
@@ -247,7 +247,7 @@
{
DefaultPageProvider provider = new DefaultPageProvider(MockPage.class, new PageParametersNg());
provider.setPageSource(context);
- RequestHandler handler = new BookmarkablePageRequestHandler(provider);
+ IRequestHandler handler = new BookmarkablePageRequestHandler(provider);
Url url = encoder.mapHandler(handler);
assertEquals("wicket/bookmarkable/" + PAGE_CLASS_NAME, url.toString());
}
@@ -264,7 +264,7 @@
parameters.setNamedParameter("b", "c");
DefaultPageProvider provider = new DefaultPageProvider(MockPage.class, parameters);
provider.setPageSource(context);
- RequestHandler handler = new BookmarkablePageRequestHandler(provider);
+ IRequestHandler handler = new BookmarkablePageRequestHandler(provider);
Url url = encoder.mapHandler(handler);
assertEquals("wicket/bookmarkable/" + PAGE_CLASS_NAME + "/i1/i2?a=b&b=c", url.toString());
}
@@ -282,7 +282,7 @@
DefaultPageProvider provider = new DefaultPageProvider(MockPage.class, parameters);
provider.setPageSource(context);
- RequestHandler handler = new BookmarkablePageRequestHandler(provider);
+ IRequestHandler handler = new BookmarkablePageRequestHandler(provider);
Url url = encoder.mapHandler(handler);
assertEquals("wicket/bookmarkable/" + PAGE_CLASS_NAME + "/i1/i2?a=b&b=c", url.toString());
@@ -300,8 +300,8 @@
page.getPageParametersNg().setNamedParameter("b", "c");
page.setCreatedBookmarkable(true);
- PageProvider provider = new DefaultPageProvider(page);
- RequestHandler handler = new RenderPageRequestHandler(provider);
+ IPageProvider provider = new DefaultPageProvider(page);
+ IRequestHandler handler = new RenderPageRequestHandler(provider);
Url url = encoder.mapHandler(handler);
assertEquals("wicket/bookmarkable/" + PAGE_CLASS_NAME + "/i1/i2?15&a=b&b=c", url.toString());
@@ -320,8 +320,8 @@
page.setCreatedBookmarkable(false);
- PageProvider provider = new DefaultPageProvider(page);
- RequestHandler handler = new RenderPageRequestHandler(provider);
+ IPageProvider provider = new DefaultPageProvider(page);
+ IRequestHandler handler = new RenderPageRequestHandler(provider);
Url url = encoder.mapHandler(handler);
// never allow bookmarkable render url for page that has not been created by bookmarkable
@@ -345,10 +345,10 @@
// as this explicitely says the url must be bookmarkable
page.setCreatedBookmarkable(false);
- RequestableComponent c = page.get("foo:bar");
+ IRequestableComponent c = page.get("foo:bar");
PageAndComponentProvider provider = new PageAndComponentProvider(page, c);
- RequestHandler handler = new BookmarkableListenerInterfaceRequestHandler(provider,
+ IRequestHandler handler = new BookmarkableListenerInterfaceRequestHandler(provider,
ILinkListener.INTERFACE);
Url url = encoder.mapHandler(handler);
@@ -372,10 +372,10 @@
// as this explicitely says the url must be bookmarkable
page.setCreatedBookmarkable(false);
- RequestableComponent c = page.get("foo:bar");
+ IRequestableComponent c = page.get("foo:bar");
PageAndComponentProvider provider = new PageAndComponentProvider(page, c);
- RequestHandler handler = new BookmarkableListenerInterfaceRequestHandler(provider,
+ IRequestHandler handler = new BookmarkableListenerInterfaceRequestHandler(provider,
ILinkListener.INTERFACE, 4);
Url url = encoder.mapHandler(handler);
@@ -394,8 +394,8 @@
page.setCreatedBookmarkable(true);
page.setPageStateless(true);
- PageProvider provider = new DefaultPageProvider(page);
- RequestHandler handler = new RenderPageRequestHandler(provider);
+ IPageProvider provider = new DefaultPageProvider(page);
+ IRequestHandler handler = new RenderPageRequestHandler(provider);
Url url = encoder.mapHandler(handler);
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/MountedMapperTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/MountedMapperTest.java?rev=892463&r1=892462&r2=892463&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/MountedMapperTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/MountedMapperTest.java Sat Dec 19 11:27:15 2009
@@ -18,16 +18,16 @@
import org.apache.wicket.ng.MockPage;
import org.apache.wicket.ng.markup.html.link.ILinkListener;
-import org.apache.wicket.ng.request.RequestHandler;
-import org.apache.wicket.ng.request.RequestMapper;
+import org.apache.wicket.ng.request.IRequestHandler;
+import org.apache.wicket.ng.request.IRequestMapper;
import org.apache.wicket.ng.request.Url;
import org.apache.wicket.ng.request.component.PageParametersNg;
-import org.apache.wicket.ng.request.component.RequestableComponent;
-import org.apache.wicket.ng.request.component.RequestablePage;
+import org.apache.wicket.ng.request.component.IRequestableComponent;
+import org.apache.wicket.ng.request.component.IRequestablePage;
import org.apache.wicket.ng.request.handler.PageAndComponentProvider;
import org.apache.wicket.ng.request.handler.DefaultPageProvider;
-import org.apache.wicket.ng.request.handler.PageProvider;
-import org.apache.wicket.ng.request.handler.PageRequestHandler;
+import org.apache.wicket.ng.request.handler.IPageProvider;
+import org.apache.wicket.ng.request.handler.IPageRequestHandler;
import org.apache.wicket.ng.request.handler.impl.BookmarkableListenerInterfaceRequestHandler;
import org.apache.wicket.ng.request.handler.impl.BookmarkablePageRequestHandler;
import org.apache.wicket.ng.request.handler.impl.ListenerInterfaceRequestHandler;
@@ -49,7 +49,7 @@
private MountedMapper encoder = new MountedMapper("/some/mount/path", MockPage.class)
{
@Override
- protected MapperContext getContext()
+ protected IMapperContext getContext()
{
return context;
}
@@ -59,7 +59,7 @@
MockPage.class)
{
@Override
- protected MapperContext getContext()
+ protected IMapperContext getContext()
{
return context;
}
@@ -71,10 +71,10 @@
public void testDecode1()
{
Url url = Url.parse("some/mount/path");
- RequestHandler handler = encoder.mapRequest(getRequest(url));
+ IRequestHandler handler = encoder.mapRequest(getRequest(url));
assertTrue(handler instanceof RenderPageRequestHandler);
- RequestablePage page = ((RenderPageRequestHandler)handler).getPage();
+ IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
assertEquals(0, page.getPageParametersNg().getIndexedParamsCount());
assertTrue(page.getPageParametersNg().getNamedParameterKeys().isEmpty());
@@ -86,10 +86,10 @@
public void testDecode2()
{
Url url = Url.parse("some/mount/path/indexed1?a=b&b=c");
- RequestHandler handler = encoder.mapRequest(getRequest(url));
+ IRequestHandler handler = encoder.mapRequest(getRequest(url));
assertTrue(handler instanceof RenderPageRequestHandler);
- RequestablePage page = ((RenderPageRequestHandler)handler).getPage();
+ IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
PageParametersNg p = page.getPageParametersNg();
assertEquals(1, p.getIndexedParamsCount());
@@ -106,10 +106,10 @@
public void testDecode3()
{
Url url = Url.parse("some/mount/path?15");
- RequestHandler handler = encoder.mapRequest(getRequest(url));
+ IRequestHandler handler = encoder.mapRequest(getRequest(url));
assertTrue(handler instanceof RenderPageRequestHandler);
- RequestablePage page = ((RenderPageRequestHandler)handler).getPage();
+ IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
checkPage(page, 15);
}
@@ -119,10 +119,10 @@
public void testDecode4()
{
Url url = Url.parse("some/mount/path/i1/i2?15&a=b&b=c");
- RequestHandler handler = encoder.mapRequest(getRequest(url));
+ IRequestHandler handler = encoder.mapRequest(getRequest(url));
assertTrue(handler instanceof RenderPageRequestHandler);
- RequestablePage page = ((RenderPageRequestHandler)handler).getPage();
+ IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
checkPage(page, 15);
PageParametersNg p = page.getPageParametersNg();
@@ -141,13 +141,13 @@
public void testDecode5()
{
Url url = Url.parse("some/mount/path?15-ILinkListener-foo-bar");
- RequestHandler handler = encoder.mapRequest(getRequest(url));
+ IRequestHandler handler = encoder.mapRequest(getRequest(url));
assertTrue(handler instanceof ListenerInterfaceRequestHandler);
ListenerInterfaceRequestHandler h = (ListenerInterfaceRequestHandler)handler;
- RequestablePage page = h.getPage();
+ IRequestablePage page = h.getPage();
checkPage(page, 15);
assertEquals(ILinkListener.INTERFACE, h.getListenerInterface());
@@ -161,12 +161,12 @@
public void testDecode6()
{
Url url = Url.parse("some/mount/path/i1/i2?15-ILinkListener-foo-bar&a=b&b=c");
- RequestHandler handler = encoder.mapRequest(getRequest(url));
+ IRequestHandler handler = encoder.mapRequest(getRequest(url));
assertTrue(handler instanceof ListenerInterfaceRequestHandler);
ListenerInterfaceRequestHandler h = (ListenerInterfaceRequestHandler)handler;
- RequestablePage page = h.getPage();
+ IRequestablePage page = h.getPage();
checkPage(page, 15);
assertEquals(ILinkListener.INTERFACE, h.getListenerInterface());
@@ -188,13 +188,13 @@
public void testDecode7()
{
Url url = Url.parse("some/mount/path?15-ILinkListener.4-foo-bar");
- RequestHandler handler = encoder.mapRequest(getRequest(url));
+ IRequestHandler handler = encoder.mapRequest(getRequest(url));
assertTrue(handler instanceof ListenerInterfaceRequestHandler);
ListenerInterfaceRequestHandler h = (ListenerInterfaceRequestHandler)handler;
- RequestablePage page = h.getPage();
+ IRequestablePage page = h.getPage();
checkPage(page, 15);
assertEquals(ILinkListener.INTERFACE, h.getListenerInterface());
@@ -208,7 +208,7 @@
public void testDecode8()
{
Url url = Url.parse("some/mmount/path?15-ILinkListener.4-foo-bar");
- RequestHandler handler = encoder.mapRequest(getRequest(url));
+ IRequestHandler handler = encoder.mapRequest(getRequest(url));
assertNull(handler);
}
@@ -220,7 +220,7 @@
{
// capture the home page
Url url = Url.parse("");
- RequestHandler handler = encoder.mapRequest(getRequest(url));
+ IRequestHandler handler = encoder.mapRequest(getRequest(url));
assertTrue(handler instanceof RenderPageRequestHandler);
}
@@ -231,13 +231,13 @@
{
Url url = Url.parse("some/mount/path?15-5.ILinkListener.4-foo-bar");
context.setNextPageRenderCount(5);
- RequestHandler handler = encoder.mapRequest(getRequest(url));
+ IRequestHandler handler = encoder.mapRequest(getRequest(url));
assertTrue(handler instanceof ListenerInterfaceRequestHandler);
ListenerInterfaceRequestHandler h = (ListenerInterfaceRequestHandler)handler;
- RequestablePage page = h.getPage();
+ IRequestablePage page = h.getPage();
assertEquals(5, page.getRenderCount());
}
@@ -251,9 +251,9 @@
try
{
- RequestHandler handler = encoder.mapRequest(getRequest(url));
+ IRequestHandler handler = encoder.mapRequest(getRequest(url));
- ((PageRequestHandler)handler).getPage();
+ ((IPageRequestHandler)handler).getPage();
// should never get here
assertTrue(false);
@@ -271,7 +271,7 @@
{
DefaultPageProvider provider = new DefaultPageProvider(MockPage.class, new PageParametersNg());
provider.setPageSource(context);
- RequestHandler handler = new BookmarkablePageRequestHandler(provider);
+ IRequestHandler handler = new BookmarkablePageRequestHandler(provider);
Url url = encoder.mapHandler(handler);
assertEquals("some/mount/path", url.toString());
}
@@ -288,7 +288,7 @@
parameters.setNamedParameter("b", "c");
DefaultPageProvider provider = new DefaultPageProvider(MockPage.class, parameters);
provider.setPageSource(context);
- RequestHandler handler = new BookmarkablePageRequestHandler(provider);
+ IRequestHandler handler = new BookmarkablePageRequestHandler(provider);
Url url = encoder.mapHandler(handler);
assertEquals("some/mount/path/i1/i2?a=b&b=c", url.toString());
}
@@ -306,7 +306,7 @@
DefaultPageProvider provider = new DefaultPageProvider(MockPage.class, parameters);
provider.setPageSource(context);
- RequestHandler handler = new BookmarkablePageRequestHandler(provider);
+ IRequestHandler handler = new BookmarkablePageRequestHandler(provider);
Url url = encoder.mapHandler(handler);
assertEquals("some/mount/path/i1/i2?a=b&b=c", url.toString());
@@ -324,8 +324,8 @@
page.getPageParametersNg().setNamedParameter("b", "c");
page.setCreatedBookmarkable(true);
- PageProvider provider = new DefaultPageProvider(page);
- RequestHandler handler = new RenderPageRequestHandler(provider);
+ IPageProvider provider = new DefaultPageProvider(page);
+ IRequestHandler handler = new RenderPageRequestHandler(provider);
Url url = encoder.mapHandler(handler);
assertEquals("some/mount/path/i1/i2?15&a=b&b=c", url.toString());
@@ -344,8 +344,8 @@
page.setCreatedBookmarkable(false);
- PageProvider provider = new DefaultPageProvider(page);
- RequestHandler handler = new RenderPageRequestHandler(provider);
+ IPageProvider provider = new DefaultPageProvider(page);
+ IRequestHandler handler = new RenderPageRequestHandler(provider);
Url url = encoder.mapHandler(handler);
// mounted pages must render mounted url even for page that has not been created by
@@ -371,10 +371,10 @@
// as this explicitely says the url must be bookmarkable
page.setCreatedBookmarkable(false);
- RequestableComponent c = page.get("foo:bar");
+ IRequestableComponent c = page.get("foo:bar");
PageAndComponentProvider provider = new PageAndComponentProvider(page, c);
- RequestHandler handler = new BookmarkableListenerInterfaceRequestHandler(provider,
+ IRequestHandler handler = new BookmarkableListenerInterfaceRequestHandler(provider,
ILinkListener.INTERFACE);
Url url = encoder.mapHandler(handler);
@@ -398,10 +398,10 @@
// as this explicitely says the url must be bookmarkable
page.setCreatedBookmarkable(false);
- RequestableComponent c = page.get("foo:bar");
+ IRequestableComponent c = page.get("foo:bar");
PageAndComponentProvider provider = new PageAndComponentProvider(page, c);
- RequestHandler handler = new BookmarkableListenerInterfaceRequestHandler(provider,
+ IRequestHandler handler = new BookmarkableListenerInterfaceRequestHandler(provider,
ILinkListener.INTERFACE, 4);
Url url = encoder.mapHandler(handler);
@@ -419,8 +419,8 @@
page.setCreatedBookmarkable(true);
page.setPageStateless(true);
- PageProvider provider = new DefaultPageProvider(page);
- RequestHandler handler = new RenderPageRequestHandler(provider);
+ IPageProvider provider = new DefaultPageProvider(page);
+ IRequestHandler handler = new RenderPageRequestHandler(provider);
Url url = encoder.mapHandler(handler);
@@ -435,7 +435,7 @@
try
{
@SuppressWarnings("unused")
- RequestMapper e = new MountedMapper("", MockPage.class);
+ IRequestMapper e = new MountedMapper("", MockPage.class);
// should never get here
assertFalse(true);
@@ -454,7 +454,7 @@
try
{
@SuppressWarnings("unused")
- RequestMapper e = new MountedMapper("/", MockPage.class);
+ IRequestMapper e = new MountedMapper("/", MockPage.class);
// should never get here
assertFalse(true);
@@ -471,10 +471,10 @@
public void testPlaceholderDecode1()
{
Url url = Url.parse("some/p1/path/p2");
- RequestHandler handler = placeholderEncoder.mapRequest(getRequest(url));
+ IRequestHandler handler = placeholderEncoder.mapRequest(getRequest(url));
assertTrue(handler instanceof RenderPageRequestHandler);
- RequestablePage page = ((RenderPageRequestHandler)handler).getPage();
+ IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
assertEquals(0, page.getPageParametersNg().getIndexedParamsCount());
assertTrue(page.getPageParametersNg().getNamedParameterKeys().size() == 2);
@@ -488,10 +488,10 @@
public void testPlaceholderDecode2()
{
Url url = Url.parse("some/p1/path/p2/indexed1?a=b&b=c");
- RequestHandler handler = placeholderEncoder.mapRequest(getRequest(url));
+ IRequestHandler handler = placeholderEncoder.mapRequest(getRequest(url));
assertTrue(handler instanceof RenderPageRequestHandler);
- RequestablePage page = ((RenderPageRequestHandler)handler).getPage();
+ IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
PageParametersNg p = page.getPageParametersNg();
assertEquals(1, p.getIndexedParamsCount());
@@ -520,7 +520,7 @@
DefaultPageProvider provider = new DefaultPageProvider(MockPage.class, parameters);
provider.setPageSource(context);
- RequestHandler handler = new BookmarkablePageRequestHandler(provider);
+ IRequestHandler handler = new BookmarkablePageRequestHandler(provider);
Url url = placeholderEncoder.mapHandler(handler);
assertEquals("some/p1/path/p2/i1/i2?a=b&b=c", url.toString());
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/PageInstanceMapperTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/PageInstanceMapperTest.java?rev=892463&r1=892462&r2=892463&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/PageInstanceMapperTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/PageInstanceMapperTest.java Sat Dec 19 11:27:15 2009
@@ -18,13 +18,13 @@
import org.apache.wicket.ng.MockPage;
import org.apache.wicket.ng.markup.html.link.ILinkListener;
-import org.apache.wicket.ng.request.RequestHandler;
+import org.apache.wicket.ng.request.IRequestHandler;
import org.apache.wicket.ng.request.Url;
-import org.apache.wicket.ng.request.component.RequestableComponent;
+import org.apache.wicket.ng.request.component.IRequestableComponent;
import org.apache.wicket.ng.request.handler.PageAndComponentProvider;
import org.apache.wicket.ng.request.handler.DefaultPageProvider;
-import org.apache.wicket.ng.request.handler.PageProvider;
-import org.apache.wicket.ng.request.handler.PageRequestHandler;
+import org.apache.wicket.ng.request.handler.IPageProvider;
+import org.apache.wicket.ng.request.handler.IPageRequestHandler;
import org.apache.wicket.ng.request.handler.impl.ListenerInterfaceRequestHandler;
import org.apache.wicket.ng.request.handler.impl.RenderPageRequestHandler;
@@ -46,7 +46,7 @@
private PageInstanceMapper encoder = new PageInstanceMapper()
{
@Override
- protected MapperContext getContext()
+ protected IMapperContext getContext()
{
return context;
}
@@ -59,7 +59,7 @@
{
Url url = Url.parse("wicket/page?4");
- RequestHandler handler = encoder.mapRequest(getRequest(url));
+ IRequestHandler handler = encoder.mapRequest(getRequest(url));
assertTrue(handler instanceof RenderPageRequestHandler);
RenderPageRequestHandler h = (RenderPageRequestHandler)handler;
@@ -73,7 +73,7 @@
{
Url url = Url.parse("wicket/page/ingore/me?4&a=3&b=3");
- RequestHandler handler = encoder.mapRequest(getRequest(url));
+ IRequestHandler handler = encoder.mapRequest(getRequest(url));
assertTrue(handler instanceof RenderPageRequestHandler);
RenderPageRequestHandler h = (RenderPageRequestHandler)handler;
@@ -87,7 +87,7 @@
{
Url url = Url.parse("wicket/page?4-ILinkListener-a-b-c");
- RequestHandler handler = encoder.mapRequest(getRequest(url));
+ IRequestHandler handler = encoder.mapRequest(getRequest(url));
assertTrue(handler instanceof ListenerInterfaceRequestHandler);
ListenerInterfaceRequestHandler h = (ListenerInterfaceRequestHandler)handler;
@@ -104,7 +104,7 @@
{
Url url = Url.parse("wickett/pagee?4-ILinkListener-a:b-c");
- RequestHandler handler = encoder.mapRequest(getRequest(url));
+ IRequestHandler handler = encoder.mapRequest(getRequest(url));
assertNull(handler);
}
@@ -115,7 +115,7 @@
{
Url url = Url.parse("wicket/page?abc");
- RequestHandler handler = encoder.mapRequest(getRequest(url));
+ IRequestHandler handler = encoder.mapRequest(getRequest(url));
assertNull(handler);
}
@@ -126,7 +126,7 @@
{
Url url = Url.parse("wicket/page?4-ILinkListener.5-a-b-c");
- RequestHandler handler = encoder.mapRequest(getRequest(url));
+ IRequestHandler handler = encoder.mapRequest(getRequest(url));
assertTrue(handler instanceof ListenerInterfaceRequestHandler);
ListenerInterfaceRequestHandler h = (ListenerInterfaceRequestHandler)handler;
@@ -145,7 +145,7 @@
context.setNextPageRenderCount(6);
- RequestHandler handler = encoder.mapRequest(getRequest(url));
+ IRequestHandler handler = encoder.mapRequest(getRequest(url));
assertTrue(handler instanceof ListenerInterfaceRequestHandler);
ListenerInterfaceRequestHandler h = (ListenerInterfaceRequestHandler)handler;
@@ -163,9 +163,9 @@
try
{
- RequestHandler handler = encoder.mapRequest(getRequest(url));
+ IRequestHandler handler = encoder.mapRequest(getRequest(url));
- ((PageRequestHandler)handler).getPage();
+ ((IPageRequestHandler)handler).getPage();
// should never get here
assertFalse(true);
@@ -182,8 +182,8 @@
public void testEncode1()
{
MockPage page = new MockPage(15);
- PageProvider provider = new DefaultPageProvider(page);
- RequestHandler handler = new RenderPageRequestHandler(provider);
+ IPageProvider provider = new DefaultPageProvider(page);
+ IRequestHandler handler = new RenderPageRequestHandler(provider);
Url url = encoder.mapHandler(handler);
assertEquals("wicket/page?15", url.toString());
@@ -198,10 +198,10 @@
MockPage page = new MockPage(15);
page.setRenderCount(5);
- RequestableComponent c = page.get("a:b:c");
+ IRequestableComponent c = page.get("a:b:c");
PageAndComponentProvider provider = new PageAndComponentProvider(page, c);
- RequestHandler handler = new ListenerInterfaceRequestHandler(provider,
+ IRequestHandler handler = new ListenerInterfaceRequestHandler(provider,
ILinkListener.INTERFACE);
Url url = encoder.mapHandler(handler);
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/ResourceReferenceEncoderTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/ResourceReferenceEncoderTest.java?rev=892463&r1=892462&r2=892463&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/ResourceReferenceEncoderTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/ResourceReferenceEncoderTest.java Sat Dec 19 11:27:15 2009
@@ -18,7 +18,7 @@
import java.util.Locale;
-import org.apache.wicket.ng.request.RequestHandler;
+import org.apache.wicket.ng.request.IRequestHandler;
import org.apache.wicket.ng.request.Url;
import org.apache.wicket.ng.request.component.PageParametersNg;
import org.apache.wicket.ng.request.handler.resource.ResourceReferenceRequestHandler;
@@ -39,7 +39,7 @@
private final ResourceReferenceMapper encoder = new ResourceReferenceMapper()
{
@Override
- protected MapperContext getContext()
+ protected IMapperContext getContext()
{
return context;
}
@@ -51,7 +51,7 @@
public void testDecode1()
{
Url url = Url.parse("wicket/resource/" + CLASS_NAME + "/reference1");
- RequestHandler handler = encoder.mapRequest(getRequest(url));
+ IRequestHandler handler = encoder.mapRequest(getRequest(url));
assertTrue(handler instanceof ResourceRequestHandler);
ResourceRequestHandler h = (ResourceRequestHandler)handler;
assertEquals(resource1, h.getResource());
@@ -68,7 +68,7 @@
public void testDecode1A()
{
Url url = Url.parse("wicket/resource/" + CLASS_NAME + "/reference1?en");
- RequestHandler handler = encoder.mapRequest(getRequest(url));
+ IRequestHandler handler = encoder.mapRequest(getRequest(url));
assertTrue(handler instanceof ResourceRequestHandler);
ResourceRequestHandler h = (ResourceRequestHandler)handler;
assertEquals(resource1, h.getResource());
@@ -85,7 +85,7 @@
public void testDecode2()
{
Url url = Url.parse("wicket/resource/" + CLASS_NAME + "/reference1?p1=v1&p2=v2");
- RequestHandler handler = encoder.mapRequest(getRequest(url));
+ IRequestHandler handler = encoder.mapRequest(getRequest(url));
assertTrue(handler instanceof ResourceRequestHandler);
ResourceRequestHandler h = (ResourceRequestHandler)handler;
assertEquals(resource1, h.getResource());
@@ -103,7 +103,7 @@
public void testDecode2A()
{
Url url = Url.parse("wicket/resource/" + CLASS_NAME + "/reference1?-style&p1=v1&p2=v2");
- RequestHandler handler = encoder.mapRequest(getRequest(url));
+ IRequestHandler handler = encoder.mapRequest(getRequest(url));
assertTrue(handler instanceof ResourceRequestHandler);
ResourceRequestHandler h = (ResourceRequestHandler)handler;
assertEquals(resource1, h.getResource());
@@ -121,7 +121,7 @@
public void testDecode3()
{
Url url = Url.parse("wicket/resource/" + CLASS_NAME + "/reference2/name2?en_EN");
- RequestHandler handler = encoder.mapRequest(getRequest(url));
+ IRequestHandler handler = encoder.mapRequest(getRequest(url));
assertTrue(handler instanceof ResourceRequestHandler);
ResourceRequestHandler h = (ResourceRequestHandler)handler;
assertEquals(resource2, h.getResource());
@@ -138,7 +138,7 @@
public void testDecode3A()
{
Url url = Url.parse("wicket/resource/" + CLASS_NAME + "/reference2/name2?en_EN-style");
- RequestHandler handler = encoder.mapRequest(getRequest(url));
+ IRequestHandler handler = encoder.mapRequest(getRequest(url));
assertTrue(handler instanceof ResourceRequestHandler);
ResourceRequestHandler h = (ResourceRequestHandler)handler;
assertEquals(resource2, h.getResource());
@@ -155,7 +155,7 @@
public void testDecode3B()
{
Url url = Url.parse("wicket/resource/" + CLASS_NAME + "/reference2/name2");
- RequestHandler handler = encoder.mapRequest(getRequest(url));
+ IRequestHandler handler = encoder.mapRequest(getRequest(url));
assertNull(handler);
}
@@ -165,7 +165,7 @@
public void testDecode4()
{
Url url = Url.parse("wicket/resource/" + CLASS_NAME + "/reference2/name2?en_EN&p1=v1&p2=v2");
- RequestHandler handler = encoder.mapRequest(getRequest(url));
+ IRequestHandler handler = encoder.mapRequest(getRequest(url));
assertTrue(handler instanceof ResourceRequestHandler);
ResourceRequestHandler h = (ResourceRequestHandler)handler;
assertEquals(resource2, h.getResource());
@@ -182,7 +182,7 @@
public void testDecode5()
{
Url url = Url.parse("wicket/resource/" + CLASS_NAME + "/reference3?-style");
- RequestHandler handler = encoder.mapRequest(getRequest(url));
+ IRequestHandler handler = encoder.mapRequest(getRequest(url));
assertTrue(handler instanceof ResourceRequestHandler);
ResourceRequestHandler h = (ResourceRequestHandler)handler;
assertEquals(resource3, h.getResource());
@@ -199,7 +199,7 @@
public void testDecode6()
{
Url url = Url.parse("wicket/resource/" + CLASS_NAME + "/reference3?-style&p1=v1&p2=v2");
- RequestHandler handler = encoder.mapRequest(getRequest(url));
+ IRequestHandler handler = encoder.mapRequest(getRequest(url));
assertTrue(handler instanceof ResourceRequestHandler);
ResourceRequestHandler h = (ResourceRequestHandler)handler;
assertEquals(resource3, h.getResource());
@@ -218,7 +218,7 @@
public void testDecode7()
{
Url url = Url.parse("wicket/resource/" + CLASS_NAME + "/reference4?en-style");
- RequestHandler handler = encoder.mapRequest(getRequest(url));
+ IRequestHandler handler = encoder.mapRequest(getRequest(url));
assertTrue(handler instanceof ResourceRequestHandler);
ResourceRequestHandler h = (ResourceRequestHandler)handler;
assertEquals(resource4, h.getResource());
@@ -235,7 +235,7 @@
public void testDecode7A()
{
Url url = Url.parse("wicket/resource/" + CLASS_NAME + "/reference4?sk");
- RequestHandler handler = encoder.mapRequest(getRequest(url));
+ IRequestHandler handler = encoder.mapRequest(getRequest(url));
assertNull(handler);
}
@@ -245,7 +245,7 @@
public void testDecode8()
{
Url url = Url.parse("wicket/resource/" + CLASS_NAME + "/reference4?en-style&p1=v1&p2=v2");
- RequestHandler handler = encoder.mapRequest(getRequest(url));
+ IRequestHandler handler = encoder.mapRequest(getRequest(url));
assertTrue(handler instanceof ResourceRequestHandler);
ResourceRequestHandler h = (ResourceRequestHandler)handler;
assertEquals(resource4, h.getResource());
@@ -264,7 +264,7 @@
{
Url url = Url.parse("wicket/resource/" + CLASS_NAME +
"/reference5?en--variation&p1=v1&p2=v2");
- RequestHandler handler = encoder.mapRequest(getRequest(url));
+ IRequestHandler handler = encoder.mapRequest(getRequest(url));
assertTrue(handler instanceof ResourceRequestHandler);
ResourceRequestHandler h = (ResourceRequestHandler)handler;
assertEquals(resource5, h.getResource());
@@ -283,7 +283,7 @@
{
Url url = Url.parse("wicket/resource/" + CLASS_NAME +
"/reference6?en-style-variation&p1=v1&p2=v2");
- RequestHandler handler = encoder.mapRequest(getRequest(url));
+ IRequestHandler handler = encoder.mapRequest(getRequest(url));
assertTrue(handler instanceof ResourceRequestHandler);
ResourceRequestHandler h = (ResourceRequestHandler)handler;
assertEquals(resource6, h.getResource());
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/TestMapperContext.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/TestMapperContext.java?rev=892463&r1=892462&r2=892463&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/TestMapperContext.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/TestMapperContext.java Sat Dec 19 11:27:15 2009
@@ -19,7 +19,7 @@
import org.apache.wicket.ng.MockPage;
import org.apache.wicket.ng.WicketRuntimeException;
import org.apache.wicket.ng.request.component.PageParametersNg;
-import org.apache.wicket.ng.request.component.RequestablePage;
+import org.apache.wicket.ng.request.component.IRequestablePage;
import org.apache.wicket.ng.request.listener.RequestListenerInterface;
import org.apache.wicket.ng.resource.ResourceReferenceRegistry;
@@ -28,7 +28,7 @@
*
* @author Matej Knopp
*/
-public class TestMapperContext implements MapperContext
+public class TestMapperContext implements IMapperContext
{
/**
@@ -100,7 +100,7 @@
this.nextPageRenderCount = nextPageRenderCount;
}
- public RequestablePage getPageInstance(int pageId)
+ public IRequestablePage getPageInstance(int pageId)
{
MockPage page = new MockPage();
page.setPageId(pageId);
@@ -112,7 +112,7 @@
int idCounter = 0;
- public RequestablePage newPageInstance(Class< ? extends RequestablePage> pageClass, PageParametersNg pageParameters)
+ public IRequestablePage newPageInstance(Class< ? extends IRequestablePage> pageClass, PageParametersNg pageParameters)
{
try
{
@@ -140,7 +140,7 @@
return listenerInterface.getName();
}
- public Class< ? extends RequestablePage> getHomePageClass()
+ public Class< ? extends IRequestablePage> getHomePageClass()
{
return MockPage.class;
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/test/TestPageRender.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/test/TestPageRender.java?rev=892463&r1=892462&r2=892463&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/test/TestPageRender.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/test/TestPageRender.java Sat Dec 19 11:27:15 2009
@@ -30,7 +30,7 @@
import org.apache.wicket.ng.request.handler.PageAndComponentProvider;
import org.apache.wicket.ng.request.handler.impl.ListenerInterfaceRequestHandler;
import org.apache.wicket.ng.request.mapper.MountedMapper;
-import org.apache.wicket.ng.settings.RequestCycleSettings.RenderStrategy;
+import org.apache.wicket.ng.settings.IRequestCycleSettings.RenderStrategy;
import org.junit.Ignore;
/**