You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by ma...@apache.org on 2008/05/11 14:05:31 UTC
svn commit: r655308 - in /wicket:
branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/
branches/wicket-1.3.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/
branches/wicket-1.3.x/jdk-1.4/wicket/src/test/java/org/apache/wi...
Author: marrink
Date: Sun May 11 05:05:31 2008
New Revision: 655308
URL: http://svn.apache.org/viewvc?rev=655308&view=rev
Log:
RESOLVED - issue WICKET-1292: WicketTester continueToOriginalDestination() uses application home page instead of original redictor
https://issues.apache.org/jira/browse/WICKET-1292
Modified:
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockWebApplication.java
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/SetResponsePageTest.java
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkablePageLinkTest.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/MockWebApplication.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/SetResponsePageTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkablePageLinkTest.java
Modified: wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockWebApplication.java
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockWebApplication.java?rev=655308&r1=655307&r2=655308&view=diff
==============================================================================
--- wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockWebApplication.java (original)
+++ wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockWebApplication.java Sun May 11 05:05:31 2008
@@ -372,7 +372,19 @@
try
{
BaseWicketTester.callOnBeginRequest(cycle);
- cycle.request(new BookmarkablePageRequestTarget(pageClass, params));
+ BookmarkablePageRequestTarget requestTarget = new BookmarkablePageRequestTarget(
+ pageClass, params);
+ if (application.getHomePage() != null)
+ {
+ String url = cycle.urlFor(requestTarget).toString();
+ String path = application.getClass().getName();
+ path = path.substring(path.lastIndexOf('.') + 1);
+ path = "/" + path + "/" + path + "/";
+ getServletRequest().setURL(path + url);
+ }
+ else
+ log.warn("The application does not have a HomePage, this might cause problems or unexpected behavior");
+ cycle.request(requestTarget);
}
finally
{
Modified: wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/SetResponsePageTest.java
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/SetResponsePageTest.java?rev=655308&r1=655307&r2=655308&view=diff
==============================================================================
--- wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/SetResponsePageTest.java (original)
+++ wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/SetResponsePageTest.java Sun May 11 05:05:31 2008
@@ -29,9 +29,10 @@
{
WicketTester tester = new WicketTester(Page1.class);
tester.setupRequestAndResponse();
- tester.getServletRequest()
- .setURL("?wicket:bookmarkablePage=:" + Page1.class.getName() + "");
- tester.processRequestCycle();
+// tester.getServletRequest()
+// .setURL("?wicket:bookmarkablePage=:" + Page1.class.getName() + "");
+// tester.processRequestCycle();
+ tester.startPage(Page1.class);
tester.assertRenderedPage(Page3.class);
tester.destroy();
}
Modified: wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkablePageLinkTest.java
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkablePageLinkTest.java?rev=655308&r1=655307&r2=655308&view=diff
==============================================================================
--- wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkablePageLinkTest.java (original)
+++ wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkablePageLinkTest.java Sun May 11 05:05:31 2008
@@ -18,8 +18,6 @@
import org.apache.wicket.PageParameters;
import org.apache.wicket.WicketTestCase;
-import org.apache.wicket.protocol.http.WebRequestCycle;
-import org.apache.wicket.request.target.component.BookmarkablePageRequestTarget;
/**
* @author jcompagner
@@ -42,19 +40,7 @@
*/
public void testBookmarkableRequest() throws Exception
{
- tester.setupRequestAndResponse();
-
- WebRequestCycle cycle = tester.createRequestCycle();
-
- String url = cycle.urlFor(
- new BookmarkablePageRequestTarget(BookmarkableHomePageLinksPage.class, null))
- .toString();
-
- tester.setupRequestAndResponse();
- tester.getServletRequest().setURL(
- "/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication/" + url);
-
- tester.processRequestCycle();
+ tester.startPage(BookmarkableHomePageLinksPage.class);
assertEquals(tester.getLastRenderedPage().getClass(), BookmarkableHomePageLinksPage.class);
@@ -65,28 +51,12 @@
*/
public void testBookmarkableRequestWithIntercept() throws Exception
{
- tester.setupRequestAndResponse();
- WebRequestCycle cycle = tester.createRequestCycle();
-
- String url = cycle.urlFor(
- new BookmarkablePageRequestTarget(BookmarkableThrowsInterceptPage.class, null))
- .toString();
- String url2 = cycle.urlFor(
- new BookmarkablePageRequestTarget(BookmarkableContinueToPage.class, null))
- .toString();
-
- tester.setupRequestAndResponse();
- tester.getServletRequest().setURL(
- "/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication/" + url);
- tester.processRequestCycle();
+ tester.startPage(BookmarkableThrowsInterceptPage.class);
assertEquals(tester.getLastRenderedPage().getClass(), BookmarkableSetSecurityPage.class);
- tester.setupRequestAndResponse();
- tester.getServletRequest().setURL(
- "/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication/" + url2);
- tester.processRequestCycle();
+ tester.startPage(BookmarkableContinueToPage.class);
assertEquals(tester.getLastRenderedPage().getClass(), BookmarkableThrowsInterceptPage.class);
}
@@ -96,30 +66,15 @@
*/
public void testBookmarkableRequestWithInterceptWithParams() throws Exception
{
- tester.setupRequestAndResponse();
-
- WebRequestCycle cycle = tester.createRequestCycle();
PageParameters pp = new PageParameters();
pp.put("test", "test");
- String url = cycle.urlFor(
- new BookmarkablePageRequestTarget(BookmarkableThrowsInterceptPage.class, pp))
- .toString();
- String url2 = cycle.urlFor(
- new BookmarkablePageRequestTarget(BookmarkableContinueToPage.class, null))
- .toString();
-
- tester.setupRequestAndResponse();
- tester.getServletRequest().setURL(
- "/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication/" + url);
- tester.processRequestCycle();
+
+ tester.startPage(BookmarkableThrowsInterceptPage.class, pp);
assertEquals(tester.getLastRenderedPage().getClass(), BookmarkableSetSecurityPage.class);
- tester.setupRequestAndResponse();
- tester.getServletRequest().setURL(
- "/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication/" + url2);
- tester.processRequestCycle();
+ tester.startPage(BookmarkableContinueToPage.class);
assertEquals(tester.getLastRenderedPage().getClass(), BookmarkableThrowsInterceptPage.class);
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/MockWebApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/MockWebApplication.java?rev=655308&r1=655307&r2=655308&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/MockWebApplication.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/protocol/http/MockWebApplication.java Sun May 11 05:05:31 2008
@@ -373,7 +373,19 @@
try
{
BaseWicketTester.callOnBeginRequest(cycle);
- cycle.request(new BookmarkablePageRequestTarget(pageClass, params));
+ BookmarkablePageRequestTarget requestTarget = new BookmarkablePageRequestTarget(
+ pageClass, params);
+ if (application.getHomePage() != null)
+ {
+ String url = cycle.urlFor(requestTarget).toString();
+ String path = application.getClass().getName();
+ path = path.substring(path.lastIndexOf('.') + 1);
+ path = "/" + path + "/" + path + "/";
+ getServletRequest().setURL(path + url);
+ }
+ else
+ log.warn("The application does not have a HomePage, this might cause problems or unexpected behavior");
+ cycle.request(requestTarget);
}
finally
{
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/SetResponsePageTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/SetResponsePageTest.java?rev=655308&r1=655307&r2=655308&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/SetResponsePageTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/SetResponsePageTest.java Sun May 11 05:05:31 2008
@@ -29,9 +29,10 @@
{
WicketTester tester = new WicketTester(Page1.class);
tester.setupRequestAndResponse();
- tester.getServletRequest()
- .setURL("?wicket:bookmarkablePage=:" + Page1.class.getName() + "");
- tester.processRequestCycle();
+// tester.getServletRequest()
+// .setURL("?wicket:bookmarkablePage=:" + Page1.class.getName() + "");
+// tester.processRequestCycle();
+ tester.startPage(Page1.class);
tester.assertRenderedPage(Page3.class);
tester.destroy();
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkablePageLinkTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkablePageLinkTest.java?rev=655308&r1=655307&r2=655308&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkablePageLinkTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkablePageLinkTest.java Sun May 11 05:05:31 2008
@@ -18,8 +18,6 @@
import org.apache.wicket.PageParameters;
import org.apache.wicket.WicketTestCase;
-import org.apache.wicket.protocol.http.WebRequestCycle;
-import org.apache.wicket.request.target.component.BookmarkablePageRequestTarget;
/**
* @author jcompagner
@@ -42,19 +40,7 @@
*/
public void testBookmarkableRequest() throws Exception
{
- tester.setupRequestAndResponse();
-
- WebRequestCycle cycle = tester.createRequestCycle();
-
- String url = cycle.urlFor(
- new BookmarkablePageRequestTarget(BookmarkableHomePageLinksPage.class, null))
- .toString();
-
- tester.setupRequestAndResponse();
- tester.getServletRequest().setURL(
- "/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication/" + url);
-
- tester.processRequestCycle();
+ tester.startPage(BookmarkableHomePageLinksPage.class);
assertEquals(tester.getLastRenderedPage().getClass(), BookmarkableHomePageLinksPage.class);
@@ -65,28 +51,12 @@
*/
public void testBookmarkableRequestWithIntercept() throws Exception
{
- tester.setupRequestAndResponse();
- WebRequestCycle cycle = tester.createRequestCycle();
-
- String url = cycle.urlFor(
- new BookmarkablePageRequestTarget(BookmarkableThrowsInterceptPage.class, null))
- .toString();
- String url2 = cycle.urlFor(
- new BookmarkablePageRequestTarget(BookmarkableContinueToPage.class, null))
- .toString();
-
- tester.setupRequestAndResponse();
- tester.getServletRequest().setURL(
- "/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication/" + url);
- tester.processRequestCycle();
+ tester.startPage(BookmarkableThrowsInterceptPage.class);
assertEquals(tester.getLastRenderedPage().getClass(), BookmarkableSetSecurityPage.class);
- tester.setupRequestAndResponse();
- tester.getServletRequest().setURL(
- "/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication/" + url2);
- tester.processRequestCycle();
+ tester.startPage(BookmarkableContinueToPage.class);
assertEquals(tester.getLastRenderedPage().getClass(), BookmarkableThrowsInterceptPage.class);
}
@@ -96,30 +66,15 @@
*/
public void testBookmarkableRequestWithInterceptWithParams() throws Exception
{
- tester.setupRequestAndResponse();
-
- WebRequestCycle cycle = tester.createRequestCycle();
PageParameters pp = new PageParameters();
pp.put("test", "test");
- String url = cycle.urlFor(
- new BookmarkablePageRequestTarget(BookmarkableThrowsInterceptPage.class, pp))
- .toString();
- String url2 = cycle.urlFor(
- new BookmarkablePageRequestTarget(BookmarkableContinueToPage.class, null))
- .toString();
-
- tester.setupRequestAndResponse();
- tester.getServletRequest().setURL(
- "/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication/" + url);
- tester.processRequestCycle();
+
+ tester.startPage(BookmarkableThrowsInterceptPage.class, pp);
assertEquals(tester.getLastRenderedPage().getClass(), BookmarkableSetSecurityPage.class);
- tester.setupRequestAndResponse();
- tester.getServletRequest().setURL(
- "/WicketTester$DummyWebApplication/WicketTester$DummyWebApplication/" + url2);
- tester.processRequestCycle();
+ tester.startPage(BookmarkableContinueToPage.class);
assertEquals(tester.getLastRenderedPage().getClass(), BookmarkableThrowsInterceptPage.class);
}