You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by kn...@apache.org on 2008/11/16 23:04:29 UTC
svn commit: r718123 [9/10] - in /wicket/sandbox/knopp/experimental/wicket:
./ .settings/ src/main/java/org/apache/wicket/
src/main/java/org/apache/wicket/ajax/
src/main/java/org/apache/wicket/ajax/form/
src/main/java/org/apache/wicket/ajax/markup/html/...
Modified: wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/ParentResourceEscapePathTest.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/ParentResourceEscapePathTest.java?rev=718123&r1=718122&r2=718123&view=diff
==============================================================================
--- wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/ParentResourceEscapePathTest.java (original)
+++ wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/ParentResourceEscapePathTest.java Sun Nov 16 14:04:19 2008
@@ -38,9 +38,9 @@
tester.assertNoErrorMessage();
final StringBuilder expectedHtml = new StringBuilder();
- expectedHtml.append("<html><head><wicket:link><script src=\"");
+ expectedHtml.append("<html><head><wicket:link><script type=\"text/javascript\" src=\"");
expectedHtml.append(expectedResourceUrl());
- expectedHtml.append("\" type=\"text/javascript\"></script></wicket:link></head></html>");
+ expectedHtml.append("\"></script></wicket:link></head></html>");
assertEquals(expectedHtml.toString(), tester.getServletResponse().getDocument());
}
Modified: wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/ajax/MockComponent1-expected.html
URL: http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/ajax/MockComponent1-expected.html?rev=718123&r1=718122&r2=718123&view=diff
==============================================================================
--- wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/ajax/MockComponent1-expected.html (original)
+++ wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/ajax/MockComponent1-expected.html Sun Nov 16 14:04:19 2008
@@ -1,5 +1,5 @@
<![CDATA[<head xmlns:wicket="http://wicket.apache.org">
-<style id="org-apache-wicket-ajax-MockComponent1-0" type="text/css">
+<style type="text/css" id="org-apache-wicket-ajax-MockComponent1-0">
.onTheFlyClass {
background-color: red;
color: white;
Modified: wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/ajax/MockComponent3-expected.html
URL: http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/ajax/MockComponent3-expected.html?rev=718123&r1=718122&r2=718123&view=diff
==============================================================================
--- wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/ajax/MockComponent3-expected.html (original)
+++ wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/ajax/MockComponent3-expected.html Sun Nov 16 14:04:19 2008
@@ -1,3 +1,3 @@
<![CDATA[<head xmlns:wicket="http://wicket.apache.org">
-<link href="resources/org.apache.wicket.ajax.MockComponent3/mockStyleSheet3.css" rel="stylesheet" type="text/css"/>
+<link rel="stylesheet" type="text/css" href="resources/org.apache.wicket.ajax.MockComponent3/mockStyleSheet3.css"/>
</head>]]>
\ No newline at end of file
Added: wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/MarkupCacheTest.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/MarkupCacheTest.java?rev=718123&view=auto
==============================================================================
--- wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/MarkupCacheTest.java (added)
+++ wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/MarkupCacheTest.java Sun Nov 16 14:04:19 2008
@@ -0,0 +1,84 @@
+/*
+ * 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;
+
+import junit.framework.TestCase;
+import org.apache.wicket.Application;
+import org.apache.wicket.MarkupContainer;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.protocol.http.WebApplication;
+import org.apache.wicket.util.resource.IResourceStream;
+import org.apache.wicket.util.tester.WicketTester;
+
+/**
+ * @author Timo Rantalaiho
+ */
+public class MarkupCacheTest extends TestCase
+{
+ private MarkupCache cache;
+ private MarkupCachingAssumingComponent component;
+
+ @Override
+ public void setUp() {
+ WebApplication application = new WicketTester.DummyWebApplication() {
+ @Override
+ public String getConfigurationType()
+ {
+ return Application.DEPLOYMENT;
+ }
+ };
+ WicketTester tester = new WicketTester(application);
+ cache = new MarkupCache(application);
+
+ component = new MarkupCachingAssumingComponent("panel");
+ tester.startComponent(component);
+ }
+
+ public void testMarkupNotFoundInformationIsCachedInDeploymentMode() {
+ Markup markup = cache.getMarkup(component, null, false);
+ assertEquals(Markup.NO_MARKUP, markup);
+
+ markup = cache.getMarkup(component, null, false);
+ assertEquals(Markup.NO_MARKUP, markup);
+ }
+
+ private class MarkupCachingAssumingComponent extends Panel implements IMarkupResourceStreamProvider {
+ private static final long serialVersionUID = -6743937191677599322L;
+ private boolean firstCall = true;
+
+ public MarkupCachingAssumingComponent(final String id)
+ {
+ super(id);
+ }
+
+ public IResourceStream getMarkupResourceStream(MarkupContainer container, Class<?> containerClass)
+ {
+ if (firstCall) {
+ firstCall = false;
+ return null;
+ }
+ fail("Markup should be cached");
+ throw new IllegalStateException();
+ }
+
+ @Override
+ public String getMarkupType()
+ {
+ return "html";
+ }
+ }
+}
Modified: wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/MarkupInheritanceBaseBase_11.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/MarkupInheritanceBaseBase_11.java?rev=718123&r1=718122&r2=718123&view=diff
==============================================================================
--- wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/MarkupInheritanceBaseBase_11.java (original)
+++ wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/MarkupInheritanceBaseBase_11.java Sun Nov 16 14:04:19 2008
@@ -36,7 +36,7 @@
public MarkupInheritanceBaseBase_11()
{
WebMarkupContainer css = new WebMarkupContainer("css");
- css.add(new AttributeModifier("src", true, new Model("myStyle.css")));
+ css.add(new AttributeModifier("src", true, new Model<String>("myStyle.css")));
add(css);
add(new Label("label1", "base label 1"));
Modified: wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_10.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_10.java?rev=718123&r1=718122&r2=718123&view=diff
==============================================================================
--- wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_10.java (original)
+++ wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_10.java Sun Nov 16 14:04:19 2008
@@ -36,7 +36,7 @@
public MarkupInheritanceBase_10()
{
WebMarkupContainer css = new WebMarkupContainer("css");
- css.add(new AttributeModifier("src", true, new Model("myStyle.css")));
+ css.add(new AttributeModifier("src", true, new Model<String>("myStyle.css")));
add(css);
add(new Label("label1", "base label 1"));
Modified: wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/MyComponent.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/MyComponent.java?rev=718123&r1=718122&r2=718123&view=diff
==============================================================================
--- wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/MyComponent.java (original)
+++ wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/MyComponent.java Sun Nov 16 14:04:19 2008
@@ -47,128 +47,129 @@
*/
public MyComponent(final String id)
{
- super(id, new Model(""));
+ super(id, new Model<String>(""));
}
/**
* Sets the number of rows per page.
*
- * @param param
+ * @param intParam
*/
- public void setIntParam(final int param)
+ public void setIntParam(final int intParam)
{
- this.intParam = param;
+ this.intParam = intParam;
}
/**
* Sets the number of rows per page.
*
- * @param param
+ * @param integerParam
*/
- public void setIntegerParam(final Integer param)
+ public void setIntegerParam(final Integer integerParam)
{
- this.integerParam = param;
+ this.integerParam = integerParam;
}
/**
* Sets the number of rows per page.
*
- * @param param
+ * @param long1Param
*/
- public void setLong1Param(final long param)
+ public void setLong1Param(final long long1Param)
{
- this.long1Param = param;
+ this.long1Param = long1Param;
}
/**
* Sets the number of rows per page.
*
- * @param param
+ * @param long2Param
*/
- public void setLong2Param(final Long param)
+ public void setLong2Param(final Long long2Param)
{
- this.long2Param = param;
+ this.long2Param = long2Param;
}
/**
* Sets the number of rows per page.
*
- * @param param
+ * @param float1Param
*/
- public void setFloat1Param(final float param)
+ public void setFloat1Param(final float float1Param)
{
- this.float1Param = param;
+ this.float1Param = float1Param;
}
/**
* Sets the number of rows per page.
*
- * @param param
+ * @param float2Param
*/
- public void setFloat2Param(final Float param)
+ public void setFloat2Param(final Float float2Param)
{
- this.float2Param = param;
+ this.float2Param = float2Param;
}
/**
* Sets the number of rows per page.
*
- * @param param
+ * @param double1Param
*/
- public void setDouble1Param(final double param)
+ public void setDouble1Param(final double double1Param)
{
- this.double1Param = param;
+ this.double1Param = double1Param;
}
/**
* Sets the number of rows per page.
*
- * @param param
+ * @param double2Param
*/
- public void setDouble2Param(final Double param)
+ public void setDouble2Param(final Double double2Param)
{
- this.double2Param = param;
+ this.double2Param = double2Param;
}
/**
* Sets the number of rows per page.
*
- * @param param
+ * @param dateParam
*/
- // public void setDateParam(final Date param)
- public void setDateParam(final String param)
+ // public void setDateParam(final Date dateParam)
+ public void setDateParam(final String dateParam)
{
- this.dateParam = param;
+ this.dateParam = dateParam;
}
/**
* Sets the number of rows per page.
*
- * @param param
+ * @param hexParam
*/
- public void setHexParam(final String param)
+ public void setHexParam(final String hexParam)
{
- this.hexParam = param;
+ this.hexParam = hexParam;
}
/**
* @see org.apache.wicket.MarkupContainer#onComponentTagBody(org.apache.wicket.markup.MarkupStream,
* org.apache.wicket.markup.ComponentTag)
*/
- protected void onComponentTagBody(MarkupStream markupStream, ComponentTag openTag)
+ @Override
+ protected void onComponentTagBody(MarkupStream markupStream, ComponentTag openTag)
{
StringBuffer str = new StringBuffer();
- str.append("intParam: " + intParam + "<br/>");
- str.append("integerParam: " + integerParam.toString() + "<br/>");
- str.append("long1Param: " + long1Param + "<br/>");
- str.append("long2Param: " + long2Param.toString() + "<br/>");
- str.append("float1Param: " + float1Param + "<br/>");
- str.append("float2Param: " + float2Param.toString() + "<br/>");
- str.append("double1Param: " + double1Param + "<br/>");
- str.append("double2Param: " + double2Param.toString() + "<br/>");
- str.append("dateParam: " + dateParam + "<br/>");
- str.append("hexParam: " + hexParam + "<br/>");
+ str.append("intParam: ").append(intParam).append("<br/>");
+ str.append("integerParam: ").append(integerParam.toString()).append("<br/>");
+ str.append("long1Param: ").append(long1Param).append("<br/>");
+ str.append("long2Param: ").append(long2Param.toString()).append("<br/>");
+ str.append("float1Param: ").append(float1Param).append("<br/>");
+ str.append("float2Param: ").append(float2Param.toString()).append("<br/>");
+ str.append("double1Param: ").append(double1Param).append("<br/>");
+ str.append("double2Param: ").append(double2Param.toString()).append("<br/>");
+ str.append("dateParam: ").append(dateParam).append("<br/>");
+ str.append("hexParam: ").append(hexParam).append("<br/>");
getResponse().write(str);
Modified: wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/MyTable.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/MyTable.java?rev=718123&r1=718122&r2=718123&view=diff
==============================================================================
--- wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/MyTable.java (original)
+++ wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/MyTable.java Sun Nov 16 14:04:19 2008
@@ -22,7 +22,7 @@
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.ListView;
-import org.apache.wicket.model.Model;
+import org.apache.wicket.model.util.ListModel;
/**
@@ -30,7 +30,7 @@
*
* @author Juergen Donnerstag
*/
-public class MyTable extends ListView
+public class MyTable extends ListView<String>
{
private static final long serialVersionUID = 1L;
@@ -41,12 +41,13 @@
*/
public MyTable(final String id)
{
- super(id, new Model(null));
+ super(id, new ListModel<String>());
}
- protected void populateItem(ListItem listItem)
+ @Override
+ protected void populateItem(ListItem<String> listItem)
{
- String txt = (String)listItem.getDefaultModelObject();
+ String txt = listItem.getModelObject();
listItem.add(new Label("txt", txt));
}
@@ -57,7 +58,7 @@
*/
public void setRowsPerPage(final int rows)
{
- List list = new ArrayList();
+ List<String> list = new ArrayList<String>();
for (int i = 0; i < rows; i++)
{
Modified: wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePage.java?rev=718123&r1=718122&r2=718123&view=diff
==============================================================================
--- wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePage.java (original)
+++ wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePage.java Sun Nov 16 14:04:19 2008
@@ -55,7 +55,7 @@
Border border2 = new SimpleBorder("myBorder2");
border2.setRenderBodyOnly(false);
- border2.add(new AttributeModifier("testAttr", true, new Model("myValue")));
+ border2.add(new AttributeModifier("testAttr", true, new Model<String>("myValue")));
add(border2);
}
}
Modified: wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_7.html
URL: http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_7.html?rev=718123&r1=718122&r2=718123&view=diff
==============================================================================
--- wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_7.html (original)
+++ wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_7.html Sun Nov 16 14:04:19 2008
@@ -5,10 +5,10 @@
<wicket:message key="myKeyNotExsts"></wicket:message>
<wicket:message key="myKey">myValue</wicket:message>
<span wicket:id="message">here it goes</span>
- <span attr-name="my i18n key" wicket:message="attr-name:i18n-key">test 2</span>
- <span wicket:id="message2" attr-name="my i18n key" wicket:message="attr-name:i18n-key">here it goes</span>
+ <span wicket:message="attr-name:i18n-key" attr-name="my i18n key">test 2</span>
+ <span wicket:id="message2" wicket:message="attr-name:i18n-key" attr-name="my i18n key">here it goes</span>
<input type="image" src="../test.gif">test 2</input>
- <input type="image" src="../test.gif" attr-name="my i18n key" wicket:message="attr-name:i18n-key">test 2</input>
+ <input type="image" src="../test.gif" wicket:message="attr-name:i18n-key" attr-name="my i18n key">test 2</input>
</body>
</html>
Modified: wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePageTest.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePageTest.java?rev=718123&r1=718122&r2=718123&view=diff
==============================================================================
--- wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePageTest.java (original)
+++ wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePageTest.java Sun Nov 16 14:04:19 2008
@@ -105,7 +105,7 @@
assertNotNull(document);
assertFalse("".equals(document));
assertEquals(
- "<span testAttr=\"myValue\" wicket:id=\"myBorder2\"><wicket:border>before body - <wicket:body>border</wicket:body> - after body</wicket:border></span>",
+ "<span wicket:id=\"myBorder2\" testAttr=\"myValue\"><wicket:border>before body - <wicket:body>border</wicket:body> - after body</wicket:border></span>",
document);
// do the same test twice. Igor reported a problem with that, so we have to test it.
@@ -116,7 +116,7 @@
assertNotNull(document);
assertFalse("".equals(document));
assertEquals(
- "<span testAttr=\"myValue\" wicket:id=\"myBorder2\"><wicket:border>before body - <wicket:body>border</wicket:body> - after body</wicket:border></span>",
+ "<span wicket:id=\"myBorder2\" testAttr=\"myValue\"><wicket:border>before body - <wicket:body>border</wicket:body> - after body</wicket:border></span>",
document);
WebMarkupContainer container = (WebMarkupContainer)tester.getLastRenderedPage().get("test");
@@ -185,7 +185,7 @@
assertNotNull(document);
assertFalse("".equals(document));
assertEquals(
- "<span testAttr=\"myValue\" wicket:id=\"myBorder2\"><wicket:border>before body - <wicket:body>border</wicket:body> - after body</wicket:border></span>",
+ "<span wicket:id=\"myBorder2\" testAttr=\"myValue\"><wicket:border>before body - <wicket:body>border</wicket:body> - after body</wicket:border></span>",
document);
// do the same test twice. Igor reported a problem with that, so we have to test it.
@@ -196,7 +196,7 @@
assertNotNull(document);
assertFalse("".equals(document));
assertEquals(
- "<span testAttr=\"myValue\" wicket:id=\"myBorder2\"><wicket:border>before body - <wicket:body>border</wicket:body> - after body</wicket:border></span>",
+ "<span wicket:id=\"myBorder2\" testAttr=\"myValue\"><wicket:border>before body - <wicket:body>border</wicket:body> - after body</wicket:border></span>",
document);
WebMarkupContainer container = (WebMarkupContainer)page.get("test");
Modified: wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePage_14.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePage_14.java?rev=718123&r1=718122&r2=718123&view=diff
==============================================================================
--- wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePage_14.java (original)
+++ wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePage_14.java Sun Nov 16 14:04:19 2008
@@ -37,7 +37,7 @@
public SimplePage_14()
{
WebMarkupContainer container = new WebMarkupContainer("html");
- container.add(new AttributeModifier("lang", new Model("de")));
+ container.add(new AttributeModifier("lang", new Model<String>("de")));
container.add(new Label("label", "label"));
add(container);
}
Added: wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/basic/XmlBasePage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/basic/XmlBasePage.java?rev=718123&view=auto
==============================================================================
--- wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/basic/XmlBasePage.java (added)
+++ wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/basic/XmlBasePage.java Sun Nov 16 14:04:19 2008
@@ -0,0 +1,46 @@
+/*
+ * 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.basic;
+
+import org.apache.wicket.markup.html.WebPage;
+
+
+/**
+ * Mock page for testing.
+ *
+ * @author Juergen Donnerstag
+ */
+public class XmlBasePage extends WebPage
+{
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * Construct.
+ */
+ public XmlBasePage()
+ {
+ }
+
+ /**
+ * @see org.apache.wicket.markup.html.WebPage#getMarkupType()
+ */
+ @Override
+ public String getMarkupType()
+ {
+ return "xml";
+ }
+}
Added: wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/basic/XmlBasePage.xmlProperties
URL: http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/basic/XmlBasePage.xmlProperties?rev=718123&view=auto
==============================================================================
--- wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/basic/XmlBasePage.xmlProperties (added)
+++ wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/basic/XmlBasePage.xmlProperties Sun Nov 16 14:04:19 2008
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+<properties>
+ <entry key="test">value</entry>
+ <entry key="wicket">cool</entry>
+</properties>
Added: wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/basic/XmlPageExpectedResult_1.xml
URL: http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/basic/XmlPageExpectedResult_1.xml?rev=718123&view=auto
==============================================================================
--- wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/basic/XmlPageExpectedResult_1.xml (added)
+++ wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/basic/XmlPageExpectedResult_1.xml Sun Nov 16 14:04:19 2008
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<root>
+ <order>
+ <item>
+ </item>
+ </order>
+</root>
Added: wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/basic/XmlPageExpectedResult_2.xml
URL: http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/basic/XmlPageExpectedResult_2.xml?rev=718123&view=auto
==============================================================================
--- wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/basic/XmlPageExpectedResult_2.xml (added)
+++ wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/basic/XmlPageExpectedResult_2.xml Sun Nov 16 14:04:19 2008
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<root>
+ <order>
+ <item>
+ </item>
+ </order>
+</root>
Added: wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/basic/XmlPageExpectedResult_3.xml
URL: http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/basic/XmlPageExpectedResult_3.xml?rev=718123&view=auto
==============================================================================
--- wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/basic/XmlPageExpectedResult_3.xml (added)
+++ wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/basic/XmlPageExpectedResult_3.xml Sun Nov 16 14:04:19 2008
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<root>
+ <order>
+ <item>
+ </item>
+ </order>
+</root>
Added: wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/basic/XmlPageTest.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/basic/XmlPageTest.java?rev=718123&view=auto
==============================================================================
--- wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/basic/XmlPageTest.java (added)
+++ wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/basic/XmlPageTest.java Sun Nov 16 14:04:19 2008
@@ -0,0 +1,95 @@
+/*
+ * 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.basic;
+
+import org.apache.wicket.Application;
+import org.apache.wicket.WicketTestCase;
+import org.apache.wicket.resource.IPropertiesFactory;
+import org.apache.wicket.resource.PropertiesFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ *
+ * @author Juergen Donnerstag
+ */
+public class XmlPageTest extends WicketTestCase
+{
+ private static final Logger log = LoggerFactory.getLogger(XmlPageTest.class);
+
+ /**
+ * Create the test.
+ *
+ * @param name
+ * The test name
+ */
+ public XmlPageTest(String name)
+ {
+ super(name);
+ }
+
+ /**
+ * @throws Exception
+ */
+ public void testRenderHomePage_1() throws Exception
+ {
+ executeTest(XmlPage_1.class, "XmlPageExpectedResult_1.xml");
+ }
+
+ /**
+ * @throws Exception
+ */
+ public void testRenderHomePage_2() throws Exception
+ {
+ IPropertiesFactory myFac = new MyPropertiesFactory(tester.getApplication());
+ tester.getApplication().getResourceSettings().setPropertiesFactory(myFac);
+
+ executeTest(XmlPage_2.class, "XmlPageExpectedResult_2.xml");
+ }
+
+ /**
+ * @throws Exception
+ */
+ public void testRenderHomePage_3() throws Exception
+ {
+ IPropertiesFactory myFac = new MyPropertiesFactory(tester.getApplication());
+ tester.getApplication().getResourceSettings().setPropertiesFactory(myFac);
+
+ executeTest(XmlPage_3.class, "XmlPageExpectedResult_3.xml");
+ }
+
+ /**
+ *
+ */
+ private class MyPropertiesFactory extends PropertiesFactory
+ {
+ /**
+ * Construct.
+ *
+ * @param application
+ */
+ public MyPropertiesFactory(Application application)
+ {
+ super(application);
+
+ getPropertiesLoaders().clear();
+ getPropertiesLoaders().add(new PropertiesFilePropertiesLoader());
+ getPropertiesLoaders().add(new XmlFilePropertiesLoader("xmlProperties"));
+ }
+ }
+}
Added: wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/basic/XmlPage_1.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/basic/XmlPage_1.java?rev=718123&view=auto
==============================================================================
--- wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/basic/XmlPage_1.java (added)
+++ wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/basic/XmlPage_1.java Sun Nov 16 14:04:19 2008
@@ -0,0 +1,46 @@
+/*
+ * 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.basic;
+
+import org.apache.wicket.markup.html.WebPage;
+
+
+/**
+ * Mock page for testing.
+ *
+ * @author Juergen Donnerstag
+ */
+public class XmlPage_1 extends WebPage
+{
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * Construct.
+ */
+ public XmlPage_1()
+ {
+ }
+
+ /**
+ * @see org.apache.wicket.markup.html.WebPage#getMarkupType()
+ */
+ @Override
+ public String getMarkupType()
+ {
+ return "xml";
+ }
+}
Added: wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/basic/XmlPage_1.xml
URL: http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/basic/XmlPage_1.xml?rev=718123&view=auto
==============================================================================
--- wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/basic/XmlPage_1.xml (added)
+++ wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/basic/XmlPage_1.xml Sun Nov 16 14:04:19 2008
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<root>
+ <order>
+ <item>
+ </item>
+ </order>
+</root>
Added: wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/basic/XmlPage_2.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/basic/XmlPage_2.java?rev=718123&view=auto
==============================================================================
--- wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/basic/XmlPage_2.java (added)
+++ wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/basic/XmlPage_2.java Sun Nov 16 14:04:19 2008
@@ -0,0 +1,39 @@
+/*
+ * 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.basic;
+
+
+/**
+ * Mock page for testing.
+ *
+ * @author Juergen Donnerstag
+ */
+public class XmlPage_2 extends XmlBasePage
+{
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * Construct.
+ */
+ public XmlPage_2()
+ {
+ if (getString("test").equals("value") == false)
+ {
+ throw new RuntimeException("Expected 'test'");
+ }
+ }
+}
Added: wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/basic/XmlPage_2.xml
URL: http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/basic/XmlPage_2.xml?rev=718123&view=auto
==============================================================================
--- wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/basic/XmlPage_2.xml (added)
+++ wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/basic/XmlPage_2.xml Sun Nov 16 14:04:19 2008
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<root>
+ <order>
+ <item>
+ </item>
+ </order>
+</root>
Added: wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/basic/XmlPage_3.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/basic/XmlPage_3.java?rev=718123&view=auto
==============================================================================
--- wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/basic/XmlPage_3.java (added)
+++ wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/basic/XmlPage_3.java Sun Nov 16 14:04:19 2008
@@ -0,0 +1,50 @@
+/*
+ * 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.basic;
+
+import org.apache.wicket.markup.html.WebPage;
+
+
+/**
+ * Mock page for testing.
+ *
+ * @author Juergen Donnerstag
+ */
+public class XmlPage_3 extends WebPage
+{
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * Construct.
+ */
+ public XmlPage_3()
+ {
+ if (getString("test").equals("value") == false)
+ {
+ throw new RuntimeException("Expected 'test'");
+ }
+ }
+
+ /**
+ * @see org.apache.wicket.markup.html.WebPage#getMarkupType()
+ */
+ @Override
+ public String getMarkupType()
+ {
+ return "xml";
+ }
+}
Added: wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/basic/XmlPage_3.xml
URL: http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/basic/XmlPage_3.xml?rev=718123&view=auto
==============================================================================
--- wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/basic/XmlPage_3.xml (added)
+++ wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/basic/XmlPage_3.xml Sun Nov 16 14:04:19 2008
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<root>
+ <order>
+ <item>
+ </item>
+ </order>
+</root>
Added: wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/basic/XmlPage_3.xmlProperties
URL: http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/basic/XmlPage_3.xmlProperties?rev=718123&view=auto
==============================================================================
--- wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/basic/XmlPage_3.xmlProperties (added)
+++ wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/basic/XmlPage_3.xmlProperties Sun Nov 16 14:04:19 2008
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+<properties>
+ <entry key="test">value</entry>
+ <entry key="wicket">cool</entry>
+</properties>
Added: wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/border/BeforeAndAfterBorder2.html
URL: http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/border/BeforeAndAfterBorder2.html?rev=718123&view=auto
==============================================================================
--- wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/border/BeforeAndAfterBorder2.html (added)
+++ wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/border/BeforeAndAfterBorder2.html Sun Nov 16 14:04:19 2008
@@ -0,0 +1 @@
+<wicket:border>[[<wicket:body/>]]</wicket:border>\ No newline at end of file
Added: wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/border/BeforeAndAfterBorder2.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/border/BeforeAndAfterBorder2.java?rev=718123&view=auto
==============================================================================
--- wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/border/BeforeAndAfterBorder2.java (added)
+++ wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/border/BeforeAndAfterBorder2.java Sun Nov 16 14:04:19 2008
@@ -0,0 +1,30 @@
+/*
+ * 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.border;
+
+
+/**
+ * @author jcompagner
+ *
+ */
+public class BeforeAndAfterBorder2 extends MarkupComponentBorder
+{
+ private static final long serialVersionUID = 1L;
+}
Modified: wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/border/MarkupComponentBorderTestPage.html
URL: http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/border/MarkupComponentBorderTestPage.html?rev=718123&r1=718122&r2=718123&view=diff
==============================================================================
--- wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/border/MarkupComponentBorderTestPage.html (original)
+++ wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/border/MarkupComponentBorderTestPage.html Sun Nov 16 14:04:19 2008
@@ -1,5 +1,6 @@
<html>
<body>
<span wicket:id="label"></span>
+<span wicket:id="label2"></span>
</body>
</html>
\ No newline at end of file
Modified: wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/border/MarkupComponentBorderTestPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/border/MarkupComponentBorderTestPage.java?rev=718123&r1=718122&r2=718123&view=diff
==============================================================================
--- wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/border/MarkupComponentBorderTestPage.java (original)
+++ wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/border/MarkupComponentBorderTestPage.java Sun Nov 16 14:04:19 2008
@@ -18,7 +18,6 @@
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.model.Model;
/**
@@ -37,6 +36,7 @@
*/
public MarkupComponentBorderTestPage()
{
- add(new Label("label", new Model("label")).setComponentBorder(new BeforeAndAfterBorder()));
+ add(new Label("label", "label").setComponentBorder(new BeforeAndAfterBorder()));
+ add(new Label("label2", "label2").setComponentBorder(new BeforeAndAfterBorder2()));
}
}
Modified: wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/border/MarkupComponentBorderTestPage_ExpectedResult.html
URL: http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/border/MarkupComponentBorderTestPage_ExpectedResult.html?rev=718123&r1=718122&r2=718123&view=diff
==============================================================================
--- wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/border/MarkupComponentBorderTestPage_ExpectedResult.html (original)
+++ wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/border/MarkupComponentBorderTestPage_ExpectedResult.html Sun Nov 16 14:04:19 2008
@@ -1,5 +1,6 @@
<html>
<body>
[[<span wicket:id="label">label</span>]]
+[[<span wicket:id="label2">label2</span>]]
</body>
</html>
\ No newline at end of file
Modified: wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/form/AbstractCheckGroupTestPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/form/AbstractCheckGroupTestPage.java?rev=718123&r1=718122&r2=718123&view=diff
==============================================================================
--- wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/form/AbstractCheckGroupTestPage.java (original)
+++ wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/form/AbstractCheckGroupTestPage.java Sun Nov 16 14:04:19 2008
@@ -16,12 +16,12 @@
*/
package org.apache.wicket.markup.html.form;
-import java.io.Serializable;
import java.util.List;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.model.Model;
+import org.apache.wicket.model.util.CollectionModel;
/**
@@ -45,8 +45,8 @@
public AbstractCheckGroupTestPage(List<String> list)
{
- Form<?> form = new Form("form");
- CheckGroup<String> group = new CheckGroup<String>("group", new Model((Serializable)list));
+ Form<?> form = new Form<Void>("form");
+ CheckGroup<String> group = new CheckGroup<String>("group", new CollectionModel<String>(list));
WebMarkupContainer container = new WebMarkupContainer("container");
Check<String> check1 = new Check<String>("check1", new Model<String>("check1"));
Check<String> check2 = new Check<String>("check2", new Model<String>("check2"));
Modified: wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupDisabledTestPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupDisabledTestPage.java?rev=718123&r1=718122&r2=718123&view=diff
==============================================================================
--- wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupDisabledTestPage.java (original)
+++ wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupDisabledTestPage.java Sun Nov 16 14:04:19 2008
@@ -16,12 +16,12 @@
*/
package org.apache.wicket.markup.html.form;
-import java.io.Serializable;
import java.util.Arrays;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.model.Model;
+import org.apache.wicket.model.util.CollectionModel;
/**
@@ -33,20 +33,14 @@
{
private static final long serialVersionUID = 1L;
- /**
- * Constructor
- *
- * @param list
- */
public CheckGroupDisabledTestPage()
{
- Form form = new Form("form");
- CheckGroup group = new CheckGroup("group", new Model((Serializable)Arrays
- .asList(new String[] { "check1", "check2" })));
+ Form<Void> form = new Form<Void>("form");
+ CheckGroup<String> group = new CheckGroup<String>("group", new CollectionModel<String>(Arrays.asList("check1", "check2")));
group.setRenderBodyOnly(false);
WebMarkupContainer container = new WebMarkupContainer("container");
- Check check1 = new Check("check1", new Model("check1"));
- Check check2 = new Check("check2", new Model("check2"));
+ Check<String> check1 = new Check<String>("check1", new Model<String>("check1"));
+ Check<String> check2 = new Check<String>("check2", new Model<String>("check2"));
add(form);
form.add(group);
Modified: wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTest.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTest.java?rev=718123&r1=718122&r2=718123&view=diff
==============================================================================
--- wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTest.java (original)
+++ wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTest.java Sun Nov 16 14:04:19 2008
@@ -22,12 +22,12 @@
import java.util.List;
import java.util.Set;
-import org.apache.wicket.RequestCycle;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.WicketTestCase;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.model.CompoundPropertyModel;
import org.apache.wicket.model.Model;
+import org.apache.wicket.model.util.CollectionModel;
import org.apache.wicket.protocol.http.MockPage;
@@ -61,13 +61,13 @@
{
private static final long serialVersionUID = 1L;
- private Set prop1 = new HashSet();
+ private Set<Object> prop1 = new HashSet<Object>();
private String prop2;
/**
* @return prop1
*/
- public Set getProp1()
+ public Set<Object> getProp1()
{
return prop1;
}
@@ -75,7 +75,7 @@
/**
* @param prop1
*/
- public void setProp1(Set prop1)
+ public void setProp1(Set<Object> prop1)
{
this.prop1 = prop1;
}
@@ -116,42 +116,43 @@
modelObject.setProp2(check2);
// test model constructors
- List list = new ArrayList();
- Model model = new Model((Serializable)list);
+ List<Object> list = new ArrayList<Object>();
+ CollectionModel<Object> model = new CollectionModel<Object>(list);
- final CheckGroup group2 = new CheckGroup("group2", model);
+ final CheckGroup<Object> group2 = new CheckGroup<Object>("group2", model);
assertTrue(group2.getDefaultModelObject() == list);
- final CheckGroup group3 = new CheckGroup("group3", list);
+ final CheckGroup<Object> group3 = new CheckGroup<Object>("group3", list);
assertTrue(group3.getDefaultModelObject() == list);
// set up necessary objects to emulate a form submission
- RequestCycle cycle = tester.createRequestCycle();
+ tester.createRequestCycle();
// this could have been any page it seems. see comment at method
MockPage page = new MockPage();
// create component hierarchy
- final Form form = new Form("form", new CompoundPropertyModel(modelObject))
+ final Form<MockModelObject> form = new Form<MockModelObject>("form", new CompoundPropertyModel<MockModelObject>(modelObject))
{
private static final long serialVersionUID = 1L;
- public String getMarkupId()
+ @Override
+ public String getMarkupId()
{
// hack for the fact that this test doesn't relate to any markup
return "foo";
}
};
- final CheckGroup group = new CheckGroup("prop1");
+ final CheckGroup<Object> group = new CheckGroup<Object>("prop1");
final WebMarkupContainer container = new WebMarkupContainer("container");
- final Check choice1 = new Check("check1", new Model(check1));
- final Check choice2 = new Check("prop2");
+ final Check<Serializable> choice1 = new Check<Serializable>("check1", new Model<Serializable>(check1));
+ final Check<String> choice2 = new Check<String>("prop2");
page.add(form);
form.add(group);
Modified: wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage5.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage5.java?rev=718123&r1=718122&r2=718123&view=diff
==============================================================================
--- wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage5.java (original)
+++ wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/form/CheckGroupTestPage5.java Sun Nov 16 14:04:19 2008
@@ -16,13 +16,13 @@
*/
package org.apache.wicket.markup.html.form;
-import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.model.Model;
+import org.apache.wicket.model.util.CollectionModel;
/**
@@ -38,12 +38,12 @@
*/
public CheckGroupTestPage5()
{
- List list = new ArrayList();
- Form form = new Form("form");
- CheckGroup group = new CheckGroup("group", new Model((Serializable)list));
+ List<String> list = new ArrayList<String>();
+ Form<Void> form = new Form<Void>("form");
+ CheckGroup<String> group = new CheckGroup<String>("group", new CollectionModel<String>(list));
WebMarkupContainer container = new WebMarkupContainer("container");
- Check check1 = new Check("check1", new Model("check1"));
- Check check2 = new Check("check2", new Model("check2"));
+ Check<String> check1 = new Check<String>("check1", new Model<String>("check1"));
+ Check<String> check2 = new Check<String>("check2", new Model<String>("check2"));
add(form);
Modified: wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/form/FormComponentPanelProcessingTest.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/form/FormComponentPanelProcessingTest.java?rev=718123&r1=718122&r2=718123&view=diff
==============================================================================
--- wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/form/FormComponentPanelProcessingTest.java (original)
+++ wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/form/FormComponentPanelProcessingTest.java Sun Nov 16 14:04:19 2008
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.markup.html.form;
+import java.io.Serializable;
+
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.WicketTestCase;
import org.apache.wicket.markup.IMarkupResourceStreamProvider;
@@ -46,7 +48,7 @@
ft.submit();
}
- private static class TestFormComponentPanel extends FormComponentPanel
+ private static class TestFormComponentPanel extends FormComponentPanel<Serializable>
implements
IMarkupResourceStreamProvider
{
@@ -55,10 +57,10 @@
private boolean childValidated = false;
private boolean childModelUpdated = false;
- private TestFormComponentPanel(String id, IModel model)
+ private TestFormComponentPanel(String id, IModel<Serializable> model)
{
super(id, model);
- add(new TextField("text", new Model())
+ add(new TextField<Serializable>("text", new Model<Serializable>())
{
private static final long serialVersionUID = 1L;
@@ -109,7 +111,7 @@
}
public IResourceStream getMarkupResourceStream(MarkupContainer container,
- Class containerClass)
+ Class<?> containerClass)
{
return new StringResourceStream(
"<wicket:panel><input wicket:id='text' type='text'/></wicket:panel>");
@@ -123,13 +125,13 @@
public TestPage()
{
- Form form = new Form("form");
+ Form<Void> form = new Form<Void>("form");
add(form);
- form.add(new TestFormComponentPanel("panel", new Model()));
+ form.add(new TestFormComponentPanel("panel", new Model<Serializable>()));
}
public IResourceStream getMarkupResourceStream(MarkupContainer container,
- Class containerClass)
+ Class<?> containerClass)
{
return new StringResourceStream(
"<body><form wicket:id='form'><div wicket:id='panel'></div></form></body>");
Modified: wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupDisabledTestPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupDisabledTestPage.java?rev=718123&r1=718122&r2=718123&view=diff
==============================================================================
--- wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupDisabledTestPage.java (original)
+++ wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupDisabledTestPage.java Sun Nov 16 14:04:19 2008
@@ -38,12 +38,12 @@
*/
public RadioGroupDisabledTestPage()
{
- Form form = new Form("form");
- RadioGroup group = new RadioGroup("group", new Model("radio2"));
+ Form<Void> form = new Form<Void>("form");
+ RadioGroup<String> group = new RadioGroup<String>("group", new Model<String>("radio2"));
group.setRenderBodyOnly(false);
WebMarkupContainer container = new WebMarkupContainer("container");
- Radio radio1 = new Radio("radio1", new Model("radio1"));
- Radio radio2 = new Radio("radio2", new Model("radio2"));
+ Radio<String> radio1 = new Radio<String>("radio1", new Model<String>("radio1"));
+ Radio<String> radio2 = new Radio<String>("radio2", new Model<String>("radio2"));
add(form);
Modified: wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTest.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTest.java?rev=718123&r1=718122&r2=718123&view=diff
==============================================================================
--- wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTest.java (original)
+++ wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTest.java Sun Nov 16 14:04:19 2008
@@ -18,7 +18,6 @@
import java.io.Serializable;
-import org.apache.wicket.RequestCycle;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.WicketTestCase;
import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -107,38 +106,39 @@
MockModelObject modelObject = new MockModelObject();
// object used to test regular model
- Model model = new Model();
+ Model<String> model = new Model<String>();
// set up necessary objects to emulate a form submission
- RequestCycle cycle = tester.createRequestCycle();
+ tester.createRequestCycle();
// this could have been any page it seems. see comment at method
MockPage page = new MockPage();
// create component hierarchy
- final Form form = new Form("form", new CompoundPropertyModel(modelObject))
+ final Form<MockModelObject> form = new Form<MockModelObject>("form", new CompoundPropertyModel<MockModelObject>(modelObject))
{
private static final long serialVersionUID = 1L;
- public String getMarkupId()
+ @Override
+ public String getMarkupId()
{
// hack for the fact that this test doesn't relate to any markup
return "foo";
}
};
- final RadioGroup group = new RadioGroup("prop1");
+ final RadioGroup<String> group = new RadioGroup<String>("prop1");
final WebMarkupContainer container = new WebMarkupContainer("container");
- final Radio choice1 = new Radio("radio1", new Model(radio1));
- final Radio choice2 = new Radio("prop2");
+ final Radio<String> choice1 = new Radio<String>("radio1", new Model<String>(radio1));
+ final Radio<String> choice2 = new Radio<String>("prop2");
- final RadioGroup group2 = new RadioGroup("group2", model);
+ final RadioGroup<String> group2 = new RadioGroup<String>("group2", model);
- final Radio choice3 = new Radio("radio3", new Model(radio1));
+ final Radio<String> choice3 = new Radio<String>("radio3", new Model<String>(radio1));
page.add(form);
form.add(group);
Modified: wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTestPage1.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTestPage1.java?rev=718123&r1=718122&r2=718123&view=diff
==============================================================================
--- wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTestPage1.java (original)
+++ wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTestPage1.java Sun Nov 16 14:04:19 2008
@@ -38,11 +38,11 @@
*/
public RadioGroupTestPage1()
{
- Form form = new Form("form");
- RadioGroup group = new RadioGroup("group", new Model("radio2"));
+ Form<Void> form = new Form<Void>("form");
+ RadioGroup<String> group = new RadioGroup<String>("group", new Model<String>("radio2"));
WebMarkupContainer container = new WebMarkupContainer("container");
- Radio radio1 = new Radio("radio1", new Model("radio1"));
- Radio radio2 = new Radio("radio2", new Model("radio2"));
+ Radio<String> radio1 = new Radio<String>("radio1", new Model<String>("radio1"));
+ Radio<String> radio2 = new Radio<String>("radio2", new Model<String>("radio2"));
add(form);
Modified: wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTestPage2.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTestPage2.java?rev=718123&r1=718122&r2=718123&view=diff
==============================================================================
--- wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTestPage2.java (original)
+++ wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/form/RadioGroupTestPage2.java Sun Nov 16 14:04:19 2008
@@ -38,11 +38,11 @@
*/
public RadioGroupTestPage2()
{
- Form form = new Form("form");
- RadioGroup group = new RadioGroup("group", new Model("radio2"));
+ Form<Void> form = new Form<Void>("form");
+ RadioGroup<String> group = new RadioGroup<String>("group", new Model<String>("radio2"));
WebMarkupContainer container = new WebMarkupContainer("container");
- Radio radio1 = new Radio("radio1", new Model("radio1"));
- Radio radio2 = new Radio("radio2", new Model("radio2"));
+ Radio<String> radio1 = new Radio<String>("radio1", new Model<String>("radio1"));
+ Radio<String> radio2 = new Radio<String>("radio2", new Model<String>("radio2"));
add(form);
Modified: wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/form/ValidatorPropertiesTest.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/form/ValidatorPropertiesTest.java?rev=718123&r1=718122&r2=718123&view=diff
==============================================================================
--- wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/form/ValidatorPropertiesTest.java (original)
+++ wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/form/ValidatorPropertiesTest.java Sun Nov 16 14:04:19 2008
@@ -34,11 +34,13 @@
{
WicketTester tester;
+ @Override
protected void setUp() throws Exception
{
tester = new WicketTester(new MyTesterApplication());
}
+ @Override
protected void tearDown() throws Exception
{
tester.destroy();
@@ -84,34 +86,60 @@
page.getText12().setInput("");
page.getText12().validateRequired();
- assertEquals("text1label is required", page.getText1().getFeedbackMessage().getMessage()
- .toString());
- assertEquals("text2 is required", page.getText2().getFeedbackMessage().getMessage()
- .toString());
- assertEquals("ok: text3333 is missing", page.getText3().getFeedbackMessage().getMessage()
- .toString());
- assertEquals("ok: Text4Label is missing", page.getText4().getFeedbackMessage().getMessage()
- .toString());
- assertEquals("ok: text is missing", page.getText5().getFeedbackMessage().getMessage()
- .toString());
- assertEquals("Default message: text6 required", page.getText6().getFeedbackMessage()
- .getMessage().toString());
- assertEquals("input for text7-Label is missing", page.getText7().getFeedbackMessage()
- .getMessage().toString());
- assertEquals("Default message: text8-Label required", page.getText8().getFeedbackMessage()
- .getMessage().toString());
- assertEquals("found it in panel", page.getText9().getFeedbackMessage().getMessage()
- .toString());
- assertEquals("found it in form", page.getText10().getFeedbackMessage().getMessage()
- .toString());
- assertEquals("found it in page", page.getText11().getFeedbackMessage().getMessage()
- .toString());
- assertEquals("found it in page", page.getText12().getFeedbackMessage().getMessage()
- .toString());
+ assertEquals("text1label is required", page.getText1()
+ .getFeedbackMessage()
+ .getMessage()
+ .toString());
+ assertEquals("text2 is required", page.getText2()
+ .getFeedbackMessage()
+ .getMessage()
+ .toString());
+ assertEquals("ok: text3333 is missing", page.getText3()
+ .getFeedbackMessage()
+ .getMessage()
+ .toString());
+ assertEquals("ok: Text4Label is missing", page.getText4()
+ .getFeedbackMessage()
+ .getMessage()
+ .toString());
+ assertEquals("ok: text is missing", page.getText5()
+ .getFeedbackMessage()
+ .getMessage()
+ .toString());
+ assertEquals("Default message: text6 required", page.getText6()
+ .getFeedbackMessage()
+ .getMessage()
+ .toString());
+ assertEquals("input for text7-Label is missing", page.getText7()
+ .getFeedbackMessage()
+ .getMessage()
+ .toString());
+ assertEquals("Default message: text8-Label required", page.getText8()
+ .getFeedbackMessage()
+ .getMessage()
+ .toString());
+ assertEquals("found it in panel", page.getText9()
+ .getFeedbackMessage()
+ .getMessage()
+ .toString());
+ assertEquals("found it in form", page.getText10()
+ .getFeedbackMessage()
+ .getMessage()
+ .toString());
+ assertEquals("found it in page", page.getText11()
+ .getFeedbackMessage()
+ .getMessage()
+ .toString());
+ assertEquals("found it in page", page.getText12()
+ .getFeedbackMessage()
+ .getMessage()
+ .toString());
// Test caching
- assertEquals("Default message: text8-Label required", page.getText8().getFeedbackMessage()
- .getMessage().toString());
+ assertEquals("Default message: text8-Label required", page.getText8()
+ .getFeedbackMessage()
+ .getMessage()
+ .toString());
// now test Dutch
@@ -145,33 +173,57 @@
page.getText12().setInput("");
page.getText12().validateRequired();
- assertEquals("text1label is verplicht", page.getText1().getFeedbackMessage().getMessage()
- .toString());
- assertEquals("text2 is verplicht", page.getText2().getFeedbackMessage().getMessage()
- .toString());
- assertEquals("ok: text3333 mist", page.getText3().getFeedbackMessage().getMessage()
- .toString());
- assertEquals("ok: Text4Label mist", page.getText4().getFeedbackMessage().getMessage()
- .toString());
+ assertEquals("text1label is verplicht", page.getText1()
+ .getFeedbackMessage()
+ .getMessage()
+ .toString());
+ assertEquals("text2 is verplicht", page.getText2()
+ .getFeedbackMessage()
+ .getMessage()
+ .toString());
+ assertEquals("ok: text3333 mist", page.getText3()
+ .getFeedbackMessage()
+ .getMessage()
+ .toString());
+ assertEquals("ok: Text4Label mist", page.getText4()
+ .getFeedbackMessage()
+ .getMessage()
+ .toString());
assertEquals("ok: text mist", page.getText5().getFeedbackMessage().getMessage().toString());
- assertEquals("Default message: text6 verplicht", page.getText6().getFeedbackMessage()
- .getMessage().toString());
- assertEquals("input for text7-Label mist", page.getText7().getFeedbackMessage()
- .getMessage().toString());
- assertEquals("Default message: text8-Label verplicht", page.getText8().getFeedbackMessage()
- .getMessage().toString());
- assertEquals("gevonden in panel", page.getText9().getFeedbackMessage().getMessage()
- .toString());
- assertEquals("gevonden in form", page.getText10().getFeedbackMessage().getMessage()
- .toString());
- assertEquals("gevonden in page", page.getText11().getFeedbackMessage().getMessage()
- .toString());
- assertEquals("gevonden in page", page.getText12().getFeedbackMessage().getMessage()
- .toString());
+ assertEquals("Default message: text6 verplicht", page.getText6()
+ .getFeedbackMessage()
+ .getMessage()
+ .toString());
+ assertEquals("input for text7-Label mist", page.getText7()
+ .getFeedbackMessage()
+ .getMessage()
+ .toString());
+ assertEquals("Default message: text8-Label verplicht", page.getText8()
+ .getFeedbackMessage()
+ .getMessage()
+ .toString());
+ assertEquals("gevonden in panel", page.getText9()
+ .getFeedbackMessage()
+ .getMessage()
+ .toString());
+ assertEquals("gevonden in form", page.getText10()
+ .getFeedbackMessage()
+ .getMessage()
+ .toString());
+ assertEquals("gevonden in page", page.getText11()
+ .getFeedbackMessage()
+ .getMessage()
+ .toString());
+ assertEquals("gevonden in page", page.getText12()
+ .getFeedbackMessage()
+ .getMessage()
+ .toString());
// Test caching
- assertEquals("Default message: text8-Label verplicht", page.getText8().getFeedbackMessage()
- .getMessage().toString());
+ assertEquals("Default message: text8-Label verplicht", page.getText8()
+ .getFeedbackMessage()
+ .getMessage()
+ .toString());
}
/**
@@ -184,8 +236,8 @@
WebRequestCycle cycle = tester.createRequestCycle();
String str = tester.getApplication().getResourceSettings().getLocalizer().getString("XXX",
- null);
- assertEquals("[Warning: String resource for 'XXX' not found]", str);
+ null);
+ assertEquals("[Warning: Property for 'XXX' not found]", str);
}
/**
Modified: wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackFormPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackFormPage.java?rev=718123&r1=718122&r2=718123&view=diff
==============================================================================
--- wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackFormPage.java (original)
+++ wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackFormPage.java Sun Nov 16 14:04:19 2008
@@ -34,15 +34,16 @@
*/
public FeedbackFormPage()
{
- final TextField tf = new TextField("input", new Model());
+ final TextField<String> tf = new TextField<String>("input", new Model<String>());
final FormComponentFeedbackBorder feedback = new FormComponentFeedbackBorder("feedback");
feedback.add(tf);
- Form form = new Form("form")
+ Form<Void> form = new Form<Void>("form")
{
private static final long serialVersionUID = 1L;
- protected void onSubmit()
+ @Override
+ protected void onSubmit()
{
tf.error("an error");
}
Modified: wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackIndicatorFormPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackIndicatorFormPage.java?rev=718123&r1=718122&r2=718123&view=diff
==============================================================================
--- wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackIndicatorFormPage.java (original)
+++ wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/form/feedback/FeedbackIndicatorFormPage.java Sun Nov 16 14:04:19 2008
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.markup.html.form.feedback;
+import java.io.Serializable;
+
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.TextField;
@@ -34,15 +36,16 @@
*/
public FeedbackIndicatorFormPage()
{
- final TextField tf = new TextField("input", new Model());
+ final TextField<Serializable> tf = new TextField<Serializable>("input", new Model<Serializable>());
final FormComponentFeedbackIndicator feedback = new FormComponentFeedbackIndicator(
"feedback");
- Form form = new Form("form")
+ Form<Void> form = new Form<Void>("form")
{
private static final long serialVersionUID = 1L;
- protected void onSubmit()
+ @Override
+ protected void onSubmit()
{
tf.error("an error");
}
Modified: wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/InvalidImageButtonPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/InvalidImageButtonPage.java?rev=718123&r1=718122&r2=718123&view=diff
==============================================================================
--- wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/InvalidImageButtonPage.java (original)
+++ wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/form/imagebutton/InvalidImageButtonPage.java Sun Nov 16 14:04:19 2008
@@ -29,6 +29,6 @@
public InvalidImageButtonPage()
{
- add(new ImageButton("invalidImage", new Model("toto.gif")));
+ add(new ImageButton("invalidImage", new Model<String>("toto.gif")));
}
}
Modified: wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/form/login/MockLoginPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/form/login/MockLoginPage.java?rev=718123&r1=718122&r2=718123&view=diff
==============================================================================
--- wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/form/login/MockLoginPage.java (original)
+++ wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/form/login/MockLoginPage.java Sun Nov 16 14:04:19 2008
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.markup.html.form.login;
+import java.io.Serializable;
+
import org.apache.wicket.Application;
import org.apache.wicket.Session;
import org.apache.wicket.markup.html.WebPage;
@@ -37,9 +39,9 @@
private static final Logger log = LoggerFactory.getLogger(MockLoginPage.class);
- private Form form;
+ private Form<Void> form;
- private TextField textField;
+ private TextField<Serializable> textField;
/**
*
@@ -48,17 +50,17 @@
{
super();
add(new Label("label", "welcome please login"));
- add(form = new Form("form")
+ add(form = new Form<Void>("form")
{
private static final long serialVersionUID = 1L;
@Override
protected void onSubmit()
{
- login(get("username").getDefaultModelObjectAsString().toString());
+ login(get("username").getDefaultModelObjectAsString());
}
});
- form.add(textField = new TextField("username", new Model()));
+ form.add(textField = new TextField<Serializable>("username", new Model<Serializable>()));
}
/**
@@ -80,7 +82,7 @@
*
* @return form
*/
- public final Form getForm()
+ public final Form<Void> getForm()
{
return form;
}
@@ -89,7 +91,7 @@
*
* @return textfield
*/
- public final TextField getTextField()
+ public final TextField<Serializable> getTextField()
{
return textField;
}
Modified: wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/form/persistence/CookieValuePersisterTest.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/form/persistence/CookieValuePersisterTest.java?rev=718123&r1=718122&r2=718123&view=diff
==============================================================================
--- wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/form/persistence/CookieValuePersisterTest.java (original)
+++ wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/form/persistence/CookieValuePersisterTest.java Sun Nov 16 14:04:19 2008
@@ -16,21 +16,15 @@
*/
package org.apache.wicket.markup.html.form.persistence;
-import java.util.List;
-
import javax.servlet.http.Cookie;
+import java.util.List;
import junit.framework.TestCase;
-
import org.apache.wicket.Page;
import org.apache.wicket.RequestCycle;
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.markup.html.form.persistence.CookieValuePersisterTestPage.TestForm;
-import org.apache.wicket.protocol.http.MockHttpServletRequest;
-import org.apache.wicket.protocol.http.MockHttpServletResponse;
-import org.apache.wicket.protocol.http.WebRequest;
-import org.apache.wicket.protocol.http.WebRequestCycle;
-import org.apache.wicket.protocol.http.WebResponse;
+import org.apache.wicket.protocol.http.*;
import org.apache.wicket.util.tester.WicketTester;
/**
@@ -55,12 +49,14 @@
{
private WicketTester application;
+ @Override
protected void setUp() throws Exception
{
application = new WicketTester();
application.startPage(CookieValuePersisterTestPage.class);
}
+ @Override
protected void tearDown() throws Exception
{
application.destroy();
@@ -70,6 +66,7 @@
*
* @throws Exception
*/
+ @SuppressWarnings({"unchecked"})
public void test1() throws Exception
{
// How does the test work: Make sure you have a page, form and form
@@ -78,7 +75,7 @@
// Get the form and form component created
final TestForm form = (TestForm)page.get("form");
- final TextField textField = (TextField)form.get("input");
+ final TextField<String> textField = (TextField<String>)form.get("input");
// Make sure a valid cycle is available through RequestCycle.get().
// The RequestCycle's constructor will attach the new cycle to
@@ -106,7 +103,7 @@
assertNull(getRequestCookies(cycle));
assertEquals(1, getResponseCookies(cycle).size());
assertEquals("test", ((Cookie)getResponseCookies(cycle).get(0)).getValue());
- assertEquals("form:input", ((Cookie)getResponseCookies(cycle).get(0)).getName());
+ assertEquals("form.input", ((Cookie)getResponseCookies(cycle).get(0)).getName());
assertEquals("/WicketTester$DummyWebApplication",
((Cookie)getResponseCookies(cycle).get(0)).getPath());
@@ -118,7 +115,7 @@
assertNull(getRequestCookies(cycle));
assertEquals(1, getResponseCookies(cycle).size());
assertEquals("test", ((Cookie)getResponseCookies(cycle).get(0)).getValue());
- assertEquals("form:input", ((Cookie)getResponseCookies(cycle).get(0)).getName());
+ assertEquals("form.input", ((Cookie)getResponseCookies(cycle).get(0)).getName());
assertEquals("/WicketTester$DummyWebApplication",
((Cookie)getResponseCookies(cycle).get(0)).getPath());
@@ -153,7 +150,7 @@
persister.clear(textField);
assertEquals(1, getRequestCookies(cycle).length);
assertEquals(2, getResponseCookies(cycle).size());
- assertEquals("form:input", ((Cookie)getResponseCookies(cycle).get(1)).getName());
+ assertEquals("form.input", ((Cookie)getResponseCookies(cycle).get(1)).getName());
assertEquals(0, ((Cookie)getResponseCookies(cycle).get(1)).getMaxAge());
}
@@ -168,8 +165,9 @@
return ((WebRequest)cycle.getRequest()).getHttpServletRequest().getCookies();
}
- private List getResponseCookies(final RequestCycle cycle)
+ private List<Cookie> getResponseCookies(final RequestCycle cycle)
{
- return (List)((MockHttpServletResponse)((WebResponse)cycle.getResponse()).getHttpServletResponse()).getCookies();
+ MockHttpServletResponse response = (MockHttpServletResponse) ((WebResponse) cycle.getResponse()).getHttpServletResponse();
+ return (List<Cookie>) response.getCookies();
}
}
Modified: wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/form/persistence/CookieValuePersisterTestPage.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/form/persistence/CookieValuePersisterTestPage.java?rev=718123&r1=718122&r2=718123&view=diff
==============================================================================
--- wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/form/persistence/CookieValuePersisterTestPage.java (original)
+++ wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/form/persistence/CookieValuePersisterTestPage.java Sun Nov 16 14:04:19 2008
@@ -50,7 +50,7 @@
*
* @author Juergen Donnerstag
*/
- public final class TestForm extends Form
+ public final class TestForm extends Form<Void>
{
private static final long serialVersionUID = 1L;
@@ -64,13 +64,14 @@
{
super(id);
- add(new TextField("input", new Model("test")));
+ add(new TextField<String>("input", new Model<String>("test")));
}
/**
* Dummy
*/
- public final void onSubmit()
+ @Override
+ public final void onSubmit()
{
}
}
Modified: wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/form/upload/MockPageWithFormAndUploadField.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/form/upload/MockPageWithFormAndUploadField.java?rev=718123&r1=718122&r2=718123&view=diff
==============================================================================
--- wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/form/upload/MockPageWithFormAndUploadField.java (original)
+++ wicket/sandbox/knopp/experimental/wicket/src/test/java/org/apache/wicket/markup/html/form/upload/MockPageWithFormAndUploadField.java Sun Nov 16 14:04:19 2008
@@ -18,6 +18,7 @@
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.model.Model;
/**
* Mock page for use in the FileUploadFieldTest
@@ -50,7 +51,7 @@
fileUpload = fileUploadField.getFileUpload();
}
};
- fileUploadField = new FileUploadField("upload");
+ fileUploadField = new FileUploadField("upload", new Model<FileUpload>());
form.add(fileUploadField);
add(form);
}