Author: jbq
Date: Sun May 6 12:56:43 2007
New Revision: 535648
URL: http://svn.apache.org/viewvc?view=rev&rev=535648
Log:
MockHttpServletRequest#getRequestURI() is now more realistic, returns context
path and servlet path concatenated
This is to avoid handling special cases in WICKET-40
Modified:
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockHttpServletRequest.java
incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/link/IndexedParamUrlCodingTest.java
incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/request/target/coding/UrlMountingTest.java
incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/stateless/StatelessComponentTest.java
incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/util/parse/metapattern/parsers/IndexedParamTest.java
Modified:
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockHttpServletRequest.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockHttpServletRequest.java?view=diff&rev=535648&r1=535647&r2=535648
==============================================================================
---
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockHttpServletRequest.java
(original)
+++
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockHttpServletRequest.java
Sun May 6 12:56:43 2007
@@ -774,7 +774,7 @@
}
/**
- * Get the request url. Always return the path value.
+ * Returns context path and servlet path concatenated, typically
/applicationClassName/applicationClassName
*
* @return The path value
* @see javax.servlet.http.HttpServletRequest#getRequestURI()
@@ -783,7 +783,7 @@
{
if (url == null)
{
- return "";
+ return getContextPath() + getServletPath();
}
return url;
}
Modified:
incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/link/IndexedParamUrlCodingTest.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/link/IndexedParamUrlCodingTest.java?view=diff&rev=535648&r1=535647&r2=535648
==============================================================================
---
incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/link/IndexedParamUrlCodingTest.java
(original)
+++
incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/link/IndexedParamUrlCodingTest.java
Sun May 6 12:56:43 2007
@@ -72,7 +72,7 @@
assertEquals("test2/Integer0/Integer1/a%3Ab/wicket:pageMapName/mypagemap",
url2);
tester.setupRequestAndResponse();
- tester.getServletRequest().setURL("/" + url1);
+
tester.getServletRequest().setURL("/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication/"
+ url1);
cycle = tester.createRequestCycle();
IRequestCodingStrategy encoder =
cycle.getProcessor().getRequestCodingStrategy();
@@ -93,7 +93,7 @@
assertEquals("a:b", params.getString("2"));
tester.setupRequestAndResponse();
- tester.getServletRequest().setURL("/" + url2);
+
tester.getServletRequest().setURL("/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication/"
+ url2);
cycle = tester.createRequestCycle();
encoder = cycle.getProcessor().getRequestCodingStrategy();
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=535648&r1=535647&r2=535648
==============================================================================
---
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 6 12:56:43 2007
@@ -59,7 +59,7 @@
*/
public void testBadRequest3()
{
-
tester.getServletRequest().setPath("/mount/point/nonexistent.TestPage");
+
tester.getServletRequest().setURL("/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication/mount/point/nonexistent.TestPage");
IRequestTargetUrlCodingStrategy ucs =
getRequestCodingStrategy();
assertNotNull(ucs);
try
@@ -84,7 +84,7 @@
{
tester.setupRequestAndResponse();
tester.getServletRequest().setURL(
- "?wicket:bookmarkablePage=:" +
TestPage.class.getName() + "");
+
"/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication?wicket:bookmarkablePage=:"
+ TestPage.class.getName() + "");
tester.processRequestCycle();
tester.assertRenderedPage(TestPage.class);
}
@@ -128,7 +128,7 @@
{
tester.setupRequestAndResponse();
tester.getServletRequest().setURL(
- "/foo/bar/?wicket:bookmarkablePage=:" +
TestPage.class.getName() + "");
+
"/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication/foo/bar/?wicket:bookmarkablePage=:"
+ TestPage.class.getName() + "");
tester.processRequestCycle();
tester.assertRenderedPage(TestPage.class);
}
@@ -141,7 +141,7 @@
tester.getApplication().getSecuritySettings().setEnforceMounts(false);
tester.setupRequestAndResponse();
- tester.getServletRequest().setURL("/mount/point/TestPage");
+
tester.getServletRequest().setURL("/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication/mount/point/TestPage");
tester.processRequestCycle();
tester.assertRenderedPage(TestPage.class);
}
@@ -151,7 +151,7 @@
*/
public void testValidMount1()
{
- tester.getServletRequest().setPath("/mount/point");
+
tester.getServletRequest().setURL("/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication/mount/point");
IRequestTargetUrlCodingStrategy ucs =
getRequestCodingStrategy();
assertNotNull(ucs);
assertNull(ucs.decode(tester.getWicketRequest().getRequestParameters()));
@@ -162,7 +162,7 @@
*/
public void testValidMount2()
{
- tester.getServletRequest().setPath("/mount/point/TestPage");
+
tester.getServletRequest().setURL("/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication/mount/point/TestPage");
IRequestTargetUrlCodingStrategy ucs =
getRequestCodingStrategy();
assertNotNull(ucs);
assertNotNull(ucs.decode(tester.getWicketRequest().getRequestParameters()));
Modified:
incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/stateless/StatelessComponentTest.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/stateless/StatelessComponentTest.java?view=diff&rev=535648&r1=535647&r2=535648
==============================================================================
---
incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/stateless/StatelessComponentTest.java
(original)
+++
incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/stateless/StatelessComponentTest.java
Sun May 6 12:56:43 2007
@@ -46,7 +46,7 @@
tester
.getServletRequest()
.setURL(
-
"?wicket:bookmarkablePage=:org.apache.wicket.stateless.StatelessComponentPage&wicket:interface=:0:link::ILinkListener:");
+
"/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication?wicket:bookmarkablePage=:org.apache.wicket.stateless.StatelessComponentPage&wicket:interface=:0:link::ILinkListener:");
try
{
tester.processRequestCycle();
@@ -70,7 +70,7 @@
// "StatelessComponentPage_mount_result.html");
tester.setupRequestAndResponse();
tester.getServletRequest().setURL(
-
"/stateless/wicket:interface/:0:link::ILinkListener:");
+
"/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication/stateless/wicket:interface/:0:link::ILinkListener:");
try
{
tester.processRequestCycle();
Modified:
incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/util/parse/metapattern/parsers/IndexedParamTest.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/util/parse/metapattern/parsers/IndexedParamTest.java?view=diff&rev=535648&r1=535647&r2=535648
==============================================================================
---
incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/util/parse/metapattern/parsers/IndexedParamTest.java
(original)
+++
incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/util/parse/metapattern/parsers/IndexedParamTest.java
Sun May 6 12:56:43 2007
@@ -55,7 +55,7 @@
tester.setupRequestAndResponse();
WebRequestCycle cycle = tester.createRequestCycle();
((MockHttpServletRequest)tester.getWicketRequest().getHttpServletRequest())
- .setURL("/page2/abc");
+
.setURL("/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication/page2/abc");
tester.processRequestCycle(cycle);
assertEquals(Page2.class,
tester.getLastRenderedPage().getClass());
