[Httpunit-commit] CVS: httpunit/test/com/meterware/httpunit WebFormTest.java,1.13,1.14 WebLinkTest.java,1.14,1.15

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

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

Modified Files:
	WebFormTest.java WebLinkTest.java 
Log Message:
Cleaned up JDK 1.1 issues, added some WebForm enhancements

Index: WebFormTest.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/test/com/meterware/httpunit/WebFormTest.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- WebFormTest.java	2001/10/26 14:00:10	1.13
+++ WebFormTest.java	2001/11/05 18:54:51	1.14
@@ -117,6 +117,8 @@
 
         assertEquals( "First checkbox",  "",   form.getParameterValue( "first" ) );
         assertEquals( "Second checkbox", "on", form.getParameterValue( "second" ) );
+        assertTrue( "Did not find parameter 'first'", form.hasParameterNamed( "first" ) );
+        assertTrue( "Did not find parameter with prefix 'sec'", form.hasParameterStartingWithPrefix( "sec" ) );
     }
 
 

Index: WebLinkTest.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/test/com/meterware/httpunit/WebLinkTest.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- WebLinkTest.java	2001/11/05 15:50:38	1.14
+++ WebLinkTest.java	2001/11/05 18:54:51	1.15
@@ -28,7 +28,6 @@
 
 import java.util.Vector;
 import java.util.Enumeration;
-import java.util.ArrayList;
 
 
 /**
@@ -224,10 +223,10 @@
         request = links[1].getRequest();
         assertNotNull( request );
         e = request.getParameterNames();
-        assertTrue( e.hasMoreElements() );
+        assertTrue( "No parameter found", e.hasMoreElements() );
         String paramName = (String)e.nextElement();
         assertNotNull(paramName);
-        assertTrue(!e.hasMoreElements());
+        assertTrue( "More than one parameter found", !e.hasMoreElements());
         assertEquals("param1",paramName);
         assertEquals("value1",request.getParameter(paramName));
 
@@ -235,10 +234,10 @@
         request = links[2].getRequest();
         assertNotNull( request );
         e = request.getParameterNames();
-        assertTrue( e.hasMoreElements() );
+        assertTrue( "No parameters found", e.hasMoreElements() );
         paramName = (String)e.nextElement();
         assertNotNull(paramName);
-        assertTrue(e.hasMoreElements());
+        assertTrue( "Only one parameter found", e.hasMoreElements());
         String paramName2 = (String)e.nextElement();
         assertNotNull(paramName2);
         assertTrue("different names",!paramName.equals(paramName2));
@@ -251,7 +250,7 @@
         request = links[3].getRequest();
         assertNotNull( request );
         e = request.getParameterNames();
-        assertTrue( e.hasMoreElements() );
+        assertTrue( "No parameters found", e.hasMoreElements() );
         paramName = (String)e.nextElement();
         assertNotNull(paramName);
         String[] values = request.getParameterValues("param1");
@@ -262,10 +261,10 @@
         request = links[4].getRequest();
         assertNotNull( request );
         e = request.getParameterNames();
-        assertTrue( e.hasMoreElements() );
+        assertTrue( "No parameters found", e.hasMoreElements() );
         paramName = (String)e.nextElement();
         assertNotNull(paramName);
-        assertTrue( e.hasMoreElements() );
+        assertTrue( "Only one parameter found", e.hasMoreElements() );
         paramName2 = (String)e.nextElement();
         assertNotNull(paramName2);
         assertTrue("different names",!paramName.equals(paramName2));
@@ -307,9 +306,11 @@
 
 
     private String[] toStringArray( Enumeration e ) {
-        ArrayList al = new ArrayList();
-        while (e.hasMoreElements()) al.add( e.nextElement() );
-        return (String[]) al.toArray( new String[ al.size() ] );
+        Vector v = new Vector();
+        while (e.hasMoreElements()) v.addElement( e.nextElement() );
+        String[] result = new String[ v.size() ];
+        v.copyInto( result );
+        return result;
     }