WICKET-5447 close generated divs Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/2abc18f1 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/2abc18f1 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/2abc18f1
Branch: refs/heads/sandbox/WICKET-4686 Commit: 2abc18f1a4c42d6ca8fcaa3462ad69acfe635b9c Parents: 43e17be Author: svenmeier <[email protected]> Authored: Tue Dec 17 08:48:41 2013 +0100 Committer: svenmeier <[email protected]> Committed: Tue Dec 17 08:48:41 2013 +0100 ---------------------------------------------------------------------- .../html/repeater/tree/table/NodeBorder.java | 4 +++ .../repeater/tree/table/NodeBorderTest.java | 29 ++++++++++++++++++++ 2 files changed, 33 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/2abc18f1/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/table/NodeBorder.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/table/NodeBorder.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/table/NodeBorder.java index 089a367..db1ca42 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/table/NodeBorder.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/table/NodeBorder.java @@ -83,6 +83,10 @@ public class NodeBorder extends Behavior for (int i = 0; i < branches.length; i++) { + if (i > 0) + { + response.write("</div>"); + } response.write("</div>"); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/2abc18f1/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/tree/table/NodeBorderTest.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/tree/table/NodeBorderTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/tree/table/NodeBorderTest.java new file mode 100644 index 0000000..7a09c96 --- /dev/null +++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/tree/table/NodeBorderTest.java @@ -0,0 +1,29 @@ +package org.apache.wicket.extensions.markup.html.repeater.tree.table; + +import org.apache.wicket.markup.html.basic.Label; +import org.apache.wicket.util.tester.WicketTester; +import org.junit.Test; + +/** + * Test for {@link NodeBorder}. + */ +public class NodeBorderTest +{ + + /** + * WICKET-5447 + */ + @Test + public void properlyClosed() throws Exception + { + WicketTester tester = new WicketTester(); + + Label label = new Label("label"); + label.add(new NodeBorder(new boolean[] { true, false, true })); + + tester.startComponentInPage(label); + + tester + .assertResultPage("<div class=\"tree-branch tree-branch-mid\"><div class=\"tree-subtree\"><div class=\"tree-branch tree-branch-last\"><div class=\"tree-subtree\"><div class=\"tree-branch tree-branch-mid\"><span wicket:id=\"label\" class=\"tree-node\"></span></div></div></div></div></div>"); + } +}
