Author: mgrigorov
Date: Thu Mar 17 19:33:39 2011
New Revision: 1082656
URL: http://svn.apache.org/viewvc?rev=1082656&view=rev
Log:
WICKET-3543 Add possibility to test Resources/ResourceReferences with
WicketTester
Add WicketTester #startResource(IResource) and
#startResourceReference(ResourceReference)
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java?rev=1082656&r1=1082655&r2=1082656&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
Thu Mar 17 19:33:39 2011
@@ -104,8 +104,11 @@ import org.apache.wicket.request.handler
import org.apache.wicket.request.handler.PageProvider;
import org.apache.wicket.request.handler.RenderPageRequestHandler;
import org.apache.wicket.request.handler.render.PageRenderer;
+import
org.apache.wicket.request.handler.resource.ResourceReferenceRequestHandler;
import org.apache.wicket.request.http.WebResponse;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.apache.wicket.request.resource.IResource;
+import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.session.ISessionStore;
import org.apache.wicket.settings.IRequestCycleSettings.RenderStrategy;
import org.apache.wicket.util.IProvider;
@@ -638,6 +641,58 @@ public class BaseWicketTester
}
/**
+ * Simulates a request to a mounted {@link IResource}
+ *
+ * @param resource
+ * the resource to test
+ * @return the used {@link ResourceReference} for the simulation
+ */
+ public ResourceReference startResource(final IResource resource)
+ {
+ return startResourceReference(new
ResourceReference("testResourceReference")
+ {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public IResource getResource()
+ {
+ return resource;
+ }
+ });
+ }
+
+ /**
+ * Simulates a request to a mounted {@link ResourceReference}
+ *
+ * @param reference
+ * the resource reference to test
+ * @return the tested resource reference
+ */
+ public ResourceReference startResourceReference(final ResourceReference
reference)
+ {
+ return startResourceReference(reference, null);
+ }
+
+ /**
+ * Simulates a request to a mounted {@link ResourceReference}
+ *
+ * @param reference
+ * the resource reference to test
+ * @param pageParameters
+ * the parameters passed to the resource reference
+ * @return the tested resource reference
+ */
+ public ResourceReference startResourceReference(final ResourceReference
reference,
+ final PageParameters pageParameters)
+ {
+ request = new MockHttpServletRequest(application, hsession,
servletContext);
+ request.setURL(request.getContextPath() +
request.getServletPath() + "/");
+ IRequestHandler handler = new
ResourceReferenceRequestHandler(reference, pageParameters);
+ processRequest(request, handler);
+ return reference;
+ }
+
+ /**
* @return last response or <code>null</code>> if no response has been
produced yet.
*/
public MockHttpServletResponse getLastResponse()
Modified:
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java?rev=1082656&r1=1082655&r2=1082656&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java
(original)
+++
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java
Thu Mar 17 19:33:39 2011
@@ -34,6 +34,7 @@ import org.apache.wicket.Session;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.WicketAjaxReference;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Button;
@@ -59,6 +60,7 @@ import org.apache.wicket.util.tester.app
import org.apache.wicket.util.tester.apps_1.ViewBook;
import org.apache.wicket.util.tester.apps_6.LinkPage;
import org.apache.wicket.util.tester.apps_6.ResultPage;
+import org.junit.Test;
/**
*
@@ -956,4 +958,24 @@ public class WicketTesterTest extends Te
{
return
(Button)tester.getComponentFromLastRenderedPage("form:submit");
}
+
+ /**
+ * <a
href="https://issues.apache.org/jira/browse/WICKET-3543";>WICKET-3543</a>
+ */
+ @Test
+ public void testStartResourceReference()
+ {
+ tester.startResourceReference(WicketAjaxReference.INSTANCE);
+ tester.assertContains("wicketAjaxGet()");
+ }
+
+ /**
+ * <a
href="https://issues.apache.org/jira/browse/WICKET-3543";>WICKET-3543</a>
+ */
+ @Test
+ public void testStartResource()
+ {
+
tester.startResource(WicketAjaxReference.INSTANCE.getResource());
+ tester.assertContains("wicketAjaxGet()");
+ }
}
