cvs commit: xml-axis/java/test/functional TestEchoSample.java

[scheu]

scheu       02/02/19 14:46:41

  Modified:    java/samples/echo TestClient.java
               java/test/functional TestEchoSample.java
  Log:
  TestClient runs 2B Interop Tests if -A is specified
  
  Revision  Changes    Path
  1.53      +32 -6     xml-axis/java/samples/echo/TestClient.java
  
  Index: TestClient.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/samples/echo/TestClient.java,v
  retrieving revision 1.52
  retrieving revision 1.53
  diff -u -r1.52 -r1.53
  --- TestClient.java   15 Feb 2002 19:41:16 -0000      1.52
  +++ TestClient.java   19 Feb 2002 22:46:40 -0000      1.53
  @@ -164,9 +164,17 @@
       }
   
       /**
  -     * Execute the tests
  +     * Execute all the 2A tests
        */
  -    public void execute() throws Exception {
  +    public void executeAll() throws Exception {
  +        execute2A();
  +        execute2B();
  +    }
  +
  +    /**
  +     * Execute the 2A tests
  +     */
  +    public void execute2A() throws Exception {
           // execute the tests
           Object output = null;
   
  @@ -256,8 +264,9 @@
           {
               try {
                   binding.echoVoid();
  +                verify("echoVoid", null, null);
               } catch (Exception e) {
  -                verify("echoInteger", null, e);
  +                verify("echoVoid", null, e);
               }
           }
   
  @@ -336,7 +345,14 @@
                   verify("echoMapArray", input, e);
               }
           }
  +    }
   
  +    /**
  +     * Execute the 2B tests
  +     */
  +    public void execute2B() throws Exception {
  +        // execute the tests
  +        Object output = null;
           {
               SOAPStruct input = new SOAPStruct(5, "Hello", 103F);
               try {
  @@ -420,12 +436,14 @@
        * on their results.
        *
        * Arguments are of the form:
  -     *   -h localhost -p 8080 -s /soap/servlet/rpcrouter
  +     *   -h localhost -p 8080 -s /soap/servlet/rpcrouter 
  +     * -h indicats the host
        */
       public static void main(String args[]) throws Exception {
           Options opts = new Options(args);
   
           boolean testPerformance = opts.isFlagSet('k') > 0;
  +        boolean allTests = opts.isFlagSet('A') > 0;
   
           // set up tests so that the results are sent to System.out
           TestClient client;
  @@ -470,12 +488,20 @@
           if (testPerformance) {
               long startTime = System.currentTimeMillis();
               for (int i = 0; i < 10; i++) {
  -                client.execute();
  +                if (allTests) {
  +                    client.executeAll();
  +                } else {
  +                    client.execute2A();
  +                }
               }
               long stopTime = System.currentTimeMillis();
               System.out.println("That took " + (stopTime - startTime) + " 
milliseconds");
           } else {
  -            client.execute();
  +            if (allTests) {
  +                client.executeAll();
  +            } else {
  +                client.execute2A();
  +            }
           }
       }
   }
  
  
  
  1.12      +1 -1      xml-axis/java/test/functional/TestEchoSample.java
  
  Index: TestEchoSample.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/functional/TestEchoSample.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- TestEchoSample.java       19 Feb 2002 17:38:22 -0000      1.11
  +++ TestEchoSample.java       19 Feb 2002 22:46:41 -0000      1.12
  @@ -94,7 +94,7 @@
   
           // run the tests using a local (in process) server
           client.setURL("local:");
  -        client.execute();
  +        client.executeAll();
   
           log.info("Test complete.");
       }