Updated Branches:
  refs/heads/wicket-1.5.x b01790689 -> 2de6a900f

WICKET-4290: testcases


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/2de6a900
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/2de6a900
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/2de6a900

Branch: refs/heads/wicket-1.5.x
Commit: 2de6a900f2f9418da6829405de076910f9ed0175
Parents: b017906
Author: Emond Papegaaij <[email protected]>
Authored: Fri Jan 6 07:56:36 2012 +0100
Committer: Emond Papegaaij <[email protected]>
Committed: Fri Jan 6 07:58:21 2012 +0100

----------------------------------------------------------------------
 .../apache/wicket/markup/html/form/FormTest.java   |   15 ++++++
 .../html/form/pageWithParameters_expected.html     |    6 ++
 .../apache/wicket/stateless/StatelessFormTest.java |   14 +++++
 .../wicket/stateless/StatelessPageWithForm.html    |    5 ++
 .../wicket/stateless/StatelessPageWithForm.java    |   40 +++++++++++++++
 .../stateless/StatelessPageWithForm_expected.html  |    5 ++
 6 files changed, 85 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/2de6a900/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormTest.java 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormTest.java
index c0fa1a5..8ae19d5 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/FormTest.java
@@ -21,6 +21,7 @@ import org.apache.wicket.MockPageParametersAware;
 import org.apache.wicket.WicketTestCase;
 import org.apache.wicket.markup.IMarkupResourceStreamProvider;
 import org.apache.wicket.markup.html.WebPage;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
 import org.apache.wicket.util.resource.IResourceStream;
 import org.apache.wicket.util.resource.StringResourceStream;
 import org.apache.wicket.util.string.Strings;
@@ -161,4 +162,18 @@ public class FormTest extends WicketTestCase
                }
 
        }
+
+       /**
+        * Tests if a stateful form does not render the pageparameters from the 
page
+        * 
+        * @throws Exception
+        */
+       @Test
+       public void pageWithParameters() throws Exception
+       {
+               PageParameters parameters = new PageParameters();
+               parameters.add("first", "foo");
+               parameters.add("second", "bar");
+               executeTest(FormMethodTestPage.class, parameters, 
"pageWithParameters_expected.html");
+       }
 }

http://git-wip-us.apache.org/repos/asf/wicket/blob/2de6a900/wicket-core/src/test/java/org/apache/wicket/markup/html/form/pageWithParameters_expected.html
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/pageWithParameters_expected.html
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/pageWithParameters_expected.html
new file mode 100644
index 0000000..ac5dd80
--- /dev/null
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/pageWithParameters_expected.html
@@ -0,0 +1,6 @@
+<html>
+<body>
+       <form wicket:id="formpost" id="formpost1" method="post" 
action="../page?0-1.IFormSubmitListener-formpost"><div 
style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input
 type="hidden" name="formpost1_hf_0" id="formpost1_hf_0" /></div></form>
+       <form wicket:id="formget" id="formget2" method="get" 
action="../page"><div 
style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input
 type="hidden" name="formget2_hf_0" id="formget2_hf_0" /><input type="hidden" 
name="0-1.IFormSubmitListener-formget" value="" /></div></form>
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/wicket/blob/2de6a900/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessFormTest.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessFormTest.java 
b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessFormTest.java
index 25bef55..43bab2d 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessFormTest.java
+++ 
b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessFormTest.java
@@ -20,6 +20,7 @@ import org.apache.wicket.Page;
 import org.apache.wicket.WicketTestCase;
 import org.apache.wicket.mock.MockApplication;
 import org.apache.wicket.protocol.http.WebApplication;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
 import org.apache.wicket.stateless.pages.HomePage;
 import org.apache.wicket.stateless.pages.LoginPage;
 import org.apache.wicket.util.tester.FormTester;
@@ -89,4 +90,17 @@ public class StatelessFormTest extends WicketTestCase
                assertTrue(page.isPanelInitialized());
        }
 
+       /**
+        * Tests if a stateless form renders an action url containing the 
pageparameters
+        * 
+        * @throws Exception
+        */
+       @Test
+       public void pageWithParameters() throws Exception
+       {
+               PageParameters parameters = new PageParameters();
+               parameters.add("first", "foo");
+               parameters.add("second", "bar");
+               executeTest(StatelessPageWithForm.class, parameters, 
"StatelessPageWithForm_expected.html");
+       }
 }

http://git-wip-us.apache.org/repos/asf/wicket/blob/2de6a900/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessPageWithForm.html
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessPageWithForm.html
 
b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessPageWithForm.html
new file mode 100644
index 0000000..0991049
--- /dev/null
+++ 
b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessPageWithForm.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+<form wicket:id="form"></form>
+</body>
+</html>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/wicket/blob/2de6a900/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessPageWithForm.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessPageWithForm.java
 
b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessPageWithForm.java
new file mode 100644
index 0000000..5252e70
--- /dev/null
+++ 
b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessPageWithForm.java
@@ -0,0 +1,40 @@
+/*
+ * 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.stateless;
+
+import org.apache.wicket.markup.html.WebPage;
+import org.apache.wicket.markup.html.form.StatelessForm;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+/**
+ * @author papegaaij
+ */
+public class StatelessPageWithForm extends WebPage
+{
+       private static final long serialVersionUID = 1L;
+
+       /**
+        * Construct.
+        * 
+        * @param parameters
+        */
+       public StatelessPageWithForm(PageParameters parameters)
+       {
+               super(parameters);
+               add(new StatelessForm<Void>("form"));
+       }
+}

http://git-wip-us.apache.org/repos/asf/wicket/blob/2de6a900/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessPageWithForm_expected.html
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessPageWithForm_expected.html
 
b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessPageWithForm_expected.html
new file mode 100644
index 0000000..a3ab72b
--- /dev/null
+++ 
b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessPageWithForm_expected.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+<form wicket:id="form" id="form1" method="post" 
action="org.apache.wicket.stateless.StatelessPageWithForm?0-1.IFormSubmitListener-form&amp;first=foo&amp;second=bar"><div
 
style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input
 type="hidden" name="form1_hf_0" id="form1_hf_0" /></div></form>
+</body>
+</html>
\ No newline at end of file

Reply via email to