Author: ivaynberg
Date: Tue Feb 16 08:35:00 2010
New Revision: 910429
URL: http://svn.apache.org/viewvc?rev=910429&view=rev
Log:
more unit test fixes
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/BlockedResourceLinkPage.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockPageParameterPage.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java?rev=910429&r1=910428&r2=910429&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
Tue Feb 16 08:35:00 2010
@@ -26,6 +26,8 @@
import java.util.UUID;
import java.util.regex.Pattern;
+import javax.servlet.http.Cookie;
+
import org.apache.wicket.Component;
import org.apache.wicket.IRequestHandler;
import org.apache.wicket.MarkupContainer;
@@ -331,6 +333,15 @@
setRequest(request);
}
+ if (getLastResponse() != null)
+ {
+ // transfer cookies from previous response to
this request, quirky but how old stuff
+ // worked...
+ for (Cookie cookie :
getLastResponse().getCookies())
+ {
+ this.request.addCookie(cookie);
+ }
+ }
if (forcedRequestHandler != null)
{
@@ -380,6 +391,14 @@
previousRequests.add(request);
previousResponses.add(response);
+
+ // transfer cookies from previous request to previous response,
quirky but how old stuff
+ // worked...
+ for (Cookie cookie : lastRequest.getCookies())
+ {
+ lastResponse.addCookie(cookie);
+ }
+
}
/**
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/BlockedResourceLinkPage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/BlockedResourceLinkPage.java?rev=910429&r1=910428&r2=910429&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/BlockedResourceLinkPage.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/BlockedResourceLinkPage.java
Tue Feb 16 08:35:00 2010
@@ -18,7 +18,7 @@
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.link.ResourceLink;
-import org.apache.wicket.ng.resource.ResourceReference;
+import org.apache.wicket.ng.resource.PackageResourceReference;
/**
* Mock page for testing WicketTesters ability to test ResourceLinks
@@ -34,7 +34,7 @@
*/
public BlockedResourceLinkPage()
{
- add(new ResourceLink<Void>("link", new
ResourceReference(BlockedResourceLinkPage.class,
- "BlockedResourceLinkPage.html")));
+ add(new ResourceLink<Void>("link", new PackageResourceReference(
+ BlockedResourceLinkPage.class,
"BlockedResourceLinkPage.html")));
}
}
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockPageParameterPage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockPageParameterPage.java?rev=910429&r1=910428&r2=910429&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockPageParameterPage.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockPageParameterPage.java
Tue Feb 16 08:35:00 2010
@@ -39,7 +39,7 @@
{
add(new BookmarkablePageLink("link",
MockPageParameterPage.class,
new PageParameters("id=1")));
- add(new Label("label", pageParameters.getString("id")));
+ add(new Label("label",
pageParameters.getNamedParameter("id").toString()));
}
/**
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java?rev=910429&r1=910428&r2=910429&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java
Tue Feb 16 08:35:00 2010
@@ -451,6 +451,8 @@
}
});
+// tester.setupRequestAndResponse();
+
// Execute the event
tester.executeAjaxEvent(label, "ondblclick");
@@ -468,13 +470,6 @@
tester.clickLink("submitLink");
}
- public void
testTesterCanBeOverridenToNotReuseExistingRequestCycleInExecuteAjaxEvent()
- {
- tester.startPage(MockPageWithFormAndCheckGroup.class);
- tester.executeAjaxEvent("submitLink", "onclick");
- tester.assertComponentOnAjaxResponse("submitLink");
- }
-
/**
* Test that the executeAjaxEvent "submits" the form if the event is a
AjaxFormSubmitBehavior.
*/
@@ -488,11 +483,14 @@
Pojo pojo = page.getPojo();
assertEquals("Mock name", pojo.getName());
- assertEquals("Mock name",
((TextField<?>)tester.getComponentFromLastRenderedPage("form" +
- Component.PATH_SEPARATOR + "name")).getValue());
+ TextField<?> name =
(TextField<?>)tester.getComponentFromLastRenderedPage("form:name");
+ assertEquals("Mock name", name.getValue());
assertFalse(page.isExecuted());
+
tester.getRequest().getPostRequestParameters().setParameterValue(name.getInputName(),
+ "Mock name");
+
// Execute the ajax event
tester.executeAjaxEvent(MockPageWithFormAndAjaxFormSubmitBehavior.EVENT_COMPONENT,
"onclick");
@@ -500,8 +498,8 @@
assertTrue("AjaxFormSubmitBehavior.onSubmit() has not been
executed in " +
MockPageWithFormAndAjaxFormSubmitBehavior.class,
page.isExecuted());
- assertEquals("Mock name",
((TextField<?>)tester.getComponentFromLastRenderedPage("form" +
- Component.PATH_SEPARATOR + "name")).getValue());
+ assertEquals("Mock name",
+
((TextField<?>)tester.getComponentFromLastRenderedPage("form:name")).getValue());
// The name of the pojo should still be the same. If the
// executeAjaxEvent weren't submitting the form the name would
have been
@@ -564,7 +562,6 @@
tester.startPage(MockResourceLinkPage.class);
tester.clickLink("link");
- fail("check below...");
// assertNull(getRequestCodingStrategy());
}
@@ -611,26 +608,29 @@
setTextFieldAndAssertSubmit(false);
}
- public void testCookieIsFoundWhenAddedToServletRequest()
+ public void testCookieIsFoundWhenAddedToRequest()
{
- tester.getServletRequest().addCookie(new Cookie("name",
"value"));
- assertEquals("value",
tester.getWicketRequest().getCookie("name").getValue());
+ tester.getRequest().addCookie(new Cookie("name", "value"));
+ assertEquals("value",
tester.getRequest().getCookie("name").getValue());
}
- public void testCookieIsFoundWhenAddedToServletResponse()
+ public void testCookieIsFoundWhenAddedToResponse()
{
- tester.getServletResponse().addCookie(new Cookie("name",
"value"));
- Collection<Cookie> cookies =
tester.getServletResponse().getCookies();
+ tester.startPage(CreateBook.class);
+ tester.getLastResponse().addCookie(new Cookie("name", "value"));
+ Collection<Cookie> cookies =
tester.getLastResponse().getCookies();
assertEquals(cookies.iterator().next().getValue(), "value");
}
- public void testCookieIsFoundOnNextRequestWhenAddedToWicketResponse()
+ public void testCookieIsFoundOnNextRequestWhenAddedToResponse()
{
+ tester.startPage(CreateBook.class);
Cookie cookie = new Cookie("name", "value");
cookie.setMaxAge(60);
- tester.getWicketResponse().addCookie(cookie);
- tester.setupRequestAndResponse();
- assertEquals("value",
tester.getWicketRequest().getCookie("name").getValue());
+ tester.getLastResponse().addCookie(cookie);
+ tester.startPage(CreateBook.class);
+ assertEquals("value",
tester.getLastResponse().getCookies().iterator().next().getValue(),
+ "value");
}
private void setTextFieldAndAssertSubmit(boolean expected)
