You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2014/02/14 14:33:20 UTC

git commit: WICKET-3335 Try to make the nested borders test working (no success)

Updated Branches:
  refs/heads/sandbox/component-queueing-2 f764e635a -> ca99c661a


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/ca99c661
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/ca99c661
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/ca99c661

Branch: refs/heads/sandbox/component-queueing-2
Commit: ca99c661a6f4739c1f691ce333cf2a5d233fb4de
Parents: f764e63
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Feb 14 15:32:43 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Feb 14 15:32:43 2014 +0200

----------------------------------------------------------------------
 .../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/ca99c661/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 &lt;wicket:body&gt; 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/ca99c661/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