You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2015/02/25 22:37:15 UTC
[2/3] wicket git commit: WICKET-5841 Fix broken test
WICKET-5841 Fix broken test
The test needs to use a proper request cycle to submit the form so that NonResettingRestartResponseException is handled by Wicket
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/5a2ca37e
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/5a2ca37e
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/5a2ca37e
Branch: refs/heads/master
Commit: 5a2ca37ec2e8b1fff8592572b0080f642adb96d2
Parents: 10ff4ad
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Feb 25 23:35:24 2015 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Feb 25 23:35:24 2015 +0200
----------------------------------------------------------------------
.../apache/wicket/markup/html/form/login/InterceptTest.java | 6 ++++--
.../apache/wicket/markup/html/form/login/MockLoginPage.java | 6 +-----
2 files changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/5a2ca37e/wicket-core/src/test/java/org/apache/wicket/markup/html/form/login/InterceptTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/login/InterceptTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/login/InterceptTest.java
index f84d64c..ae441b5 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/login/InterceptTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/login/InterceptTest.java
@@ -94,8 +94,10 @@ public class InterceptTest extends WicketTestCase
assertEquals(((MyMockWebApplication)tester.getApplication()).getLoginPage(),
loginPage.getClass());
- // bypass form completely to login but continue to intercept page
- assertTrue(((MockLoginPage)tester.getLastRenderedPage()).login("admin"));
+ // bypass formTester completely to login but continue to intercept page
+ FormTester formTester = tester.newFormTester("form");
+ formTester.setValue("username", "admin");
+ formTester.submit();
tester.startPage(tester.getApplication().getHomePage());
assertEquals(tester.getApplication().getHomePage(), tester.getLastRenderedPage().getClass());
http://git-wip-us.apache.org/repos/asf/wicket/blob/5a2ca37e/wicket-core/src/test/java/org/apache/wicket/markup/html/form/login/MockLoginPage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/login/MockLoginPage.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/login/MockLoginPage.java
index 1715540..52f4a8a 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/login/MockLoginPage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/login/MockLoginPage.java
@@ -26,8 +26,6 @@ import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.markup.html.form.login.InterceptTest.MySession;
import org.apache.wicket.model.Model;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
@@ -37,8 +35,6 @@ public class MockLoginPage extends WebPage
{
private static final long serialVersionUID = 1L;
- private static final Logger log = LoggerFactory.getLogger(MockLoginPage.class);
-
private Form<Void> form;
private TextField<Serializable> textField;
@@ -60,7 +56,7 @@ public class MockLoginPage extends WebPage
login(get("username").getDefaultModelObjectAsString());
}
});
- form.add(textField = new TextField<Serializable>("username", new Model<Serializable>()));
+ form.add(textField = new TextField<>("username", new Model<>()));
}
/**