Author: jdonnerstag
Date: Sun Apr 3 15:58:06 2011
New Revision: 1088327
URL: http://svn.apache.org/viewvc?rev=1088327&view=rev
Log:
fixed WICKET-3085: Support for starting FormComponentPanel in WicketTester
made testing of any Component type (not just Page and Panel) more easy. See
startComponent(component, markup).
Issue: WICKET-3085
Added:
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/formComponentPanel/
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/formComponentPanel/MyFormComponentPanel.java
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/formComponentPanel/SimplePageTest.java
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Component.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Page.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/tester/ITestPageSource.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/tester/ITestPanelSource.java
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/TesterTest.java
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxRequestTargetTest.java
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxTimerBehaviorTest.java
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadFieldTest.java
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/markupId/MyPanel.java
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_3/FormTesterTest.java
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_5/AjaxLinkClickTest.java
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_5/AjaxSubmitLinkClickTest.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/resource/StringResourceStream.java
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Component.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Component.java?rev=1088327&r1=1088326&r2=1088327&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Component.java
(original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Component.java Sun
Apr 3 15:58:06 2011
@@ -703,18 +703,33 @@ public abstract class Component
*/
public IMarkupFragment getMarkup()
{
+ // Markup already determined or preset?
if (markup != null)
{
return markup;
}
+ // No parent, than check associated markup files
if (parent == null)
{
- throw new MarkupException(
+ // Must be a MarkupContainer to have associated markup
file
+ if (this instanceof MarkupContainer)
+ {
+ MarkupContainer container =
(MarkupContainer)this;
+ if (container.hasAssociatedMarkup())
+ {
+ markup =
container.getAssociatedMarkup();
+ return markup;
+ }
+ }
+
+ // Don't know how to find the markup
+ throw new MarkupNotFoundException(
"Can not determine Markup. Component is not yet
connected to a parent. " +
toString());
}
+ // Ask the parent for find the markup for me
markup = parent.getMarkup(this);
return markup;
}
@@ -747,7 +762,7 @@ public abstract class Component
}
// move the component to its real parent if necessary
-// moveComponentToItsRealParent();
+ // moveComponentToItsRealParent();
}
/**
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Page.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Page.java?rev=1088327&r1=1088326&r2=1088327&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Page.java
(original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/Page.java Sun Apr
3 15:58:06 2011
@@ -377,15 +377,6 @@ public abstract class Page extends Marku
}
/**
- * @deprecated
- */
- @Deprecated
- public int getNumericId()
- {
- return getPageId();
- }
-
- /**
*
* @return page class
*/
@@ -1082,15 +1073,6 @@ public abstract class Page extends Marku
}
/**
- * @see org.apache.wicket.Component#getMarkup()
- */
- @Override
- public IMarkupFragment getMarkup()
- {
- return getAssociatedMarkup();
- }
-
- /**
* @see org.apache.wicket.page.IManageablePage#getPageId()
*/
public int getPageId()
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java?rev=1088327&r1=1088326&r2=1088327&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
Sun Apr 3 15:58:06 2011
@@ -62,6 +62,9 @@ import org.apache.wicket.behavior.Behavi
import org.apache.wicket.feedback.FeedbackMessage;
import org.apache.wicket.feedback.FeedbackMessages;
import org.apache.wicket.feedback.IFeedbackMessageFilter;
+import org.apache.wicket.markup.IMarkupFragment;
+import org.apache.wicket.markup.Markup;
+import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.FormComponent;
@@ -112,6 +115,7 @@ import org.apache.wicket.request.resourc
import org.apache.wicket.session.ISessionStore;
import org.apache.wicket.settings.IRequestCycleSettings.RenderStrategy;
import org.apache.wicket.util.IProvider;
+import org.apache.wicket.util.lang.Args;
import org.apache.wicket.util.lang.Classes;
import org.apache.wicket.util.lang.Generics;
import org.apache.wicket.util.resource.ResourceStreamNotFoundException;
@@ -143,6 +147,7 @@ public class BaseWicketTester
/**
* @author jcompagner
*/
+ @Deprecated
private static final class TestPageSource implements ITestPageSource
{
private final Page page;
@@ -202,7 +207,7 @@ public class BaseWicketTester
// The root component used for the start. Usually the Page, but can
also be a Panel
// see https://issues.apache.org/jira/browse/WICKET-1214
- private MarkupContainer startComponent;
+ private Component startComponent;
/**
* Creates <code>WicketTester</code> and automatically create a
<code>WebApplication</code>, but
@@ -699,11 +704,21 @@ public class BaseWicketTester
/**
*
- * @return last response as String
+ * @return last response as String. In case the component processed was
not a Page, than the
+ * automatically created page markup gets removed.
*/
public String getLastResponseAsString()
{
- return lastResponse.getDocument();
+ String response = lastResponse.getDocument();
+ if (startComponent == null)
+ {
+ return response;
+ }
+
+ // Remove first and last tag
+ int pos1 = response.indexOf('>');
+ int pos2 = response.lastIndexOf('<');
+ return response.substring(pos1 + 1, pos2);
}
/**
@@ -812,7 +827,9 @@ public class BaseWicketTester
* @param testPageSource
* a <code>Page</code> factory that creates a test page
instance
* @return the rendered Page
+ * @deprecated since 1.5 use startPage(page) instead
*/
+ @Deprecated
public final Page startPage(final ITestPageSource testPageSource)
{
return startPage(testPageSource.getTestPage());
@@ -994,20 +1011,13 @@ public class BaseWicketTester
* @param testPanelSource
* a <code>Panel</code> factory that creates test
<code>Panel</code> instances
* @return a rendered <code>Panel</code>
+ * @deprecated since 1.5 use startPanel(panel) instead
*/
+ @Deprecated
public final Panel startPanel(final ITestPanelSource testPanelSource)
{
- Panel panel = (Panel)startPage(new ITestPageSource()
- {
- private static final long serialVersionUID = 1L;
-
- public Page getTestPage()
- {
- return new DummyPanelPage(testPanelSource);
- }
- }).get(DummyPanelPage.TEST_PANEL_ID);
- startComponent = panel;
- return panel;
+ return
(Panel)startComponent(testPanelSource.getTestPanel(DummyPanelPage.TEST_PANEL_ID),
+ null);
}
/**
@@ -1023,33 +1033,64 @@ public class BaseWicketTester
*/
public final <C extends Panel> Panel startPanel(final Class<C>
panelClass)
{
- Panel panel = (Panel)startPage(new ITestPageSource()
+ return (Panel)startComponent(panelClass, null);
+ }
+
+ /**
+ * Process a component. The web page will automatically created with
the pageMarkup provided. In
+ * case pageMarkup is null, the markup will be automatically created.
+ *
+ * @param componentClass
+ * @param pageMarkup
+ * May be null
+ * @return The component processed
+ */
+ public final Component startComponent(final Class<? extends Component>
componentClass,
+ final IMarkupFragment pageMarkup)
+ {
+ Component comp;
+ try
+ {
+ Constructor<? extends Component> c =
componentClass.getConstructor(String.class);
+ comp = c.newInstance("testObject");
+ }
+ catch (Exception e)
+ {
+ throw convertoUnexpect(e);
+ }
+
+ return startComponent(comp, pageMarkup);
+ }
+
+ /**
+ * Process a component. The web page will automatically created with
the pageMarkup provided. In
+ * case pageMarkup is null, the markup will be automatically created.
+ *
+ * @param component
+ * @param pageMarkup
+ * May be null
+ * @return The component processed
+ */
+ public final Component startComponent(final Component component,
IMarkupFragment pageMarkup)
+ {
+ Args.notNull(component, "component");
+
+ if (pageMarkup == null)
+ {
+ pageMarkup = Markup.of("<span wicket:id='" +
component.getId() + "'></span>");
+ }
+
+ Page page = new WebPage()
{
private static final long serialVersionUID = 1L;
+ };
- public Page getTestPage()
- {
- return new DummyPanelPage(new ITestPanelSource()
- {
- private static final long
serialVersionUID = 1L;
+ page.setMarkup(pageMarkup);
+ page.add(component);
- public Panel getTestPanel(String
panelId)
- {
- try
- {
- Constructor<? extends
Panel> c = panelClass.getConstructor(String.class);
- return
c.newInstance(panelId);
- }
- catch (Exception e)
- {
- throw
convertoUnexpect(e);
- }
- }
- });
- }
- }).get(DummyPanelPage.TEST_PANEL_ID);
- startComponent = panel;
- return panel;
+ startPage(page);
+
+ return startComponent = component;
}
/**
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/tester/ITestPageSource.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/tester/ITestPageSource.java?rev=1088327&r1=1088326&r2=1088327&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/tester/ITestPageSource.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/tester/ITestPageSource.java
Sun Apr 3 15:58:06 2011
@@ -24,7 +24,9 @@ import org.apache.wicket.Page;
*
* @author Ingram Chen
* @since 1.2.6
+ * @deprecated since 1.5 No longer needed
*/
+@Deprecated
public interface ITestPageSource extends IClusterable
{
/**
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/tester/ITestPanelSource.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/tester/ITestPanelSource.java?rev=1088327&r1=1088326&r2=1088327&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/tester/ITestPanelSource.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/util/tester/ITestPanelSource.java
Sun Apr 3 15:58:06 2011
@@ -24,7 +24,9 @@ import org.apache.wicket.markup.html.pan
*
* @author Ingram Chen
* @since 1.2.6
+ * @deprecated since 1.5 No longer needed
*/
+@Deprecated
public interface ITestPanelSource extends IClusterable
{
/**
Modified:
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/TesterTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/TesterTest.java?rev=1088327&r1=1088326&r2=1088327&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/TesterTest.java
(original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/TesterTest.java
Sun Apr 3 15:58:06 2011
@@ -21,7 +21,6 @@ import junit.framework.TestCase;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.util.tester.ITestPageSource;
import org.apache.wicket.util.tester.WicketTester;
/**
@@ -49,15 +48,7 @@ public class TesterTest extends TestCase
*/
public void testAssert()
{
- tester.startPage(new ITestPageSource()
- {
- private static final long serialVersionUID = 1L;
-
- public Page getTestPage()
- {
- return new MyPage();
- }
- });
+ tester.startPage(new MyPage());
tester.debugComponentTrees();
try
{
Modified:
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxRequestTargetTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxRequestTargetTest.java?rev=1088327&r1=1088326&r2=1088327&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxRequestTargetTest.java
(original)
+++
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxRequestTargetTest.java
Sun Apr 3 15:58:06 2011
@@ -24,13 +24,11 @@ import java.util.regex.Pattern;
import org.apache.wicket.Component;
import org.apache.wicket.MockPageWithLinkAndComponent;
-import org.apache.wicket.Page;
import org.apache.wicket.WicketTestCase;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.event.IEvent;
import org.apache.wicket.markup.html.WebComponent;
import org.apache.wicket.util.tester.DiffUtil;
-import org.apache.wicket.util.tester.ITestPageSource;
/**
@@ -109,15 +107,7 @@ public class AjaxRequestTargetTest exten
}
});
- tester.startPage(new ITestPageSource()
- {
- private static final long serialVersionUID = 1L;
-
- public Page getTestPage()
- {
- return page;
- }
- });
+ tester.startPage(page);
//
System.out.println(tester.getServletResponse().getDocument());
tester.debugComponentTrees();
Modified:
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxTimerBehaviorTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxTimerBehaviorTest.java?rev=1088327&r1=1088326&r2=1088327&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxTimerBehaviorTest.java
(original)
+++
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxTimerBehaviorTest.java
Sun Apr 3 15:58:06 2011
@@ -20,14 +20,12 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.wicket.MockPageWithLinkAndComponent;
-import org.apache.wicket.Page;
import org.apache.wicket.WicketTestCase;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.markup.html.WebComponent;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.Link;
-import org.apache.wicket.util.tester.ITestPageSource;
import org.apache.wicket.util.time.Duration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -71,16 +69,7 @@ public class AjaxTimerBehaviorTest exten
}
});
- tester.startPage(new ITestPageSource()
- {
- private static final long serialVersionUID = 1L;
-
- public Page getTestPage()
- {
- return page;
- }
- });
-
+ tester.startPage(page);
tester.clickLink(MockPageWithLinkAndComponent.LINK_ID);
validate(timer, false);
@@ -111,15 +100,7 @@ public class AjaxTimerBehaviorTest exten
label.setOutputMarkupId(true);
label.add(timer);
- tester.startPage(new ITestPageSource()
- {
- private static final long serialVersionUID = 1L;
-
- public Page getTestPage()
- {
- return page;
- }
- });
+ tester.startPage(page);
validate(timer, true);
@@ -201,7 +182,7 @@ public class AjaxTimerBehaviorTest exten
return "\\Q" + s + "\\E";
}
- StringBuilder sb = new StringBuilder(s.length() * 2);
+ StringBuilder sb = new StringBuilder(s.length() * 2);
sb.append("\\Q");
slashEIndex = 0;
int current = 0;
Added:
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/formComponentPanel/MyFormComponentPanel.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/formComponentPanel/MyFormComponentPanel.java?rev=1088327&view=auto
==============================================================================
---
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/formComponentPanel/MyFormComponentPanel.java
(added)
+++
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/formComponentPanel/MyFormComponentPanel.java
Sun Apr 3 15:58:06 2011
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.wicket.markup.html.form.formComponentPanel;
+
+import org.apache.wicket.markup.IMarkupFragment;
+import org.apache.wicket.markup.Markup;
+import org.apache.wicket.markup.html.form.FormComponentPanel;
+
+/**
+ *
+ */
+public class MyFormComponentPanel extends FormComponentPanel<Void>
+{
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * Construct.
+ *
+ * @param id
+ */
+ public MyFormComponentPanel(final String id)
+ {
+ super(id);
+ }
+
+ @Override
+ public IMarkupFragment getAssociatedMarkup()
+ {
+ return Markup.of("<wicket:panel>test</wicket:panel>");
+ }
+}
Added:
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/formComponentPanel/SimplePageTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/formComponentPanel/SimplePageTest.java?rev=1088327&view=auto
==============================================================================
---
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/formComponentPanel/SimplePageTest.java
(added)
+++
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/formComponentPanel/SimplePageTest.java
Sun Apr 3 15:58:06 2011
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.wicket.markup.html.form.formComponentPanel;
+
+import org.apache.wicket.WicketTestCase;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ *
+ */
+public class SimplePageTest extends WicketTestCase
+{
+ private static final Logger log =
LoggerFactory.getLogger(SimplePageTest.class);
+
+ /**
+ * @throws Exception
+ */
+ public void testRenderHomePage() throws Exception
+ {
+ tester.startComponent(MyFormComponentPanel.class, null);
+ String doc = tester.getLastResponseAsString();
+ // log.error(doc);
+ assertEquals(doc, "<wicket:panel>test</wicket:panel>");
+ }
+}
Modified:
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadFieldTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadFieldTest.java?rev=1088327&r1=1088326&r2=1088327&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadFieldTest.java
(original)
+++
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/form/upload/FileUploadFieldTest.java
Sun Apr 3 15:58:06 2011
@@ -27,11 +27,9 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import org.apache.wicket.Page;
import org.apache.wicket.WicketTestCase;
import org.apache.wicket.util.file.File;
import org.apache.wicket.util.tester.FormTester;
-import org.apache.wicket.util.tester.ITestPageSource;
import org.apache.wicket.util.visit.IVisit;
import org.apache.wicket.util.visit.IVisitor;
import org.apache.wicket.validation.IValidatable;
@@ -149,16 +147,7 @@ public class FileUploadFieldTest extends
}
});
- tester.startPage(new ITestPageSource()
- {
- private static final long serialVersionUID = 1L;
-
- public Page getTestPage()
- {
- return page;
- }
- });
-
+ tester.startPage(page);
FormTester formtester = tester.newFormTester("form");
formtester.setFile("upload", tmpFile, "text/plain");
formtester.submit();
Modified:
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/markupId/MyPanel.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/markupId/MyPanel.java?rev=1088327&r1=1088326&r2=1088327&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/markupId/MyPanel.java
(original)
+++
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/markupId/MyPanel.java
Sun Apr 3 15:58:06 2011
@@ -19,8 +19,16 @@ package org.apache.wicket.markup.html.ma
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.panel.Panel;
+/**
+ *
+ */
public class MyPanel extends Panel
{
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * @param id
+ */
public MyPanel(String id)
{
super(id);
Modified:
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java?rev=1088327&r1=1088326&r2=1088327&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java
(original)
+++
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java
Sun Apr 3 15:58:06 2011
@@ -90,18 +90,9 @@ public class WicketTesterTest extends Te
*/
public void testViewBook() throws Exception
{
- // for WebPage without default constructor, I define a
TestPageSource to
- // let the page be instatiated lately.
- tester.startPage(new ITestPageSource()
- {
- private static final long serialVersionUID = 1L;
-
- public Page getTestPage()
- {
- Book mockBook = new Book("xxId", "xxName");
- return new ViewBook(mockBook);
- }
- });
+ Book mockBook = new Book("xxId", "xxName");
+ Page page = new ViewBook(mockBook);
+ tester.startPage(page);
// assertion
tester.assertRenderedPage(ViewBook.class);
@@ -161,16 +152,8 @@ public class WicketTesterTest extends Te
{
// for WebPage without default constructor, I define a
TestPageSource to
// let the page be instatiated lately.
- tester.startPage(new ITestPageSource()
- {
- private static final long serialVersionUID = 1L;
-
- public Page getTestPage()
- {
- Book mockBook = new Book("xxId", "xxName");
- return new ViewBook(mockBook);
- }
- });
+ Book mockBook = new Book("xxId", "xxName");
+ tester.startPage(new ViewBook(mockBook));
// assertion
tester.assertRenderedPage(ViewBook.class);
@@ -470,16 +453,7 @@ public class WicketTesterTest extends Te
page.add(ajaxLink);
- tester.startPage(new ITestPageSource()
- {
- private static final long serialVersionUID = 1L;
-
- public Page getTestPage()
- {
- return page;
- }
- });
-
+ tester.startPage(page);
// Click the link
tester.clickLink(MockPageWithLink.LINK_ID);
@@ -541,16 +515,7 @@ public class WicketTesterTest extends Te
page.add(ajaxLink);
ajaxLink.add(label);
- tester.startPage(new ITestPageSource()
- {
- private static final long serialVersionUID = 1L;
-
- public Page getTestPage()
- {
- return page;
- }
- });
-
+ tester.startPage(page);
// Click the link
tester.clickLink(MockPageWithLinkAndLabel.LINK_ID);
@@ -586,15 +551,7 @@ public class WicketTesterTest extends Te
page.add(label);
// Start the page
- tester.startPage(new ITestPageSource()
- {
- private static final long serialVersionUID = 1L;
-
- public Page getTestPage()
- {
- return page;
- }
- });
+ tester.startPage(page);
// tester.setupRequestAndResponse();
@@ -690,6 +647,9 @@ public class WicketTesterTest extends Te
assertEquals("Mock name", pojo.getName());
}
+ /**
+ *
+ */
public void testSubmittingFormWithAjaxEventSubmitsFormValues()
{
tester.startPage(MockPageWithFormAndAjaxFormSubmitBehavior.class);
@@ -897,12 +857,18 @@ public class WicketTesterTest extends Te
setTextFieldAndAssertSubmit(false);
}
+ /**
+ *
+ */
public void testCookieIsFoundWhenAddedToRequest()
{
tester.getRequest().addCookie(new Cookie("name", "value"));
assertEquals("value",
tester.getRequest().getCookie("name").getValue());
}
+ /**
+ *
+ */
public void testCookieIsFoundWhenAddedToResponse()
{
tester.startPage(CreateBook.class);
@@ -911,6 +877,9 @@ public class WicketTesterTest extends Te
assertEquals(cookies.iterator().next().getValue(), "value");
}
+ /**
+ *
+ */
public void testCookieIsFoundOnNextRequestWhenAddedToResponse()
{
// Test that maxAge == -1 (Default) works properly
Modified:
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_3/FormTesterTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_3/FormTesterTest.java?rev=1088327&r1=1088326&r2=1088327&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_3/FormTesterTest.java
(original)
+++
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_3/FormTesterTest.java
Sun Apr 3 15:58:06 2011
@@ -19,11 +19,9 @@ package org.apache.wicket.util.tester.ap
import java.util.Arrays;
import java.util.List;
-import org.apache.wicket.Page;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.WicketTestCase;
import org.apache.wicket.util.tester.FormTester;
-import org.apache.wicket.util.tester.ITestPageSource;
import org.apache.wicket.util.tester.apps_1.Book;
@@ -56,15 +54,7 @@ public class FormTesterTest extends Wick
books = new Book[] { new Book("1", "book1"), new Book("2",
"book2"),
new Book("3", "book3"), new Book("4", "book4")
};
- choicePage = (ChoicePage)tester.startPage(new ITestPageSource()
- {
- private static final long serialVersionUID = 1L;
-
- public Page getTestPage()
- {
- return new ChoicePage(Arrays.asList(books));
- }
- });
+ choicePage = (ChoicePage)tester.startPage(new
ChoicePage(Arrays.asList(books)));
formTester = tester.newFormTester("choiceForm");
}
Modified:
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_5/AjaxLinkClickTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_5/AjaxLinkClickTest.java?rev=1088327&r1=1088326&r2=1088327&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_5/AjaxLinkClickTest.java
(original)
+++
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_5/AjaxLinkClickTest.java
Sun Apr 3 15:58:06 2011
@@ -21,7 +21,6 @@ import org.apache.wicket.WicketTestCase;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxFallbackLink;
import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.util.tester.ITestPageSource;
/**
@@ -74,22 +73,9 @@ public class AjaxLinkClickTest extends W
}
};
- tester.startPage(new ITestPageSource()
- {
- /**
- *
- */
- private static final long serialVersionUID = 1L;
-
- public Page getTestPage()
- {
- Page page = new MockPageWithLink();
- page.add(ajaxLink);
-
- return page;
- }
- });
-
+ Page page = new MockPageWithLink();
+ page.add(ajaxLink);
+ tester.startPage(page);
tester.clickLink("ajaxLink");
assertTrue(linkClicked);
@@ -119,19 +105,7 @@ public class AjaxLinkClickTest extends W
}
});
- tester.startPage(new ITestPageSource()
- {
- /**
- *
- */
- private static final long serialVersionUID = 1L;
-
- public Page getTestPage()
- {
- return page;
- }
- });
-
+ tester.startPage(page);
tester.clickLink("ajaxLink");
assertTrue(linkClicked);
@@ -159,18 +133,7 @@ public class AjaxLinkClickTest extends W
}
});
- tester.startPage(new ITestPageSource()
- {
- /**
- *
- */
- private static final long serialVersionUID = 1L;
-
- public Page getTestPage()
- {
- return page;
- }
- });
+ tester.startPage(page);
// Click the link with ajax disabled
tester.clickLink("ajaxLink", false);
Modified:
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_5/AjaxSubmitLinkClickTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_5/AjaxSubmitLinkClickTest.java?rev=1088327&r1=1088326&r2=1088327&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_5/AjaxSubmitLinkClickTest.java
(original)
+++
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/util/tester/apps_5/AjaxSubmitLinkClickTest.java
Sun Apr 3 15:58:06 2011
@@ -16,12 +16,10 @@
*/
package org.apache.wicket.util.tester.apps_5;
-import org.apache.wicket.Page;
import org.apache.wicket.WicketTestCase;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink;
import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.util.tester.ITestPageSource;
import org.apache.wicket.util.tester.apps_5.MockPageWithFormAndLink.MockPojo;
@@ -74,8 +72,9 @@ public class AjaxSubmitLinkClickTest ext
tester.assertRenderedPage(MockPageWithFormAndContainedLink.class);
// Change the name in the textfield
- tester.getRequest().getPostParameters().setParameterValue(
- page.getNameField().getInputName(), "new mock value");
+ tester.getRequest()
+ .getPostParameters()
+ .setParameterValue(page.getNameField().getInputName(),
"new mock value");
// Click the submit link
tester.clickLink("form:link");
@@ -114,21 +113,13 @@ public class AjaxSubmitLinkClickTest ext
};
page.add(link);
- tester.startPage(new ITestPageSource()
- {
- private static final long serialVersionUID = 1L;
-
- public Page getTestPage()
- {
- return page;
- }
- });
-
+ tester.startPage(page);
tester.assertRenderedPage(MockPageWithFormAndLink.class);
// Change the name in the textfield
- tester.getRequest().getPostParameters().setParameterValue(
- page.getNameField().getInputName(), "new mock value");
+ tester.getRequest()
+ .getPostParameters()
+ .setParameterValue(page.getNameField().getInputName(),
"new mock value");
// Click the submit link
tester.clickLink("link");
Modified:
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/resource/StringResourceStream.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/resource/StringResourceStream.java?rev=1088327&r1=1088326&r2=1088327&view=diff
==============================================================================
---
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/resource/StringResourceStream.java
(original)
+++
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/resource/StringResourceStream.java
Sun Apr 3 15:58:06 2011
@@ -62,7 +62,7 @@ public final class StringResourceStream
@Override
public String toString()
{
- return string.toString();
+ return super.toString() + ": " + string.toString();
}
/**
@@ -71,7 +71,7 @@ public final class StringResourceStream
@Override
protected String getString()
{
- return toString();
+ return string.toString();
}
/**
