Author: jbq
Date: Thu Aug 23 05:48:54 2007
New Revision: 568960
URL: http://svn.apache.org/viewvc?rev=568960&view=rev
Log:
WICKET-702 MockWebApplication doesn't redirect properly to mounted pages under
RestartResponseAtInterceptPageException
Remove occurences of ".." from the path
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockHttpServletRequest.java
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/login/InterceptTest.java
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockHttpServletRequest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockHttpServletRequest.java?rev=568960&r1=568959&r2=568960&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockHttpServletRequest.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/MockHttpServletRequest.java
Thu Aug 23 05:48:54 2007
@@ -1293,7 +1293,17 @@
// We need to absolutize the redirect URL as we are not as
smart as a web-browser (WICKET-702)
url = getContextPath() + getServletPath() + "/" + redirect;
- log.debug("Redirecting to " + url);
+
+ try
+ {
+ // Remove occurences of ".." from the path
+ url = new File(url).getCanonicalPath();
+ }
+ catch (IOException e)
+ {
+ throw new RuntimeException(e);
+ }
+ log.info("Redirecting to " + url);
}
/**
Modified:
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/login/InterceptTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/login/InterceptTest.java?rev=568960&r1=568959&r2=568960&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/login/InterceptTest.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/login/InterceptTest.java
Thu Aug 23 05:48:54 2007
@@ -88,16 +88,14 @@
"admin");
application.processRequestCycle();
- // FIXME continueToInterceptPage seems to return the same call,
causing it to
- // login twice as a result the lastrendered page is null
- /*assertEquals(application.getApplication().getHomePage(),
application.getLastRenderedPage()
+ assertEquals(application.getApplication().getHomePage(),
application.getLastRenderedPage()
.getClass());
application.setupRequestAndResponse();
application.getServletRequest().setRequestToComponent(
application.getLastRenderedPage().get("link"));
application.processRequestCycle();
- assertEquals(PageA.class,
application.getLastRenderedPage().getClass());*/
+ assertEquals(PageA.class,
application.getLastRenderedPage().getClass());
}
/**
@@ -117,16 +115,15 @@
WebRequestCycle requestCycle = application.createRequestCycle();
assertTrue(((MockLoginPage)application.getLastRenderedPage()).login("admin"));
application.processRequestCycle(requestCycle);
- // FIXME continueToInterceptPage seems to return the same call,
causing it to
- // login twice as a result the lastrendered page is null
- /*assertEquals(application.getApplication().getHomePage(),
application.getLastRenderedPage()
+
+ assertEquals(application.getApplication().getHomePage(),
application.getLastRenderedPage()
.getClass());
application.setupRequestAndResponse();
application.getServletRequest().setRequestToComponent(
application.getLastRenderedPage().get("link"));
application.processRequestCycle();
- assertEquals(PageA.class,
application.getLastRenderedPage().getClass());*/
+ assertEquals(PageA.class,
application.getLastRenderedPage().getClass());
}
/**
