MockWebApplication.processRequestCycle is used to render a page. I renamed MockWebApplication.rerender(Component) to processRequestCycle(Component) to reflect that it is not limited to re-render anymore.
git-svn-id: https://svn.apache.org/repos/asf/incubator/wicket/trunk@458677 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/wicket/src/java/wicket/protocol/http/MockWebApplication.java b/wicket/src/java/wicket/protocol/http/MockWebApplication.java
index 9946c55..00ec501 100644
--- a/wicket/src/java/wicket/protocol/http/MockWebApplication.java
+++ b/wicket/src/java/wicket/protocol/http/MockWebApplication.java
@@ -245,7 +245,7 @@
*
* @param component
*/
- public void rerender(final Component component)
+ public void processRequestCycle(final Component component)
{
setupRequestAndResponse();
WebRequestCycle cycle = new WebRequestCycle(wicketSession, wicketRequest, wicketResponse);
diff --git a/wicket/src/java/wicket/util/tester/WicketTester.java b/wicket/src/java/wicket/util/tester/WicketTester.java
index c2f60cf..a10d8b3 100644
--- a/wicket/src/java/wicket/util/tester/WicketTester.java
+++ b/wicket/src/java/wicket/util/tester/WicketTester.java
@@ -241,7 +241,7 @@
public final Page startPage(final Page page)
{
setHomePage(DummyHomePage.class);
- rerender(page);
+ processRequestCycle(page);
Page last = getLastRenderedPage();
diff --git a/wicket/src/test/wicket/markup/html/basic/SimplePageTest.java b/wicket/src/test/wicket/markup/html/basic/SimplePageTest.java
index 6c56a06..fb21b8e 100644
--- a/wicket/src/test/wicket/markup/html/basic/SimplePageTest.java
+++ b/wicket/src/test/wicket/markup/html/basic/SimplePageTest.java
@@ -68,21 +68,21 @@
Label label = (Label)application.getLastRenderedPage().get("myLabel");
assertNotNull(label);
- application.rerender(label);
+ application.processRequestCycle(label);
String document = application.getServletResponse().getDocument();
assertNotNull(document);
assertEquals("<span wicket:id=\"myLabel\">Test Label</span>", document);
Panel panel = (Panel)application.getLastRenderedPage().get("myPanel");
assertNotNull(panel);
- application.rerender(panel);
+ application.processRequestCycle(panel);
document = application.getServletResponse().getDocument();
assertNotNull(document);
assertEquals("<wicket:panel>Inside the panel<span wicket:id=\"label\">mein Label</span></wicket:panel>", document);
label = (Label)application.getLastRenderedPage().get("myPanel:label");
assertNotNull(label);
- application.rerender(label);
+ application.processRequestCycle(label);
document = application.getServletResponse().getDocument();
assertNotNull(document);
assertFalse("".equals(document));
@@ -90,7 +90,7 @@
Border border = (Border)application.getLastRenderedPage().get("myBorder");
assertNotNull(border);
- application.rerender(border);
+ application.processRequestCycle(border);
document = application.getServletResponse().getDocument();
assertNotNull(document);
assertFalse("".equals(document));
@@ -98,7 +98,7 @@
border = (Border)application.getLastRenderedPage().get("myBorder2");
assertNotNull(border);
- application.rerender(border);
+ application.processRequestCycle(border);
document = application.getServletResponse().getDocument();
assertNotNull(document);
assertFalse("".equals(document));
@@ -107,7 +107,7 @@
// do the same test twice. Igor reported a problem with that, so we have to test it.
border = (Border)application.getLastRenderedPage().get("myBorder2");
assertNotNull(border);
- application.rerender(border);
+ application.processRequestCycle(border);
document = application.getServletResponse().getDocument();
assertNotNull(document);
assertFalse("".equals(document));
@@ -115,7 +115,7 @@
WebMarkupContainer container = (WebMarkupContainer)application.getLastRenderedPage().get("test");
assertNotNull(container);
- application.rerender(container);
+ application.processRequestCycle(container);
document = application.getServletResponse().getDocument();
assertNotNull(document);
assertFalse("".equals(document));
@@ -123,7 +123,7 @@
label = (Label)application.getLastRenderedPage().get("test:myLabel2");
assertNotNull(label);
- application.rerender(label);
+ application.processRequestCycle(label);
document = application.getServletResponse().getDocument();
assertNotNull(document);
assertFalse("".equals(document));
@@ -140,21 +140,21 @@
Label label = (Label)page.get("myLabel");
assertNotNull(label);
- application.rerender(label);
+ application.processRequestCycle(label);
String document = application.getServletResponse().getDocument();
assertNotNull(document);
assertEquals("<span wicket:id=\"myLabel\">Test Label</span>", document);
Panel panel = (Panel)page.get("myPanel");
assertNotNull(panel);
- application.rerender(panel);
+ application.processRequestCycle(panel);
document = application.getServletResponse().getDocument();
assertNotNull(document);
assertEquals("<wicket:panel>Inside the panel<span wicket:id=\"label\">mein Label</span></wicket:panel>", document);
label = (Label)page.get("myPanel:label");
assertNotNull(label);
- application.rerender(label);
+ application.processRequestCycle(label);
document = application.getServletResponse().getDocument();
assertNotNull(document);
assertFalse("".equals(document));
@@ -162,7 +162,7 @@
Border border = (Border)page.get("myBorder");
assertNotNull(border);
- application.rerender(border);
+ application.processRequestCycle(border);
document = application.getServletResponse().getDocument();
assertNotNull(document);
assertFalse("".equals(document));
@@ -170,7 +170,7 @@
border = (Border)page.get("myBorder2");
assertNotNull(border);
- application.rerender(border);
+ application.processRequestCycle(border);
document = application.getServletResponse().getDocument();
assertNotNull(document);
assertFalse("".equals(document));
@@ -179,7 +179,7 @@
// do the same test twice. Igor reported a problem with that, so we have to test it.
border = (Border)page.get("myBorder2");
assertNotNull(border);
- application.rerender(border);
+ application.processRequestCycle(border);
document = application.getServletResponse().getDocument();
assertNotNull(document);
assertFalse("".equals(document));
@@ -187,7 +187,7 @@
WebMarkupContainer container = (WebMarkupContainer)page.get("test");
assertNotNull(container);
- application.rerender(container);
+ application.processRequestCycle(container);
document = application.getServletResponse().getDocument();
assertNotNull(document);
assertFalse("".equals(document));
@@ -195,7 +195,7 @@
label = (Label)page.get("test:myLabel2");
assertNotNull(label);
- application.rerender(label);
+ application.processRequestCycle(label);
document = application.getServletResponse().getDocument();
assertNotNull(document);
assertFalse("".equals(document));
@@ -321,7 +321,7 @@
Panel panel = (Panel)application.getLastRenderedPage().get("myPanel");
assertNotNull(panel);
panel.setVisible(true);
- application.rerender(panel);
+ application.processRequestCycle(panel);
String document = application.getServletResponse().getDocument();
assertNotNull(document);
assertEquals("<wicket:panel>Inside the panel<span wicket:id=\"label\">mein Label</span></wicket:panel>", document);
diff --git a/wicket/src/test/wicket/markup/html/list/SimpleTableTest.java b/wicket/src/test/wicket/markup/html/list/SimpleTableTest.java
index 8918165..99eb4c2 100644
--- a/wicket/src/test/wicket/markup/html/list/SimpleTableTest.java
+++ b/wicket/src/test/wicket/markup/html/list/SimpleTableTest.java
@@ -65,7 +65,7 @@
// Does re-render do as well ??
ListView view = (ListView)application.getLastRenderedPage().get("table");
assertNotNull(view);
- application.rerender(view);
+ application.processRequestCycle(view);
document = application.getServletResponse().getDocument();
assertNotNull(document);
assertFalse("".equals(document));
