Author: ivaynberg Date: Fri Feb 12 06:09:18 2010 New Revision: 909253 URL: http://svn.apache.org/viewvc?rev=909253&view=rev Log: test fixes wip, more passing then failing now... :)
Removed: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/mock/WicketTester.java wicket/trunk/wicket/src/test/java/org/apache/wicket/properties/MyApplication.java wicket/trunk/wicket/src/test/java/org/apache/wicket/properties/MyTesterApplication.java Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/mock/MockRequestCycle.java wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java wicket/trunk/wicket/src/test/java/org/apache/wicket/WicketTestCase.java wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BorderRenderWrappedTestPage_1.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/header/threelayers2/InheritanceHeadTest.java wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorTest.java wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderTest.java wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginTest.java wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableTest.java wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/page/TestHomePage.java wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/resolver/TestHomePage.java wicket/trunk/wicket/src/test/java/org/apache/wicket/model/InheritedModelTest.java wicket/trunk/wicket/src/test/java/org/apache/wicket/model/StringResourceModelTest.java wicket/trunk/wicket/src/test/java/org/apache/wicket/properties/PropertiesTest.java wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/StringResourceLoaderTestBase.java wicket/trunk/wicket/src/test/java/org/apache/wicket/util/cookies/CookieUtilsTest.java wicket/trunk/wicket/src/test/java/org/apache/wicket/util/crypt/Base64Test.java wicket/trunk/wicket/src/test/java/org/apache/wicket/util/lang/PropertyResolverTest.java wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_7/TestHomePage.java Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/mock/MockRequestCycle.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/mock/MockRequestCycle.java?rev=909253&r1=909252&r2=909253&view=diff ============================================================================== --- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/mock/MockRequestCycle.java (original) +++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/mock/MockRequestCycle.java Fri Feb 12 06:09:18 2010 @@ -17,6 +17,7 @@ package org.apache.wicket.ng.mock; import org.apache.wicket.IRequestHandler; +import org.apache.wicket.ng.ThreadContext; import org.apache.wicket.ng.request.cycle.RequestCycle; import org.apache.wicket.ng.request.cycle.RequestCycleContext; @@ -62,4 +63,12 @@ return super.resolveRequestHandler(); } } + + @Override + public void detach() + { + super.detach(); + // keep self in the threadlocal so we can generate urls in the test case + ThreadContext.setRequestCycle(this); + } } 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=909253&r1=909252&r2=909253&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 Fri Feb 12 06:09:18 2010 @@ -23,6 +23,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; +import java.util.UUID; import java.util.regex.Pattern; import org.apache.wicket.Component; @@ -61,7 +62,6 @@ import org.apache.wicket.ng.mock.MockRequestCycle; import org.apache.wicket.ng.mock.MockWebRequest; import org.apache.wicket.ng.mock.MockWebResponse; -import org.apache.wicket.ng.mock.WicketTester; import org.apache.wicket.ng.request.IRequestMapper; import org.apache.wicket.ng.request.Url; import org.apache.wicket.ng.request.component.IRequestablePage; @@ -189,8 +189,10 @@ { oldThreadContext = ThreadContext.detach(); - this.application = new MockApplication(); - this.application.setName("WicketTesterApplication"); + this.application = application; + // FIXME some tests are leaking applications by not calling destroy on them or overriding + // teardown() without calling super, for now we work around by making each name unique + this.application.setName("WicketTesterApplication-" + UUID.randomUUID()); this.application.set(); this.application.initApplication(); @@ -239,8 +241,8 @@ */ public void destroy() { - ThreadContext.restore(oldThreadContext); - application.internalDestroy(); + application.destroy(); + ThreadContext.detach(); } /** Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/WicketTestCase.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/WicketTestCase.java?rev=909253&r1=909252&r2=909253&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/WicketTestCase.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/WicketTestCase.java Fri Feb 12 06:09:18 2010 @@ -52,24 +52,19 @@ super(name); } - /** - * @see junit.framework.TestCase#setUp() - */ @Override protected void setUp() throws Exception { tester = new WicketTester(); } - /** - * @see junit.framework.TestCase#tearDown() - */ @Override protected void tearDown() throws Exception { tester.destroy(); } + /** * Use <code>-Dwicket.replace.expected.results=true</code> to automatically replace the expected * output file. Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BorderRenderWrappedTestPage_1.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BorderRenderWrappedTestPage_1.java?rev=909253&r1=909252&r2=909253&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BorderRenderWrappedTestPage_1.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BorderRenderWrappedTestPage_1.java Fri Feb 12 06:09:18 2010 @@ -16,9 +16,9 @@ */ package org.apache.wicket.markup.html.border; +import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.markup.html.form.TextField; -import org.apache.wicket.markup.html.image.Image; /** * Mock page for testing. @@ -39,6 +39,6 @@ add(border); border.getBodyContainer().add(new TextField<String>("text")); - border.getBodyContainer().add(new Image("img")); + border.getBodyContainer().add(new WebMarkupContainer("img")); } } 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=909253&r1=909252&r2=909253&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 Fri Feb 12 06:09:18 2010 @@ -16,8 +16,7 @@ */ package org.apache.wicket.markup.html.form.validation; -import junit.framework.TestCase; - +import org.apache.wicket.WicketTestCase; import org.apache.wicket.feedback.FeedbackMessage; import org.apache.wicket.markup.html.form.TextField; import org.apache.wicket.util.tester.FormTester; @@ -26,14 +25,13 @@ /** * Simple test using the WicketTester */ -public class HomePageTest extends TestCase +public class HomePageTest extends WicketTestCase { - private WicketTester tester; @Override - public void setUp() + public void setUp() throws Exception { - tester = new WicketTester(); + super.setUp(); tester.startPage(HomePage.class); tester.assertRenderedPage(HomePage.class); } @@ -82,7 +80,8 @@ { TextField textfield = (TextField)tester.getLastRenderedPage().get( "border:form2:border_body:textfield1"); - tester.getServletRequest().setParameter(textfield.getInputName(), "abcde"); + tester.getLastRequest().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/header/threelayers2/InheritanceHeadTest.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/header/threelayers2/InheritanceHeadTest.java?rev=909253&r1=909252&r2=909253&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/header/threelayers2/InheritanceHeadTest.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/header/threelayers2/InheritanceHeadTest.java Fri Feb 12 06:09:18 2010 @@ -17,6 +17,7 @@ package org.apache.wicket.markup.html.header.threelayers2; import org.apache.wicket.WicketTestCase; +import org.junit.Test; /** * Tests the inclusion of the wicket:head section from a panel in a subclassed page. @@ -26,19 +27,10 @@ public class InheritanceHeadTest extends WicketTestCase { /** - * Construct. - * - * @param name - */ - public InheritanceHeadTest(String name) - { - super(name); - } - - /** * * @throws Exception */ + @Test public void test_1() throws Exception { executeTest(MeldingPage.class, "ExpectedResult.html"); Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorTest.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorTest.java?rev=909253&r1=909252&r2=909253&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorTest.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorTest.java Fri Feb 12 06:09:18 2010 @@ -18,17 +18,15 @@ import java.util.List; -import junit.framework.TestCase; - +import org.apache.wicket.WicketTestCase; import org.apache.wicket.markup.html.link.Link; import org.apache.wicket.util.diff.DiffUtil; -import org.apache.wicket.util.tester.WicketTester; /** * Test for simple table behavior. */ -public class PagedTableNavigatorTest extends TestCase +public class PagedTableNavigatorTest extends WicketTestCase { /** * Construct. @@ -56,11 +54,10 @@ */ public void testPagedTable() throws Exception { - WicketTester application = new WicketTester(); - application.startPage(PagedTableNavigatorPage.class); - PagedTableNavigatorPage page = (PagedTableNavigatorPage)application.getLastRenderedPage(); - String document = application.getServletResponse().getDocument(); - application.setupRequestAndResponse(); + tester.startPage(PagedTableNavigatorPage.class); + PagedTableNavigatorPage page = (PagedTableNavigatorPage)tester.getLastRenderedPage(); + String document = tester.getLastResponseAsString(); + DiffUtil.validatePage(document, this.getClass(), "PagedTableNavigatorExpectedResult_1.html", true); @@ -77,10 +74,10 @@ assertTrue(link.isEnabled()); link = (Link)page.get("navigator:next"); - application.setupRequestAndResponse(); - application.getServletRequest().setRequestToComponent(link); - application.processRequestCycle(); - document = application.getServletResponse().getDocument(); + + tester.clickLink(link.getPageRelativePath()); + + document = tester.getLastResponseAsString(); DiffUtil.validatePage(document, this.getClass(), "PagedTableNavigatorExpectedResult_2.html", true); @@ -97,10 +94,8 @@ assertTrue(link.isEnabled()); link = (Link)page.get("navigator:prev"); - application.setupRequestAndResponse(); - application.getServletRequest().setRequestToComponent(link); - application.processRequestCycle(); - document = application.getServletResponse().getDocument(); + tester.clickLink(link.getPageRelativePath()); + document = tester.getLastResponseAsString(); DiffUtil.validatePage(document, this.getClass(), "PagedTableNavigatorExpectedResult_3.html", true); @@ -117,10 +112,8 @@ assertTrue(link.isEnabled()); link = (Link)page.get("navigator:last"); - application.setupRequestAndResponse(); - application.getServletRequest().setRequestToComponent(link); - application.processRequestCycle(); - document = application.getServletResponse().getDocument(); + tester.clickLink(link.getPageRelativePath()); + document = tester.getLastResponseAsString(); DiffUtil.validatePage(document, this.getClass(), "PagedTableNavigatorExpectedResult_4.html", true); @@ -137,10 +130,8 @@ assertFalse(link.isEnabled()); link = (Link)page.get("navigator:first"); - application.setupRequestAndResponse(); - application.getServletRequest().setRequestToComponent(link); - application.processRequestCycle(); - document = application.getServletResponse().getDocument(); + tester.clickLink(link.getPageRelativePath()); + document = tester.getLastResponseAsString(); DiffUtil.validatePage(document, this.getClass(), "PagedTableNavigatorExpectedResult_5.html", true); @@ -157,10 +148,8 @@ assertTrue(link.isEnabled()); link = (Link)page.get("navigator:navigation:2:pageLink"); - application.setupRequestAndResponse(); - application.getServletRequest().setRequestToComponent(link); - application.processRequestCycle(); - document = application.getServletResponse().getDocument(); + tester.clickLink(link.getPageRelativePath()); + document = tester.getLastResponseAsString(); DiffUtil.validatePage(document, this.getClass(), "PagedTableNavigatorExpectedResult_6.html", true); @@ -177,10 +166,8 @@ assertTrue(link.isEnabled()); link = (Link)page.get("navigator:prev"); - application.setupRequestAndResponse(); - application.getServletRequest().setRequestToComponent(link); - application.processRequestCycle(); - document = application.getServletResponse().getDocument(); + tester.clickLink(link.getPageRelativePath()); + document = tester.getLastResponseAsString(); DiffUtil.validatePage(document, this.getClass(), "PagedTableNavigatorExpectedResult_7.html", true); @@ -203,13 +190,11 @@ modelData.add("add-3"); link = (Link)page.get("navigator:first"); - application.setupRequestAndResponse(); - application.getServletRequest().setRequestToComponent(link); - application.processRequestCycle(); - document = application.getServletResponse().getDocument(); + tester.clickLink(link.getPageRelativePath()); + document = tester.getLastResponseAsString(); DiffUtil.validatePage(document, this.getClass(), "PagedTableNavigatorExpectedResult_8.html", true); - application.destroy(); + tester.destroy(); } } Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderTest.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderTest.java?rev=909253&r1=909252&r2=909253&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderTest.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderTest.java Fri Feb 12 06:09:18 2010 @@ -16,17 +16,15 @@ */ package org.apache.wicket.markup.html.list; -import junit.framework.TestCase; - +import org.apache.wicket.WicketTestCase; import org.apache.wicket.markup.html.link.Link; import org.apache.wicket.util.diff.DiffUtil; -import org.apache.wicket.util.tester.WicketTester; /** * Test for simple table behavior. */ -public class PagedTableNavigatorWithLabelProviderTest extends TestCase +public class PagedTableNavigatorWithLabelProviderTest extends WicketTestCase { /** * Construct. @@ -54,10 +52,9 @@ */ public void testPagedTable() throws Exception { - WicketTester application = new WicketTester(); - application.startPage(PagedTableNavigatorWithLabelProviderPage.class); - PagedTableNavigatorWithLabelProviderPage page = (PagedTableNavigatorWithLabelProviderPage)application.getLastRenderedPage(); - String document = application.getServletResponse().getDocument(); + tester.startPage(PagedTableNavigatorWithLabelProviderPage.class); + PagedTableNavigatorWithLabelProviderPage page = (PagedTableNavigatorWithLabelProviderPage)tester.getLastRenderedPage(); + String document = tester.getLastResponseAsString(); DiffUtil.validatePage(document, this.getClass(), "PagedTableNavigatorWithLabelProviderExpectedResult_1.html", true); @@ -74,10 +71,8 @@ assertTrue(link.isEnabled()); link = (Link)page.get("navigator:next"); - application.setupRequestAndResponse(); - application.getServletRequest().setRequestToComponent(link); - application.processRequestCycle(); - document = application.getServletResponse().getDocument(); + tester.clickLink(link.getPageRelativePath()); + document = tester.getLastResponseAsString(); DiffUtil.validatePage(document, this.getClass(), "PagedTableNavigatorWithLabelProviderExpectedResult_2.html", true); @@ -94,10 +89,8 @@ assertTrue(link.isEnabled()); link = (Link)page.get("navigator:prev"); - application.setupRequestAndResponse(); - application.getServletRequest().setRequestToComponent(link); - application.processRequestCycle(); - document = application.getServletResponse().getDocument(); + tester.clickLink(link.getPageRelativePath()); + document = tester.getLastResponseAsString(); DiffUtil.validatePage(document, this.getClass(), "PagedTableNavigatorWithLabelProviderExpectedResult_3.html", true); @@ -114,10 +107,8 @@ assertTrue(link.isEnabled()); link = (Link)page.get("navigator:last"); - application.setupRequestAndResponse(); - application.getServletRequest().setRequestToComponent(link); - application.processRequestCycle(); - document = application.getServletResponse().getDocument(); + tester.clickLink(link.getPageRelativePath()); + document = tester.getLastResponseAsString(); DiffUtil.validatePage(document, this.getClass(), "PagedTableNavigatorWithLabelProviderExpectedResult_4.html", true); @@ -134,10 +125,8 @@ assertFalse(link.isEnabled()); link = (Link)page.get("navigator:first"); - application.setupRequestAndResponse(); - application.getServletRequest().setRequestToComponent(link); - application.processRequestCycle(); - document = application.getServletResponse().getDocument(); + tester.clickLink(link.getPageRelativePath()); + document = tester.getLastResponseAsString(); DiffUtil.validatePage(document, this.getClass(), "PagedTableNavigatorWithLabelProviderExpectedResult_5.html", true); @@ -154,10 +143,8 @@ assertTrue(link.isEnabled()); link = (Link)page.get("navigator:navigation:3:pageLink"); - application.setupRequestAndResponse(); - application.getServletRequest().setRequestToComponent(link); - application.processRequestCycle(); - document = application.getServletResponse().getDocument(); + tester.clickLink(link.getPageRelativePath()); + document = tester.getLastResponseAsString(); DiffUtil.validatePage(document, this.getClass(), "PagedTableNavigatorWithLabelProviderExpectedResult_6.html", true); @@ -174,10 +161,8 @@ assertTrue(link.isEnabled()); link = (Link)page.get("navigator:prev"); - application.setupRequestAndResponse(); - application.getServletRequest().setRequestToComponent(link); - application.processRequestCycle(); - document = application.getServletResponse().getDocument(); + tester.clickLink(link.getPageRelativePath()); + document = tester.getLastResponseAsString(); DiffUtil.validatePage(document, this.getClass(), "PagedTableNavigatorWithLabelProviderExpectedResult_7.html", true); @@ -193,6 +178,6 @@ link = (Link)page.get("navigator:last"); assertTrue(link.isEnabled()); - application.destroy(); + tester.destroy(); } } Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginTest.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginTest.java?rev=909253&r1=909252&r2=909253&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginTest.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginTest.java Fri Feb 12 06:09:18 2010 @@ -16,17 +16,15 @@ */ package org.apache.wicket.markup.html.list; -import junit.framework.TestCase; - +import org.apache.wicket.WicketTestCase; import org.apache.wicket.markup.html.link.Link; import org.apache.wicket.util.diff.DiffUtil; -import org.apache.wicket.util.tester.WicketTester; /** * Test for simple table behavior. */ -public class PagedTableNavigatorWithMarginTest extends TestCase +public class PagedTableNavigatorWithMarginTest extends WicketTestCase { /** * Construct. @@ -54,10 +52,9 @@ */ public void testPagedTable() throws Exception { - WicketTester application = new WicketTester(); - application.startPage(PagedTableNavigatorWithMarginPage.class); - PagedTableNavigatorWithMarginPage page = (PagedTableNavigatorWithMarginPage)application.getLastRenderedPage(); - String document = application.getServletResponse().getDocument(); + tester.startPage(PagedTableNavigatorWithMarginPage.class); + PagedTableNavigatorWithMarginPage page = (PagedTableNavigatorWithMarginPage)tester.getLastRenderedPage(); + String document = tester.getLastResponseAsString(); DiffUtil.validatePage(document, this.getClass(), "PagedTableNavigatorWithMarginExpectedResult_1.html", true); @@ -74,10 +71,8 @@ assertTrue(link.isEnabled()); link = (Link)page.get("navigator:next"); - application.setupRequestAndResponse(); - application.getServletRequest().setRequestToComponent(link); - application.processRequestCycle(); - document = application.getServletResponse().getDocument(); + tester.clickLink(link.getPageRelativePath()); + document = tester.getLastResponseAsString(); DiffUtil.validatePage(document, this.getClass(), "PagedTableNavigatorWithMarginExpectedResult_2.html", true); @@ -94,10 +89,8 @@ assertTrue(link.isEnabled()); link = (Link)page.get("navigator:prev"); - application.setupRequestAndResponse(); - application.getServletRequest().setRequestToComponent(link); - application.processRequestCycle(); - document = application.getServletResponse().getDocument(); + tester.clickLink(link.getPageRelativePath()); + document = tester.getLastResponseAsString(); DiffUtil.validatePage(document, this.getClass(), "PagedTableNavigatorWithMarginExpectedResult_3.html", true); @@ -114,10 +107,8 @@ assertTrue(link.isEnabled()); link = (Link)page.get("navigator:last"); - application.setupRequestAndResponse(); - application.getServletRequest().setRequestToComponent(link); - application.processRequestCycle(); - document = application.getServletResponse().getDocument(); + tester.clickLink(link.getPageRelativePath()); + document = tester.getLastResponseAsString(); DiffUtil.validatePage(document, this.getClass(), "PagedTableNavigatorWithMarginExpectedResult_4.html", true); @@ -134,10 +125,8 @@ assertFalse(link.isEnabled()); link = (Link)page.get("navigator:first"); - application.setupRequestAndResponse(); - application.getServletRequest().setRequestToComponent(link); - application.processRequestCycle(); - document = application.getServletResponse().getDocument(); + tester.clickLink(link.getPageRelativePath()); + document = tester.getLastResponseAsString(); DiffUtil.validatePage(document, this.getClass(), "PagedTableNavigatorWithMarginExpectedResult_5.html", true); @@ -154,10 +143,8 @@ assertTrue(link.isEnabled()); link = (Link)page.get("navigator:navigation:3:pageLink"); - application.setupRequestAndResponse(); - application.getServletRequest().setRequestToComponent(link); - application.processRequestCycle(); - document = application.getServletResponse().getDocument(); + tester.clickLink(link.getPageRelativePath()); + document = tester.getLastResponseAsString(); DiffUtil.validatePage(document, this.getClass(), "PagedTableNavigatorWithMarginExpectedResult_6.html", true); @@ -174,10 +161,8 @@ assertTrue(link.isEnabled()); link = (Link)page.get("navigator:prev"); - application.setupRequestAndResponse(); - application.getServletRequest().setRequestToComponent(link); - application.processRequestCycle(); - document = application.getServletResponse().getDocument(); + tester.clickLink(link.getPageRelativePath()); + document = tester.getLastResponseAsString(); DiffUtil.validatePage(document, this.getClass(), "PagedTableNavigatorWithMarginExpectedResult_7.html", true); Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableTest.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableTest.java?rev=909253&r1=909252&r2=909253&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableTest.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/list/PagedTableTest.java Fri Feb 12 06:09:18 2010 @@ -16,20 +16,18 @@ */ package org.apache.wicket.markup.html.list; -import junit.framework.TestCase; - +import org.apache.wicket.WicketTestCase; import org.apache.wicket.markup.html.link.Link; 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.diff.DiffUtil; -import org.apache.wicket.util.tester.WicketTester; /** * Test for simple table behavior. */ -public class PagedTableTest extends TestCase +public class PagedTableTest extends WicketTestCase { /** @@ -58,19 +56,16 @@ */ public void testPagedTable() throws Exception { - WicketTester application = new WicketTester(); - application.startPage(PagedTablePage.class); - PagedTablePage page = (PagedTablePage)application.getLastRenderedPage(); - String document = application.getServletResponse().getDocument(); + tester.startPage(PagedTablePage.class); + PagedTablePage page = (PagedTablePage)tester.getLastRenderedPage(); + String document = tester.getLastResponseAsString(); assertTrue(validatePage1(document)); Link link = (Link)page.get("navigation:1:pageLink"); - application.setupRequestAndResponse(); - application.getServletRequest().setRequestToComponent(link); - application.processRequestCycle(); - document = application.getServletResponse().getDocument(); + tester.clickLink(link.getPageRelativePath()); + document = tester.getLastResponseAsString(); DiffUtil.validatePage(document, this.getClass(), "PagedTablePageExpectedResult.html", true); - application.destroy(); + tester.destroy(); } /** Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/page/TestHomePage.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/page/TestHomePage.java?rev=909253&r1=909252&r2=909253&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/page/TestHomePage.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/page/TestHomePage.java Fri Feb 12 06:09:18 2010 @@ -16,22 +16,13 @@ */ package org.apache.wicket.markup.html.page; -import junit.framework.TestCase; - -import org.apache.wicket.ng.mock.WicketTester; +import org.apache.wicket.WicketTestCase; /** * Simple test using the WicketTester */ -public class TestHomePage extends TestCase +public class TestHomePage extends WicketTestCase { - private WicketTester tester; - - @Override - public void setUp() - { - tester = new WicketTester(); - } public void testRenderMyPage() { Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/resolver/TestHomePage.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/resolver/TestHomePage.java?rev=909253&r1=909252&r2=909253&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/resolver/TestHomePage.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/resolver/TestHomePage.java Fri Feb 12 06:09:18 2010 @@ -16,22 +16,13 @@ */ package org.apache.wicket.markup.resolver; -import junit.framework.TestCase; - -import org.apache.wicket.util.tester.WicketTester; +import org.apache.wicket.WicketTestCase; /** * Simple test using the WicketTester */ -public class TestHomePage extends TestCase +public class TestHomePage extends WicketTestCase { - private WicketTester tester; - - @Override - public void setUp() - { - tester = new WicketTester(); - } /** * @@ -50,7 +41,7 @@ String href = "href=\"resources/org.apache.wicket.markup.resolver.HomePage_1/main.css\""; - String doc = tester.getServletResponse().getDocument(); + String doc = tester.getLastResponseAsString(); tester.assertContains(href); // When rendered the 2nd time, the result should be same. The href must not contain the @@ -69,7 +60,7 @@ String href = "href=\"resources/org.apache.wicket.markup.resolver.HomePage_2/main.css\""; - String doc = tester.getServletResponse().getDocument(); + String doc = tester.getLastResponseAsString(); tester.assertContains(href); // When rendered the 2nd time, the result should be same. The href must not contain the Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/model/InheritedModelTest.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/model/InheritedModelTest.java?rev=909253&r1=909252&r2=909253&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/model/InheritedModelTest.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/model/InheritedModelTest.java Fri Feb 12 06:09:18 2010 @@ -39,12 +39,11 @@ InheritedTestPage page = new InheritedTestPage(); - tester.setupRequestAndResponse(); + page.setDefaultModel(new CompoundPropertyModel(data1)); tester.startPage(page); tester.assertLabel("label", "foo"); - tester.setupRequestAndResponse(); page.setDefaultModel(new CompoundPropertyModel(data2)); tester.startPage(page); tester.assertLabel("label", "bar"); Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/model/StringResourceModelTest.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/model/StringResourceModelTest.java?rev=909253&r1=909252&r2=909253&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/model/StringResourceModelTest.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/model/StringResourceModelTest.java Fri Feb 12 06:09:18 2010 @@ -22,22 +22,19 @@ import java.util.Locale; import junit.framework.Assert; -import junit.framework.TestCase; +import org.apache.wicket.WicketTestCase; import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.protocol.http.MockPage; import org.apache.wicket.resource.loader.BundleStringResourceLoader; -import org.apache.wicket.util.tester.WicketTester; /** * Test cases for the <code>StringResourceModel</code> class. * * @author Chris Turner */ -public class StringResourceModelTest extends TestCase +public class StringResourceModelTest extends WicketTestCase { - private WicketTester tester; - private WebPage page; private WeatherStation ws; @@ -58,7 +55,7 @@ @Override protected void setUp() throws Exception { - tester = new WicketTester(); + super.setUp(); tester.getApplication().getResourceSettings().addStringResourceLoader( new BundleStringResourceLoader("org.apache.wicket.model.StringResourceModelTest")); page = new MockPage(); @@ -66,11 +63,6 @@ wsModel = new Model<WeatherStation>(ws); } - @Override - protected void tearDown() throws Exception - { - tester.destroy(); - } /** * @@ -181,7 +173,7 @@ public void testSubstitutionParametersResourceWithSingleQuote() throws Exception { - tester.getWicketSession().setLocale(Locale.ENGLISH); + tester.getSession().setLocale(Locale.ENGLISH); StringResourceModel model = new StringResourceModel("with.quote", page, null, new Object[] { 10, 20 }); assertEquals("2010.00", model.getString()); @@ -229,9 +221,6 @@ }; StringResourceModel model = new StringResourceModel("simple.text", page, wsDetachModel); - tester.setupRequestAndResponse(); - new WebRequestCycle(tester.getApplication(), tester.getWicketRequest(), - tester.getWicketResponse()); model.getObject(); Assert.assertNotNull(model.getLocalizer()); model.detach(); Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/properties/PropertiesTest.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/properties/PropertiesTest.java?rev=909253&r1=909252&r2=909253&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/properties/PropertiesTest.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/properties/PropertiesTest.java Fri Feb 12 06:09:18 2010 @@ -19,7 +19,6 @@ import java.util.Locale; import org.apache.wicket.WicketTestCase; -import org.apache.wicket.util.tester.WicketTester; /** @@ -28,44 +27,22 @@ */ public class PropertiesTest extends WicketTestCase { - /** - * Construct. - * - * @param name - */ - public PropertiesTest(final String name) - { - super(name); - } - - @Override - protected void setUp() throws Exception - { - tester = new WicketTester(new MyApplication()); - } - - @Override - protected void tearDown() throws Exception - { - tester.destroy(); - } /** */ public void test_1() { - tester.setupRequestAndResponse(); - WebRequestCycle cycle = tester.createRequestCycle(); + tester.getSession().setLocale(Locale.GERMANY); + tester.getSession().setStyle("mystyle"); + TestPage page = new TestPage(); - cycle.getSession().setLocale(Locale.GERMANY); - cycle.getSession().setStyle("mystyle"); assertEquals("MyApplication", page.getString("test1")); assertEquals("MyApplication_de", page.getString("test2")); assertEquals("MyApplication_mystyle", page.getString("test3")); assertEquals("MyApplication_mystyle_de", page.getString("test4")); - cycle.getSession().setLocale(Locale.ENGLISH); + tester.getSession().setLocale(Locale.ENGLISH); assertEquals("MyApplication_en", page.getString("test2")); assertEquals("MyApplication_mystyle_en", page.getString("test4")); @@ -75,9 +52,7 @@ */ public void test_2() { - tester.setupRequestAndResponse(); - WebRequestCycle cycle = tester.createRequestCycle(); - cycle.getSession().setLocale(Locale.GERMANY); + tester.getSession().setLocale(Locale.GERMANY); TestPage page = new TestPage() { private static final long serialVersionUID = 1L; @@ -94,7 +69,7 @@ assertEquals("MyApplication_mystyle", page.getString("test3")); assertEquals("MyApplication_mystyle_de", page.getString("test4")); - cycle.getSession().setLocale(Locale.ENGLISH); + tester.getSession().setLocale(Locale.ENGLISH); assertEquals("MyApplication_en", page.getString("test2")); assertEquals("MyApplication_mystyle_en", page.getString("test4")); Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/StringResourceLoaderTestBase.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/StringResourceLoaderTestBase.java?rev=909253&r1=909252&r2=909253&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/StringResourceLoaderTestBase.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/resource/StringResourceLoaderTestBase.java Fri Feb 12 06:09:18 2010 @@ -19,9 +19,9 @@ import java.util.Locale; import junit.framework.Assert; -import junit.framework.TestCase; import org.apache.wicket.Component; +import org.apache.wicket.WicketTestCase; import org.apache.wicket.protocol.http.WebApplication; import org.apache.wicket.resource.loader.IStringResourceLoader; import org.apache.wicket.util.tester.WicketTester; @@ -32,7 +32,7 @@ * * @author Chris Turner */ -public abstract class StringResourceLoaderTestBase extends TestCase +public abstract class StringResourceLoaderTestBase extends WicketTestCase { WicketTester tester; // The loader to test @@ -66,9 +66,6 @@ protected void setUp() throws Exception { super.setUp(); - application = new DummyApplication(); - // Initialize the application - tester = new WicketTester(application); component = new DummyComponent("test", application); DummyPage page = new DummyPage(); page.add(component); @@ -78,7 +75,7 @@ @Override protected void tearDown() throws Exception { - tester.destroy(); + super.tearDown(); } /** Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/util/cookies/CookieUtilsTest.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/cookies/CookieUtilsTest.java?rev=909253&r1=909252&r2=909253&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/cookies/CookieUtilsTest.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/cookies/CookieUtilsTest.java Fri Feb 12 06:09:18 2010 @@ -20,36 +20,27 @@ import javax.servlet.http.Cookie; -import junit.framework.TestCase; - import org.apache.wicket.Page; +import org.apache.wicket.WicketTestCase; import org.apache.wicket.markup.html.form.TextField; import org.apache.wicket.ng.request.cycle.RequestCycle; import org.apache.wicket.protocol.http.WebRequest; import org.apache.wicket.protocol.http.WebResponse; import org.apache.wicket.util.cookies.CookieValuePersisterTestPage.TestForm; -import org.apache.wicket.util.tester.WicketTester; /** * * @author Juergen Donnerstag */ -public class CookieUtilsTest extends TestCase +public class CookieUtilsTest extends WicketTestCase { - private WicketTester application; - @Override protected void setUp() throws Exception { - application = new WicketTester(); - application.startPage(CookieValuePersisterTestPage.class); + super.setUp(); + tester.startPage(CookieValuePersisterTestPage.class); } - @Override - protected void tearDown() throws Exception - { - application.destroy(); - } /** * @@ -60,7 +51,7 @@ { // How does the test work: Make sure you have a page, form and form component properly set // up (getRelativePath() etc.). See setUp(). - final Page page = application.getLastRenderedPage(); + final Page page = tester.getLastRenderedPage(); // Get the form and form component created final TestForm form = (TestForm)page.get("form"); @@ -68,7 +59,7 @@ // Make sure a valid cycle is available via RequestCycle.get(). Attached to this cycle must // be a valid request and response. - final WebRequestCycle cycle = application.createRequestCycle(); + final WebRequestCycle cycle = tester.createRequestCycle(); // Right after init, the requests and responses cookie lists must be empty assertNull(getRequestCookies(cycle)); Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/util/crypt/Base64Test.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/crypt/Base64Test.java?rev=909253&r1=909252&r2=909253&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/crypt/Base64Test.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/crypt/Base64Test.java Fri Feb 12 06:09:18 2010 @@ -22,7 +22,6 @@ import junit.framework.TestCase; -import org.apache.wicket.ng.request.cycle.RequestCycle; import org.apache.wicket.settings.ISecuritySettings; import org.apache.wicket.util.tester.WicketTester; @@ -271,7 +270,6 @@ public void test_5() throws IOException { WicketTester tester = new WicketTester(); - RequestCycle cycle = tester.createRequestCycle(); ICrypt crypt = tester.getApplication().getSecuritySettings().getCryptFactory().newCrypt(); String input = "wicket-sep-wicket"; @@ -283,5 +281,7 @@ String output = crypt.decryptUrlSafe(encrypted); assertEquals(in, output); } + + tester.destroy(); } } Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/util/lang/PropertyResolverTest.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/lang/PropertyResolverTest.java?rev=909253&r1=909252&r2=909253&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/lang/PropertyResolverTest.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/lang/PropertyResolverTest.java Fri Feb 12 06:09:18 2010 @@ -27,11 +27,9 @@ import junit.framework.TestCase; -import org.apache.wicket.Page; import org.apache.wicket.WicketRuntimeException; -import org.apache.wicket.protocol.http.WebApplication; -import org.apache.wicket.session.HttpSessionStore; -import org.apache.wicket.session.ISessionStore; +import org.apache.wicket.ng.ThreadContext; +import org.apache.wicket.ng.mock.MockApplication; import org.apache.wicket.util.convert.ConversionException; import org.apache.wicket.util.convert.ConverterLocator; @@ -45,7 +43,7 @@ new ConverterLocator(), Locale.US); private Person person; - private MockWebApplication app; + private MockApplication app; /** * @see junit.framework.TestCase#setUp() @@ -54,36 +52,15 @@ protected void setUp() throws Exception { person = new Person(); - app = new MockWebApplication(new WebApplication() - { - - @Override - public Class<? extends Page> getHomePage() - { - return null; - } - - @Override - protected void outputDevelopmentModeWarning() - { - // Do nothing. - } - - @Override - protected ISessionStore newSessionStore() - { - // Don't use a filestore, or we spawn lots of threads, which makes things slow. - return new HttpSessionStore(); - } - - }, "/foo"); + app = new MockApplication(); + app.set(); } @Override protected void tearDown() throws Exception { - super.tearDown(); - PropertyResolver.destroy(app.getApplication()); + PropertyResolver.destroy(app); + ThreadContext.detach(); } /** Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_7/TestHomePage.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_7/TestHomePage.java?rev=909253&r1=909252&r2=909253&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_7/TestHomePage.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/util/tester/apps_7/TestHomePage.java Fri Feb 12 06:09:18 2010 @@ -16,26 +16,13 @@ */ package org.apache.wicket.util.tester.apps_7; -import junit.framework.TestCase; - -import org.apache.wicket.util.tester.WicketTester; +import org.apache.wicket.WicketTestCase; /** * Simple test using the WicketTester */ -public class TestHomePage extends TestCase +public class TestHomePage extends WicketTestCase { - private WicketTester tester; - - @Override - public void setUp() - { - tester = new WicketTester(new WicketApplication()); - } - - /** - * - */ public void testAjaxSubmitWhileAnotherButtonIsNotVisible() { // start and render the test page