[Httpunit-commit] CVS: httpunit/test/com/meterware/httpunit Base64Test.java,1.2,1.3 FileUploadTest.j
Brought to you by:
russgold
Menu
▾
▴
[Httpunit-commit] CVS: httpunit/test/com/meterware/httpunit Base64Test.java,1.2,1.3 FileUploadTest.java,1.8,1.9 HttpRequestStream.java,1.2,1.3 HttpUnitSuite.java,1.14,1.15 MessageBodyRequestTest.java,1.2,1.3 PseudoServer.java,1.15,1.16 PseudoServlet.java,1.5,1.6 WebLinkTest.java,1.15,1.16 WebResource.java,1.5,1.6
|
From: Russell G. <rus...@us...> - 2001-11-09 18:35:17
|
Update of /cvsroot/httpunit/httpunit/test/com/meterware/httpunit
In directory usw-pr-cvs1:/tmp/cvs-serv30213/test/com/meterware/httpunit
Modified Files:
Base64Test.java FileUploadTest.java HttpRequestStream.java
HttpUnitSuite.java MessageBodyRequestTest.java
PseudoServer.java PseudoServlet.java WebLinkTest.java
WebResource.java
Log Message:
Coding style cleanup
Index: Base64Test.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/test/com/meterware/httpunit/Base64Test.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Base64Test.java 2001/07/02 13:23:45 1.2
+++ Base64Test.java 2001/11/09 18:35:14 1.3
@@ -32,7 +32,7 @@
**/
public class Base64Test extends TestCase {
- public static void main(String args[]) {
+ public static void main( String[] args ) {
junit.textui.TestRunner.run( suite() );
}
Index: FileUploadTest.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/test/com/meterware/httpunit/FileUploadTest.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- FileUploadTest.java 2001/10/19 18:26:29 1.8
+++ FileUploadTest.java 2001/11/09 18:35:14 1.9
@@ -19,18 +19,8 @@
* DEALINGS IN THE SOFTWARE.
*
*******************************************************************************************************************/
-
-import java.net.URL;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import java.util.*;
-
import java.io.*;
-
-import org.w3c.dom.Document;
+import java.util.StringTokenizer;
import javax.activation.DataSource;
@@ -38,6 +28,8 @@
import javax.mail.internet.MimeBodyPart;
import javax.mail.internet.MimeMultipart;
+import junit.framework.Test;
+import junit.framework.TestSuite;
/**
* A unit test of the file upload simulation capability.
Index: HttpRequestStream.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/test/com/meterware/httpunit/HttpRequestStream.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- HttpRequestStream.java 2001/11/05 15:50:38 1.2
+++ HttpRequestStream.java 2001/11/09 18:35:14 1.3
@@ -19,11 +19,15 @@
* DEALINGS IN THE SOFTWARE.
*
*******************************************************************************************************************/
-import java.net.URL;
+import java.io.BufferedInputStream;
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.IOException;
+import java.io.Reader;
-import java.net.*;
-import java.io.*;
-import java.util.*;
+import java.util.StringTokenizer;
+import java.util.Hashtable;
class HttpRequestStream {
Index: HttpUnitSuite.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/test/com/meterware/httpunit/HttpUnitSuite.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- HttpUnitSuite.java 2001/06/04 20:45:33 1.14
+++ HttpUnitSuite.java 2001/11/09 18:35:14 1.15
@@ -29,33 +29,33 @@
**/
public class HttpUnitSuite {
- public static void main(String args[]) {
+ public static void main( String[] args ) {
junit.textui.TestRunner.run( suite() );
}
public static Test suite() {
- TestSuite suite = new TestSuite();
- suite.addTest( WebPageTest.suite() );
- suite.addTest( WebLinkTest.suite() );
- suite.addTest( HtmlTablesTest.suite() );
- suite.addTest( WebFormTest.suite() );
- suite.addTest( WebFrameTest.suite() );
- suite.addTest( RequestTargetTest.suite() );
- suite.addTest( FormParametersTest.suite() );
- suite.addTest( FormSubmitTest.suite() );
- suite.addTest( Base64Test.suite() );
- suite.addTest( PseudoServerTest.suite() );
- suite.addTest( MessageBodyRequestTest.suite() );
- addOptionalTestCase( suite, "com.meterware.httpunit.XMLPageTest" );
- addOptionalTestCase( suite, "com.meterware.httpunit.FileUploadTest" );
- return suite;
+ TestSuite result = new TestSuite();
+ result.addTest( WebPageTest.suite() );
+ result.addTest( WebLinkTest.suite() );
+ result.addTest( HtmlTablesTest.suite() );
+ result.addTest( WebFormTest.suite() );
+ result.addTest( WebFrameTest.suite() );
+ result.addTest( RequestTargetTest.suite() );
+ result.addTest( FormParametersTest.suite() );
+ result.addTest( FormSubmitTest.suite() );
+ result.addTest( Base64Test.suite() );
+ result.addTest( PseudoServerTest.suite() );
+ result.addTest( MessageBodyRequestTest.suite() );
+ addOptionalTestCase( result, "com.meterware.httpunit.XMLPageTest" );
+ addOptionalTestCase( result, "com.meterware.httpunit.FileUploadTest" );
+ return result;
}
- private static void addOptionalTestCase( TestSuite suite, String testCaseName ) {
+ private static void addOptionalTestCase( TestSuite testSuite, String testCaseName ) {
try {
- suite.addTest( new TestSuite( Class.forName( testCaseName ) ) );
+ testSuite.addTest( new TestSuite( Class.forName( testCaseName ) ) );
} catch (ClassNotFoundException e) {
System.out.println( "Note: test suite " + testCaseName + " not found; skipping." );
}
Index: MessageBodyRequestTest.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/test/com/meterware/httpunit/MessageBodyRequestTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MessageBodyRequestTest.java 2001/06/11 21:21:09 1.2
+++ MessageBodyRequestTest.java 2001/11/09 18:35:14 1.3
@@ -19,24 +19,13 @@
* DEALINGS IN THE SOFTWARE.
*
*******************************************************************************************************************/
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.io.IOException;
-import java.net.URL;
-
import junit.framework.Test;
-import junit.framework.TestCase;
import junit.framework.TestSuite;
-
-import java.util.*;
-
-import java.io.*;
-
-import org.w3c.dom.Document;
-
-import javax.activation.DataSource;
-
-import javax.mail.MessagingException;
-import javax.mail.internet.MimeBodyPart;
-import javax.mail.internet.MimeMultipart;
/**
Index: PseudoServer.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/test/com/meterware/httpunit/PseudoServer.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- PseudoServer.java 2001/07/17 12:50:47 1.15
+++ PseudoServer.java 2001/11/09 18:35:14 1.16
@@ -19,11 +19,20 @@
* DEALINGS IN THE SOFTWARE.
*
*******************************************************************************************************************/
-import java.net.URL;
+import java.io.InterruptedIOException;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.io.UnsupportedEncodingException;
-import java.net.*;
-import java.io.*;
-import java.util.*;
+import java.net.HttpURLConnection;
+import java.net.ServerSocket;
+import java.net.Socket;
+
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Vector;
/**
* A basic simulated web-server for testing the HttpUnit library.
Index: PseudoServlet.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/test/com/meterware/httpunit/PseudoServlet.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PseudoServlet.java 2001/06/11 21:21:09 1.5
+++ PseudoServlet.java 2001/11/09 18:35:14 1.6
@@ -19,8 +19,6 @@
* DEALINGS IN THE SOFTWARE.
*
*******************************************************************************************************************/
-import java.util.Dictionary;
-
import java.io.Reader;
/**
Index: WebLinkTest.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/test/com/meterware/httpunit/WebLinkTest.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- WebLinkTest.java 2001/11/05 18:54:51 1.15
+++ WebLinkTest.java 2001/11/09 18:35:14 1.16
@@ -301,7 +301,7 @@
WebLink link = mapPage.getLinks()[0];
WebRequest wr = link.getRequest();
assertMatchingSet( "Request parameter names", new String[] { "arg1", "valueless" }, toStringArray( wr.getParameterNames() ) );
- assertEquals( "Value of arg1", "", wr.getParameter( "arg1" ) );
+ assertEquals( "Value of arg1", null, wr.getParameter( "arg1" ) );
}
Index: WebResource.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/test/com/meterware/httpunit/WebResource.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- WebResource.java 2001/07/17 12:50:47 1.5
+++ WebResource.java 2001/11/09 18:35:14 1.6
@@ -19,11 +19,9 @@
* DEALINGS IN THE SOFTWARE.
*
*******************************************************************************************************************/
-import java.net.URL;
-
-import java.net.*;
-import java.io.*;
-import java.util.*;
+import java.io.UnsupportedEncodingException;
+import java.net.HttpURLConnection;
+import java.util.Vector;
/**
|
