You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by jb...@apache.org on 2007/05/13 22:17:49 UTC
svn commit: r537654 -
/incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/request/target/coding/UrlMountingTest.java
Author: jbq
Date: Sun May 13 13:17:48 2007
New Revision: 537654
URL: http://svn.apache.org/viewvc?view=rev&rev=537654
Log:
Assert error code 404 for WICKET-293: PackageRequestTargetUrlCodingStrategy
should sends a 404 when a page/class cannot be found
Modified:
incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/request/target/coding/UrlMountingTest.java
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/request/target/coding/UrlMountingTest.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/request/target/coding/UrlMountingTest.java?view=diff&rev=537654&r1=537653&r2=537654
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/request/target/coding/UrlMountingTest.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/request/target/coding/UrlMountingTest.java Sun May 13 13:17:48 2007
@@ -21,7 +21,7 @@
import junit.framework.TestCase;
import org.apache.wicket.IRequestTarget;
-import org.apache.wicket.WicketRuntimeException;
+import org.apache.wicket.RequestCycle;
import org.apache.wicket.protocol.http.WebRequestCycle;
import org.apache.wicket.protocol.http.WebRequestCycleProcessor;
import org.apache.wicket.protocol.http.request.WebErrorCodeResponseTarget;
@@ -83,19 +83,9 @@
.getServletRequest()
.setURL(
"/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication/mount/point/nonexistent.TestPage");
- IRequestTargetUrlCodingStrategy ucs = getRequestCodingStrategy();
- assertNotNull(ucs);
- try
- {
- ucs.decode(tester.getWicketRequest().getRequestParameters());
- fail("decode() should have raised a WicketRuntimeException!");
- }
- catch (WicketRuntimeException e)
- {
- assertEquals(
- "Unable to load class with name: org.apache.wicket.request.target.coding.nonexistent.TestPage",
- e.getMessage());
- }
+ WebRequestCycle requestCycle = tester.createRequestCycle();
+ tester.processRequestCycle(requestCycle);
+ assertEquals(HttpServletResponse.SC_NOT_FOUND, getErrorCode(requestCycle));
}
/**
@@ -106,15 +96,21 @@
public void testDirectAccessToMountedPageAllowed()
{
tester.setupRequestAndResponse();
- tester
- .getServletRequest()
- .setURL(
- "/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication?wicket:bookmarkablePage=:" +
- TestPage.class.getName() + "");
+ tester.getServletRequest().setURL(
+ "/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication?wicket:bookmarkablePage=:"
+ + TestPage.class.getName() + "");
tester.processRequestCycle();
tester.assertRenderedPage(TestPage.class);
}
+ int getErrorCode(RequestCycle requestCycle)
+ {
+ IRequestTarget requestTarget = requestCycle.getRequestTarget();
+ assertTrue(requestTarget instanceof WebErrorCodeResponseTarget);
+ WebErrorCodeResponseTarget error = (WebErrorCodeResponseTarget)requestTarget;
+ return error.getErrorCode();
+ }
+
/**
* Test direct access (with wicket parameters) to a mounted page that should
* NOT be allowed due to the {@link ISecuritySettings#getEnforceMounts()}
@@ -131,10 +127,7 @@
{
WebRequestCycle requestCycle = tester.createRequestCycle();
tester.processRequestCycle(requestCycle);
- IRequestTarget requestTarget = requestCycle.getRequestTarget();
- assertTrue(requestTarget instanceof WebErrorCodeResponseTarget);
- WebErrorCodeResponseTarget error = (WebErrorCodeResponseTarget)requestTarget;
- assertEquals(HttpServletResponse.SC_FORBIDDEN, error.getErrorCode());
+ assertEquals(HttpServletResponse.SC_FORBIDDEN, getErrorCode(requestCycle));
}
finally
{
@@ -156,8 +149,8 @@
tester
.getServletRequest()
.setURL(
- "/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication/foo/bar/?wicket:bookmarkablePage=:" +
- TestPage.class.getName() + "");
+ "/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication/foo/bar/?wicket:bookmarkablePage=:"
+ + TestPage.class.getName() + "");
tester.processRequestCycle();
tester.assertRenderedPage(TestPage.class);
}