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

[dims]

dims        2002/06/04 05:46:56

  Modified:    java/samples/jaxm DelayedStockQuote.java
               java/test build_functional_tests.xml
               java/test/functional TestJAXMSamples.java
  Log:
  - Comment out the pass-thru of proxy parameters.
  - Added package for DelayedStockQuote
  - Skip DelayedStockQuote if there is a ConnectException.
  
  Revision  Changes    Path
  1.3       +1 -1      xml-axis/java/samples/jaxm/DelayedStockQuote.java
  
  Index: DelayedStockQuote.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/samples/jaxm/DelayedStockQuote.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DelayedStockQuote.java    3 Jun 2002 17:57:00 -0000       1.2
  +++ DelayedStockQuote.java    4 Jun 2002 12:46:56 -0000       1.3
  @@ -52,7 +52,7 @@
    * information on the Apache Software Foundation, please see
    * <http://www.apache.org/>.
    */
  -//package samples.jaxm;
  +package samples.jaxm;
   
   import javax.xml.messaging.URLEndpoint;
   import javax.xml.soap.MessageFactory;
  
  
  
  1.42      +2 -0      xml-axis/java/test/build_functional_tests.xml
  
  Index: build_functional_tests.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/build_functional_tests.xml,v
  retrieving revision 1.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- build_functional_tests.xml        3 Jun 2002 17:57:01 -0000       1.41
  +++ build_functional_tests.xml        4 Jun 2002 12:46:56 -0000       1.42
  @@ -93,11 +93,13 @@
       <!-- now, run the actual test -->
       <junit dir="." printsummary="yes" haltonfailure="${test.functional.fail}" 
fork="yes">
         <!-- Pass through the proxy parameters -->
  +      <!--
         <jvmarg value="-Dhttp.proxyHost=${http.proxyHost}"/>
         <jvmarg value="-Dhttp.proxyPort=${http.proxyPort}"/>
         <jvmarg value="-Dhttp.nonProxyHosts=${http.nonProxyHosts}"/>
         <jvmarg value="-Dhttp.proxyUser=${http.proxyUser}"/>
         <jvmarg value="-Dhttp.proxyPassword=${http.proxyPassword}"/>
  +      -->
         <classpath refid="test-classpath" />
         <formatter type="xml" usefile="${test.functional.usefile}"/>
         <batchtest todir="${test.functional.reportdir}">
  
  
  
  1.3       +11 -3     xml-axis/java/test/functional/TestJAXMSamples.java
  
  Index: TestJAXMSamples.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/functional/TestJAXMSamples.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TestJAXMSamples.java      3 Jun 2002 17:57:01 -0000       1.2
  +++ TestJAXMSamples.java      4 Jun 2002 12:46:56 -0000       1.3
  @@ -55,12 +55,14 @@
   
   package test.functional;
   
  +import samples.jaxm.DelayedStockQuote;
   import junit.framework.TestCase;
   import org.apache.axis.AxisFault;
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
   import samples.jaxm.UddiPing;
  -import DelayedStockQuote;
  +
  +import java.net.ConnectException;
   
   /**
    * Test the JAX-RPC compliance samples.
  @@ -92,9 +94,15 @@
               log.info("Test complete.");
           } catch (javax.xml.soap.SOAPException e) {
               Throwable t = e.getCause();
  -            if(t != null){
  -                if (t instanceof AxisFault) ((AxisFault) t).dump();
  +            if (t != null) {
                   t.printStackTrace();
  +                if (t instanceof AxisFault) {
  +                    ((AxisFault) t).dump();
  +                    if (((AxisFault) t).detail instanceof ConnectException) {
  +                        System.out.println("Connect failure caused JAXM 
DelayedStockQuote to be skipped.");
  +                        return;
  +                    }
  +                }
                   throw new Exception("Fault returned from test: " + t);
               } else {
                   e.printStackTrace();