Author: jbq
Date: Thu Feb 22 09:39:45 2007
New Revision: 510601
URL: http://svn.apache.org/viewvc?view=rev&rev=510601
Log:
WICKET-147 Backport the "MockWebApplication and WicketTester are no longer
derived from WebApplication"
Finish refactoring
Needed to move WicketTestCase from src/test to src/java so that it is accessible
in any module, otherwise it is not packaged in the jar
Added:
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/WicketTestCase.java
- copied unchanged from r510588,
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/WicketTestCase.java
Removed:
incubator/wicket/branches/wicket-1.x/wicket-examples/src/test/java/wicket/examples/WicketTestCase.java
incubator/wicket/branches/wicket-1.x/wicket/src/test/java/wicket/WicketTestCase.java
Modified:
incubator/wicket/branches/wicket-1.x/wicket-auth-roles/src/test/java/wicket/authorization/strategies/role/annotations/AnnotationsRoleTest.java
incubator/wicket/branches/wicket-1.x/wicket-examples/src/test/java/wicket/examples/displaytag/list/SortableTableHeadersTest.java
incubator/wicket/branches/wicket-1.x/wicket-examples/src/test/java/wicket/examples/panels/signin/CookieTest.java
incubator/wicket/branches/wicket-1.x/wicket-spring/src/test/java/wicket/proxy/LazyInitProxyFactoryTest.java
incubator/wicket/branches/wicket-1.x/wicket-spring/src/test/java/wicket/spring/SpringBeanLocatorTest.java
Modified:
incubator/wicket/branches/wicket-1.x/wicket-auth-roles/src/test/java/wicket/authorization/strategies/role/annotations/AnnotationsRoleTest.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket-auth-roles/src/test/java/wicket/authorization/strategies/role/annotations/AnnotationsRoleTest.java?view=diff&rev=510601&r1=510600&r2=510601
==============================================================================
---
incubator/wicket/branches/wicket-1.x/wicket-auth-roles/src/test/java/wicket/authorization/strategies/role/annotations/AnnotationsRoleTest.java
(original)
+++
incubator/wicket/branches/wicket-1.x/wicket-auth-roles/src/test/java/wicket/authorization/strategies/role/annotations/AnnotationsRoleTest.java
Thu Feb 22 09:39:45 2007
@@ -37,7 +37,9 @@
*/
public class AnnotationsRoleTest extends TestCase
{
- /**
+ WicketTester tester;
+
+ /**
* Construct.
*/
public AnnotationsRoleTest()
@@ -55,13 +57,20 @@
super(arg0);
}
+ @Override
+ protected void setUp() throws Exception {
+ tester = new WicketTester();
+ }
+ @Override
+ protected void tearDown() throws Exception {
+ tester.destroy();
+ }
/**
* @throws Exception
*/
public void testClear() throws Exception
{
- WicketTester tester = new WicketTester();
- tester.getSecuritySettings().setAuthorizationStrategy(
+
tester.getApplication().getSecuritySettings().setAuthorizationStrategy(
new RoleAuthorizationStrategy(new
UserRolesAuthorizer("FOO")));
tester.startPage(new ITestPageSource()
{
@@ -81,7 +90,7 @@
public void testAuthorized() throws Exception
{
WicketTester tester = new WicketTester();
- tester.getSecuritySettings().setAuthorizationStrategy(
+
tester.getApplication().getSecuritySettings().setAuthorizationStrategy(
new RoleAuthorizationStrategy(new
UserRolesAuthorizer("ADMIN")));
tester.startPage(new ITestPageSource()
{
@@ -101,7 +110,7 @@
public void testNotAuthorized() throws Exception
{
WicketTester tester = new WicketTester();
- tester.getSecuritySettings().setAuthorizationStrategy(
+
tester.getApplication().getSecuritySettings().setAuthorizationStrategy(
new RoleAuthorizationStrategy(new
UserRolesAuthorizer("USER")));
final class Listener implements
IUnauthorizedComponentInstantiationListener
{
@@ -113,7 +122,7 @@
}
}
Listener listener = new Listener();
-
tester.getSecuritySettings().setUnauthorizedComponentInstantiationListener(listener);
+
tester.getApplication().getSecuritySettings().setUnauthorizedComponentInstantiationListener(listener);
try
{
Modified:
incubator/wicket/branches/wicket-1.x/wicket-examples/src/test/java/wicket/examples/displaytag/list/SortableTableHeadersTest.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket-examples/src/test/java/wicket/examples/displaytag/list/SortableTableHeadersTest.java?view=diff&rev=510601&r1=510600&r2=510601
==============================================================================
---
incubator/wicket/branches/wicket-1.x/wicket-examples/src/test/java/wicket/examples/displaytag/list/SortableTableHeadersTest.java
(original)
+++
incubator/wicket/branches/wicket-1.x/wicket-examples/src/test/java/wicket/examples/displaytag/list/SortableTableHeadersTest.java
Thu Feb 22 09:39:45 2007
@@ -20,12 +20,12 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import wicket.examples.WicketTestCase;
+import wicket.WicketTestCase;
import wicket.markup.html.link.Link;
import wicket.protocol.http.MockHttpServletResponse;
-import wicket.protocol.http.MockWebApplication;
import wicket.settings.IRequestCycleSettings;
import wicket.util.diff.DiffUtil;
+import wicket.util.tester.WicketTester;
/**
@@ -53,12 +53,10 @@
*/
public void testPagedTable() throws Exception
{
- MockWebApplication application = new MockWebApplication(null);
- application.getRequestCycleSettings().setRenderStrategy(
+ WicketTester application = new WicketTester();
+
application.getApplication().getRequestCycleSettings().setRenderStrategy(
IRequestCycleSettings.REDIRECT_TO_BUFFER);
- application.setHomePage(SortableTableHeadersPage.class);
- application.setupRequestAndResponse();
- application.processRequestCycle();
+ application.startPage(SortableTableHeadersPage.class);
SortableTableHeadersPage page =
(SortableTableHeadersPage)application.getLastRenderedPage();
String document =
application.getServletResponse().getDocument();
DiffUtil.validatePage(document, this.getClass(),
"SortableTableHeadersExpectedResult_1.html", true);
@@ -99,7 +97,7 @@
// Check that redirect was set as expected and invoke it
// Check that wicket:border tag gets removed
assertTrue("Response should be a redirect",
application.getServletResponse().isRedirect());
- application.getMarkupSettings().setStripWicketTags(true);
+
application.getApplication().getMarkupSettings().setStripWicketTags(true);
redirect =
application.getServletResponse().getRedirectLocation();
application.setupRequestAndResponse();
application.getServletRequest().setRequestToRedirectString(redirect);
@@ -108,5 +106,6 @@
document = application.getServletResponse().getDocument();
assertTrue(DiffUtil.validatePage(document, this.getClass(),
"SortableTableHeadersExpectedResult_3.html",
false));
+ application.destroy();
}
}
Modified:
incubator/wicket/branches/wicket-1.x/wicket-examples/src/test/java/wicket/examples/panels/signin/CookieTest.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket-examples/src/test/java/wicket/examples/panels/signin/CookieTest.java?view=diff&rev=510601&r1=510600&r2=510601
==============================================================================
---
incubator/wicket/branches/wicket-1.x/wicket-examples/src/test/java/wicket/examples/panels/signin/CookieTest.java
(original)
+++
incubator/wicket/branches/wicket-1.x/wicket-examples/src/test/java/wicket/examples/panels/signin/CookieTest.java
Thu Feb 22 09:39:45 2007
@@ -33,11 +33,11 @@
import wicket.markup.html.WebPage;
import wicket.markup.html.form.Form;
import wicket.markup.html.form.FormComponent;
-import wicket.protocol.http.MockWebApplication;
import wicket.protocol.http.WebRequestCycle;
import wicket.settings.ISecuritySettings;
import wicket.util.crypt.ICrypt;
import wicket.util.crypt.NoCryptFactory;
+import wicket.util.tester.WicketTester;
/**
@@ -49,7 +49,7 @@
{
private static final Log log = LogFactory.getLog(CookieTest.class);
- private MockWebApplication application;
+ private WicketTester application;
private SignInPanel panel;
private Form form;
private Cookie cookieUsername;
@@ -73,11 +73,10 @@
{
super.setUp();
- application = new MockWebApplication(null);
- application.setHomePage(MockPage.class);
+ application = new WicketTester(MockPage.class);
application.setupRequestAndResponse();
- final ISecuritySettings settings =
application.getSecuritySettings();
+ final ISecuritySettings settings =
application.getApplication().getSecuritySettings();
settings.setCryptFactory(new NoCryptFactory());
this.panel = new SignInPanel("panel")
@@ -91,7 +90,7 @@
this.panel.setPersistent(true);
this.form = (Form)panel.get("signInForm");
- final ICrypt crypt =
application.getSecuritySettings().getCryptFactory().newCrypt();
+ final ICrypt crypt =
application.getApplication().getSecuritySettings().getCryptFactory().newCrypt();
final String encryptedPassword = crypt.encryptUrlSafe("test");
assertNotNull(encryptedPassword);
this.cookieUsername = new Cookie("panel:signInForm:username",
"juergen");
Modified:
incubator/wicket/branches/wicket-1.x/wicket-spring/src/test/java/wicket/proxy/LazyInitProxyFactoryTest.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket-spring/src/test/java/wicket/proxy/LazyInitProxyFactoryTest.java?view=diff&rev=510601&r1=510600&r2=510601
==============================================================================
---
incubator/wicket/branches/wicket-1.x/wicket-spring/src/test/java/wicket/proxy/LazyInitProxyFactoryTest.java
(original)
+++
incubator/wicket/branches/wicket-1.x/wicket-spring/src/test/java/wicket/proxy/LazyInitProxyFactoryTest.java
Thu Feb 22 09:39:45 2007
@@ -37,13 +37,6 @@
*/
public class LazyInitProxyFactoryTest extends TestCase
{
-
-
- protected void setUp() throws Exception
- {
- new WicketTester(null);
- }
-
private static InterfaceObject interfaceObject = new
InterfaceObject("interface");
private static ConcreteObject concreteObject = new
ConcreteObject("concrete");
Modified:
incubator/wicket/branches/wicket-1.x/wicket-spring/src/test/java/wicket/spring/SpringBeanLocatorTest.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket-spring/src/test/java/wicket/spring/SpringBeanLocatorTest.java?view=diff&rev=510601&r1=510600&r2=510601
==============================================================================
---
incubator/wicket/branches/wicket-1.x/wicket-spring/src/test/java/wicket/spring/SpringBeanLocatorTest.java
(original)
+++
incubator/wicket/branches/wicket-1.x/wicket-spring/src/test/java/wicket/spring/SpringBeanLocatorTest.java
Thu Feb 22 09:39:45 2007
@@ -20,7 +20,6 @@
import wicket.spring.test.ApplicationContextMock;
import wicket.spring.test.SpringContextLocatorMock;
import wicket.util.lang.Objects;
-import wicket.util.tester.WicketTester;
/**
* Tests [EMAIL PROTECTED] SpringBeanLocator}
@@ -44,7 +43,6 @@
protected void setUp() throws Exception
{
- new WicketTester(null);
ctx=new ApplicationContextMock();
ctxLocator = new SpringContextLocatorMock(ctx);
}
