You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by jd...@apache.org on 2006/11/06 14:37:08 UTC
svn commit: r471728 - in
/incubator/wicket/trunk/wicket-extensions/src/test/java/wicket:
WicketTestCase.java extensions/markup/html/tree/TreeTest.java
extensions/proxy/LazyInitProxyFactoryTest.java
Author: jdonnerstag
Date: Mon Nov 6 05:37:07 2006
New Revision: 471728
URL: http://svn.apache.org/viewvc?view=rev&rev=471728
Log:
MockWebApplication and WicketTester are no longer derived from WebApplication which allows to use
"MyApplication" for testing as well instead of copy & paste the MyApps code.
Modified:
incubator/wicket/trunk/wicket-extensions/src/test/java/wicket/WicketTestCase.java
incubator/wicket/trunk/wicket-extensions/src/test/java/wicket/extensions/markup/html/tree/TreeTest.java
incubator/wicket/trunk/wicket-extensions/src/test/java/wicket/extensions/proxy/LazyInitProxyFactoryTest.java
Modified: incubator/wicket/trunk/wicket-extensions/src/test/java/wicket/WicketTestCase.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket-extensions/src/test/java/wicket/WicketTestCase.java?view=diff&rev=471728&r1=471727&r2=471728
==============================================================================
--- incubator/wicket/trunk/wicket-extensions/src/test/java/wicket/WicketTestCase.java (original)
+++ incubator/wicket/trunk/wicket-extensions/src/test/java/wicket/WicketTestCase.java Mon Nov 6 05:37:07 2006
@@ -35,14 +35,13 @@
public abstract class WicketTestCase extends TestCase
{
/** */
- public WicketTester application;
+ public WicketTester tester;
/**
* Constructor
*/
public WicketTestCase()
{
-
}
/**
@@ -59,7 +58,7 @@
@Override
protected void setUp() throws Exception
{
- application = new WicketTester(null);
+ tester = new WicketTester();
}
/**
@@ -91,14 +90,14 @@
protected MockHttpServletResponse accessPage(final Class<? extends Page> pageClass)
throws Exception
{
- application.setHomePage(pageClass);
+ tester = new WicketTester(pageClass);
// Do the processing
- application.setupRequestAndResponse();
- application.processRequestCycle();
+ tester.setupRequestAndResponse();
+ tester.processRequestCycle();
- assertEquals(pageClass, application.getLastRenderedPage().getClass());
- return application.getServletResponse();
+ assertEquals(pageClass, tester.getLastRenderedPage().getClass());
+ return tester.getServletResponse();
}
/**
@@ -116,12 +115,12 @@
System.out.println("=== " + pageClass.getName() + " : " + component.getPageRelativePath()
+ " ===");
- application.setupRequestAndResponse();
- WebRequestCycle cycle = application.createRequestCycle();
- application.getServletRequest().setRequestToComponent(component);
- application.processRequestCycle(cycle);
+ tester.setupRequestAndResponse();
+ WebRequestCycle cycle = tester.createRequestCycle();
+ tester.getServletRequest().setRequestToComponent(component);
+ tester.processRequestCycle(cycle);
- String document = application.getServletResponse().getDocument();
+ String document = tester.getServletResponse().getDocument();
assertTrue(DiffUtil.validatePage(document, pageClass, filename));
}
@@ -139,13 +138,13 @@
System.out.println("=== " + pageClass.getName() + " : " + behavior.toString() + " ===");
- application.setupRequestAndResponse();
- WebRequestCycle cycle = application.createRequestCycle();
- application.getServletRequest().setRequestToRedirectString(
+ tester.setupRequestAndResponse();
+ WebRequestCycle cycle = tester.createRequestCycle();
+ tester.getServletRequest().setRequestToRedirectString(
behavior.getCallbackUrl(false).toString());
- application.processRequestCycle(cycle);
+ tester.processRequestCycle(cycle);
- String document = application.getServletResponse().getDocument();
+ String document = tester.getServletResponse().getDocument();
assertTrue(DiffUtil.validatePage(document, pageClass, filename));
}
}
Modified: incubator/wicket/trunk/wicket-extensions/src/test/java/wicket/extensions/markup/html/tree/TreeTest.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket-extensions/src/test/java/wicket/extensions/markup/html/tree/TreeTest.java?view=diff&rev=471728&r1=471727&r2=471728
==============================================================================
--- incubator/wicket/trunk/wicket-extensions/src/test/java/wicket/extensions/markup/html/tree/TreeTest.java (original)
+++ incubator/wicket/trunk/wicket-extensions/src/test/java/wicket/extensions/markup/html/tree/TreeTest.java Mon Nov 6 05:37:07 2006
@@ -50,7 +50,7 @@
{
executeTest(TreePage.class, "TreePageExpectedResult_1.html");
- executedListener(TreePage.class, application.getLastRenderedPage().get(
+ executedListener(TreePage.class, tester.getLastRenderedPage().get(
"tree:tree:3:node:junctionLink"), "TreePageExpectedResult_1-1.html");
}
@@ -64,7 +64,7 @@
{
executeTest(TreePageWithBorder.class, "TreePageWithBorderExpectedResult_1.html");
- executedListener(TreePageWithBorder.class, application.getLastRenderedPage().get(
+ executedListener(TreePageWithBorder.class, tester.getLastRenderedPage().get(
"tree:tree:3:node:junctionLink"), "TreePageWithBorderExpectedResult_1-1.html");
}
@@ -78,7 +78,7 @@
{
executeTest(TreePageNoWicketHeadTag.class, "TreePageNoWicketHeadTagExpectedResult_1.html");
- executedListener(TreePageNoWicketHeadTag.class, application.getLastRenderedPage().get(
+ executedListener(TreePageNoWicketHeadTag.class, tester.getLastRenderedPage().get(
"tree:tree:3:node:junctionLink"), "TreePageNoWicketHeadTagExpectedResult_1-1.html");
}
}
Modified: incubator/wicket/trunk/wicket-extensions/src/test/java/wicket/extensions/proxy/LazyInitProxyFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket-extensions/src/test/java/wicket/extensions/proxy/LazyInitProxyFactoryTest.java?view=diff&rev=471728&r1=471727&r2=471728
==============================================================================
--- incubator/wicket/trunk/wicket-extensions/src/test/java/wicket/extensions/proxy/LazyInitProxyFactoryTest.java (original)
+++ incubator/wicket/trunk/wicket-extensions/src/test/java/wicket/extensions/proxy/LazyInitProxyFactoryTest.java Mon Nov 6 05:37:07 2006
@@ -21,15 +21,14 @@
import java.lang.reflect.Proxy;
import junit.framework.TestCase;
-import wicket.Application;
import wicket.extensions.proxy.LazyInitProxyFactory.ProxyReplacement;
import wicket.extensions.proxy.util.ConcreteObject;
import wicket.extensions.proxy.util.IInterface;
import wicket.extensions.proxy.util.IObjectMethodTester;
import wicket.extensions.proxy.util.InterfaceObject;
import wicket.extensions.proxy.util.ObjectMethodTester;
-import wicket.protocol.http.MockWebApplication;
import wicket.util.lang.Objects;
+import wicket.util.tester.WicketTester;
/**
* Tests lazy init proxy factory
@@ -74,10 +73,7 @@
*/
public void testInterfaceProxy()
{
- MockWebApplication application=new MockWebApplication("/");
-
-
- Application.set(application);
+ WicketTester application = new WicketTester();
// test proxy creation for an interface class
IInterface proxy = (IInterface) LazyInitProxyFactory.createProxy(