Repository: wicket Updated Branches: refs/heads/master 4e62461c7 -> 88897690a
WICKET-6435: Add assertAbsent to BaseWicketTester. Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/88897690 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/88897690 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/88897690 Branch: refs/heads/master Commit: 88897690a0f30f306792c1c4478e3e9f010b0738 Parents: 4e62461 Author: Jezza <[email protected]> Authored: Tue Oct 16 23:56:22 2018 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Wed Nov 7 10:25:08 2018 +0200 ---------------------------------------------------------------------- .../wicket/util/tester/BaseWicketTester.java | 31 ++++++++++++++++---- 1 file changed, 26 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/88897690/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 d4de9f6..79f596e 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 @@ -1515,6 +1515,12 @@ public class BaseWicketTester return new StartComponentInPage(); } + public Component getComponentFromLastRenderedPage(String path, + boolean wantVisibleInHierarchy) + { + return getComponentFromLastRenderedPage(path, wantVisibleInHierarchy, true); + } + /** * Gets the component with the given path from last rendered page. This method fails in case the * component couldn't be found. @@ -1527,7 +1533,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) { @@ -1541,8 +1547,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; } @@ -1691,19 +1700,31 @@ public class BaseWicketTester Component component = getComponentFromLastRenderedPage(path); if (component == null) { - fail("path: '" + path + "' does no exist for page: " + + 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; }
