WICKET-3335 Try to make the nested borders test working (no success)
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/ed80141a Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/ed80141a Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/ed80141a Branch: refs/heads/master Commit: ed80141a9afa5e19fbd2704e0abd6e1963ff555b Parents: 612f6fb Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Fri Feb 14 15:32:43 2014 +0200 Committer: Igor Vaynberg <[email protected]> Committed: Thu Feb 20 23:37:15 2014 -0800 ---------------------------------------------------------------------- .../org/apache/wicket/markup/html/border/Border.java | 2 +- .../apache/wicket/queueing/ComponentQueueingTest.java | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/ed80141a/wicket-core/src/main/java/org/apache/wicket/markup/html/border/Border.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/border/Border.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/border/Border.java index 3c5b0d7..b3e1296 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/border/Border.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/border/Border.java @@ -398,7 +398,7 @@ public abstract class Border extends WebMarkupContainer implements IComponentRes /** * The container to be associated with the <wicket:body> tag */ - public class BorderBodyContainer extends WebMarkupContainer + public class BorderBodyContainer extends WebMarkupContainer implements IQueueRegion { private static final long serialVersionUID = 1L; http://git-wip-us.apache.org/repos/asf/wicket/blob/ed80141a/wicket-core/src/test/java/org/apache/wicket/queueing/ComponentQueueingTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/queueing/ComponentQueueingTest.java b/wicket-core/src/test/java/org/apache/wicket/queueing/ComponentQueueingTest.java index b0d13d7..55344a8 100644 --- a/wicket-core/src/test/java/org/apache/wicket/queueing/ComponentQueueingTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/queueing/ComponentQueueingTest.java @@ -565,25 +565,28 @@ public class ComponentQueueingTest extends WicketTestCase tester.startPage(p); assertThat(p, hasPath(new Path(a, border, r, s))); + assertThat(p, hasPath(new Path(a, border, border.getBodyContainer(), b))); } @Ignore @Test public void dequeueWithNestedBorders() { - MarkupContainer a = new A(), b = new B(), c= new C(), d = new D(), r = new R(); + MarkupContainer a = new A(), b = new B(), c= new C(), d = new D(), r = new R(), s = new S(); TestBorder outerBorder = new TestBorder("outerBorder"); outerBorder.setBorderMarkup("<wicket:border><p wicket:id='r'><p wicket:id='innerBorder'>" + - "<wicket:body/></p></p></wicket:border>"); + "<p wicket='s'></p></p><wicket:body/></p></wicket:border>"); TestBorder innerBorder = new TestBorder("innerBorder"); innerBorder.setBorderMarkup("<wicket:border><p wicket:id='c'><p wicket:id='d'>" + "<wicket:body/></p></p></wicket:border>"); - innerBorder.queueToBorder(c, d); outerBorder.queueToBorder(r, innerBorder); + innerBorder.queueToBorder(c, d); + outerBorder.queue(s); + TestPage p = new TestPage(); p.setPageMarkup("<p wicket:id='a'><p wicket:id='outerBorder'><p wicket:id='b'></p></p></p>"); @@ -591,7 +594,8 @@ public class ComponentQueueingTest extends WicketTestCase tester.startPage(p); - assertThat(p, hasPath(new Path(a, outerBorder, r, innerBorder, c, d))); + assertThat(p, hasPath(new Path(a, outerBorder, r, innerBorder, s))); + assertThat(p, hasPath(new Path(a, outerBorder, r, innerBorder, innerBorder.getBodyContainer(), c, d))); } private static class A extends WebMarkupContainer
