svn commit: r917265 - in /wicket/trunk/wicket/src/test/java/org/apache/wicket: ajax/form/AjaxFormSubmitTest.java markup/html/form/submitlink/TestHomePage.java properties/PropertiesTest.java

[ivaynberg]

Author: ivaynberg
Date: Sun Feb 28 19:30:11 2010
New Revision: 917265

URL: http://svn.apache.org/viewvc?rev=917265&view=rev
Log:
test fixes

Modified:
    
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTest.java
    
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/submitlink/TestHomePage.java
    
wicket/trunk/wicket/src/test/java/org/apache/wicket/properties/PropertiesTest.java

Modified: 
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTest.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTest.java?rev=917265&r1=917264&r2=917265&view=diff
==============================================================================
--- 
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTest.java
 (original)
+++ 
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTest.java
 Sun Feb 28 19:30:11 2010
@@ -28,25 +28,6 @@
  */
 public class AjaxFormSubmitTest extends WicketTestCase
 {
-
-       /**
-        * @see org.apache.wicket.WicketTestCase#setUp()
-        */
-       @Override
-       protected void setUp() throws Exception
-       {
-               super.setUp();
-       }
-
-       /**
-        * @see org.apache.wicket.WicketTestCase#tearDown()
-        */
-       @Override
-       protected void tearDown() throws Exception
-       {
-               super.tearDown();
-       }
-
        /**
         * Test ajax form submit without default form processing.
         */
@@ -60,6 +41,9 @@
                FormTester form = tester.newFormTester("form");
                form.setValue("txt1", "txt1");
                form.setValue("txt2", "txt2");
+               // mark the button as the one being pressed. there is a ':' 
infront of name because wicket
+               // escapes "submit" input names as they break browsers
+               
tester.getRequest().getPostParameters().setParameterValue(":submit", "x");
                tester.executeAjaxEvent("form:submit", "onclick");
                AjaxFormSubmitTestPage page = 
(AjaxFormSubmitTestPage)tester.getLastRenderedPage();
                assertFalse((page.getFormSubmitted() & 
AjaxFormSubmitTestPage.FORM) == AjaxFormSubmitTestPage.FORM);
@@ -71,8 +55,8 @@
        }
 
        /**
-        * Test that onclick handler is generated with the proper XHTML entities
-        * for special characters, notably ampersand. See WICKET-2033.
+        * Test that onclick handler is generated with the proper XHTML 
entities for special characters,
+        * notably ampersand. See WICKET-2033.
         */
        public void testEventJavaScriptEscaped() throws Exception
        {

Modified: 
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/submitlink/TestHomePage.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/submitlink/TestHomePage.java?rev=917265&r1=917264&r2=917265&view=diff
==============================================================================
--- 
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/submitlink/TestHomePage.java
 (original)
+++ 
wicket/trunk/wicket/src/test/java/org/apache/wicket/markup/html/form/submitlink/TestHomePage.java
 Sun Feb 28 19:30:11 2010
@@ -26,7 +26,7 @@
                tester.startPage(HomePage.class);
                tester.assertRenderedPage(HomePage.class);
                HomePage home = (HomePage)tester.getLastRenderedPage();
-               
tester.getRequest().getPostParameters().setParameterValue("form:text", "Hello");
+               
tester.getRequest().getPostParameters().setParameterValue("text", "Hello");
                tester.clickLink("form:link");
                assertEquals("Hello", home.getText());
                assertTrue("Form.onSubmit() has not been called!", 
home.isSubmitted());
@@ -38,7 +38,7 @@
                tester.startPage(HomePage.class);
                tester.assertRenderedPage(HomePage.class);
                HomePage home = (HomePage)tester.getLastRenderedPage();
-               
tester.getRequest().getPostParameters().setParameterValue("form:text", "Hello");
+               
tester.getRequest().getPostParameters().setParameterValue("text", "Hello");
                // Pretend we clicked on "link"
                
tester.getRequest().getPostParameters().setParameterValue("link", "");
                tester.submitForm("form");

Modified: 
wicket/trunk/wicket/src/test/java/org/apache/wicket/properties/PropertiesTest.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/properties/PropertiesTest.java?rev=917265&r1=917264&r2=917265&view=diff
==============================================================================
--- 
wicket/trunk/wicket/src/test/java/org/apache/wicket/properties/PropertiesTest.java
 (original)
+++ 
wicket/trunk/wicket/src/test/java/org/apache/wicket/properties/PropertiesTest.java
 Sun Feb 28 19:30:11 2010
@@ -18,15 +18,29 @@
 
 import java.util.Locale;
 
-import org.apache.wicket.WicketTestCase;
+import junit.framework.TestCase;
 
+import org.apache.wicket.util.tester.WicketTester;
 
 /**
  * 
  * @author Juergen Donnerstag
  */
-public class PropertiesTest extends WicketTestCase
+public class PropertiesTest extends TestCase
 {
+       private WicketTester tester;
+
+       @Override
+       public void setUp()
+       {
+               tester = new WicketTester(new MyApplication());
+       }
+
+       @Override
+       public void tearDown()
+       {
+               tester.destroy();
+       }
 
        /**
         */