[Httpunit-commit] CVS: httpunit/src/com/meterware/httpunit HttpUnitUtils.java,NONE,1.1 HttpWebRespon
Brought to you by:
russgold
Menu
▾
▴
[Httpunit-commit] CVS: httpunit/src/com/meterware/httpunit HttpUnitUtils.java,NONE,1.1 HttpWebResponse.java,1.11,1.12 WebResponse.java,1.37,1.38
|
From: Russell G. <rus...@us...> - 2001-07-06 17:11:06
|
Update of /cvsroot/httpunit/httpunit/src/com/meterware/httpunit In directory usw-pr-cvs1:/tmp/cvs-serv3916/src/com/meterware/httpunit Modified Files: HttpWebResponse.java WebResponse.java Added Files: HttpUnitUtils.java Log Message: Release to enable access from Cactus ***** Error reading new file[Errno 2] No such file or directory: 'HttpUnitUtils.java' Index: HttpWebResponse.java =================================================================== RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/HttpWebResponse.java,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- HttpWebResponse.java 2001/07/02 13:05:56 1.11 +++ HttpWebResponse.java 2001/07/06 17:11:04 1.12 @@ -20,34 +20,39 @@ * *******************************************************************************************************************/ -import java.io.*; +import java.io.BufferedInputStream; +import java.io.IOException; import java.net.HttpURLConnection; import java.net.URL; import java.net.URLConnection; -import java.util.Enumeration; import java.util.Hashtable; import java.util.StringTokenizer; /** * A response from a web server to an Http request. + * + * @author <a href="mailto:rus...@ac...">Russell Gold</a> **/ class HttpWebResponse extends WebResponse { /** * Constructs a response object from an input stream. + * @param target the target window or frame to which the request should be directed * @param url the url from which the response was received - * @param inputStream the input stream from which the response can be read + * @param connection the URL connection from which the response can be read **/ HttpWebResponse( String target, URL url, URLConnection connection ) throws IOException { super( target, url ); - _connection = connection; readHeaders( connection ); - if (_responseCode == HttpURLConnection.HTTP_OK && getContentType().startsWith( "text" )) { - loadResponseText( connection ); + + /** make sure that any IO exception for HTML received page happens here, not later. **/ + if (_responseCode == HttpURLConnection.HTTP_OK) { + defineRawInputStream( new BufferedInputStream( connection.getInputStream() ) ); + if (getContentType().startsWith( "text" )) loadResponseText(); } } @@ -68,75 +73,23 @@ } - /** - * Returns the text of the response (excluding headers) as a string. Use this method in preference to 'toString' - * which may be used to represent internal state of this object. - **/ - public String getText() throws IOException { - if (_responseText == null) loadResponseText( _connection ); - return _responseText; + public String toString() { + return "[headers=" + _headers + "]"; } - - /** - * Returns an input stream for reading the contents of this reply. - **/ - public InputStream getInputStream() throws IOException { - if (_responseText != null) { - return new ByteArrayInputStream( _responseText.getBytes() ); - } else { - return new BufferedInputStream( _connection.getInputStream() ); - } - } - - public String toString() { - return "[headers=" + _headers + "; ??]"; - } - -//-------------------------------------------- private members ------------------------------------------------ +//------------------------------------- private members ------------------------------------- final private static String END_OF_LINE = System.getProperty( "line.separator" ); final private static String FILE_ENCODING = System.getProperty( "file.encoding" ); - - private int _responseCode = HttpURLConnection.HTTP_OK; - private URLConnection _connection; + private int _responseCode = HttpURLConnection.HTTP_OK; - private String _responseText; - private Hashtable _headers = new Hashtable(); - private void loadResponseText( URLConnection connection ) throws IOException { - StringBuffer sb = new StringBuffer(); - try { - ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); - BufferedInputStream inputStream = new BufferedInputStream( connection.getInputStream() ); - byte[] buffer = new byte[8 * 1024]; - int count = 0; - do { - outputStream.write( buffer, 0, count ); - count = inputStream.read( buffer, 0, buffer.length ); - } while (count != -1); - - inputStream.close(); - - readMetaTags( outputStream.toByteArray() ); - _responseText = new String( outputStream.toByteArray(), getCharacterSet() ); - } catch (FileNotFoundException e) { - if (connection instanceof HttpURLConnection) { - _responseCode = HttpURLConnection.HTTP_NOT_FOUND; - _responseText = ""; - } else { - e.fillInStackTrace(); - throw e; - } - } - } - - + private int getResponseCode( URLConnection connection, String statusHeader ) { if (statusHeader == null) throw new HttpNotFoundException( connection.getURL().toExternalForm() ); @@ -152,42 +105,14 @@ } - final - protected void readMetaTags( byte[] rawMessage ) throws UnsupportedEncodingException { - ByteTagParser parser = new ByteTagParser( rawMessage ); - ByteTag tag = parser.getNextTag(); - while (tag != null && !tag.getName().equalsIgnoreCase( "body" )) { - if (tag.getName().equalsIgnoreCase( "meta" )) processMetaTag( tag ); - tag = parser.getNextTag(); - } - } - - - private void processMetaTag( ByteTag tag ) { - if ("content-type".equalsIgnoreCase( tag.getAttribute( "http_equiv" ) )) { - inferContentType( tag.getAttribute( "content" ) ); - } else if ("refresh".equalsIgnoreCase( tag.getAttribute( "http_equiv" ) )) { - readRefreshRequest( tag.getAttribute( "content" ) ); - } - } - - - private void inferContentType( String contentTypeHeader ) { - String originalHeader = (String) _headers.get( "Content-type".toUpperCase() ); - if (originalHeader == null || originalHeader.indexOf( "charset" ) < 0) { - _headers.put( "Content-type".toUpperCase(), contentTypeHeader ); - } - } - - private void readHeaders( URLConnection connection ) { loadHeaders( connection ); if (connection instanceof HttpURLConnection) { _responseCode = getResponseCode( connection, connection.getHeaderField(0) ); } else { _responseCode = HttpURLConnection.HTTP_OK; - if (getContentType().startsWith( "text" )) { - _headers.put( "Content-type".toUpperCase(), getContentType() + "; charset=" + FILE_ENCODING ); + if (connection.getContentType().startsWith( "text" )) { + setContentTypeHeader( connection.getContentType() + "; charset=" + FILE_ENCODING ); } } } @@ -207,7 +132,7 @@ } if (connection.getContentType() != null) { - _headers.put( "Content-type".toUpperCase(), connection.getContentType() ); + setContentTypeHeader( connection.getContentType() ); } } @@ -221,95 +146,5 @@ } } -} - -//======================================================================================= - -class ByteTag { - - ByteTag( byte[] buffer, int start, int length ) throws UnsupportedEncodingException { - _buffer = new String( buffer, start, length, "iso-8859-1" ).toCharArray(); - _name = nextToken(); - - String attribute = ""; - String token = nextToken(); - while (token.length() != 0) { - if (token.equals( "=" ) && attribute.length() != 0) { - _attributes.put( attribute.toLowerCase(), nextToken() ); - attribute = ""; - } else { - if (attribute.length() > 0) _attributes.put( attribute.toLowerCase(), "" ); - attribute = token; - } - token = nextToken(); - } - } - - - public String getName() { - return _name; - } - - public String getAttribute( String attributeName ) { - return (String) _attributes.get( attributeName ); - } - - public String toString() { - return "ByteTag[ name=" + _name + ";attributes = " + _attributes + ']'; - } - - private String _name = ""; - private Hashtable _attributes = new Hashtable(); - - - private char[] _buffer; - private int _start; - private int _end = -1; - - - private String nextToken() { - _start = _end+1; - while (_start < _buffer.length && Character.isWhitespace( _buffer[ _start ] )) _start++; - if (_start >= _buffer.length) { - return ""; - } else if (_buffer[ _start ] == '"') { - for (_end = _start+1; _end < _buffer.length && _buffer[ _end ] != '"'; _end++); - return new String( _buffer, _start+1, _end-_start-1 ); - } else if (_buffer[ _start ] == '\'') { - for (_end = _start+1; _end < _buffer.length && _buffer[ _end ] != '\''; _end++); - return new String( _buffer, _start+1, _end-_start-1 ); - } else if (_buffer[ _start ] == '=') { - _end = _start; - return "="; - } else { - for (_end = _start+1; _end < _buffer.length && _buffer[ _end ] != '=' && !Character.isWhitespace( _buffer[ _end ] ); _end++); - return new String( _buffer, _start, (_end--)-_start ); - } - } -} - -//======================================================================================= - - -class ByteTagParser { - - ByteTagParser( byte[] buffer ) { - _buffer = buffer; - } - - - ByteTag getNextTag() throws UnsupportedEncodingException { - _start = _end+1; - while (_start < _buffer.length && _buffer[ _start ] != '<') _start++; - for (_end =_start+1; _end < _buffer.length && _buffer[ _end ] != '>'; _end++); - if (_end >= _buffer.length || _end < _start) return null; - return new ByteTag( _buffer, _start+1, _end-_start-1 ); - } - - - private int _start = 0; - private int _end = -1; - - private byte[] _buffer; } Index: WebResponse.java =================================================================== RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/WebResponse.java,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- WebResponse.java 2001/07/02 13:05:56 1.37 +++ WebResponse.java 2001/07/06 17:11:04 1.38 @@ -20,17 +20,22 @@ * *******************************************************************************************************************/ +import java.io.BufferedInputStream; import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; import java.io.InputStream; import java.io.IOException; import java.io.StringReader; +import java.io.UnsupportedEncodingException; + import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import java.net.URL; import java.net.HttpURLConnection; +import java.net.URL; +import java.net.URLConnection; import java.util.Enumeration; import java.util.Hashtable; @@ -52,6 +57,15 @@ /** + * Returns a web response built from a URL connection. Provided to allow + * access to WebResponse parsing without using a WebClient. + **/ + public static WebResponse newResponse( URLConnection connection ) throws IOException { + return new HttpWebResponse( "_top", connection.getURL(), connection ); + } + + + /** * Returns true if the response is HTML. **/ public boolean isHTML() { @@ -168,15 +182,18 @@ * Returns the text of the response (excluding headers) as a string. Use this method in preference to 'toString' * which may be used to represent internal state of this object. **/ - abstract - public String getText() throws IOException; + public String getText() throws IOException { + if (_responseText == null) loadResponseText(); + return _responseText; + } /** - * Returns an input stream for reading the contents of this reply. + * Returns a buffered input stream for reading the contents of this reply. **/ - abstract - public InputStream getInputStream() throws IOException; + public InputStream getInputStream() throws IOException { + return _inputStream; + } /** @@ -343,6 +360,15 @@ final + protected void defineRawInputStream( InputStream inputStream ) { + if (_inputStream != null || _responseText != null) { + throw new IllegalStateException( "Must be called before response text is defined." ); + } + _inputStream = inputStream; + } + + + final protected void readRefreshRequest( String contentTypeHeader ) { int splitIndex = contentTypeHeader.indexOf( ';' ); if (splitIndex < 0) splitIndex = 0; @@ -355,6 +381,14 @@ } + /** + * Overwrites the current value (if any) of the content type header. + **/ + protected void setContentTypeHeader( String value ) { + _contentHeader = value; + } + + //------------------------------------------ package members ------------------------------------------------ @@ -391,6 +425,8 @@ private ReceivedPage _page; + private String _contentHeader; + private String _contentType; private String _characterSet; @@ -401,7 +437,11 @@ private int _refreshDelay; + private String _responseText; + + private InputStream _inputStream; + // the following variables are essentially final; however, the JDK 1.1 compiler does not handle blank final variables properly with // multiple constructors that call each other, so the final qualifiers have been removed. @@ -410,6 +450,57 @@ private String _target; + protected void loadResponseText() throws IOException { + if (_responseText != null) throw new IllegalStateException( "May only invoke loadResponseText once" ); + _responseText = ""; + + InputStream inputStream = _inputStream; + try { + ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); + byte[] buffer = new byte[8 * 1024]; + int count = 0; + do { + outputStream.write( buffer, 0, count ); + count = inputStream.read( buffer, 0, buffer.length ); + } while (count != -1); + + byte[] bytes = outputStream.toByteArray(); + readMetaTags( bytes ); + _responseText = new String( bytes, getCharacterSet() ); + _inputStream = new ByteArrayInputStream( bytes ); + } finally { + inputStream.close(); + } + } + + + private void readMetaTags( byte[] rawMessage ) throws UnsupportedEncodingException { + ByteTagParser parser = new ByteTagParser( rawMessage ); + ByteTag tag = parser.getNextTag(); + while (tag != null && !tag.getName().equalsIgnoreCase( "body" )) { + if (tag.getName().equalsIgnoreCase( "meta" )) processMetaTag( tag ); + tag = parser.getNextTag(); + } + } + + + private void processMetaTag( ByteTag tag ) { + if ("content-type".equalsIgnoreCase( tag.getAttribute( "http_equiv" ) )) { + inferContentType( tag.getAttribute( "content" ) ); + } else if ("refresh".equalsIgnoreCase( tag.getAttribute( "http_equiv" ) )) { + readRefreshRequest( tag.getAttribute( "content" ) ); + } + } + + + private void inferContentType( String contentTypeHeader ) { + String originalHeader = getHeaderField( "Content-type" ); + if (originalHeader == null || originalHeader.indexOf( "charset" ) < 0) { + setContentTypeHeader( contentTypeHeader ); + } + } + + private Hashtable getNewCookies() { if (_newCookies == null) { _newCookies = new Hashtable(); @@ -446,17 +537,12 @@ private void readContentTypeHeader() { - String contentHeader = getHeaderField( "Content-type" ); + String contentHeader = (_contentHeader != null) ? _contentHeader + : getHeaderField( "Content-type" ); if (contentHeader == null) contentHeader = DEFAULT_CONTENT_HEADER; - StringTokenizer st = new StringTokenizer( contentHeader, ";=" ); - _contentType = st.nextToken(); - while (st.hasMoreTokens()) { - String parameter = st.nextToken(); - if (st.hasMoreTokens()) { - String value = st.nextToken(); - if (parameter.trim().equalsIgnoreCase( "charset" )) _characterSet = value; - } - } + String[] parts = HttpUnitUtils.parseContentTypeHeader( contentHeader ); + _contentType = parts[0]; + if (parts[1] != null) _characterSet = parts[1]; } @@ -536,6 +622,100 @@ } + +//======================================================================================= + +class ByteTag { + + ByteTag( byte[] buffer, int start, int length ) throws UnsupportedEncodingException { + _buffer = new String( buffer, start, length, "iso-8859-1" ).toCharArray(); + _name = nextToken(); + + String attribute = ""; + String token = nextToken(); + while (token.length() != 0) { + if (token.equals( "=" ) && attribute.length() != 0) { + _attributes.put( attribute.toLowerCase(), nextToken() ); + attribute = ""; + } else { + if (attribute.length() > 0) _attributes.put( attribute.toLowerCase(), "" ); + attribute = token; + } + token = nextToken(); + } + } + + + public String getName() { + return _name; + } + + public String getAttribute( String attributeName ) { + return (String) _attributes.get( attributeName ); + } + + public String toString() { + return "ByteTag[ name=" + _name + ";attributes = " + _attributes + ']'; + } + + private String _name = ""; + private Hashtable _attributes = new Hashtable(); + + + private char[] _buffer; + private int _start; + private int _end = -1; + + + private String nextToken() { + _start = _end+1; + while (_start < _buffer.length && Character.isWhitespace( _buffer[ _start ] )) _start++; + if (_start >= _buffer.length) { + return ""; + } else if (_buffer[ _start ] == '"') { + for (_end = _start+1; _end < _buffer.length && _buffer[ _end ] != '"'; _end++); + return new String( _buffer, _start+1, _end-_start-1 ); + } else if (_buffer[ _start ] == '\'') { + for (_end = _start+1; _end < _buffer.length && _buffer[ _end ] != '\''; _end++); + return new String( _buffer, _start+1, _end-_start-1 ); + } else if (_buffer[ _start ] == '=') { + _end = _start; + return "="; + } else { + for (_end = _start+1; _end < _buffer.length && _buffer[ _end ] != '=' && !Character.isWhitespace( _buffer[ _end ] ); _end++); + return new String( _buffer, _start, (_end--)-_start ); + } + } +} + + +//======================================================================================= + + +class ByteTagParser { + + ByteTagParser( byte[] buffer ) { + _buffer = buffer; + } + + + ByteTag getNextTag() throws UnsupportedEncodingException { + _start = _end+1; + while (_start < _buffer.length && _buffer[ _start ] != '<') _start++; + for (_end =_start+1; _end < _buffer.length && _buffer[ _end ] != '>'; _end++); + if (_end >= _buffer.length || _end < _start) return null; + return new ByteTag( _buffer, _start+1, _end-_start-1 ); + } + + + private int _start = 0; + private int _end = -1; + + private byte[] _buffer; +} + + +//======================================================================================= class DefaultWebResponse extends WebResponse { |
