You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by jd...@apache.org on 2010/11/27 15:47:20 UTC
svn commit: r1039691 - in /wicket/trunk/wicket/src:
main/java/org/apache/wicket/util/tester/BaseWicketTester.java
test/java/org/apache/wicket/markup/html/markupId/MyPanel.java
test/java/org/apache/wicket/markup/html/panel/PanelTest.java
Author: jdonnerstag
Date: Sat Nov 27 14:47:20 2010
New Revision: 1039691
URL: http://svn.apache.org/viewvc?rev=1039691&view=rev
Log:
fixed WICKET-1214 WicketTester#startPanel does not work (correctly)
Issue: WICKET-1214
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/markupId/MyPanel.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/panel/PanelTest.java
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java?rev=1039691&r1=1039690&r2=1039691&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java Sat Nov 27 14:47:20 2010
@@ -967,7 +967,13 @@ public class BaseWicketTester
*/
public Component getComponentFromLastRenderedPage(String path)
{
- final Component component = getLastRenderedPage().get(path);
+ MarkupContainer root = getLastRenderedPage();
+ if (root instanceof DummyPanelPage)
+ {
+ root = (MarkupContainer)root.get(DummyPanelPage.TEST_PANEL_ID);
+ }
+
+ Component component = root.get(path);
if (component == null)
{
fail("path: '" + path + "' does not exist for page: " +
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/markupId/MyPanel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/markupId/MyPanel.java?rev=1039691&r1=1039690&r2=1039691&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/markupId/MyPanel.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/markupId/MyPanel.java Sat Nov 27 14:47:20 2010
@@ -27,6 +27,6 @@ public class MyPanel extends Panel
add(new Label("label", "text"));
- addOrReplace(new Label("label", "text"));
+ addOrReplace(new Label("label", "Hello, World!"));
}
}
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/panel/PanelTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/panel/PanelTest.java?rev=1039691&r1=1039690&r2=1039691&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/panel/PanelTest.java (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/panel/PanelTest.java Sat Nov 27 14:47:20 2010
@@ -21,6 +21,8 @@ import org.apache.wicket.Page;
import org.apache.wicket.WicketTestCase;
import org.apache.wicket.markup.MarkupException;
import org.apache.wicket.markup.MarkupNotFoundException;
+import org.apache.wicket.markup.html.markupId.MyPanel;
+import org.apache.wicket.util.tester.WicketTester;
/**
@@ -178,4 +180,14 @@ public class PanelTest extends WicketTes
tester.clickLink("add");
tester.assertComponentOnAjaxResponse(node);
}
+
+ /**
+ *
+ */
+ public void testStartPanel()
+ {
+ WicketTester tester = new WicketTester();
+ tester.startPanel(MyPanel.class);
+ tester.assertLabel("label", "Hello, World!");
+ }
}