You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2011/01/06 20:34:55 UTC
svn commit: r1056026 - in /wicket/trunk/wicket-core/src:
main/java/org/apache/wicket/util/tester/BaseWicketTester.java
test/java/org/apache/wicket/util/tester/WicketTesterTest.java
Author: mgrigorov
Date: Thu Jan 6 19:34:55 2011
New Revision: 1056026
URL: http://svn.apache.org/viewvc?rev=1056026&view=rev
Log:
Remove the type casting for BaseWicketTester#getLastRenderedPage()
It doesn't build with JDK1.5
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=1056026&r1=1056025&r2=1056026&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 Jan 6 19:34:55 2011
@@ -270,7 +270,7 @@ public class BaseWicketTester
hsession = new MockHttpSession(servletContext);
- ThreadContext oldThreadContext= ThreadContext.detach();
+ ThreadContext oldThreadContext = ThreadContext.detach();
this.application = application;
@@ -310,9 +310,9 @@ public class BaseWicketTester
/**
* @return last rendered page
*/
- public <T extends Page> T getLastRenderedPage()
+ public Page getLastRenderedPage()
{
- return (T)lastRenderedPage;
+ return lastRenderedPage;
}
/**
@@ -2041,7 +2041,7 @@ public class BaseWicketTester
*/
public void setUseRequestUrlAsBase(boolean setBaseUrl)
{
- this.useRequestUrlAsBase = setBaseUrl;
+ useRequestUrlAsBase = setBaseUrl;
}
/**
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=1056026&r1=1056025&r2=1056026&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 Jan 6 19:34:55 2011
@@ -729,7 +729,7 @@ public class WicketTesterTest extends Te
tester.startPage(MockPageParametersAware.class);
- MockPageParametersAware page = tester.getLastRenderedPage();
+ MockPageParametersAware page = (MockPageParametersAware)tester.getLastRenderedPage();
assertEquals("v1", page.getLastQueryParameters().getParameterValue("p1").toString());
}
@@ -749,7 +749,7 @@ public class WicketTesterTest extends Te
tester.processRequest();
- MockPageParametersAware page = tester.getLastRenderedPage();
+ MockPageParametersAware page = (MockPageParametersAware)tester.getLastRenderedPage();
assertEquals("q_1_value", page.getLastQueryParameters().getParameterValue("q_1").toString());
assertEquals("q_2_value", page.getLastQueryParameters().getParameterValue("q_2").toString());
}
@@ -771,7 +771,7 @@ public class WicketTesterTest extends Te
tester.processRequest();
- MockPageParametersAware page = tester.getLastRenderedPage();
+ MockPageParametersAware page = (MockPageParametersAware)tester.getLastRenderedPage();
IRequestParameters lastQueryParameter = page.getLastQueryParameters();
List<StringValue> q1ParameterValues = lastQueryParameter.getParameterValues("q_1");
assertTrue(q1ParameterValues.contains(StringValue.valueOf("q_1_value_1")));
@@ -795,7 +795,7 @@ public class WicketTesterTest extends Te
formTester.submit();
- MockPageParametersAware page = tester.getLastRenderedPage();
+ MockPageParametersAware page = (MockPageParametersAware)tester.getLastRenderedPage();
assertEquals("v1", page.getLastPostParameters().getParameterValue("textfield").toString());
assertEquals("p_1_value", page.getLastPostParameters().getParameterValue("p_1").toString());
assertEquals("q_1_value", page.getLastQueryParameters().getParameterValue("q_1").toString());
@@ -815,7 +815,7 @@ public class WicketTesterTest extends Te
formTester.submit();
- MockPageParametersAware page = tester.getLastRenderedPage();
+ MockPageParametersAware page = (MockPageParametersAware)tester.getLastRenderedPage();
assertEquals("v1", page.getLastPostParameters().getParameterValue("textfield").toString());
assertEquals("p_1_value", page.getLastPostParameters().getParameterValue("p_1").toString());
assertEquals("q_1_value", page.getLastQueryParameters().getParameterValue("q_1").toString());