Author: ivaynberg
Date: Thu Feb 25 07:19:34 2010
New Revision: 916162
URL: http://svn.apache.org/viewvc?rev=916162&view=rev
Log:
unit test fixes
Removed:
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/parse/metapattern/parsers/IndexedParamTest.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/parse/metapattern/parsers/IndexedParamTest_ExpectedResult-1.html
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/parse/metapattern/parsers/IndexedParamTest_ExpectedResult-2.html
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/parse/metapattern/parsers/Page1.html
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/parse/metapattern/parsers/Page1.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/parse/metapattern/parsers/Page2.html
wicket/trunk/wicket/src/test/java/org/apache/wicket/util/parse/metapattern/parsers/Page2.java
Modified:
wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/pages/SignInPage.java
wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/pages/SignOutPage.java
wicket/trunk/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/annotations/AnnotationsRoleTest.java
wicket/trunk/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/metadata/ActionPermissionsTest.java
wicket/trunk/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/metadata/InstantiationPermissionsTest.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/OpenCloseTagExpander.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/SetResponsePageTest.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/resolver/SimplePageExpectedResult_1.html
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/resolver/SimplePageExpectedResult_2.html
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/resolver/SimplePageExpectedResult_2a.html
wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/TemporarySessionTest.java
Modified:
wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/pages/SignInPage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/pages/SignInPage.java?rev=916162&r1=916161&r2=916162&view=diff
==============================================================================
---
wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/pages/SignInPage.java
(original)
+++
wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/pages/SignInPage.java
Thu Feb 25 07:19:34 2010
@@ -16,9 +16,9 @@
*/
package org.apache.wicket.authentication.pages;
-import org.apache.wicket.PageParameters;
import org.apache.wicket.authentication.panel.SignInPanel;
import org.apache.wicket.markup.html.WebPage;
+import org.apache.wicket.ng.request.component.PageParameters;
/**
Modified:
wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/pages/SignOutPage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/pages/SignOutPage.java?rev=916162&r1=916161&r2=916162&view=diff
==============================================================================
---
wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/pages/SignOutPage.java
(original)
+++
wicket/trunk/wicket-auth-roles/src/main/java/org/apache/wicket/authentication/pages/SignOutPage.java
Thu Feb 25 07:19:34 2010
@@ -16,8 +16,8 @@
*/
package org.apache.wicket.authentication.pages;
-import org.apache.wicket.PageParameters;
import org.apache.wicket.markup.html.WebPage;
+import org.apache.wicket.ng.request.component.PageParameters;
/**
* Simple sign out page.
Modified:
wicket/trunk/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/annotations/AnnotationsRoleTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/annotations/AnnotationsRoleTest.java?rev=916162&r1=916161&r2=916162&view=diff
==============================================================================
---
wicket/trunk/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/annotations/AnnotationsRoleTest.java
(original)
+++
wicket/trunk/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/annotations/AnnotationsRoleTest.java
Thu Feb 25 07:19:34 2010
@@ -22,13 +22,11 @@
import junit.framework.TestCase;
import org.apache.wicket.Component;
-import org.apache.wicket.Page;
import
org.apache.wicket.authorization.IUnauthorizedComponentInstantiationListener;
import org.apache.wicket.authorization.UnauthorizedInstantiationException;
import org.apache.wicket.authorization.strategies.role.IRoleCheckingStrategy;
import
org.apache.wicket.authorization.strategies.role.RoleAuthorizationStrategy;
import org.apache.wicket.authorization.strategies.role.Roles;
-import org.apache.wicket.util.tester.ITestPageSource;
import org.apache.wicket.util.tester.WicketTester;
/**
@@ -40,24 +38,6 @@
{
WicketTester tester;
- /**
- * Construct.
- */
- public AnnotationsRoleTest()
- {
- super();
- }
-
- /**
- * Construct.
- *
- * @param arg0
- */
- public AnnotationsRoleTest(String arg0)
- {
- super(arg0);
- }
-
@Override
protected void setUp() throws Exception
{
@@ -77,15 +57,7 @@
{
tester.getApplication().getSecuritySettings().setAuthorizationStrategy(
new RoleAuthorizationStrategy(new
UserRolesAuthorizer("FOO")));
- tester.startPage(new ITestPageSource()
- {
- private static final long serialVersionUID = 1L;
-
- public Page getTestPage()
- {
- return new NormalPage();
- }
- });
+ tester.startPage(NormalPage.class);
tester.assertRenderedPage(NormalPage.class);
}
@@ -97,15 +69,7 @@
WicketTester tester = new WicketTester();
tester.getApplication().getSecuritySettings().setAuthorizationStrategy(
new RoleAuthorizationStrategy(new
UserRolesAuthorizer("ADMIN")));
- tester.startPage(new ITestPageSource()
- {
- private static final long serialVersionUID = 1L;
-
- public Page getTestPage()
- {
- return new AdminPage();
- }
- });
+ tester.startPage(AdminPage.class);
tester.assertRenderedPage(AdminPage.class);
}
@@ -133,15 +97,7 @@
try
{
- tester.startPage(new ITestPageSource()
- {
- private static final long serialVersionUID = 1L;
-
- public Page getTestPage()
- {
- return new AdminPage();
- }
- });
+ tester.startPage(AdminPage.class);
assertTrue("an authorization exception event should
have been received",
listener.eventReceived);
}
Modified:
wicket/trunk/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/metadata/ActionPermissionsTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/metadata/ActionPermissionsTest.java?rev=916162&r1=916161&r2=916162&view=diff
==============================================================================
---
wicket/trunk/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/metadata/ActionPermissionsTest.java
(original)
+++
wicket/trunk/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/metadata/ActionPermissionsTest.java
Thu Feb 25 07:19:34 2010
@@ -31,22 +31,18 @@
*/
public class ActionPermissionsTest extends TestCase
{
- /**
- * Construct.
- */
- public ActionPermissionsTest()
+ private WicketTester tester;
+
+ @Override
+ protected void setUp() throws Exception
{
- super();
+ tester = new WicketTester();
}
- /**
- * Construct.
- *
- * @param arg0
- */
- public ActionPermissionsTest(String arg0)
+ @Override
+ protected void tearDown() throws Exception
{
- super(arg0);
+ tester.destroy();
}
/**
@@ -90,8 +86,6 @@
*/
public void testRemove2()
{
- WicketTester tester = new WicketTester();
- tester.setupRequestAndResponse();
Label label = new Label("label", "text");
Action mambo = new Action("mambo");
MetaDataRoleAuthorizationStrategy strategy = new
MetaDataRoleAuthorizationStrategy(
@@ -107,8 +101,6 @@
new ActionPermissions());
MetaDataRoleAuthorizationStrategy.unauthorize(label, mambo,
"johan");
assertFalse(strategy.isActionAuthorized(label, mambo));
- tester.processRequestCycle();
- tester.destroy();
}
/**
@@ -117,8 +109,6 @@
*/
public void testRemove3()
{
- WicketTester tester = new WicketTester();
- tester.setupRequestAndResponse();
Label label = new Label("label", "text");
Action mambo = new Action("mambo");
MetaDataRoleAuthorizationStrategy strategy = new
MetaDataRoleAuthorizationStrategy(
@@ -135,7 +125,5 @@
MetaDataRoleAuthorizationStrategy.authorize(label, mambo,
"johan");
MetaDataRoleAuthorizationStrategy.unauthorize(label, mambo,
"johan");
assertFalse(strategy.isActionAuthorized(label, mambo));
- tester.processRequestCycle();
- tester.destroy();
}
}
Modified:
wicket/trunk/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/metadata/InstantiationPermissionsTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/metadata/InstantiationPermissionsTest.java?rev=916162&r1=916161&r2=916162&view=diff
==============================================================================
---
wicket/trunk/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/metadata/InstantiationPermissionsTest.java
(original)
+++
wicket/trunk/wicket-auth-roles/src/test/java/org/apache/wicket/authorization/strategies/role/metadata/InstantiationPermissionsTest.java
Thu Feb 25 07:19:34 2010
@@ -31,22 +31,18 @@
*/
public class InstantiationPermissionsTest extends TestCase
{
- /**
- * Construct.
- */
- public InstantiationPermissionsTest()
+ private WicketTester tester;
+
+ @Override
+ protected void setUp() throws Exception
{
- super();
+ tester = new WicketTester();
}
- /**
- * Construct.
- *
- * @param arg0
- */
- public InstantiationPermissionsTest(String arg0)
+ @Override
+ protected void tearDown() throws Exception
{
- super(arg0);
+ tester.destroy();
}
/**
@@ -88,8 +84,6 @@
*/
public void testRemove2()
{
- WicketTester tester = new WicketTester();
- tester.setupRequestAndResponse();
MetaDataRoleAuthorizationStrategy strategy = new
MetaDataRoleAuthorizationStrategy(
new IRoleCheckingStrategy()
{
@@ -104,8 +98,6 @@
new InstantiationPermissions());
MetaDataRoleAuthorizationStrategy.unauthorize(Page.class,
"martijn");
assertFalse(strategy.isInstantiationAuthorized(Page.class));
- tester.processRequestCycle();
- tester.destroy();
}
/**
@@ -114,8 +106,6 @@
*/
public void testRemove3()
{
- WicketTester tester = new WicketTester();
- tester.setupRequestAndResponse();
MetaDataRoleAuthorizationStrategy strategy = new
MetaDataRoleAuthorizationStrategy(
new IRoleCheckingStrategy()
{
@@ -131,7 +121,5 @@
MetaDataRoleAuthorizationStrategy.authorize(Page.class,
"martijn");
MetaDataRoleAuthorizationStrategy.unauthorize(Page.class,
"martijn");
assertFalse(strategy.isInstantiationAuthorized(Page.class));
- tester.processRequestCycle();
- tester.destroy();
}
}
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/OpenCloseTagExpander.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/OpenCloseTagExpander.java?rev=916162&r1=916161&r2=916162&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/OpenCloseTagExpander.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/parser/filter/OpenCloseTagExpander.java
Thu Feb 25 07:19:34 2010
@@ -41,7 +41,7 @@
"sub", "sup", "abbr", "acronym", "cite", "code", "del",
"dfn", "em", "ins", "kbd",
"samp", "var", "label", "textarea", "tr", "td", "th",
"caption", "thead", "tbody",
"tfoot", "dl", "dt", "dd", "li", "ol", "ul", "h1",
"h2", "h3", "h4", "h5", "h6", "pre",
- "title" });
+ "title", "div" });
private ComponentTag next = null;
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=916162&r1=916161&r2=916162&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
Thu Feb 25 07:19:34 2010
@@ -67,7 +67,6 @@
import org.apache.wicket.ng.mock.MockWebResponse;
import org.apache.wicket.ng.request.IRequestMapper;
import org.apache.wicket.ng.request.Url;
-import org.apache.wicket.ng.request.component.IRequestablePage;
import org.apache.wicket.ng.request.component.PageParameters;
import org.apache.wicket.ng.request.cycle.RequestCycle;
import org.apache.wicket.ng.request.handler.IPageProvider;
@@ -531,33 +530,7 @@
*/
public final Page startPage(final ITestPageSource testPageSource)
{
- return startPage(new IPageProvider()
- {
- public void detach()
- {
- }
-
- public Class<? extends IRequestablePage> getPageClass()
- {
- return null;
- }
-
- public boolean isNewPageInstance()
- {
- return false;
- }
-
- public IRequestablePage getPageInstance()
- {
- return testPageSource.getTestPage();
- }
-
- public PageParameters getPageParameters()
- {
- return null;
- }
-
- });
+ return startPage(testPageSource.getTestPage());
}
/**
@@ -1616,5 +1589,10 @@
return response;
}
+ public MockWebRequest getLastRequest()
+ {
+ return lastRequest;
+ }
+
}
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=916162&r1=916161&r2=916162&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
Thu Feb 25 07:19:34 2010
@@ -28,7 +28,6 @@
{
tester.startPage(Page1.class);
tester.assertRenderedPage(Page3.class);
- tester.destroy();
}
/** first page, redirects to page 2. */
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=916162&r1=916161&r2=916162&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
Thu Feb 25 07:19:34 2010
@@ -28,24 +28,6 @@
*/
public class PagedTableNavigatorTest extends WicketTestCase
{
- /**
- * Construct.
- */
- public PagedTableNavigatorTest()
- {
- super();
- }
-
- /**
- * Construct.
- *
- * @param name
- * name of test
- */
- public PagedTableNavigatorTest(String name)
- {
- super(name);
- }
/**
* Test simple table behavior.
@@ -194,7 +176,5 @@
document = tester.getLastResponseAsString();
DiffUtil.validatePage(document, this.getClass(),
"PagedTableNavigatorExpectedResult_8.html", true);
-
- tester.destroy();
}
}
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/resolver/SimplePageExpectedResult_1.html
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/resolver/SimplePageExpectedResult_1.html?rev=916162&r1=916161&r2=916162&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/resolver/SimplePageExpectedResult_1.html
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/resolver/SimplePageExpectedResult_1.html
Thu Feb 25 07:19:34 2010
@@ -12,7 +12,7 @@
<span wicket:message="attr-name:i18n-key" attr-name="my i18n key">test
2</span>
<span wicket:id="message2" wicket:message="attr-name:i18n-key" attr-name="my
i18n key">here it goes</span>
- <input type="image" src="../test.gif">test 2</input>
- <input type="image" src="../test.gif" wicket:message="attr-name:i18n-key"
attr-name="my i18n key">test 2</input>
+ <input type="image" src="../../test.gif">test 2</input>
+ <input type="image" src="../../test.gif" wicket:message="attr-name:i18n-key"
attr-name="my i18n key">test 2</input>
</body>
</html>
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/resolver/SimplePageExpectedResult_2.html
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/resolver/SimplePageExpectedResult_2.html?rev=916162&r1=916161&r2=916162&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/resolver/SimplePageExpectedResult_2.html
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/resolver/SimplePageExpectedResult_2.html
Thu Feb 25 07:19:34 2010
@@ -1,6 +1,6 @@
<html xmlns:wicket>
<body>
-<wicket:message key="myKey">Your balance is $5.00. Click <a
href="?wicket:bookmarkablePage=:org.apache.wicket.markup.resolver.SimplePage_1"
wicket:id="link">
+<wicket:message key="myKey">Your balance is $5.00. Click <a
href="org.apache.wicket.markup.resolver.SimplePage_1" wicket:id="link">
<wicket:message key="linkText">here</wicket:message>
</a> to view the details.</wicket:message>
</body>
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/resolver/SimplePageExpectedResult_2a.html
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/resolver/SimplePageExpectedResult_2a.html?rev=916162&r1=916161&r2=916162&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/resolver/SimplePageExpectedResult_2a.html
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/resolver/SimplePageExpectedResult_2a.html
Thu Feb 25 07:19:34 2010
@@ -1,6 +1,6 @@
<html>
<body>
-Your balance is $5.00. Click <a
href="?wicket:bookmarkablePage=:org.apache.wicket.markup.resolver.SimplePage_1">
+Your balance is $5.00. Click <a
href="org.apache.wicket.markup.resolver.SimplePage_1">
here
</a> to view the details.
</body>
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/TemporarySessionTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/TemporarySessionTest.java?rev=916162&r1=916161&r2=916162&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/TemporarySessionTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/TemporarySessionTest.java
Thu Feb 25 07:19:34 2010
@@ -16,9 +16,10 @@
*/
package org.apache.wicket.stateless;
+import junit.framework.TestCase;
+
import org.apache.wicket.Page;
import org.apache.wicket.Session;
-import org.apache.wicket.WicketTestCase;
import org.apache.wicket.ng.mock.MockApplication;
import org.apache.wicket.stateless.pages.HomePage;
import org.apache.wicket.stateless.pages.LoginPage;
@@ -32,7 +33,7 @@
*
* @author marrink
*/
-public class TemporarySessionTest extends WicketTestCase
+public class TemporarySessionTest extends TestCase
{
private WicketTester tester;
