Repository: wicket Updated Branches: refs/heads/master f20a495d8 -> 3c4f10258
WICKET-6081 Add "assertNotRequired" to the WicketTester Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/3c4f1025 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/3c4f1025 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/3c4f1025 Branch: refs/heads/master Commit: 3c4f102586e07e7d247ddcdbb6f6f58661c9aed9 Parents: f20a495 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Fri Feb 5 20:40:59 2016 +0100 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Fri Feb 5 20:52:49 2016 +0100 ---------------------------------------------------------------------- .../wicket/util/tester/BaseWicketTester.java | 71 +++++++++++++------- .../apache/wicket/util/tester/WicketTester.java | 11 +++ 2 files changed, 58 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/3c4f1025/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java b/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java index 47c7099..0242eb9 100644 --- a/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java +++ b/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java @@ -1641,11 +1641,7 @@ public class BaseWicketTester */ public <C extends Component> Result isComponent(String path, Class<C> expectedComponentClass) { - Component component = getComponentFromLastRenderedPage(path); - if (component == null) - { - return Result.fail("Component not found: " + path); - } + Component component = assertExists(path); return isTrue("component '" + Classes.simpleName(component.getClass()) + "' is not type:" + Classes.simpleName(expectedComponentClass), @@ -1713,12 +1709,7 @@ public class BaseWicketTester */ public Result isEnabled(final String path) { - Component component = getComponentFromLastRenderedPage(path); - if (component == null) - { - fail("path: '" + path + "' does no exist for page: " + - Classes.simpleName(getLastRenderedPage().getClass())); - } + Component component = assertExists(path); return isTrue("component '" + path + "' is disabled", component.isEnabledInHierarchy()); } @@ -1732,14 +1723,29 @@ public class BaseWicketTester */ public Result isDisabled(final String path) { + Component component = assertExists(path); + + return isFalse("component '" + path + "' is enabled", component.isEnabledInHierarchy()); + } + + private Component assertExists(final String path) { Component component = getComponentFromLastRenderedPage(path); if (component == null) { fail("path: '" + path + "' does no exist for page: " + - Classes.simpleName(getLastRenderedPage().getClass())); + Classes.simpleName(getLastRenderedPage().getClass())); } + return component; + } - return isFalse("component '" + path + "' is enabled", component.isEnabledInHierarchy()); + private FormComponent assertFormComponent(final String path) { + Component component = assertExists(path); + + if (component instanceof FormComponent == false) + { + fail("path: '" + path + "' is not a form component"); + } + return (FormComponent) component; } /** @@ -1751,18 +1757,9 @@ public class BaseWicketTester */ public Result isRequired(String path) { - Component component = getComponentFromLastRenderedPage(path); - if (component == null) - { - fail("path: '" + path + "' does no exist for page: " + - Classes.simpleName(getLastRenderedPage().getClass())); - } - else if (component instanceof FormComponent == false) - { - fail("path: '" + path + "' is not a form component"); - } + FormComponent formComponent = assertFormComponent(path); - return isRequired((FormComponent<?>)component); + return isRequired(formComponent); } /** @@ -1778,6 +1775,32 @@ public class BaseWicketTester } /** + * Asserts that a component is not required. + * + * @param path + * path to component + * @return a <code>Result</code> + */ + public Result isNotRequired(String path) + { + FormComponent formComponent = assertFormComponent(path); + + return isNotRequired(formComponent); + } + + /** + * Asserts that a component is not required. + * + * @param component + * a form component + * @return a <code>Result</code> + */ + public Result isNotRequired(FormComponent<?> component) + { + return isFalse("component '" + component + "' is required", component.isRequired()); + } + + /** * assert the content of last rendered page contains(matches) regex pattern. * * @param pattern http://git-wip-us.apache.org/repos/asf/wicket/blob/3c4f1025/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java b/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java index 36b0c9e..0bb396b 100644 --- a/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java +++ b/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java @@ -750,6 +750,17 @@ public class WicketTester extends BaseWicketTester } /** + * assert form component is required. + * + * @param path + * path to form component + */ + public void assertNotRequired(String path) + { + assertResult(isNotRequired(path)); + } + + /** * * @param result */
