Author: gseitz Date: Sun Dec 2 14:16:37 2007 New Revision: 600390 URL: http://svn.apache.org/viewvc?rev=600390&view=rev Log: WICKET-1173: unit test for hiding/unhiding border body wrappen in a WMC
Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/border/ComponentBorderTest.java wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/border/HideableBorder.html wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/border/HideableBorder.java wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/border/HideableBorderPage_ExpectedResult.html Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/border/ComponentBorderTest.java URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/border/ComponentBorderTest.java?rev=600390&r1=600389&r2=600390&view=diff ============================================================================== --- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/border/ComponentBorderTest.java (original) +++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/border/ComponentBorderTest.java Sun Dec 2 14:16:37 2007 @@ -19,6 +19,7 @@ import org.apache.wicket.Page; import org.apache.wicket.WicketTestCase; import org.apache.wicket.ajax.markup.html.AjaxLink; +import org.apache.wicket.markup.html.WebMarkupContainer; /** * @author jcompagner @@ -42,7 +43,7 @@ public void testMarkupComponentBorder() throws Exception { executeTest(MarkupComponentBorderTestPage.class, - "MarkupComponentBorderTestPage_ExpectedResult.html"); + "MarkupComponentBorderTestPage_ExpectedResult.html"); } /** @@ -57,10 +58,11 @@ Border border = (Border)page.get("hideable"); assertNotNull(border); AjaxLink link = (AjaxLink)border.get("hideLink"); + WebMarkupContainer wrapper = (WebMarkupContainer)border.get("wrapper"); assertNotNull(link); tester.clickLink("hideable:hideLink"); - tester.assertComponentOnAjaxResponse(border.getBodyContainer()); + tester.assertComponentOnAjaxResponse(wrapper); tester.clickLink("hideable:hideLink"); - tester.assertComponentOnAjaxResponse(border.getBodyContainer()); + tester.assertComponentOnAjaxResponse(wrapper); } } Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/border/HideableBorder.html URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/border/HideableBorder.html?rev=600390&r1=600389&r2=600390&view=diff ============================================================================== --- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/border/HideableBorder.html (original) +++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/border/HideableBorder.html Sun Dec 2 14:16:37 2007 @@ -2,7 +2,9 @@ <body> <wicket:border> <a wicket:id="hideLink">Hide contents</a> + <div wicket:id="wrapper"> <wicket:body></wicket:body> + </div> </wicket:border> </body> </html> Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/border/HideableBorder.java URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/border/HideableBorder.java?rev=600390&r1=600389&r2=600390&view=diff ============================================================================== --- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/border/HideableBorder.java (original) +++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/border/HideableBorder.java Sun Dec 2 14:16:37 2007 @@ -18,6 +18,7 @@ import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.markup.html.AjaxLink; +import org.apache.wicket.markup.html.WebMarkupContainer; /** * @@ -36,6 +37,9 @@ public HideableBorder(String name) { super(name); + final WebMarkupContainer containerWrapper = new WebMarkupContainer("wrapper"); + add(containerWrapper); + containerWrapper.add(getBodyContainer()); add(new AjaxLink("hideLink") { private static final long serialVersionUID = 1L; @@ -43,10 +47,10 @@ public void onClick(AjaxRequestTarget target) { hidden = !hidden; - getBodyContainer().setVisible(!hidden); - target.addComponent(getBodyContainer()); + containerWrapper.setVisible(!hidden); + target.addComponent(containerWrapper); } }); - getBodyContainer().setOutputMarkupPlaceholderTag(true); + containerWrapper.setOutputMarkupPlaceholderTag(true); } } Modified: wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/border/HideableBorderPage_ExpectedResult.html URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/border/HideableBorderPage_ExpectedResult.html?rev=600390&r1=600389&r2=600390&view=diff ============================================================================== --- wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/border/HideableBorderPage_ExpectedResult.html (original) +++ wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/border/HideableBorderPage_ExpectedResult.html Sun Dec 2 14:16:37 2007 @@ -9,9 +9,11 @@ </head><body> <div wicket:id="hideable"><wicket:border> <a href="#" wicket:id="hideLink" onclick="var wcall=wicketAjaxGet('?wicket:interface=:0:hideable:hideLink::IBehaviorListener:0:',null,null, function() {return Wicket.$$(this)}.bind(this));return !wcall;" id="hideLink1">Hide contents</a> - <wicket:body id="id__body2"> + <div wicket:id="wrapper" id="wrapper2"> + <wicket:body> Contents </wicket:body> + </div> </wicket:border></div> </body> </html>