Author: ivaynberg
Date: Sun Feb 28 04:15:13 2010
New Revision: 917113
URL: http://svn.apache.org/viewvc?rev=917113&view=rev
Log:
more test cleanup
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkableHomePageLinksPage_result.html
wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessFormTest.java
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkableHomePageLinksPage_result.html
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkableHomePageLinksPage_result.html?rev=917113&r1=917112&r2=917113&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkableHomePageLinksPage_result.html
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/link/BookmarkableHomePageLinksPage_result.html
Sun Feb 28 04:15:13 2010
@@ -14,8 +14,8 @@
-->
<html xmlns:wicket>
<body>
- <a wicket:id="defaulthompage" href="./"></a>
- <a wicket:id="defaulthompagewithparams" href="?param1=1&param2=test"></a>
- <a wicket:id="defaulthompagewithpagemap" href="./"></a>
+ <a wicket:id="defaulthompage"
href="org.apache.wicket.ng.mock.MockHomePage"></a>
+ <a wicket:id="defaulthompagewithparams"
href="org.apache.wicket.ng.mock.MockHomePage?param1=1&param2=test"></a>
+ <a wicket:id="defaulthompagewithpagemap"
href="org.apache.wicket.ng.mock.MockHomePage"></a>
</body>
</html>
Modified:
wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessFormTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessFormTest.java?rev=917113&r1=917112&r2=917113&view=diff
==============================================================================
---
wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessFormTest.java
(original)
+++
wicket/trunk/wicket/src/test/java/org/apache/wicket/stateless/StatelessFormTest.java
Sun Feb 28 04:15:13 2010
@@ -35,88 +35,38 @@
{
private static final Logger log =
LoggerFactory.getLogger(StatelessFormTest.class);
- private WicketTester mock = null;
+ private final Class<? extends Page> HOME = HomePage.class;
+ private final Class<? extends Page> LOGIN = LoginPage.class;
- private MockApplication application;
-
- private Class<? extends Page> homePage = HomePage.class;
- private Class<? extends Page> loginPage = LoginPage.class;
-
-
- @Override
- protected void setUp() throws Exception
+ /**
+ * Login through the login page.
+ */
+ public void testLogin()
{
- mock = new WicketTester(application = new MockApplication()
+ WicketTester tester = new WicketTester(new MockApplication()
{
@Override
public Class<? extends Page> getHomePage()
{
- return StatelessFormTest.this.getHomePage();
+ return HOME;
}
});
- }
-
- @Override
- protected void tearDown() throws Exception
- {
- mock.getSession().invalidate();
- mock.processRequest();
- mock.destroy();
- mock = null;
- application = null;
- setHomePage(HomePage.class);
- setLoginPage(LoginPage.class);
- }
-
- /**
- * @return Returns the homePage.
- */
- public Class<? extends Page> getHomePage()
- {
- return homePage;
- }
-
- /**
- * @param <C>
- * @param homePage
- * The homePage to set.
- */
- public <C extends Page> void setHomePage(Class<C> homePage)
- {
- this.homePage = homePage;
- }
-
- /**
- * @return Returns the loginPage.
- */
- public Class<? extends Page> getLoginPage()
- {
- return loginPage;
- }
- /**
- * @param <C>
- * @param loginPage
- * The loginPage to set.
- */
- public <C extends Page> void setLoginPage(Class<C> loginPage)
- {
- this.loginPage = loginPage;
- }
-
- /**
- * Login through the login page.
- */
- public void testLogin()
- {
- mock.startPage(getLoginPage());
- mock.assertRenderedPage(getLoginPage());
- FormTester form = mock.newFormTester("signInPanel:signInForm");
- form.setValue("username", "test");
- form.setValue("password", "test");
- form.submit();
- mock.assertRenderedPage(getHomePage());
+ try
+ {
+ tester.startPage(LOGIN);
+ tester.assertRenderedPage(LOGIN);
+ FormTester form =
tester.newFormTester("signInPanel:signInForm");
+ form.setValue("username", "test");
+ form.setValue("password", "test");
+ form.submit();
+ tester.assertRenderedPage(HOME);
+ }
+ finally
+ {
+ tester.destroy();
+ }
}
}
