Author: ivaynberg
Date: Fri Feb 12 04:08:20 2010
New Revision: 909218
URL: http://svn.apache.org/viewvc?rev=909218&view=rev
Log:
more unit test fixes
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/ComponentCreateTagTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/MarkupCacheTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/MarkupInheritanceTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/WicketNamespaceTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/HomePageRedirectTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/border/BoxBorderTest.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=909218&r1=909217&r2=909218&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 04:08:20 2010
@@ -369,6 +369,11 @@
return lastResponse;
}
+ public String getLastResponseAsString()
+ {
+ return lastResponse.getTextResponse().toString();
+ }
+
/**
* @return list of prior requests
*/
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/ComponentCreateTagTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/ComponentCreateTagTest.java?rev=909218&r1=909217&r2=909218&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/ComponentCreateTagTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/ComponentCreateTagTest.java
Fri Feb 12 04:08:20 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;
/**
@@ -35,17 +30,6 @@
public class ComponentCreateTagTest extends WicketTestCase
{
/**
- * Create the test.
- *
- * @param name
- * The test name
- */
- public ComponentCreateTagTest(String name)
- {
- super(name);
- }
-
- /**
* Simple Label
*
* @throws Exception
@@ -96,23 +80,7 @@
*/
public void testRenderHomePage_6() 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);
tester.getApplication().getMarkupSettings().setStripWicketTags(true);
executeTest(ComponentCreateTag_6.class,
"ComponentCreateTagExpectedResult_6.html");
}
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/MarkupCacheTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/MarkupCacheTest.java?rev=909218&r1=909217&r2=909218&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/MarkupCacheTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/MarkupCacheTest.java
Fri Feb 12 04:08:20 2010
@@ -16,35 +16,23 @@
*/
package org.apache.wicket.markup;
-import junit.framework.TestCase;
-
-import org.apache.wicket.Application;
import org.apache.wicket.MarkupContainer;
+import org.apache.wicket.WicketTestCase;
import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.util.resource.IResourceStream;
-import org.apache.wicket.util.tester.WicketTester;
/**
* @author Timo Rantalaiho
*/
-public class MarkupCacheTest extends TestCase
+public class MarkupCacheTest extends WicketTestCase
{
private MarkupCache cache;
private MarkupCachingAssumingComponent component;
@Override
- public void setUp()
+ public void setUp() throws Exception
{
- WebApplication application = new
WicketTester.DummyWebApplication()
- {
- @Override
- public String getConfigurationType()
- {
- return Application.DEPLOYMENT;
- }
- };
- WicketTester tester = new WicketTester(application);
+ super.setUp();
cache = new MarkupCache();
component = new MarkupCachingAssumingComponent("panel");
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/MarkupInheritanceTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/MarkupInheritanceTest.java?rev=909218&r1=909217&r2=909218&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/MarkupInheritanceTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/MarkupInheritanceTest.java
Fri Feb 12 04:08:20 2010
@@ -51,17 +51,13 @@
executeTest(MarkupInheritanceExtension_1.class,
"MarkupInheritanceExpectedResult_1.html");
// then, render with style1
- tester.setupRequestAndResponse();
- WebRequestCycle cycle = tester.createRequestCycle();
- cycle.getSession().setStyle("style1");
+ tester.getSession().setStyle("style1");
tester.startPage(MarkupInheritanceExtension_1.class);
tester.assertRenderedPage(MarkupInheritanceExtension_1.class);
tester.assertResultPage(getClass(),
"MarkupInheritanceExpectedResult_1_style1.html");
// then, render with style2
- tester.setupRequestAndResponse();
- cycle = tester.createRequestCycle();
- cycle.getSession().setStyle("style2");
+ tester.getSession().setStyle("style2");
tester.startPage(MarkupInheritanceExtension_1.class);
tester.assertRenderedPage(MarkupInheritanceExtension_1.class);
tester.assertResultPage(getClass(),
"MarkupInheritanceExpectedResult_1_style2.html");
@@ -102,19 +98,17 @@
// Validate the document
assertEquals(MarkupInheritanceExtension_4.class,
tester.getLastRenderedPage().getClass());
- String document = tester.getServletResponse().getDocument();
+ String document =
tester.getLastResponse().getTextResponse().toString();
DiffUtil.validatePage(document, getClass(),
"MarkupInheritanceExpectedResult_4.html", true);
MarkupInheritanceExtension_4 page =
(MarkupInheritanceExtension_4)tester.getLastRenderedPage();
Link link = (Link)page.get("link");
- tester.setupRequestAndResponse();
- tester.getServletRequest().setRequestToComponent(link);
- tester.processRequestCycle();
+ tester.clickLink(link.getPageRelativePath());
assertEquals(MarkupInheritanceExtension_4.class,
tester.getLastRenderedPage().getClass());
- document = tester.getServletResponse().getDocument();
+ document =
tester.getLastResponse().getTextResponse().toString();
DiffUtil.validatePage(document, getClass(),
"MarkupInheritanceExpectedResult_4-1.html",
true);
}
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/WicketNamespaceTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/WicketNamespaceTest.java?rev=909218&r1=909217&r2=909218&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/WicketNamespaceTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/WicketNamespaceTest.java
Fri Feb 12 04:08:20 2010
@@ -16,17 +16,12 @@
*/
package org.apache.wicket.markup;
-import junit.framework.TestCase;
-
-import org.apache.wicket.util.diff.DiffUtil;
-import org.apache.wicket.util.tester.WicketTester;
+import org.apache.wicket.WicketTestCase;
/**
*/
-public class WicketNamespaceTest extends TestCase
+public class WicketNamespaceTest extends WicketTestCase
{
- private WicketTester application;
-
/**
* Create the test.
*
@@ -86,21 +81,4 @@
executeTest(WicketNamespace_6.class,
"WicketNamespaceExpectedResult_6.html");
}
- /**
- * @param pageClass
- * @param filename
- * @throws Exception
- */
- public void executeTest(final Class pageClass, final String filename)
throws Exception
- {
- System.out.println("=== " + pageClass.getName() + " ===");
-
- application = new WicketTester();
- application.startPage(pageClass);
-
- // Validate the document
- String document =
application.getServletResponse().getDocument();
- DiffUtil.validatePage(document, this.getClass(), filename,
true);
- application.destroy();
- }
}
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/HomePageRedirectTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/HomePageRedirectTest.java?rev=909218&r1=909217&r2=909218&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/HomePageRedirectTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/basic/HomePageRedirectTest.java
Fri Feb 12 04:08:20 2010
@@ -16,29 +16,14 @@
*/
package org.apache.wicket.markup.html.basic;
-import junit.framework.TestCase;
-
+import org.apache.wicket.WicketTestCase;
import org.apache.wicket.util.diff.DiffUtil;
-import org.apache.wicket.util.tester.WicketTester;
/**
* @author jcompagner
*/
-public class HomePageRedirectTest extends TestCase
+public class HomePageRedirectTest extends WicketTestCase
{
- WicketTester application;
-
- @Override
- protected void setUp() throws Exception
- {
- application = new WicketTester();
- }
-
- @Override
- protected void tearDown() throws Exception
- {
- application.destroy();
- }
/**
* Construct.
@@ -53,12 +38,12 @@
*/
public void testRenderHomePagePageRedirect() throws Exception
{
- application.startPage(HomePagePageRedirect.class);
+ tester.startPage(HomePagePageRedirect.class);
- assertEquals(RedirectPage.class,
application.getLastRenderedPage().getClass());
+ assertEquals(RedirectPage.class,
tester.getLastRenderedPage().getClass());
// Validate the document
- String document =
application.getServletResponse().getDocument();
+ String document = tester.getLastResponseAsString();
DiffUtil.validatePage(document, this.getClass(),
"RedirectPage.html", true);
}
@@ -67,12 +52,11 @@
*/
public void testRenderHomePageClassRedirect() throws Exception
{
- application.startPage(HomePageClassRedirect.class);
+ tester.startPage(HomePageClassRedirect.class);
- assertEquals(RedirectPage.class,
application.getLastRenderedPage().getClass());
+ assertEquals(RedirectPage.class,
tester.getLastRenderedPage().getClass());
- // Validate the document
- String document =
application.getServletResponse().getDocument();
+ String document = tester.getLastResponseAsString();
DiffUtil.validatePage(document, this.getClass(),
"RedirectPage.html", true);
}
}
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=909218&r1=909217&r2=909218&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
Fri Feb 12 04:08:20 2010
@@ -81,13 +81,9 @@
"border:myForm:border_body:name");
assertEquals("", input.getDefaultModelObjectAsString());
- tester.setupRequestAndResponse();
-
- MockHttpServletRequest mockRequest = tester.getServletRequest();
- mockRequest.setRequestToComponent(form);
- mockRequest.setParameter(input.getInputName(), "jdo");
-
- tester.processRequestCycle();
+
tester.getLastRequest().getPostRequestParameters().setParameterValue(input.getInputName(),
+ "jdo");
+ tester.submitForm(form.getPageRelativePath());
input = (TextField<String>)tester.getLastRenderedPage().get(
"border:myForm:border_body:name");
