[Httpunit-commit] CVS: httpunit/test/com/meterware/httpunit HttpUnitTest.java,1.21,1.22 HttpRequestS
Brought to you by:
russgold
From: Russell G. <rus...@us...> - 2002-07-24 17:29:00
|
Update of /cvsroot/httpunit/httpunit/test/com/meterware/httpunit In directory usw-pr-cvs1:/tmp/cvs-serv874/test/com/meterware/httpunit Modified Files: HttpUnitTest.java Removed Files: HttpRequestStream.java UnknownMethodException.java WebResource.java Log Message: moved pseudo server to its own package Index: HttpUnitTest.java =================================================================== RCS file: /cvsroot/httpunit/httpunit/test/com/meterware/httpunit/HttpUnitTest.java,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- HttpUnitTest.java 18 Jun 2002 16:53:20 -0000 1.21 +++ HttpUnitTest.java 24 Jul 2002 17:28:57 -0000 1.22 @@ -19,6 +19,8 @@ * DEALINGS IN THE SOFTWARE. * *******************************************************************************************************************/ +import com.meterware.pseudoserver.HttpUserAgentTest; + import java.net.URL; import junit.framework.Test; @@ -36,7 +38,8 @@ * @author <a href="mailto:rus...@ac...">Russell Gold</a> **/ abstract -public class HttpUnitTest extends TestCase { +public class HttpUnitTest extends HttpUserAgentTest { + public HttpUnitTest( String name ) { super( name ); @@ -44,160 +47,9 @@ public void setUp() throws Exception { - _server = new PseudoServer(); + super.setUp(); HttpUnitOptions.reset(); - _hostPath = "http://localhost:" + _server.getConnectedPort(); - } - - - public void tearDown() throws Exception { - if (_server != null) _server.shutDown(); - } - - -//--------------------------------- protected members ---------------------------------------------- - - - protected void defineResource( String resourceName, PseudoServlet servlet ) { - _server.setResource( resourceName, servlet ); - } - - - protected void defineResource( String resourceName, String value ) { - _server.setResource( resourceName, value ); - } - - - protected void defineResource( String resourceName, String value, int statusCode ) { - _server.setErrorResource( resourceName, statusCode, value ); - } - - - protected void defineResource( String resourceName, String value, String contentType ) { - _server.setResource( resourceName, value, contentType ); - } - - - protected void addResourceHeader( String resourceName, String header ) { - _server.addResourceHeader( resourceName, header ); - } - - - protected void setResourceCharSet( String resourceName, String setName, boolean reportCharSet ) { - _server.setCharacterSet( resourceName, setName ); - _server.setSendCharacterSet( resourceName, reportCharSet ); } - - - protected void defineWebPage( String pageName, String body ) { - defineResource( pageName + ".html", "<html><head><title>" + pageName + "</title></head>\n" + - "<body>" + body + "</body></html>" ); - } - - - protected String getHostPath() { - return _hostPath; - } - - - 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(); - Vector foundItems = new Vector(); - - for (int i = 0; i < expected.length; i++) expectedItems.addElement( expected[i] ); - for (int i = 0; i < found.length; i++) foundItems.addElement( found[i] ); - - for (int i = 0; i < expected.length; i++) { - if (!foundItems.contains( expected[i] )) { - fail( comment + ": expected " + asText( expected ) + " but found " + asText( found ) ); - } else { - foundItems.removeElement( expected[i] ); - } - } - - for (int i = 0; i < found.length; i++) { - if (!expectedItems.contains( found[i] )) { - fail( comment + ": expected " + asText( expected ) + " but found " + asText( found ) ); - } else { - expectedItems.removeElement( found[i] ); - } - } - - if (!foundItems.isEmpty()) fail( comment + ": expected " + asText( expected ) + " but found " + asText( found ) ); - } - - - protected String asText( Object[] args ) { - StringBuffer sb = new StringBuffer( "{" ); - for (int i = 0; i < args.length; i++) { - if (i != 0) sb.append( "," ); - sb.append( '"' ).append( args[i] ).append( '"' ); - } - sb.append( "}" ); - return sb.toString(); - } - - - - - protected void assertEquals( String comment, byte[] expected, byte[] actual ) - { - if (!equals( expected, actual )) - { - fail( comment + " expected:\n" + toString( expected ) + ", but was:\n" + toString( actual ) ); - } - } - - - private boolean equals( byte[] first, byte[] second ) - { - if (first.length != second.length) return false; - for (int i = 0; i < first.length; i++) - { - if (first[i] != second[i]) return false; - } - return true; - } - - - private String toString( byte[] message ) - { - StringBuffer sb = new StringBuffer(); - for (int i = 0; i < message.length; i++) - { - if (i != 0 && (i % 4) == 0) sb.append( ' ' ); - if (message[i] >= 0 && message[i] < 16) sb.append( '0' ); - sb.append( Integer.toHexString( 0xff & (int) message[i] ) ); - } - return sb.toString(); - } - - -//---------------------------------------- private members ----------------------------------------- - - private String _hostPath; - - private PseudoServer _server; } |