Author: knopp
Date: Tue Mar 2 00:59:39 2010
New Revision: 917826
URL: http://svn.apache.org/viewvc?rev=917826&view=rev
Log:
Fixed some tests
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/Application.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/component/PageParameters.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/PageProvider.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/resource/ResourceReferenceRequestHandler.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/AbstractBookmarkableMapper.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/AbstractMapper.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/MountedMapper.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/parameters/SimplePageParametersEncoder.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/session/DefaultPageFactory.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/HomePageClassRedirect.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/HomePagePageRedirect.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/TestMapperContext.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/info/ComponentInfoTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/FormTesterTest.java
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/Application.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/Application.java?rev=917826&r1=917825&r2=917826&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/Application.java
(original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/Application.java Tue
Mar 2 00:59:39 2010
@@ -1470,7 +1470,13 @@
getRootRequestMapper(), new DefaultExceptionMapper());
RequestCycle requestCycle =
getRequestCycleProvider().get(context);
-
+ requestCycle.register(new RequestCycle.DetachCallback()
+ {
+ public void onDetach(RequestCycle requestCycle)
+ {
+ getPageManager().commitRequest();
+ }
+ });
return requestCycle;
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/component/PageParameters.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/component/PageParameters.java?rev=917826&r1=917825&r2=917826&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/component/PageParameters.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/component/PageParameters.java
Tue Mar 2 00:59:39 2010
@@ -72,16 +72,17 @@
*/
public PageParameters(final PageParameters copy)
{
- Checks.argumentNotNull(copy, "copy");
-
- if (copy.indexedParameters != null)
+ if (copy != null)
{
- indexedParameters = new
ArrayList<String>(copy.indexedParameters);
- }
+ if (copy.indexedParameters != null)
+ {
+ indexedParameters = new
ArrayList<String>(copy.indexedParameters);
+ }
- if (copy.namedParameters != null)
- {
- namedParameters = new
ArrayList<Entry>(copy.namedParameters);
+ if (copy.namedParameters != null)
+ {
+ namedParameters = new
ArrayList<Entry>(copy.namedParameters);
+ }
}
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/PageProvider.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/PageProvider.java?rev=917826&r1=917825&r2=917826&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/PageProvider.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/PageProvider.java
Tue Mar 2 00:59:39 2010
@@ -124,10 +124,6 @@
{
setPageParameters(pageParameters);
}
- else
- {
- setPageParameters(new PageParameters());
- }
}
/**
@@ -138,7 +134,7 @@
*/
public PageProvider(Class<? extends IRequestablePage> pageClass)
{
- this(pageClass, new PageParameters());
+ this(pageClass, null);
}
/**
@@ -180,9 +176,13 @@
{
return pageParameters;
}
+ else if (pageInstance != null)
+ {
+ return pageInstance.getPageParameters();
+ }
else
{
- return getPageInstance().getPageParameters();
+ return null;
}
}
@@ -318,8 +318,6 @@
*/
private void setPageParameters(PageParameters pageParameters)
{
- Checks.argumentNotNull(pageParameters, "pageParameters");
-
this.pageParameters = pageParameters;
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/resource/ResourceReferenceRequestHandler.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/resource/ResourceReferenceRequestHandler.java?rev=917826&r1=917825&r2=917826&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/resource/ResourceReferenceRequestHandler.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/handler/resource/ResourceReferenceRequestHandler.java
Tue Mar 2 00:59:39 2010
@@ -58,7 +58,7 @@
Checks.argumentNotNull(resourceReference, "resourceReference");
this.resourceReference = resourceReference;
- this.pageParameters = pageParameters;
+ this.pageParameters = pageParameters != null ? pageParameters :
new PageParameters();
}
/**
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/AbstractBookmarkableMapper.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/AbstractBookmarkableMapper.java?rev=917826&r1=917825&r2=917826&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/AbstractBookmarkableMapper.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/AbstractBookmarkableMapper.java
Tue Mar 2 00:59:39 2010
@@ -72,7 +72,7 @@
Checks.argumentNotNull(pageClass, "pageClass");
this.pageComponentInfo = pageComponentInfo;
- this.pageParameters = pageParameters != null ?
pageParameters : null;
+ this.pageParameters = pageParameters;
this.pageClass = pageClass;
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/AbstractMapper.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/AbstractMapper.java?rev=917826&r1=917825&r2=917826&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/AbstractMapper.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/AbstractMapper.java
Tue Mar 2 00:59:39 2010
@@ -230,7 +230,7 @@
}
PageParameters decoded =
encoder.decodePageParameters(request.requestWithUrl(urlCopy));
- return decoded != null ? decoded : new PageParameters();
+ return decoded;
}
/**
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/MountedMapper.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/MountedMapper.java?rev=917826&r1=917825&r2=917826&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/MountedMapper.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/MountedMapper.java
Tue Mar 2 00:59:39 2010
@@ -126,6 +126,10 @@
if (placeholder != null)
{
// extract the parameter from URL
+ if (pageParameters == null)
+ {
+ pageParameters = new
PageParameters();
+ }
pageParameters.addNamedParameter(placeholder, url.getSegments().get(i));
}
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/parameters/SimplePageParametersEncoder.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/parameters/SimplePageParametersEncoder.java?rev=917826&r1=917825&r2=917826&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/parameters/SimplePageParametersEncoder.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/mapper/parameters/SimplePageParametersEncoder.java
Tue Mar 2 00:59:39 2010
@@ -54,7 +54,7 @@
parameters.addNamedParameter(p.getName(), p.getValue());
}
- return parameters;
+ return parameters.isEmpty() ? null : parameters;
}
/**
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/session/DefaultPageFactory.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/session/DefaultPageFactory.java?rev=917826&r1=917825&r2=917826&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/session/DefaultPageFactory.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/session/DefaultPageFactory.java
Tue Mar 2 00:59:39 2010
@@ -64,7 +64,8 @@
Constructor<?> constructor = constructor(pageClass,
PageParameters.class);
if (constructor != null)
{
- return newPage(constructor, new
PageParameters());
+ PageParameters pp = new PageParameters();
+ return processPage(newPage(constructor, pp),
pp);
}
else
{
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/HomePageClassRedirect.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/HomePageClassRedirect.java?rev=917826&r1=917825&r2=917826&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/HomePageClassRedirect.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/HomePageClassRedirect.java
Tue Mar 2 00:59:39 2010
@@ -16,6 +16,7 @@
*/
package org.apache.wicket.markup.html.basic;
+import org.apache.wicket.RestartResponseException;
import org.apache.wicket.markup.html.WebPage;
/**
@@ -30,6 +31,6 @@
*/
public HomePageClassRedirect()
{
- setResponsePage(RedirectPage.class);
+ throw new RestartResponseException(RedirectPage.class);
}
}
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/HomePagePageRedirect.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/HomePagePageRedirect.java?rev=917826&r1=917825&r2=917826&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/HomePagePageRedirect.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/HomePagePageRedirect.java
Tue Mar 2 00:59:39 2010
@@ -16,6 +16,7 @@
*/
package org.apache.wicket.markup.html.basic;
+import org.apache.wicket.RestartResponseException;
import org.apache.wicket.markup.html.WebPage;
/**
@@ -30,6 +31,6 @@
*/
public HomePagePageRedirect()
{
- setResponsePage(new RedirectPage());
+ throw new RestartResponseException(new RedirectPage());
}
}
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=917826&r1=917825&r2=917826&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
Tue Mar 2 00:59:39 2010
@@ -134,7 +134,10 @@
page.setPageId(++idCounter);
page.setBookmarkable(true);
page.setCreatedBookmarkable(true);
- page.getPageParameters().assign(pageParameters);
+ if (pageParameters != null)
+ {
+ page.getPageParameters().assign(pageParameters);
+ }
return page;
}
catch (Exception e)
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/info/ComponentInfoTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/info/ComponentInfoTest.java?rev=917826&r1=917825&r2=917826&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/info/ComponentInfoTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/ng/request/mapper/info/ComponentInfoTest.java
Tue Mar 2 00:59:39 2010
@@ -43,7 +43,7 @@
assertEquals("listener", info.getListenerInterface());
assertEquals("component:path", info.getComponentPath());
assertNull(info.getBehaviorIndex());
-
+
assertEquals(s, info.toString());
}
@@ -54,19 +54,21 @@
{
String s = "-component-path";
ComponentInfo info = ComponentInfo.parse(s);
- assertEquals(null, info);
+ assertEquals(null, info);
}
-
+
/**
*
*/
public void test3()
{
String s = "listener-";
- ComponentInfo info = ComponentInfo.parse(s);
- assertEquals(null, info);
+ ComponentInfo info = ComponentInfo.parse(s);
+ // empty component path is allowed - listener invoked on page
+ assertEquals("listener", info.getListenerInterface());
+ assertEquals("", info.getComponentPath());
}
-
+
/**
*
*/
@@ -76,7 +78,7 @@
ComponentInfo info = ComponentInfo.parse(s);
assertEquals(null, info);
}
-
+
/**
*
*/
@@ -85,7 +87,7 @@
String s = "abcd";
assertEquals(null, ComponentInfo.parse(s));
}
-
+
/**
*
*/
@@ -96,7 +98,7 @@
assertEquals("listener", info.getListenerInterface());
assertEquals("compo-nent:path", info.getComponentPath());
assertNull(info.getBehaviorIndex());
-
+
assertEquals(s, info.toString());
}
@@ -110,7 +112,7 @@
assertEquals("listener", info.getListenerInterface());
assertEquals("co-mpo--nent:path", info.getComponentPath());
assertNull(info.getBehaviorIndex());
-
+
assertEquals(s, info.toString());
}
@@ -124,10 +126,10 @@
assertEquals("listener", info.getListenerInterface());
assertEquals("component:path", info.getComponentPath());
assertEquals((Object)12, info.getBehaviorIndex());
-
+
assertEquals(s, info.toString());
}
-
+
/**
*
*/
@@ -137,10 +139,10 @@
ComponentInfo info = ComponentInfo.parse(s);
assertEquals("listener", info.getListenerInterface());
assertEquals((Integer)4, info.getRenderCount());
-
+
assertEquals(s, info.toString());
}
-
+
/**
*
*/
@@ -151,7 +153,7 @@
assertEquals("listener", info.getListenerInterface());
assertEquals((Integer)4, info.getRenderCount());
assertEquals((Integer)5, info.getBehaviorIndex());
-
+
assertEquals(s, info.toString());
}
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/FormTesterTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/FormTesterTest.java?rev=917826&r1=917825&r2=917826&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/FormTesterTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/FormTesterTest.java
Tue Mar 2 00:59:39 2010
@@ -162,7 +162,8 @@
*/
public void testSubmitWithoutUploadFile()
{
- tester.startPage(MockFormFileUploadPage.class, new
PageParameters("required=true"));
+ // tester.startPage(MockFormFileUploadPage.class, new
PageParameters("required=true"));
+ tester.startPage(MockFormFileUploadPage.class);
MockFormFileUploadPage page =
(MockFormFileUploadPage)tester.getLastRenderedPage();
Session.get().setLocale(Locale.US);
