[Httpunit-commit] CVS: httpunit/test/com/meterware/httpunit FileUploadTest.java,1.1,1.2 FormSubmitTe
Brought to you by:
russgold
Menu
▾
▴
[Httpunit-commit] CVS: httpunit/test/com/meterware/httpunit FileUploadTest.java,1.1,1.2 FormSubmitTest.java,1.6,1.7 HttpUnitTest.java,1.9,1.10 PseudoServer.java,1.8,1.9 WebResource.java,1.2,1.3
|
From: Russell G. <rus...@us...> - 2001-03-20 23:33:23
|
Update of /cvsroot/httpunit/httpunit/test/com/meterware/httpunit
In directory usw-pr-cvs1:/tmp/cvs-serv26791/test/com/meterware/httpunit
Modified Files:
FileUploadTest.java FormSubmitTest.java HttpUnitTest.java
PseudoServer.java WebResource.java
Log Message:
Clean up implementation dependancies
Index: FileUploadTest.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/test/com/meterware/httpunit/FileUploadTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FileUploadTest.java 2001/01/05 14:00:36 1.1
+++ FileUploadTest.java 2001/03/20 23:35:43 1.2
@@ -75,7 +75,7 @@
WebResponse simplePage = wc.getResponse( request );
WebRequest formSubmit = simplePage.getForms()[0].getRequest();
WebResponse encoding = wc.getResponse( formSubmit );
- assertEquals( "Parameters", "update=age&age=12", encoding.getText().trim() );
+ assertEqualQueries( "http://dummy?update=age&age=12", "http://dummy?" + encoding.getText().trim() );
}
Index: FormSubmitTest.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/test/com/meterware/httpunit/FormSubmitTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FormSubmitTest.java 2001/02/21 19:01:07 1.6
+++ FormSubmitTest.java 2001/03/20 23:35:43 1.7
@@ -77,7 +77,7 @@
WebResponse page = _wc.getResponse( getHostPath() + "/Default.html" );
WebForm form = page.getForms()[0];
WebRequest request = form.getRequest();
- assertEquals( getHostPath() + "/ask?age=12", request.getURL().toExternalForm() );
+ assertEqualQueries( getHostPath() + "/ask?age=12", request.getURL().toExternalForm() );
}
@@ -226,13 +226,13 @@
WebResponse page = _wc.getResponse( getHostPath() + "/Default.html" );
WebForm form = page.getForms()[0];
WebRequest request = form.getRequest( form.getSubmitButton( "update", "name" ) );
- assertEquals( getHostPath() + "/ask?update=name&age=12", request.getURL().toExternalForm() );
+ assertEqualQueries( getHostPath() + "/ask?update=name&age=12", request.getURL().toExternalForm() );
request = form.getRequest( "update", "name" );
- assertEquals( getHostPath() + "/ask?update=name&age=12", request.getURL().toExternalForm() );
+ assertEqualQueries( getHostPath() + "/ask?update=name&age=12", request.getURL().toExternalForm() );
request = form.getRequest( "update" );
- assertEquals( getHostPath() + "/ask?update=age&age=12", request.getURL().toExternalForm() );
+ assertEqualQueries( getHostPath() + "/ask?update=age&age=12", request.getURL().toExternalForm() );
}
@@ -290,50 +290,7 @@
}
- protected void assertEqualQueries( String query1, String query2 ) {
- assertEquals( new QuerySpec( query1 ), new QuerySpec( query2 ) );
- }
-
-
- static class QuerySpec {
- QuerySpec( String urlString ) {
- if (urlString.indexOf( '?' ) < 0) {
- _path = urlString;
- } else {
- _path = urlString.substring( 0, urlString.indexOf( '?' ) );
- }
- _fullString = urlString;
-
- StringTokenizer st = new StringTokenizer( urlString.substring( urlString.indexOf( '?' )+1 ), "&" );
- while (st.hasMoreTokens()) _parameters.addElement( st.nextToken() );
- }
-
- public String toString() {
- return _fullString;
- }
-
- public boolean equals( Object o ) {
- return getClass().equals( o.getClass() ) && equals( (QuerySpec) o );
- }
- private String _path;
- private String _fullString;
- private Vector _parameters = new Vector();
-
- private boolean equals( QuerySpec o ) {
- if (!_path.equals( o._path )) {
- return false;
- } else if (_parameters.size() != o._parameters.size() ) {
- return false;
- } else {
- for (Enumeration e = o._parameters.elements(); e.hasMoreElements();) {
- if (!_parameters.contains( e.nextElement() )) return false;
- }
- return true;
- }
- }
- }
-
//---------------------------------------------- private members ------------------------------------------------
Index: HttpUnitTest.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/test/com/meterware/httpunit/HttpUnitTest.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- HttpUnitTest.java 2000/12/27 20:02:17 1.9
+++ HttpUnitTest.java 2001/03/20 23:35:43 1.10
@@ -6,6 +6,8 @@
import junit.framework.TestCase;
import junit.framework.TestSuite;
+import java.util.Enumeration;
+import java.util.StringTokenizer;
import java.util.Vector;
@@ -66,6 +68,12 @@
}
+ protected void assertEqualQueries( String query1, String query2 ) {
+ assertEquals( new QuerySpec( query1 ), new QuerySpec( query2 ) );
+ }
+
+
+
protected void assertMatchingSet( String comment, Object[] expected, Object[] found ) {
Vector expectedItems = new Vector();
Vector foundItems = new Vector();
@@ -109,5 +117,45 @@
private String _hostPath;
private PseudoServer _server;
+
+ static class QuerySpec {
+ QuerySpec( String urlString ) {
+ if (urlString.indexOf( '?' ) < 0) {
+ _path = urlString;
+ } else {
+ _path = urlString.substring( 0, urlString.indexOf( '?' ) );
+ }
+ _fullString = urlString;
+
+ StringTokenizer st = new StringTokenizer( urlString.substring( urlString.indexOf( '?' )+ 1 ), "&" );
+ while (st.hasMoreTokens()) _parameters.addElement( st.nextToken() );
+ }
+
+ public String toString() {
+ return _fullString;
+ }
+
+ public boolean equals( Object o ) {
+ return getClass().equals( o.getClass() ) && equals( (QuerySpec) o );
+ }
+
+ private String _path;
+ private String _fullString;
+ private Vector _parameters = new Vector();
+
+ private boolean equals( QuerySpec o ) {
+ if (!_path.equals( o._path )) {
+ return false;
+ } else if (_parameters.size() != o._parameters.size() ) {
+ return false;
+ } else {
+ for (Enumeration e = o._parameters.elements(); e.hasMoreElements();) {
+ if (!_parameters.contains( e.nextElement() )) return false;
+ }
+ return true;
+ }
+ }
+ }
+
}
Index: PseudoServer.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/test/com/meterware/httpunit/PseudoServer.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- PseudoServer.java 2001/02/21 19:01:07 1.8
+++ PseudoServer.java 2001/03/20 23:35:43 1.9
@@ -46,6 +46,11 @@
_active = false;
}
}
+ try {
+ if (_serverSocket != null) _serverSocket.close();
+ _serverSocket = null;
+ } catch (IOException e) {
+ }
}
};
t.start();
@@ -178,7 +183,9 @@
sendResponse( pw, HttpURLConnection.HTTP_NOT_FOUND, "unable to find " + uri );
} else if (resource.getResponseCode() != HttpURLConnection.HTTP_OK) {
sendResponse( pw, resource.getResponseCode(), resource.getContents() );
- } else {
+ sendLine( pw, "" );
+ pw.flush();
+ } else {
sendResponse( pw, HttpURLConnection.HTTP_OK, "OK" );
sendLine( pw, "Content-type: " + resource.getContentType() + resource.getCharacterSetParameter() );
String[] headers = resource.getHeaders();
@@ -220,11 +227,17 @@
private Dictionary readRequest( BufferedReader br ) throws IOException {
Hashtable headers = new Hashtable();
+ String lastHeader = null;
String header = br.readLine();
while (header.length() > 0) {
- headers.put( header.substring( 0, header.indexOf(':') ).toUpperCase(),
- header.substring( header.indexOf(':')+1 ).trim() );
+ if (header.charAt(0) <= ' ') {
+ if (lastHeader == null) continue;
+ headers.put( lastHeader, headers.get( lastHeader ) + header.trim() );
+ } else {
+ lastHeader = header.substring( 0, header.indexOf(':') ).toUpperCase();
+ headers.put( lastHeader, header.substring( header.indexOf(':')+1 ).trim() );
+ }
header = br.readLine();
}
Index: WebResource.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/test/com/meterware/httpunit/WebResource.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- WebResource.java 2001/02/21 19:01:07 1.2
+++ WebResource.java 2001/03/20 23:35:43 1.3
@@ -109,6 +109,12 @@
}
+ public String toString() {
+ return "WebResource [code=" + _responseCode + "; type = " + _contentType
+ + "; charset = " + _characterSet + "]\n" + _contents;
+ }
+
+
private int _responseCode;
private boolean _sendCharacterSet;
private String _contents;
|
