You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by st...@apache.org on 2004/06/15 18:05:20 UTC

cvs commit: ws-axis/java/test/functional TestElementSample.java

stevel      2004/06/15 09:05:20

  Modified:    java/test/wsdl/esr EsrTestServiceTestCase.java
               java/test/wsdl/addrNoImplSEI
                        AddressBookDynamicProxyTestCase.java
               java/test/wsdd TestBadWSDD.java TestAdminService.java
               java/test/functional TestElementSample.java
  Log:
  move to new constructor of AxisClient, and factoring of hostname
  
  Revision  Changes    Path
  1.4       +3 -2      ws-axis/java/test/wsdl/esr/EsrTestServiceTestCase.java
  
  Index: EsrTestServiceTestCase.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/test/wsdl/esr/EsrTestServiceTestCase.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- EsrTestServiceTestCase.java	13 Dec 2003 20:43:01 -0000	1.3
  +++ EsrTestServiceTestCase.java	15 Jun 2004 16:05:20 -0000	1.4
  @@ -8,6 +8,7 @@
   package test.wsdl.esr;
   
   import org.apache.axis.transport.http.SimpleAxisWorker;
  +import org.apache.axis.utils.NetworkUtils;
   
   import javax.xml.namespace.QName;
   
  @@ -26,7 +27,7 @@
       public void test1EsrTestEsrInOut() {
           // Using WSDL file to make a SOAP call
           try {
  -            String thisHost = SimpleAxisWorker.getLocalHost();
  +            String thisHost = NetworkUtils.getLocalHostname();
               String thisPort = System.getProperty("test.functional.ServicePort", "8080");
   
               //load wsdl file
  @@ -84,7 +85,7 @@
       public void test1EsrTestEsrInOut2() {
           // Using WSDL file to make a SOAP call
           try {
  -            String thisHost = SimpleAxisWorker.getLocalHost();
  +            String thisHost = NetworkUtils.getLocalHostname();
               String thisPort = System.getProperty("test.functional.ServicePort", "8080");
   
               //load wsdl file
  
  
  
  1.4       +2 -1      ws-axis/java/test/wsdl/addrNoImplSEI/AddressBookDynamicProxyTestCase.java
  
  Index: AddressBookDynamicProxyTestCase.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/test/wsdl/addrNoImplSEI/AddressBookDynamicProxyTestCase.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- AddressBookDynamicProxyTestCase.java	25 Feb 2004 14:03:02 -0000	1.3
  +++ AddressBookDynamicProxyTestCase.java	15 Jun 2004 16:05:20 -0000	1.4
  @@ -18,6 +18,7 @@
   
   import junit.framework.TestCase;
   import org.apache.axis.transport.http.SimpleAxisWorker;
  +import org.apache.axis.utils.NetworkUtils;
   
   import javax.xml.namespace.QName;
   import javax.xml.rpc.Service;
  @@ -42,7 +43,7 @@
           String nameSpaceUri = "http://addrNoImplSEI.wsdl.test";
           String serviceName = "AddressBookNoImplSEIService";
   
  -        String thisHost = SimpleAxisWorker.getLocalHost();
  +        String thisHost = NetworkUtils.getLocalHostname();
           String thisPort = System.getProperty("test.functional.ServicePort", "8080");
   
           //location of wsdl file
  
  
  
  1.8       +1 -1      ws-axis/java/test/wsdd/TestBadWSDD.java
  
  Index: TestBadWSDD.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/test/wsdd/TestBadWSDD.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- TestBadWSDD.java	5 Sep 2003 17:58:59 -0000	1.7
  +++ TestBadWSDD.java	15 Jun 2004 16:05:20 -0000	1.8
  @@ -77,7 +77,7 @@
           Handler h1 = server.getHandler(HANDLER_NAME);
           assertNotNull("Couldn't get logger handler from engine!", h1);
   
  -        AdminClient client = new AdminClient();
  +        AdminClient client = new AdminClient(true);
           String doc = header + badHandler + footer;
           ByteArrayInputStream stream = new ByteArrayInputStream(doc.getBytes());
           
  
  
  
  1.6       +1 -1      ws-axis/java/test/wsdd/TestAdminService.java
  
  Index: TestAdminService.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/test/wsdd/TestAdminService.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- TestAdminService.java	5 Sep 2003 17:58:59 -0000	1.5
  +++ TestAdminService.java	15 Jun 2004 16:05:20 -0000	1.6
  @@ -68,7 +68,7 @@
           Handler handler = server.getHandler("other");
           assertNotNull("Couldn't get handler", handler);
   
  -        AdminClient client = new AdminClient();
  +        AdminClient client = new AdminClient(true);
           Call call = client.getCall();
           LocalTransport transport = new LocalTransport(server);
           transport.setRemoteService("AdminService");
  
  
  
  1.17      +3 -2      ws-axis/java/test/functional/TestElementSample.java
  
  Index: TestElementSample.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/test/functional/TestElementSample.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- TestElementSample.java	25 Feb 2004 14:02:55 -0000	1.16
  +++ TestElementSample.java	15 Jun 2004 16:05:20 -0000	1.17
  @@ -20,6 +20,7 @@
   import org.apache.axis.client.AdminClient;
   import org.apache.axis.components.logger.LogFactory;
   import org.apache.axis.transport.http.SimpleAxisWorker;
  +import org.apache.axis.utils.NetworkUtils;
   import org.apache.commons.logging.Log;
   import samples.encoding.TestElem;
   
  @@ -35,13 +36,13 @@
       }
       
       public void doTestElement () throws Exception {
  -        String thisHost = SimpleAxisWorker.getLocalHost();
  +        String thisHost = NetworkUtils.getLocalHostname();
           String thisPort = System.getProperty("test.functional.ServicePort","8080");
   
           String[] args = {thisHost,thisPort};
           String   xml = "<x:hello xmlns:x=\"urn:foo\">a string</x:hello>";
           System.out.println("Sending : " + xml );
  -        String res = new TestElem().doit(args, xml);
  +        String res = TestElem.doit(args, xml);
           System.out.println("Received: " + res );
           assertEquals("TestElementSample.doit(): xml must match", res, xml);
       }