cvs commit: xml-rpc/src/test/org/apache/xmlrpc ClientServerRpcTest.java

[dlr]

dlr         02/02/18 20:54:39

  Modified:    src/test/org/apache/xmlrpc ClientServerRpcTest.java
  Log:
  Implemented testServer() unit test.
  
  Revision  Changes    Path
  1.4       +13 -7     xml-rpc/src/test/org/apache/xmlrpc/ClientServerRpcTest.java
  
  Index: ClientServerRpcTest.java
  ===================================================================
  RCS file: /home/cvs/xml-rpc/src/test/org/apache/xmlrpc/ClientServerRpcTest.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -u -r1.3 -r1.4
  --- ClientServerRpcTest.java  19 Feb 2002 03:53:27 -0000      1.3
  +++ ClientServerRpcTest.java  19 Feb 2002 04:54:39 -0000      1.4
  @@ -54,6 +54,7 @@
    * <http://www.apache.org/>.
    */
   
  +import java.io.ByteArrayInputStream;
   import java.io.ByteArrayOutputStream;
   import java.io.IOException;
   import java.io.InputStream;
  @@ -67,7 +68,7 @@
    * Tests XmlRpc run-time.
    *
    * @author <a href="mailto:[EMAIL PROTECTED]";>Daniel Rall</a>
  - * @version $Id: ClientServerRpcTest.java,v 1.3 2002/02/19 03:53:27 dlr Exp $
  + * @version $Id: ClientServerRpcTest.java,v 1.4 2002/02/19 04:54:39 dlr Exp $
    */
   public class ClientServerRpcTest
       extends TestCase 
  @@ -83,14 +84,19 @@
       private static final String REQUEST_PARAM_VALUE = "foobar";
   
       /**
  +     * The value to use in our request parameter.
  +     */
  +    private static final String REQUEST_PARAM_XML =
  +        "<value>" + REQUEST_PARAM_VALUE + "</value>";
  +
  +    /**
        * A RPC request of our echo server in XML.
        */
       private static final String RPC_REQUEST =
           "<?xml version=\"1.0\"?>\n" +
           "<methodCall>\n" +
           " <methodName>" + HANDLER_NAME + ".echo</methodName>\n" +
  -        " <params><param><value>" + REQUEST_PARAM_VALUE +
  -        "</value></param></params>\n" +
  +        " <params><param>" + REQUEST_PARAM_XML + "</param></params>\n" +
           "</methodCall>\n";
   
       private WebServer webServer;
  @@ -159,10 +165,10 @@
       {
           try
           {
  -            InputStream in = null;
  -            //server.execute(in);
  -            throw new Exception("testServer() not implemented");
  -            // TODO: Test the Server directly
  +            InputStream in = new ByteArrayInputStream(RPC_REQUEST.getBytes());
  +            byte[] response = server.execute(in);
  +            assertTrue("Response did not contain " + REQUEST_PARAM_VALUE,
  +                       new String(response).indexOf(REQUEST_PARAM_XML) != -1);
           }
           catch (Exception e)
           {