Updated Branches: refs/heads/markup-driven-component-tree 7a5cfbbc6 -> fa68ce99a
Add test with manually added components Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/e801a5f4 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/e801a5f4 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/e801a5f4 Branch: refs/heads/markup-driven-component-tree Commit: e801a5f4f45ea2a844f31ce679a6bb322dd95979 Parents: 7a5cfbb Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Thu Jan 23 14:56:52 2014 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Thu Jan 23 14:56:52 2014 +0200 ---------------------------------------------------------------------- .../java/org/apache/wicket/MarkupContainer.java | 1 + .../markupdriventree/BasePageWithPanel.html | 28 ++++++++++++++++++++ .../markupdriventree/BasePageWithPanel.java | 11 ++++++++ .../markupdriventree/MarkupDrivenTreeTest.java | 18 +++++++++++-- .../markupdriventree/PageWithAutoPanel.java | 18 +++++++++++++ .../PageWithManuallyAddedPanel.java | 16 +++++++++++ .../wicket/markupdriventree/PageWithPanel.html | 28 -------------------- .../wicket/markupdriventree/PageWithPanel.java | 18 ------------- 8 files changed, 90 insertions(+), 48 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/e801a5f4/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java b/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java index 313b65f..ad8fb7e 100644 --- a/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java +++ b/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java @@ -1895,6 +1895,7 @@ public abstract class MarkupContainer extends Component implements Iterable<Comp } } + @Override final void buildComponentTree() { ComponentTreeBuilder builder = new ComponentTreeBuilder(); http://git-wip-us.apache.org/repos/asf/wicket/blob/e801a5f4/wicket-core/src/test/java/org/apache/wicket/markupdriventree/BasePageWithPanel.html ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markupdriventree/BasePageWithPanel.html b/wicket-core/src/test/java/org/apache/wicket/markupdriventree/BasePageWithPanel.html new file mode 100644 index 0000000..647250a --- /dev/null +++ b/wicket-core/src/test/java/org/apache/wicket/markupdriventree/BasePageWithPanel.html @@ -0,0 +1,28 @@ +<!DOCTYPE html> +<html xmlns:wicket="http://wicket.apache.org";> + <head> + <meta charset="utf-8" /> + <title>Page with panel</title> + </head> + <body> + <div id="hd"> + <div id="logo"> + <img src="logo.png" width="50px" height="50px" alt="Wicket Logo" /> + <h1>Apache Wicket</h1> + </div> + </div> + <div id="bd"> + + <div wicket:id="c"> + </div> + + <div wicket:id="b"> + <div wicket:id="a"></div> + </div> + + <div wicket:id="panelA"></div> + + </div> + + </body> +</html> http://git-wip-us.apache.org/repos/asf/wicket/blob/e801a5f4/wicket-core/src/test/java/org/apache/wicket/markupdriventree/BasePageWithPanel.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markupdriventree/BasePageWithPanel.java b/wicket-core/src/test/java/org/apache/wicket/markupdriventree/BasePageWithPanel.java new file mode 100644 index 0000000..7f67322 --- /dev/null +++ b/wicket-core/src/test/java/org/apache/wicket/markupdriventree/BasePageWithPanel.java @@ -0,0 +1,11 @@ +package org.apache.wicket.markupdriventree; + +/** + * + */ +public abstract class BasePageWithPanel extends BasePage +{ + public BasePageWithPanel() + { + } +} http://git-wip-us.apache.org/repos/asf/wicket/blob/e801a5f4/wicket-core/src/test/java/org/apache/wicket/markupdriventree/MarkupDrivenTreeTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markupdriventree/MarkupDrivenTreeTest.java b/wicket-core/src/test/java/org/apache/wicket/markupdriventree/MarkupDrivenTreeTest.java index def70cb..5b2af28 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markupdriventree/MarkupDrivenTreeTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markupdriventree/MarkupDrivenTreeTest.java @@ -43,9 +43,23 @@ public class MarkupDrivenTreeTest extends WicketTestCase } @Test - public void pageWithPanel() + public void pageWithAutoPanel() { - tester.startPage(PageWithPanel.class); + tester.startPage(PageWithAutoPanel.class); + + tester.assertComponent("c", ComponentC.class); + tester.assertComponent("b", ComponentB.class); + tester.assertComponent("b:a", ComponentA.class); + + tester.assertComponent("panelA", PanelA.class); + tester.assertComponent("panelA:a", ComponentA.class); + } + + + @Test + public void pageWithManuallyAddedPanel() + { + tester.startPage(PageWithManuallyAddedPanel.class); tester.assertComponent("c", ComponentC.class); tester.assertComponent("b", ComponentB.class); http://git-wip-us.apache.org/repos/asf/wicket/blob/e801a5f4/wicket-core/src/test/java/org/apache/wicket/markupdriventree/PageWithAutoPanel.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markupdriventree/PageWithAutoPanel.java b/wicket-core/src/test/java/org/apache/wicket/markupdriventree/PageWithAutoPanel.java new file mode 100644 index 0000000..ad6ff89 --- /dev/null +++ b/wicket-core/src/test/java/org/apache/wicket/markupdriventree/PageWithAutoPanel.java @@ -0,0 +1,18 @@ +package org.apache.wicket.markupdriventree; + +import org.apache.wicket.Auto; +import org.apache.wicket.markupdriventree.components.PanelA; + +/** + * + */ +public class PageWithAutoPanel extends BasePageWithPanel +{ + @Auto + PanelA panelA; + + public PageWithAutoPanel() + { + panelA = new PanelA("panelA"); + } +} http://git-wip-us.apache.org/repos/asf/wicket/blob/e801a5f4/wicket-core/src/test/java/org/apache/wicket/markupdriventree/PageWithManuallyAddedPanel.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markupdriventree/PageWithManuallyAddedPanel.java b/wicket-core/src/test/java/org/apache/wicket/markupdriventree/PageWithManuallyAddedPanel.java new file mode 100644 index 0000000..122ce26 --- /dev/null +++ b/wicket-core/src/test/java/org/apache/wicket/markupdriventree/PageWithManuallyAddedPanel.java @@ -0,0 +1,16 @@ +package org.apache.wicket.markupdriventree; + +import org.apache.wicket.Auto; +import org.apache.wicket.markupdriventree.components.PanelA; + +/** + * + */ +public class PageWithManuallyAddedPanel extends BasePageWithPanel +{ + public PageWithManuallyAddedPanel() + { + PanelA panelA = new PanelA("panelA"); + add(panelA); + } +} http://git-wip-us.apache.org/repos/asf/wicket/blob/e801a5f4/wicket-core/src/test/java/org/apache/wicket/markupdriventree/PageWithPanel.html ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markupdriventree/PageWithPanel.html b/wicket-core/src/test/java/org/apache/wicket/markupdriventree/PageWithPanel.html deleted file mode 100644 index 647250a..0000000 --- a/wicket-core/src/test/java/org/apache/wicket/markupdriventree/PageWithPanel.html +++ /dev/null @@ -1,28 +0,0 @@ -<!DOCTYPE html> -<html xmlns:wicket="http://wicket.apache.org";> - <head> - <meta charset="utf-8" /> - <title>Page with panel</title> - </head> - <body> - <div id="hd"> - <div id="logo"> - <img src="logo.png" width="50px" height="50px" alt="Wicket Logo" /> - <h1>Apache Wicket</h1> - </div> - </div> - <div id="bd"> - - <div wicket:id="c"> - </div> - - <div wicket:id="b"> - <div wicket:id="a"></div> - </div> - - <div wicket:id="panelA"></div> - - </div> - - </body> -</html> http://git-wip-us.apache.org/repos/asf/wicket/blob/e801a5f4/wicket-core/src/test/java/org/apache/wicket/markupdriventree/PageWithPanel.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markupdriventree/PageWithPanel.java b/wicket-core/src/test/java/org/apache/wicket/markupdriventree/PageWithPanel.java deleted file mode 100644 index e453662..0000000 --- a/wicket-core/src/test/java/org/apache/wicket/markupdriventree/PageWithPanel.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.apache.wicket.markupdriventree; - -import org.apache.wicket.Auto; -import org.apache.wicket.markupdriventree.components.PanelA; - -/** - * - */ -public class PageWithPanel extends BasePage -{ - @Auto - PanelA panelA; - - public PageWithPanel() - { - panelA = new PanelA("panelA"); - } -}
