Author: ivaynberg
Date: Wed Feb 17 02:48:56 2010
New Revision: 910805
URL: http://svn.apache.org/viewvc?rev=910805&view=rev
Log:
unit test fix wip
Removed:
wicket/trunk/wicket/src/test/java/org/apache/wicket/PageParametersTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/MockWebApplicationTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WebRequestCodingStrategyTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WebRequestTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WebResponseTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/request/urlcompressing/MyPage.html
wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/request/urlcompressing/MyPage.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/request/urlcompressing/UrlCompressingWebRequestProcessorTest.java
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/AuthorizationTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/SetResponsePageTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/AjaxRequestTargetTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/AjaxTimerBehaviorTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/DomReadyOrderTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/form/OnChangeAjaxBehaviorTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPanelTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/behavior/ImmutableBehaviorIndexTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePageTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimpleResponsePageClassTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/ComponentBorderTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/FormHasErrorPage.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/LocalizedErrorMessageTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/TestFormHasError.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/ValidatorPropertiesTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/border/TestHomePage.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/feedback/FormFeedbackTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/InvalidImageButtonTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/submitlink/TestHomePage.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/validation/HomePageTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/SimpleTableTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WebSessionTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WicketTagPanelTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockFormFileUploadPage.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=910805&r1=910804&r2=910805&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
Wed Feb 17 02:48:56 2010
@@ -615,11 +615,12 @@
* a test <code>Page</code> class with default constructor
* @return the rendered <code>Page</code>
*/
- public final <C extends Page> void startPage(Class<C> pageClass)
+ public final <C extends Page> Page startPage(Class<C> pageClass)
{
request.setUrl(RequestCycle.get().urlFor(
new BookmarkablePageRequestHandler(new
PageProvider(pageClass))));
processRequest();
+ return getLastRenderedPage();
}
/**
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/AuthorizationTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/AuthorizationTest.java?rev=910805&r1=910804&r2=910805&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/AuthorizationTest.java
(original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/AuthorizationTest.java
Wed Feb 17 02:48:56 2010
@@ -37,24 +37,6 @@
public class AuthorizationTest extends WicketTestCase
{
/**
- * Construct.
- */
- public AuthorizationTest()
- {
- super();
- }
-
- /**
- * Construct.
- *
- * @param name
- */
- public AuthorizationTest(String name)
- {
- super(name);
- }
-
- /**
* Tests that a component can be created when authorization is allowed.
*
* @throws Exception
@@ -149,7 +131,9 @@
tester.startPage(AuthTestPage1.class);
tester.assertRenderedPage(AuthTestPage1.class);
- tester.setParameterForNextRequest("form:stringInput", "test");
+ tester.getRequest()
+ .getPostRequestParameters()
+ .setParameterValue("form:stringInput", "test");
tester.submitForm("form");
tester.assertRenderedPage(AuthTestPage1.class);
AuthTestPage1 page =
(AuthTestPage1)tester.getLastRenderedPage();
@@ -186,7 +170,9 @@
});
tester.startPage(AuthTestPage1.class);
tester.assertRenderedPage(AuthTestPage1.class);
- tester.setParameterForNextRequest("form:stringInput", "test");
+ tester.getRequest()
+ .getPostRequestParameters()
+ .setParameterValue("form:stringInput", "test");
try
{
tester.submitForm("form");
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=910805&r1=910804&r2=910805&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
Wed Feb 17 02:48:56 2010
@@ -17,7 +17,6 @@
package org.apache.wicket;
import org.apache.wicket.markup.html.WebPage;
-import org.apache.wicket.util.tester.WicketTester;
/**
* Test for calling {...@link Component#setResponsePage(Class)} in constructor.
@@ -27,11 +26,6 @@
/** Fixe setting response page in constructor. */
public void testSetResponsePage()
{
- WicketTester tester = new WicketTester(Page1.class);
- tester.setupRequestAndResponse();
-// 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/ajax/AjaxHeaderContributionTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionTest.java?rev=910805&r1=910804&r2=910805&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionTest.java
Wed Feb 17 02:48:56 2010
@@ -28,7 +28,7 @@
*/
public void testAjaxHeaderContribution() throws Exception
{
- tester.processRequestCycle(AjaxHeaderContributionPage.class);
+ tester.startPage(AjaxHeaderContributionPage.class);
tester.assertResultPage(AjaxHeaderContributionPage.class,
"AjaxHeaderContributionPage_expected.html");
@@ -40,7 +40,7 @@
public void testDoubleAjaxHeaderContribution() throws Exception
{
- tester.processRequestCycle(AjaxHeaderContributionPage2.class);
+ tester.startPage(AjaxHeaderContributionPage2.class);
tester.assertResultPage(AjaxHeaderContributionPage2.class,
"AjaxHeaderContributionPage2_expected.html");
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/AjaxRequestTargetTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/AjaxRequestTargetTest.java?rev=910805&r1=910804&r2=910805&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/AjaxRequestTargetTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/AjaxRequestTargetTest.java
Wed Feb 17 02:48:56 2010
@@ -39,14 +39,6 @@
public class AjaxRequestTargetTest extends WicketTestCase
{
/**
- * Construct.
- */
- public AjaxRequestTargetTest()
- {
- super("Test of AjaxRequestTarget");
- }
-
- /**
* Test that a normal <style> header contribution is added correctly.
*
* @throws IOException
@@ -131,7 +123,7 @@
tester.clickLink(MockPageWithLinkAndComponent.LINK_ID);
- String document = tester.getServletResponse().getDocument();
+ String document = tester.getLastResponseAsString();
Pattern pat =
Pattern.compile(".*<header-contribution>(.*?)</header-contribution>.*",
Pattern.DOTALL);
@@ -193,7 +185,7 @@
final String labelMarkupId = "label" + i;
final String expectedContent =
String.format(VarargsAddComponentPage.INITIAL_CONTENT, i);
tester.assertLabel(labelMarkupId, expectedContent);
-}
+ }
tester.clickLink("link");
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/AjaxTimerBehaviorTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/AjaxTimerBehaviorTest.java?rev=910805&r1=910804&r2=910805&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/AjaxTimerBehaviorTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/AjaxTimerBehaviorTest.java
Wed Feb 17 02:48:56 2010
@@ -44,17 +44,6 @@
private static final Logger log =
LoggerFactory.getLogger(AjaxTimerBehaviorTest.class);
/**
- * Construct.
- *
- * @param name
- */
- public AjaxTimerBehaviorTest(String name)
- {
- super(name);
- }
-
-
- /**
* Tests timer behavior in a component added to an AjaxRequestTarget
*/
public void testAddToAjaxUpdate()
@@ -148,7 +137,7 @@
*/
private void validate(MyAjaxSelfUpdatingTimerBehavior timer, boolean
inBodyOnLoad)
{
- String document = tester.getServletResponse().getDocument();
+ String document = tester.getLastResponseAsString();
String updateScript = timer.getUpdateScript();
@@ -173,7 +162,7 @@
}
// Validate the document
- document = tester.getServletResponse().getDocument();
+ document = tester.getLastResponseAsString();
validateTimerScript(document, updateScript);
}
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/DomReadyOrderTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/DomReadyOrderTest.java?rev=910805&r1=910804&r2=910805&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/DomReadyOrderTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/DomReadyOrderTest.java
Wed Feb 17 02:48:56 2010
@@ -33,7 +33,7 @@
*/
public void testDomReadyOrder() throws Exception
{
- tester.processRequestCycle(DomReadyOrderPage.class);
+ tester.startPage(DomReadyOrderPage.class);
tester.assertResultPage(DomReadyOrderPage.class,
"DomReadyOrderPage_expected.html");
tester.clickLink("test", true);
@@ -45,7 +45,7 @@
*/
public void testDomReadyOrder2() throws Exception
{
- tester.processRequestCycle(DomReadyOrderPage.class);
+ tester.startPage(DomReadyOrderPage.class);
tester.assertResultPage(DomReadyOrderPage.class,
"DomReadyOrderPage_expected.html");
tester.executeAjaxEvent("test", "onclick");
@@ -74,7 +74,7 @@
// assert rendered page class
tester.assertRenderedPage(HomePage.class);
- String doc = tester.getServletResponse().getDocument();
+ String doc = tester.getLastResponseAsString();
log.error("'" + doc + "'");
// assert rendered row elements
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/form/OnChangeAjaxBehaviorTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/form/OnChangeAjaxBehaviorTest.java?rev=910805&r1=910804&r2=910805&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/form/OnChangeAjaxBehaviorTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/form/OnChangeAjaxBehaviorTest.java
Wed Feb 17 02:48:56 2010
@@ -18,12 +18,7 @@
import java.util.Locale;
-import org.apache.wicket.Request;
-import org.apache.wicket.Response;
-import org.apache.wicket.Session;
import org.apache.wicket.WicketTestCase;
-import org.apache.wicket.protocol.http.WebApplication;
-import org.apache.wicket.util.tester.WicketTester;
/**
* @author Janne Hietamäki (janne)
@@ -35,22 +30,7 @@
*/
public void testRendering() throws Exception
{
- WebApplication myApplication = new DummyWebApplication()
- {
- /**
- * @see
org.apache.wicket.protocol.http.WebApplication#newSession(org.apache.wicket.Request,
- * org.apache.wicket.Response)
- */
- @Override
- public Session newSession(Request request, Response
response)
- {
- Session session = super.newSession(request,
response);
- session.setLocale(Locale.ENGLISH);
- return session;
- }
- };
-
- tester = new WicketTester(myApplication);
+ tester.getSession().setLocale(Locale.ENGLISH);
executeTest(OnChangeAjaxBehaviorTestPage.class,
"OnChangeAjaxBehaviorTestPage_expected.html");
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPanelTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPanelTest.java?rev=910805&r1=910804&r2=910805&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPanelTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPanelTest.java
Wed Feb 17 02:48:56 2010
@@ -29,28 +29,17 @@
public class SimpleTestPanelTest extends WicketTestCase
{
/**
- * Construct.
- *
- * @param name
- */
- public SimpleTestPanelTest(String name)
- {
- super(name);
- }
-
- /**
* @throws Exception
*/
public void testRenderHomePage_2() throws Exception
{
- tester.setupRequestAndResponse(true);
executeTest(SimpleTestPage.class,
"SimpleTestPageExpectedResult.html");
Page page = tester.getLastRenderedPage();
tester.executeBehavior(((SimpleTestPanel)page.get("testPanel")).getTimeBehavior());
// Validate the document
- String document = tester.getServletResponse().getDocument();
+ String document = tester.getLastResponseAsString();
DiffUtil.validatePage(document, SimpleTestPage.class,
"SimpleTestPageExpectedResult-1.html", true);
}
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/behavior/ImmutableBehaviorIndexTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/behavior/ImmutableBehaviorIndexTest.java?rev=910805&r1=910804&r2=910805&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/behavior/ImmutableBehaviorIndexTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/behavior/ImmutableBehaviorIndexTest.java
Wed Feb 17 02:48:56 2010
@@ -38,7 +38,7 @@
page.getContainer().add(new SimpleAttributeModifier("class",
"border"));
tester.startPage(page);
-
assertTrue(tester.getServletResponse().getDocument().contains("class=\"border\""));
+
assertTrue(tester.getLastResponseAsString().contains("class=\"border\""));
}
/**
@@ -58,7 +58,7 @@
page.getContainer().add(border, auto, link, border2, link2,
auto2);
tester.startPage(page);
- String output = tester.getServletResponse().getDocument();
+ String output = tester.getLastResponseAsString();
System.out.println(output);
assertTrue(output.contains("class=\"border\""));
assertTrue(output.contains("autocomplete=\"off\""));
@@ -75,7 +75,7 @@
page.getContainer().remove(auto);
page.getContainer().remove(auto2);
tester.startPage(page);
- output = tester.getServletResponse().getDocument();
+ output = tester.getLastResponseAsString();
assertTrue(output.contains("IBehaviorListener:2"));
assertTrue(output.contains("IBehaviorListener:4"));
}
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePageTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePageTest.java?rev=910805&r1=910804&r2=910805&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePageTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePageTest.java
Wed Feb 17 02:48:56 2010
@@ -62,77 +62,46 @@
public void testRenderHomePage_2() throws Exception
{
executeTest(SimplePage.class, "SimplePageExpectedResult.html");
+ String document = tester.getLastResponseAsString();
Label label =
(Label)tester.getLastRenderedPage().get("myLabel");
assertNotNull(label);
- tester.processRequestCycle(label);
- String document = tester.getServletResponse().getDocument();
- assertNotNull(document);
- assertEquals("<span wicket:id=\"myLabel\">Test Label</span>",
document);
+ assertTrue(document.contains("<span wicket:id=\"myLabel\">Test
Label</span>"));
Panel panel =
(Panel)tester.getLastRenderedPage().get("myPanel");
assertNotNull(panel);
- tester.processRequestCycle(panel);
- document = tester.getServletResponse().getDocument();
- assertNotNull(document);
- assertEquals(
- "<wicket:panel>Inside the panel<span
wicket:id=\"label\">mein Label</span></wicket:panel>",
- document);
+ assertTrue(document.contains("<wicket:panel>Inside the
panel<span wicket:id=\"label\">mein Label</span></wicket:panel>"));
label =
(Label)tester.getLastRenderedPage().get("myPanel:label");
assertNotNull(label);
- tester.processRequestCycle(label);
- document = tester.getServletResponse().getDocument();
- assertNotNull(document);
assertFalse("".equals(document));
- assertEquals("<span wicket:id=\"label\">mein Label</span>",
document);
+ assertTrue(document.contains("<span wicket:id=\"label\">mein
Label</span>"));
Border border =
(Border)tester.getLastRenderedPage().get("myBorder");
assertNotNull(border);
- tester.processRequestCycle(border);
- document = tester.getServletResponse().getDocument();
- assertNotNull(document);
assertFalse("".equals(document));
- assertEquals(
- "<wicket:border>before body -
<wicket:body>border</wicket:body> - after body</wicket:border>",
- document);
+ assertTrue(document.contains("<wicket:border>before body -
<wicket:body>border</wicket:body> - after body</wicket:border>"));
border = (Border)tester.getLastRenderedPage().get("myBorder2");
assertNotNull(border);
- tester.processRequestCycle(border);
- document = tester.getServletResponse().getDocument();
- assertNotNull(document);
assertFalse("".equals(document));
- assertEquals(
- "<span wicket:id=\"myBorder2\"
testAttr=\"myValue\"><wicket:border>before body -
<wicket:body>border</wicket:body> - after body</wicket:border></span>",
- document);
+ assertTrue(document.contains("<span wicket:id=\"myBorder2\"
testAttr=\"myValue\"><wicket:border>before body -
<wicket:body>border</wicket:body> - after body</wicket:border></span>"));
// do the same test twice. Igor reported a problem with that,
so we have to test it.
border = (Border)tester.getLastRenderedPage().get("myBorder2");
assertNotNull(border);
- tester.processRequestCycle(border);
- document = tester.getServletResponse().getDocument();
- assertNotNull(document);
assertFalse("".equals(document));
- assertEquals(
- "<span wicket:id=\"myBorder2\"
testAttr=\"myValue\"><wicket:border>before body -
<wicket:body>border</wicket:body> - after body</wicket:border></span>",
- document);
+ assertTrue(document.contains("<span wicket:id=\"myBorder2\"
testAttr=\"myValue\"><wicket:border>before body -
<wicket:body>border</wicket:body> - after body</wicket:border></span>"));
WebMarkupContainer container =
(WebMarkupContainer)tester.getLastRenderedPage().get("test");
assertNotNull(container);
- tester.processRequestCycle(container);
- document = tester.getServletResponse().getDocument();
- assertNotNull(document);
assertFalse("".equals(document));
- assertEquals("body<span wicket:id=\"myLabel2\">Test
Label2</span>", document);
+ assertTrue(document.contains("body<span
wicket:id=\"myLabel2\">Test Label2</span>"));
label =
(Label)tester.getLastRenderedPage().get("test:myLabel2");
assertNotNull(label);
- tester.processRequestCycle(label);
- document = tester.getServletResponse().getDocument();
- assertNotNull(document);
assertFalse("".equals(document));
- assertEquals("<span wicket:id=\"myLabel2\">Test Label2</span>",
document);
+ assertTrue(document.contains("<span wicket:id=\"myLabel2\">Test
Label2</span>"));
}
/**
@@ -142,77 +111,40 @@
{
// Render the component without having rendered the page
previously
SimplePage page = new SimplePage();
-
+ tester.startPage(page);
+ String document = tester.getLastResponseAsString();
Label label = (Label)page.get("myLabel");
assertNotNull(label);
- tester.processRequestCycle(label);
- String document = tester.getServletResponse().getDocument();
- assertNotNull(document);
- assertEquals("<span wicket:id=\"myLabel\">Test Label</span>",
document);
+ assertTrue(document.contains("<span wicket:id=\"myLabel\">Test
Label</span>"));
Panel panel = (Panel)page.get("myPanel");
assertNotNull(panel);
- tester.processRequestCycle(panel);
- document = tester.getServletResponse().getDocument();
- assertNotNull(document);
- assertEquals(
- "<wicket:panel>Inside the panel<span
wicket:id=\"label\">mein Label</span></wicket:panel>",
- document);
+ assertTrue(document.contains("<wicket:panel>Inside the
panel<span wicket:id=\"label\">mein Label</span></wicket:panel>"));
label = (Label)page.get("myPanel:label");
assertNotNull(label);
- tester.processRequestCycle(label);
- document = tester.getServletResponse().getDocument();
- assertNotNull(document);
- assertFalse("".equals(document));
- assertEquals("<span wicket:id=\"label\">mein Label</span>",
document);
+ assertTrue(document.contains("<span wicket:id=\"label\">mein
Label</span>"));
Border border = (Border)page.get("myBorder");
assertNotNull(border);
- tester.processRequestCycle(border);
- document = tester.getServletResponse().getDocument();
- assertNotNull(document);
- assertFalse("".equals(document));
- assertEquals(
- "<wicket:border>before body -
<wicket:body>border</wicket:body> - after body</wicket:border>",
- document);
+ assertTrue(document.contains("<wicket:border>before body -
<wicket:body>border</wicket:body> - after body</wicket:border>"));
border = (Border)page.get("myBorder2");
assertNotNull(border);
- tester.processRequestCycle(border);
- document = tester.getServletResponse().getDocument();
- assertNotNull(document);
- assertFalse("".equals(document));
- assertEquals(
- "<span wicket:id=\"myBorder2\"
testAttr=\"myValue\"><wicket:border>before body -
<wicket:body>border</wicket:body> - after body</wicket:border></span>",
- document);
+ assertTrue(document.contains("<span wicket:id=\"myBorder2\"
testAttr=\"myValue\"><wicket:border>before body -
<wicket:body>border</wicket:body> - after body</wicket:border></span>"));
// do the same test twice. Igor reported a problem with that,
so we have to test it.
border = (Border)page.get("myBorder2");
assertNotNull(border);
- tester.processRequestCycle(border);
- document = tester.getServletResponse().getDocument();
- assertNotNull(document);
- assertFalse("".equals(document));
- assertEquals(
- "<span wicket:id=\"myBorder2\"
testAttr=\"myValue\"><wicket:border>before body -
<wicket:body>border</wicket:body> - after body</wicket:border></span>",
- document);
+ assertTrue(document.contains("<span wicket:id=\"myBorder2\"
testAttr=\"myValue\"><wicket:border>before body -
<wicket:body>border</wicket:body> - after body</wicket:border></span>"));
WebMarkupContainer container =
(WebMarkupContainer)page.get("test");
assertNotNull(container);
- tester.processRequestCycle(container);
- document = tester.getServletResponse().getDocument();
- assertNotNull(document);
- assertFalse("".equals(document));
- assertEquals("body<span wicket:id=\"myLabel2\">Test
Label2</span>", document);
+ assertTrue(document.contains("body<span
wicket:id=\"myLabel2\">Test Label2</span>"));
label = (Label)page.get("test:myLabel2");
assertNotNull(label);
- tester.processRequestCycle(label);
- document = tester.getServletResponse().getDocument();
- assertNotNull(document);
- assertFalse("".equals(document));
- assertEquals("<span wicket:id=\"myLabel2\">Test Label2</span>",
document);
+ assertTrue(document.contains("<span wicket:id=\"myLabel2\">Test
Label2</span>"));
}
/**
@@ -377,20 +309,12 @@
public void testRenderHomePage_10() throws Exception
{
executeTest(SimplePage_10.class,
"SimplePageExpectedResult_10.html");
-
+ String document = tester.getLastResponseAsString();
Panel panel =
(Panel)tester.getLastRenderedPage().get("myPanel");
assertNotNull(panel);
- // we need to setup request/response before calling setvisible
- tester.setupRequestAndResponse();
- tester.createRequestCycle();
panel.setVisible(true);
- tester.processRequestCycle(panel);
- String document = tester.getServletResponse().getDocument();
- assertNotNull(document);
- assertEquals(
- "<wicket:panel>Inside the panel<span
wicket:id=\"label\">mein Label</span></wicket:panel>",
- document);
+ assertTrue(document.contains("<wicket:panel>Inside the
panel<span wicket:id=\"label\">mein Label</span></wicket:panel>"));
}
/**
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimpleResponsePageClassTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimpleResponsePageClassTest.java?rev=910805&r1=910804&r2=910805&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimpleResponsePageClassTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimpleResponsePageClassTest.java
Wed Feb 17 02:48:56 2010
@@ -16,35 +16,28 @@
*/
package org.apache.wicket.markup.html.basic;
-import junit.framework.TestCase;
-
+import org.apache.wicket.WicketTestCase;
import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.util.tester.WicketTester;
/**
* @author jcompagner
*
*/
-public class SimpleResponsePageClassTest extends TestCase
+public class SimpleResponsePageClassTest extends WicketTestCase
{
/**
* @throws Exception
*/
public void testResponsePageClass() throws Exception
{
- WicketTester mockWebApp = new WicketTester();
- mockWebApp.startPage(SimpleResponsePageClass.class);
- SimpleResponsePageClass manageBook =
(SimpleResponsePageClass)mockWebApp.getLastRenderedPage();
+ tester.startPage(SimpleResponsePageClass.class);
+ SimpleResponsePageClass manageBook =
(SimpleResponsePageClass)tester.getLastRenderedPage();
Form form = (Form)manageBook.get("form");
- mockWebApp.setupRequestAndResponse();
- MockHttpServletRequest mockRequest =
mockWebApp.getServletRequest();
- mockRequest.setRequestToComponent(form);
- mockWebApp.processRequestCycle();
+ tester.submitForm(form);
// assertion failed, getLastRenderedPage() return null.
- assertTrue(mockWebApp.getLastRenderedPage() instanceof
SimplePage);
- mockWebApp.destroy();
+ assertTrue(tester.getLastRenderedPage() instanceof SimplePage);
}
}
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTest.java?rev=910805&r1=910804&r2=910805&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTest.java
Wed Feb 17 02:48:56 2010
@@ -32,16 +32,6 @@
*/
public class BoxBorderTest extends WicketTestCase
{
- /**
- * Create the test.
- *
- * @param name
- * The test name
- */
- public BoxBorderTest(String name)
- {
- super(name);
- }
/**
* Test a simply page containing the debug component
@@ -81,7 +71,7 @@
"border:myForm:border_body:name");
assertEquals("", input.getDefaultModelObjectAsString());
-
tester.getLastRequest().getPostRequestParameters().setParameterValue(input.getInputName(),
+
tester.getRequest().getPostRequestParameters().setParameterValue(input.getInputName(),
"jdo");
tester.submitForm(form.getPageRelativePath());
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/ComponentBorderTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/ComponentBorderTest.java?rev=910805&r1=910804&r2=910805&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/ComponentBorderTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/ComponentBorderTest.java
Wed Feb 17 02:48:56 2010
@@ -81,10 +81,10 @@
WebMarkupContainer wrapper =
(WebMarkupContainer)border.get("wrapper");
assertNotNull(wrapper);
tester.clickLink("hideable:hideLink");
- String ajaxResponse = tester.getServletResponse().getDocument();
+ String ajaxResponse = tester.getLastResponseAsString();
tester.assertComponentOnAjaxResponse(wrapper);
tester.clickLink("hideable:hideLink");
- ajaxResponse = tester.getServletResponse().getDocument();
+ ajaxResponse = tester.getLastResponseAsString();
tester.assertComponentOnAjaxResponse(wrapper);
}
}
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/FormHasErrorPage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/FormHasErrorPage.java?rev=910805&r1=910804&r2=910805&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/FormHasErrorPage.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/FormHasErrorPage.java
Wed Feb 17 02:48:56 2010
@@ -18,13 +18,13 @@
import junit.framework.Assert;
-import org.apache.wicket.PageParameters;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.panel.FeedbackPanel;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
+import org.apache.wicket.ng.request.component.PageParameters;
/**
* FormHasErrorPage
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/LocalizedErrorMessageTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/LocalizedErrorMessageTest.java?rev=910805&r1=910804&r2=910805&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/LocalizedErrorMessageTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/LocalizedErrorMessageTest.java
Wed Feb 17 02:48:56 2010
@@ -31,36 +31,27 @@
*/
public void testWICKET_891()
{
- tester.setupRequestAndResponse();
-
- tester.getWicketSession().setLocale(new Locale("nl"));
+ tester.getSession().setLocale(new Locale("nl"));
LocalizedMessagePage page = new LocalizedMessagePage();
tester.startPage(page);
- tester.processRequestCycle();
- tester.setupRequestAndResponse();
-
- tester.getServletRequest().setRequestToComponent(page.form);
-
tester.getServletRequest().setParameter(page.integerField.getInputName(),
"foo");
- page.form.onFormSubmitted();
+
tester.getRequest().getPostRequestParameters().setParameterValue(
+ page.integerField.getInputName(), "foo");
+ tester.submitForm(page.form);
tester.assertErrorMessages(new String[] { "'foo' in veld
'integer' moet een geheel getal zijn. " });
- tester.getWicketSession().setLocale(new Locale("us"));
-
- tester.getWicketSession().cleanupFeedbackMessages();
+ tester.getSession().setLocale(new Locale("us"));
- tester.setupRequestAndResponse();
+ tester.getSession().cleanupFeedbackMessages();
page = new LocalizedMessagePage();
tester.startPage(page);
- tester.processRequestCycle();
- tester.setupRequestAndResponse();
- tester.getServletRequest().setRequestToComponent(page.form);
-
tester.getServletRequest().setParameter(page.integerField.getInputName(),
"foo");
+
tester.getRequest().getPostRequestParameters().setParameterValue(
+ page.integerField.getInputName(), "foo");
- page.form.onFormSubmitted();
+ tester.submitForm(page.form);
tester.assertErrorMessages(new String[] { "'foo' is not a valid
Integer." });
}
@@ -74,37 +65,28 @@
public void testWICKET_1927()
{
tester.getApplication().getMarkupSettings().setDefaultMarkupEncoding("UTF-8");
- tester.setupRequestAndResponse();
-
- tester.getWicketSession().setLocale(new Locale("de"));
+ tester.getSession().setLocale(new Locale("de"));
LocalizedMessagePage page = new LocalizedMessagePage();
tester.startPage(page);
- tester.processRequestCycle();
- tester.setupRequestAndResponse();
- tester.getServletRequest().setRequestToComponent(page.form);
-
tester.getServletRequest().setParameter(page.integerField.getInputName(),
"foo");
+
tester.getRequest().getPostRequestParameters().setParameterValue(
+ page.integerField.getInputName(), "foo");
- page.form.onFormSubmitted();
+ tester.submitForm(page.form);
tester.assertErrorMessages(new String[] { "'foo' ist kein
g\u00FCltiger Wert f\u00FCr 'Integer'." });
- tester.getWicketSession().setLocale(new Locale("pl"));
-
- tester.getWicketSession().cleanupFeedbackMessages();
+ tester.getSession().setLocale(new Locale("pl"));
- tester.setupRequestAndResponse();
+ tester.getSession().cleanupFeedbackMessages();
page = new LocalizedMessagePage();
tester.startPage(page);
- tester.processRequestCycle();
- tester.setupRequestAndResponse();
-
- tester.getServletRequest().setRequestToComponent(page.form);
-
tester.getServletRequest().setParameter(page.integerField.getInputName(),
"foo");
- page.form.onFormSubmitted();
+
tester.getRequest().getPostRequestParameters().setParameterValue(
+ page.integerField.getInputName(), "foo");
+ tester.submitForm(page.form);
tester.assertErrorMessages(new String[] { "'foo' nie jest
w\u0142a\u015Bciwym Integer." });
}
}
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTest.java?rev=910805&r1=910804&r2=910805&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTest.java
Wed Feb 17 02:48:56 2010
@@ -110,8 +110,6 @@
// set up necessary objects to emulate a form submission
- tester.createRequestCycle();
-
// this could have been any page it seems. see comment at method
MockPage page = new MockPage();
@@ -159,8 +157,10 @@
assertTrue("group2: running with nothing selected - model must
be set to null",
model.getObject() == null);
- tester.getServletRequest().setParameter(group.getInputName(),
choice1.getValue());
- tester.getServletRequest().setParameter(group2.getInputName(),
choice3.getValue());
+
tester.getRequest().getPostRequestParameters().setParameterValue(group.getInputName(),
+ choice1.getValue());
+
tester.getRequest().getPostRequestParameters().setParameterValue(group2.getInputName(),
+ choice3.getValue());
form.onFormSubmitted();
assertEquals("group: running with choice1 selected - model must
be set to value of radio1",
modelObject.getProp1(),
choice1.getDefaultModelObject());
@@ -168,12 +168,14 @@
"group2: running with choice3 selected - model must be
set to value of radio1",
model.getObject(), choice3.getDefaultModelObject());
- tester.getServletRequest().setParameter(group.getInputName(),
choice2.getValue());
+
tester.getRequest().getPostRequestParameters().setParameterValue(group.getInputName(),
+ choice2.getValue());
form.onFormSubmitted();
assertEquals("group: running with choice2 selected - model must
be set to value of radio2",
modelObject.getProp1(),
choice2.getDefaultModelObject());
- tester.getServletRequest().setParameter(group2.getInputName(),
choice1.getValue());
+
tester.getRequest().getPostRequestParameters().setParameterValue(group2.getInputName(),
+ choice1.getValue());
try
{
form.onFormSubmitted();
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/TestFormHasError.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/TestFormHasError.java?rev=910805&r1=910804&r2=910805&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/TestFormHasError.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/TestFormHasError.java
Wed Feb 17 02:48:56 2010
@@ -16,27 +16,10 @@
*/
package org.apache.wicket.markup.html.form;
-import junit.framework.TestCase;
+import org.apache.wicket.WicketTestCase;
-import org.apache.wicket.ng.mock.WicketTester;
-
-public class TestFormHasError extends TestCase
+public class TestFormHasError extends WicketTestCase
{
- private WicketTester tester;
-
- @Override
- protected void setUp() throws Exception
- {
- super.setUp();
- tester = new WicketTester();
- }
-
- @Override
- protected void tearDown() throws Exception
- {
- super.tearDown();
- tester = null;
- }
public void testFormHasError()
{
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/ValidatorPropertiesTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/ValidatorPropertiesTest.java?rev=910805&r1=910804&r2=910805&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/ValidatorPropertiesTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/ValidatorPropertiesTest.java
Wed Feb 17 02:48:56 2010
@@ -19,11 +19,8 @@
import java.util.Locale;
import java.util.MissingResourceException;
-import junit.framework.TestCase;
-
-import org.apache.wicket.properties.MyTesterApplication;
+import org.apache.wicket.WicketTestCase;
import org.apache.wicket.properties.TestPage;
-import org.apache.wicket.util.tester.WicketTester;
/**
*
@@ -33,29 +30,14 @@
*
* @author Juergen Donnerstag
*/
-public class ValidatorPropertiesTest extends TestCase
+public class ValidatorPropertiesTest extends WicketTestCase
{
- WicketTester tester;
-
- @Override
- protected void setUp() throws Exception
- {
- tester = new WicketTester(new MyTesterApplication());
- }
-
- @Override
- protected void tearDown() throws Exception
- {
- tester.destroy();
- }
-
/**
*
*/
public void test1()
{
- WebRequestCycle cycle = tester.setupRequestAndResponse();
- cycle.getSession().setLocale(Locale.ENGLISH);
+ tester.getSession().setLocale(Locale.ENGLISH);
// test English/ default
@@ -157,7 +139,7 @@
// now test Dutch
- cycle.getSession().setLocale(new Locale("nl"));
+ tester.getSession().setLocale(new Locale("nl"));
page = new TestPage();
form = (Form)page.get("form1");
assertNotNull(form);
@@ -249,8 +231,6 @@
public void test2()
{
tester.getApplication().getResourceSettings().setThrowExceptionOnMissingResource(false);
- tester.setupRequestAndResponse();
- tester.createRequestCycle();
String str =
tester.getApplication().getResourceSettings().getLocalizer().getString("XXX",
null);
@@ -263,8 +243,6 @@
public void test3()
{
tester.getApplication().getResourceSettings().setThrowExceptionOnMissingResource(true);
- tester.setupRequestAndResponse();
- tester.createRequestCycle();
boolean hit = false;
try
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/border/TestHomePage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/border/TestHomePage.java?rev=910805&r1=910804&r2=910805&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/border/TestHomePage.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/border/TestHomePage.java
Wed Feb 17 02:48:56 2010
@@ -16,25 +16,19 @@
*/
package org.apache.wicket.markup.html.form.border;
-import junit.framework.TestCase;
-
+import org.apache.wicket.WicketTestCase;
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.util.tester.FormTester;
-import org.apache.wicket.util.tester.WicketTester;
/**
* Simple test using the WicketTester
*/
-public class TestHomePage extends TestCase
+public class TestHomePage extends WicketTestCase
{
- private WicketTester tester;
-
- private FormTester formTester;
-
@Override
- public void setUp()
+ public void setUp() throws Exception
{
- tester = new WicketTester();
+ super.setUp();
// Start and render the test page
tester.startPage(HomePage.class);
@@ -46,21 +40,24 @@
*/
public void testWithBorder2()
{
- formTester = tester.newFormTester("border:form");
+ FormTester formTester = tester.newFormTester("border:form");
// formTester.setValue("..:textfield1", "testxxx");
TextField<String> textfield =
(TextField<String>)tester.getLastRenderedPage().get(
"border:form:border_body:textfield");
-
tester.getServletRequest().setParameter(textfield.getInputName(), "abcde");
+
tester.getRequest().getPostRequestParameters().setParameterValue(textfield.getInputName(),
+ "abcde");
MyTextField datefield =
(MyTextField)tester.getLastRenderedPage().get(
"border:form:border_body:datefield");
-
tester.getServletRequest().setParameter(datefield.getInputName(), "aaabbb");
+
tester.getRequest().getPostRequestParameters().setParameterValue(datefield.getInputName(),
+ "aaabbb");
MyDateField datefield2 =
(MyDateField)tester.getLastRenderedPage().get(
"border:form:border_body:datefield2");
TextField<String> date =
(TextField<String>)datefield2.get("date");
- tester.getServletRequest().setParameter(date.getInputName(),
"abcdef");
+
tester.getRequest().getPostRequestParameters().setParameterValue(date.getInputName(),
+ "abcdef");
formTester.submit();
tester.assertNoErrorMessage();
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/feedback/FormFeedbackTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/feedback/FormFeedbackTest.java?rev=910805&r1=910804&r2=910805&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/feedback/FormFeedbackTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/feedback/FormFeedbackTest.java
Wed Feb 17 02:48:56 2010
@@ -26,23 +26,6 @@
{
/**
- * Construct.
- */
- public FormFeedbackTest()
- {
- }
-
- /**
- * Construct.
- *
- * @param name
- */
- public FormFeedbackTest(String name)
- {
- super(name);
- }
-
- /**
* @throws Exception
*/
public void testFormComponentFeedbackBorder() throws Exception
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/InvalidImageButtonTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/InvalidImageButtonTest.java?rev=910805&r1=910804&r2=910805&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/InvalidImageButtonTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/InvalidImageButtonTest.java
Wed Feb 17 02:48:56 2010
@@ -24,7 +24,6 @@
{
tester.startPage(InvalidImageButtonPage.class);
tester.assertRenderedPage(InvalidImageButtonPage.class);
- tester.createRequestCycle();
tester.startPage(new InvalidImageButtonPage());
tester.assertRenderedPage(InvalidImageButtonPage.class);
}
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/submitlink/TestHomePage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/submitlink/TestHomePage.java?rev=910805&r1=910804&r2=910805&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/submitlink/TestHomePage.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/submitlink/TestHomePage.java
Wed Feb 17 02:48:56 2010
@@ -26,7 +26,7 @@
tester.startPage(HomePage.class);
tester.assertRenderedPage(HomePage.class);
HomePage home = (HomePage)tester.getLastRenderedPage();
- tester.setParameterForNextRequest("form:text", "Hello");
+
tester.getRequest().getPostRequestParameters().setParameterValue("form:text",
"Hello");
tester.clickLink("form:link");
assertEquals("Hello", home.getText());
assertTrue("Form.onSubmit() has not been called!",
home.isSubmitted());
@@ -38,9 +38,9 @@
tester.startPage(HomePage.class);
tester.assertRenderedPage(HomePage.class);
HomePage home = (HomePage)tester.getLastRenderedPage();
- tester.setParameterForNextRequest("form:text", "Hello");
+
tester.getRequest().getPostRequestParameters().setParameterValue("form:text",
"Hello");
// Pretend we clicked on "link"
- tester.getParametersForNextRequest().put("link", new String[] {
"" });
+
tester.getRequest().getPostRequestParameters().setParameterValue("link", "");
tester.submitForm("form");
assertEquals("Hello", home.getText());
assertTrue("Form.onSubmit() has not been called!",
home.isSubmitted());
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/validation/HomePageTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/validation/HomePageTest.java?rev=910805&r1=910804&r2=910805&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/validation/HomePageTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/validation/HomePageTest.java
Wed Feb 17 02:48:56 2010
@@ -80,8 +80,8 @@
{
TextField textfield =
(TextField)tester.getLastRenderedPage().get(
"border:form2:border_body:textfield1");
-
tester.getLastRequest().getPostRequestParameters().setParameterValue(
- textfield.getInputName(), "abcde");
+
tester.getRequest().getPostRequestParameters().setParameterValue(textfield.getInputName(),
+ "abcde");
tester.executeAjaxEvent("border:form2:submit", "onclick");
tester.assertNoErrorMessage();
assertFalse(((MyBorder)tester.getLastRenderedPage().get("border")).hitOnError);
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/SimpleTableTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/SimpleTableTest.java?rev=910805&r1=910804&r2=910805&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/SimpleTableTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/SimpleTableTest.java
Wed Feb 17 02:48:56 2010
@@ -26,16 +26,6 @@
public class SimpleTableTest extends WicketTestCase
{
/**
- * Construct.
- *
- * @param arg0
- */
- public SimpleTableTest(String arg0)
- {
- super(arg0);
- }
-
- /**
* Test simple table behavior.
*
* @throws Exception
@@ -43,35 +33,20 @@
public void testSimpleTable_1() throws Exception
{
executeTest(SimpleTablePage_1.class,
"SimpleTablePageExpectedResult_1.html");
-
+ String document = tester.getLastResponseAsString();
// Does re-render do as well ??
ListView view =
(ListView)tester.getLastRenderedPage().get("table");
assertNotNull(view);
- tester.processRequestCycle(view);
- String document = tester.getServletResponse().getDocument();
- assertNotNull(document);
- assertFalse("".equals(document));
- assertEquals(
- "<li wicket:id=\"table\"><span
wicket:id=\"txt\">one</span></li><li wicket:id=\"table\"><span
wicket:id=\"txt\">two</span></li><li wicket:id=\"table\"><span
wicket:id=\"txt\">three</span></li>",
- document);
+ assertTrue(document.contains("<li wicket:id=\"table\"><span
wicket:id=\"txt\">one</span></li><li wicket:id=\"table\"><span
wicket:id=\"txt\">two</span></li><li wicket:id=\"table\"><span
wicket:id=\"txt\">three</span></li>"));
// Does re-render do as well ??
ListItem item =
(ListItem)tester.getLastRenderedPage().get("table:0");
- assertNotNull(item);
- tester.processRequestCycle(item);
- document = tester.getServletResponse().getDocument();
- assertNotNull(document);
- assertFalse("".equals(document));
- assertEquals("<li wicket:id=\"table\"><span
wicket:id=\"txt\">one</span></li>", document);
+ assertTrue(document.contains("<li wicket:id=\"table\"><span
wicket:id=\"txt\">one</span></li>"));
// Does re-render do as well ??
Label label =
(Label)tester.getLastRenderedPage().get("table:1:txt");
assertNotNull(label);
- tester.processRequestCycle(label);
- document = tester.getServletResponse().getDocument();
- assertNotNull(document);
- assertFalse("".equals(document));
- assertEquals("<span wicket:id=\"txt\">two</span>", document);
+ assertTrue(document.contains("<span
wicket:id=\"txt\">two</span>"));
}
/**
@@ -82,27 +57,15 @@
public void testSimpleTable_2() throws Exception
{
executeTest(SimpleTablePage_2.class,
"SimpleTablePageExpectedResult_2.html");
-
+ String document = tester.getLastResponseAsString();
// Does re-render do as well ??
ListView view =
(ListView)tester.getLastRenderedPage().get("table");
assertNotNull(view);
- tester.processRequestCycle(view);
- String document = tester.getServletResponse().getDocument();
- assertNotNull(document);
- assertFalse("".equals(document));
- assertEquals(
- "<li wicket:id=\"table\"><span
wicket:id=\"txt\">one</span></li><li wicket:id=\"table\"><span
wicket:id=\"txt\">two</span></li><li wicket:id=\"table\"><span
wicket:id=\"txt\">three</span></li>",
- document);
+ assertTrue(document.contains("<li wicket:id=\"table\"><span
wicket:id=\"txt\">one</span></li><li wicket:id=\"table\"><span
wicket:id=\"txt\">two</span></li><li wicket:id=\"table\"><span
wicket:id=\"txt\">three</span></li>"));
// Does re-render do as well ??
view = (ListView)tester.getLastRenderedPage().get("table");
assertNotNull(view);
- tester.processRequestCycle(view);
- document = tester.getServletResponse().getDocument();
- assertNotNull(document);
- assertFalse("".equals(document));
- assertEquals(
- "<li wicket:id=\"table\"><span
wicket:id=\"txt\">one</span></li><li wicket:id=\"table\"><span
wicket:id=\"txt\">two</span></li><li wicket:id=\"table\"><span
wicket:id=\"txt\">three</span></li>",
- document);
+ assertTrue(document.contains("<li wicket:id=\"table\"><span
wicket:id=\"txt\">one</span></li><li wicket:id=\"table\"><span
wicket:id=\"txt\">two</span></li><li wicket:id=\"table\"><span
wicket:id=\"txt\">three</span></li>"));
}
}
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WebSessionTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WebSessionTest.java?rev=910805&r1=910804&r2=910805&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WebSessionTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WebSessionTest.java
Wed Feb 17 02:48:56 2010
@@ -18,11 +18,10 @@
import java.util.Locale;
-import javax.servlet.http.HttpServletRequest;
-
import junit.framework.TestCase;
-import org.apache.wicket.protocol.http.servlet.ServletWebRequest;
+import org.apache.wicket.ng.mock.MockWebRequest;
+import org.apache.wicket.ng.request.Url;
/**
* @author Timo Rantalaiho
@@ -32,7 +31,7 @@
public void testReadsLocaleFromRequestOnConstruction()
{
final Locale locale = Locale.TRADITIONAL_CHINESE;
- HttpServletRequest request = new MockHttpServletRequest(null,
null, null)
+ MockWebRequest request = new MockWebRequest(Url.parse("/"))
{
@Override
public Locale getLocale()
@@ -41,7 +40,7 @@
}
};
- WebSession session = new WebSession(new
ServletWebRequest(request));
+ WebSession session = new WebSession(request);
assertEquals(locale, session.getLocale());
}
}
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WicketTagPanelTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WicketTagPanelTest.java?rev=910805&r1=910804&r2=910805&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WicketTagPanelTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/protocol/http/WicketTagPanelTest.java
Wed Feb 17 02:48:56 2010
@@ -16,12 +16,10 @@
*/
package org.apache.wicket.protocol.http;
-import junit.framework.TestCase;
-
+import org.apache.wicket.WicketTestCase;
import
org.apache.wicket.protocol.http.documentvalidation.HtmlDocumentValidator;
import org.apache.wicket.protocol.http.documentvalidation.Tag;
import org.apache.wicket.protocol.http.documentvalidation.TextContent;
-import org.apache.wicket.util.tester.WicketTester;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -32,44 +30,18 @@
*
* @author Chris Turner
*/
-public class WicketTagPanelTest extends TestCase
+public class WicketTagPanelTest extends WicketTestCase
{
private static final Logger log =
LoggerFactory.getLogger(WicketTagPanelTest.class);
- private WicketTester application;
-
- /**
- * Create the test.
- *
- * @param name
- * The test name
- */
- public WicketTagPanelTest(String name)
- {
- super(name);
- }
-
- @Override
- protected void setUp() throws Exception
- {
- super.setUp();
- application = new WicketTester();
- }
-
- @Override
- protected void tearDown() throws Exception
- {
- application.destroy();
- }
-
/**
* @throws Exception
*/
public void testRenderHomePage() throws Exception
{
- application.startPage(WicketPanelPage.class);
+ tester.startPage(WicketPanelPage.class);
// Validate the document
- String document =
application.getServletResponse().getDocument();
+ String document = tester.getLastResponseAsString();
log.info(document);
assertTrue(validatePage1(document));
}
@@ -105,11 +77,11 @@
public void testRenderHomePageWicketTagRemoved() throws Exception
{
// Remove wicket tags from output
-
application.getApplication().getMarkupSettings().setStripWicketTags(true);
- application.startPage(WicketPanelPage.class);
+
tester.getApplication().getMarkupSettings().setStripWicketTags(true);
+ tester.startPage(WicketPanelPage.class);
// Validate the document
- String document =
application.getServletResponse().getDocument();
+ String document = tester.getLastResponseAsString();
log.info(document);
assertTrue("Document with Wicket tags stripped did not match",
validatePage2(document));
}
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockFormFileUploadPage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockFormFileUploadPage.java?rev=910805&r1=910804&r2=910805&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockFormFileUploadPage.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/MockFormFileUploadPage.java
Wed Feb 17 02:48:56 2010
@@ -99,7 +99,7 @@
form.setMaxSize(Bytes.kilobytes(100));
form.add(new TextField<String>("text"));
fileUploadField = new FileUploadField("file", new
Model<FileUpload>());
- fileUploadField.setRequired(param.getAsBoolean("required",
true));
+
fileUploadField.setRequired(param.getNamedParameter("required").toBoolean());
form.add(fileUploadField);
}
