Updated Branches: refs/heads/master 87ae870fe -> c31c5f566
re-added @Test and fixed validation Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/c31c5f56 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/c31c5f56 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/c31c5f56 Branch: refs/heads/master Commit: c31c5f5666136c4a9fd7e95fcb1fde248d927b65 Parents: 87ae870 Author: svenmeier <[email protected]> Authored: Fri Sep 21 15:07:04 2012 +0200 Committer: svenmeier <[email protected]> Committed: Fri Sep 21 15:07:04 2012 +0200 ---------------------------------------------------------------------- .../wicket/markup/html/form/FormHasErrorPage.java | 13 +++++++++++-- .../wicket/markup/html/form/TestFormHasError.java | 4 ++++ 2 files changed, 15 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/c31c5f56/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormHasErrorPage.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormHasErrorPage.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormHasErrorPage.java index f3ab505..ce2f85e 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormHasErrorPage.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormHasErrorPage.java @@ -74,6 +74,8 @@ public class FormHasErrorPage extends WebPage { private static final long serialVersionUID = 1L; + private transient IFormSubmitter submittingComponent; + @Override protected void onError() { @@ -92,6 +94,15 @@ public class FormHasErrorPage extends WebPage @Override public void process(IFormSubmitter submittingComponent) { + // keep submitting component for #onValidate() + this.submittingComponent = submittingComponent; + + super.process(submittingComponent); + } + + @Override + protected void onValidate() + { // set the error based on which link submitted the form if (submittingComponent == submitFormComponent) { @@ -105,8 +116,6 @@ public class FormHasErrorPage extends WebPage { error("Form validation error"); } - - super.process(submittingComponent); } }; add(form); http://git-wip-us.apache.org/repos/asf/wicket/blob/c31c5f56/wicket-core/src/test/java/org/apache/wicket/markup/html/form/TestFormHasError.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/TestFormHasError.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/TestFormHasError.java index 3f42b0a..c451e81 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/TestFormHasError.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/TestFormHasError.java @@ -17,6 +17,7 @@ package org.apache.wicket.markup.html.form; import org.apache.wicket.WicketTestCase; +import org.junit.Test; /** */ @@ -26,6 +27,7 @@ public class TestFormHasError extends WicketTestCase /** * testFormHasError() */ + @Test public void testFormHasError() { tester.startPage(FormHasErrorPage.class); @@ -37,6 +39,7 @@ public class TestFormHasError extends WicketTestCase /** * testFormComponentHasError() */ + @Test public void testFormComponentHasError() { tester.startPage(FormHasErrorPage.class); @@ -48,6 +51,7 @@ public class TestFormHasError extends WicketTestCase /** * testComponentHasError() */ + @Test public void testComponentHasError() { tester.startPage(FormHasErrorPage.class);
