[Httpunit-commit] CVS: httpunit/test/com/meterware/httpunit FormParametersTest.java,1.4,1.5 HttpUnitTest.java,1.14,1.15 WebFormTest.java,1.11,1.12

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

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

Modified Files:
	FormParametersTest.java HttpUnitTest.java WebFormTest.java 
Log Message:
Return option values in HTML order

Index: FormParametersTest.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/test/com/meterware/httpunit/FormParametersTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FormParametersTest.java	2000/10/31 19:54:15	1.4
+++ FormParametersTest.java	2001/08/06 20:19:41	1.5
@@ -156,6 +156,7 @@
         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" ) );
         request.setParameter( "color", "red" );
         request.setParameter( "color", "blue" );
         validateSetParameterRejected( request, "color", "black", "setting radio buttons to unknown value" );

Index: HttpUnitTest.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/test/com/meterware/httpunit/HttpUnitTest.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- HttpUnitTest.java	2001/07/17 12:50:47	1.14
+++ HttpUnitTest.java	2001/08/06 20:19:41	1.15
@@ -98,6 +98,24 @@
     }
 
 
+    protected void assertEquals( String comment, Object[] expected, Object[] found ) {
+        if (!equals( expected, found )) {
+            fail( comment + " expected: " + asText( expected ) + " but found " + asText( found ) );
+        }
+    }
+
+    private boolean equals( Object[] first, Object[] second )
+    {
+        if (first.length != second.length) return false;
+        for (int i = 0; i < first.length; i++)
+        {
+            if (!first[i].equals( second[i] )) return false;
+        }
+        return true;
+    }
+
+
+
 
     protected void assertMatchingSet( String comment, Object[] expected, Object[] found ) {
         Vector expectedItems = new Vector();

Index: WebFormTest.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/test/com/meterware/httpunit/WebFormTest.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- WebFormTest.java	2001/06/11 21:21:09	1.11
+++ WebFormTest.java	2001/08/06 20:19:41	1.12
@@ -222,7 +222,7 @@
         assertEquals( "parameter name", "colors", parameterNames[0] );
         assertMatchingSet( "Select defaults", new String[] { "red", "pink" }, form.getParameterValues( "colors" ) );
         assertMatchingSet( "Select options", new String[] { "blue", "red", "green", "salmon" }, form.getOptions( "colors" ) );
-        assertMatchingSet( "Select values", new String[] { "blue", "red", "green", "pink" }, form.getOptionValues( "colors" ) );
+        assertEquals( "Select values", new String[] { "blue", "red", "green", "pink" }, form.getOptionValues( "colors" ) );
         WebRequest request = form.getRequest();
         assertMatchingSet( "Request defaults", new String[] { "red", "pink" }, request.getParameterValues( "colors" ) );
         assertEquals( "URL", getHostPath() + "/ask?colors=red&colors=pink", request.getURL().toExternalForm() );