[Httpunit-commit] CVS: httpunit/test/com/meterware/httpunit FormParametersTest.java,1.19,1.20

[Russell G. <rus...@us...>]

Update of /cvsroot/httpunit/httpunit/test/com/meterware/httpunit
In directory sc8-pr-cvs1:/tmp/cvs-serv23915/test/com/meterware/httpunit

Modified Files:
	FormParametersTest.java 
Log Message:
Support getOptions for radio buttons and checkboxes

Index: FormParametersTest.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/test/com/meterware/httpunit/FormParametersTest.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- FormParametersTest.java	6 Feb 2003 02:55:59 -0000	1.19
+++ FormParametersTest.java	4 May 2003 12:45:10 -0000	1.20
@@ -201,14 +201,15 @@
 
     public void testRadioButtonValidation() throws Exception {
         defineWebPage( "Default", "<form method=GET action = \"/ask\">" +
-                                       "<Input type=radio name=color value=red>" +
-                                       "<Input type=radio name=color value=blue>" +
-                                       "<Input type=radio name=color value=green>" +
+                                       "<Input type=radio name=color value=red>Crimson" +
+                                       "<Input type=radio name=color value=blue>Aquamarine" +
+                                       "<Input type=radio name=color value=green>Chartreuse" +
                                        "<Input type=submit></form>" );
         WebResponse page = _wc.getResponse( getHostPath() + "/Default.html" );
         WebRequest request = page.getForms()[0].getRequest();
         HttpUnitOptions.setParameterValuesValidated( true );
         assertEquals( "color options", new String[] { "red", "blue", "green" }, page.getForms()[0].getOptionValues( "color" ) );
+        assertEquals( "color names", new String[] { "Crimson", "Aquamarine", "Chartreuse" }, page.getForms()[0].getOptions( "color" ) );
         request.setParameter( "color", "red" );
         request.setParameter( "color", "blue" );
         validateSetParameterRejected( request, "color", "black", "setting radio buttons to unknown value" );
@@ -233,10 +234,11 @@
     public void testCheckboxValidation() throws Exception {
         defineWebPage( "Default", "<form method=GET action = 'ask?color='>" +
                                        "<Input type=checkbox name=use_color>" +
-                                       "<Input type=checkbox name=color value=red>" +
-                                       "<Input type=checkbox name=color value=blue>" +
+                                       "<Input type=checkbox name=color value=red>Scarlet" +
+                                       "<Input type=checkbox name=color value=blue>Turquoise" +
                                        "<Input type=submit></form>" );
         WebResponse page = _wc.getResponse( getHostPath() + "/Default.html" );
+        assertEquals( "Color values", new String[] { "Scarlet", "Turquoise" }, page.getForms()[0].getOptions( "color" ) );
         WebRequest request = page.getForms()[0].getRequest();
         request.setParameter( "use_color", "on" );
         request.removeParameter( "use_color" );