Repository: wicket Updated Branches: refs/heads/wicket-8.x f71edadf3 -> a58d4f24f
WICKET-6435: Add assertAbsent to BaseWicketTester. (cherry picked from commit 88897690a0f30f306792c1c4478e3e9f010b0738) Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/a58d4f24 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/a58d4f24 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/a58d4f24 Branch: refs/heads/wicket-8.x Commit: a58d4f24fd284b712264bea053885e3979c06760 Parents: f71edad Author: Jezza <[email protected]> Authored: Tue Oct 16 23:56:22 2018 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Wed Nov 7 10:32:45 2018 +0200 ---------------------------------------------------------------------- .../wicket/util/tester/BaseWicketTester.java | 34 ++++++++++++++++---- 1 file changed, 28 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/a58d4f24/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 54e7808..9a4b4ac 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 @@ -1519,6 +1519,12 @@ public class BaseWicketTester return new StartComponentInPage(); } + public Component getComponentFromLastRenderedPage(String path, + boolean wantVisibleInHierarchy) + { + return getComponentFromLastRenderedPage(path, wantVisibleInHierarchy, true); + } + /** * A page that is used as the automatically created page for * {@link BaseWicketTester#startComponentInPage(Class)} and the other variations. @@ -1582,7 +1588,7 @@ public class BaseWicketTester * @see org.apache.wicket.MarkupContainer#get(String) */ public Component getComponentFromLastRenderedPage(String path, - final boolean wantVisibleInHierarchy) + boolean wantVisibleInHierarchy, boolean failOnAbsent) { if (componentInPage != null && componentInPage.isInstantiated) { @@ -1596,8 +1602,11 @@ public class BaseWicketTester Component component = getLastRenderedPage().get(path); if (component == null) { - fail("path: '" + path + "' does not exist for page: " + - Classes.simpleName(getLastRenderedPage().getClass())); + if (failOnAbsent) + { + fail("path: '" + path + "' does not exist for page: " + + Classes.simpleName(getLastRenderedPage().getClass())); + } return null; } @@ -1744,18 +1753,31 @@ public class BaseWicketTester Component component = getComponentFromLastRenderedPage(path); if (component == null) { - fail("path: '" + path + "' does no exist for page: " + - Classes.simpleName(getLastRenderedPage().getClass())); + fail("path: '" + path + "' does not exist for page: " + + Classes.simpleName(getLastRenderedPage().getClass())); + return null; } return component; } - private FormComponent assertFormComponent(final String path) { + protected void assertAbsent(final String path) + { + Component component = getComponentFromLastRenderedPage(path, true, false); + if (component != null) + { + fail("path: '" + path + "' does exists for page: " + + Classes.simpleName(getLastRenderedPage().getClass())); + } + } + + private FormComponent assertFormComponent(final String path) + { Component component = assertExists(path); if (component instanceof FormComponent == false) { fail("path: '" + path + "' is not a form component"); + return null; } return (FormComponent) component; }
