You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by gd...@apache.org on 2002/10/07 06:12:23 UTC

cvs commit: xml-axis/java/test/wsdl/interop4/groupH/complexRPCenc ComplexRpcEncServiceTestCase.java

gdaniels    2002/10/06 21:12:23

  Modified:    java/test/wsdl/interop4/groupH/complexDocLit Tag: interop4
                        ComplexDocLitBindingImpl.java
                        ComplexDocLitServiceTestCase.java
               java/test/wsdl/interop4/groupH/complexRPCenc Tag: interop4
                        ComplexRpcEncServiceTestCase.java
  Log:
  OK, framework code in place, but the extended struct doc lit test isn't
  working for some reason.  Will look at it tomorrow.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.2   +19 -11    xml-axis/java/test/wsdl/interop4/groupH/complexDocLit/Attic/ComplexDocLitBindingImpl.java
  
  Index: ComplexDocLitBindingImpl.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/wsdl/interop4/groupH/complexDocLit/Attic/ComplexDocLitBindingImpl.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- ComplexDocLitBindingImpl.java	7 Oct 2002 03:49:38 -0000	1.1.2.1
  +++ ComplexDocLitBindingImpl.java	7 Oct 2002 04:12:23 -0000	1.1.2.2
  @@ -7,25 +7,33 @@
   
   package test.wsdl.interop4.groupH.complexDocLit;
   
  -public class ComplexDocLitBindingImpl implements test.wsdl.interop4.groupH.complexDocLit.ComplexDocLitPortType{
  -    public test.wsdl.interop4.groupH.complexDocLit.EchoSOAPStructFaultResponse echoSOAPStructFault(test.wsdl.interop4.groupH.complexDocLit.SOAPStruct param) throws java.rmi.RemoteException, test.wsdl.interop4.groupH.complexDocLit.SOAPStructFault {
  -        return null;
  +public class ComplexDocLitBindingImpl implements ComplexDocLitPortType{
  +    public EchoSOAPStructFaultResponse echoSOAPStructFault(SOAPStruct param) throws java.rmi.RemoteException, SOAPStructFault {
  +        throw new SOAPStructFault(param);
       }
   
  -    public test.wsdl.interop4.groupH.complexDocLit.EchoBaseStructFaultResponse echoBaseStructFault(test.wsdl.interop4.groupH.complexDocLit.BaseStruct param) throws java.rmi.RemoteException, test.wsdl.interop4.groupH.complexDocLit.BaseStruct {
  -        return null;
  +    public EchoBaseStructFaultResponse echoBaseStructFault(BaseStruct param) throws java.rmi.RemoteException, BaseStruct {
  +        throw param;
       }
   
  -    public test.wsdl.interop4.groupH.complexDocLit.EchoExtendedStructFaultResponse echoExtendedStructFault(test.wsdl.interop4.groupH.complexDocLit.ExtendedStruct param) throws java.rmi.RemoteException, test.wsdl.interop4.groupH.complexDocLit.ExtendedStruct {
  -        return null;
  +    public EchoExtendedStructFaultResponse echoExtendedStructFault(ExtendedStruct param) throws java.rmi.RemoteException, ExtendedStruct {
  +        throw param;
       }
   
  -    public test.wsdl.interop4.groupH.complexDocLit.EchoMultipleFaults1Response echoMultipleFaults1(test.wsdl.interop4.groupH.complexDocLit.EchoMultipleFaults1Request param) throws java.rmi.RemoteException, test.wsdl.interop4.groupH.complexDocLit.BaseStruct, test.wsdl.interop4.groupH.complexDocLit.SOAPStructFault {
  -        return null;
  +    public EchoMultipleFaults1Response echoMultipleFaults1(EchoMultipleFaults1Request param) throws java.rmi.RemoteException, BaseStruct, SOAPStructFault {
  +        if (param.getWhichFault() == 2) {
  +            throw param.getParam2();
  +        }
  +        throw new SOAPStructFault(param.getParam1());
       }
   
  -    public test.wsdl.interop4.groupH.complexDocLit.EchoMultipleFaults2Response echoMultipleFaults2(test.wsdl.interop4.groupH.complexDocLit.EchoMultipleFaults2Request param) throws java.rmi.RemoteException, test.wsdl.interop4.groupH.complexDocLit.MoreExtendedStruct, test.wsdl.interop4.groupH.complexDocLit.ExtendedStruct, test.wsdl.interop4.groupH.complexDocLit.BaseStruct {
  -        return null;
  +    public EchoMultipleFaults2Response echoMultipleFaults2(EchoMultipleFaults2Request param) throws java.rmi.RemoteException, MoreExtendedStruct, ExtendedStruct, BaseStruct {
  +        if (param.getWhichFault() == 2) {
  +            throw param.getParam2();
  +        } else if (param.getWhichFault() == 3) {
  +            throw param.getParam3();
  +        }
  +        throw param.getParam1();
       }
   
   }
  
  
  
  1.1.2.2   +145 -54   xml-axis/java/test/wsdl/interop4/groupH/complexDocLit/Attic/ComplexDocLitServiceTestCase.java
  
  Index: ComplexDocLitServiceTestCase.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/wsdl/interop4/groupH/complexDocLit/Attic/ComplexDocLitServiceTestCase.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- ComplexDocLitServiceTestCase.java	7 Oct 2002 03:49:38 -0000	1.1.2.1
  +++ ComplexDocLitServiceTestCase.java	7 Oct 2002 04:12:23 -0000	1.1.2.2
  @@ -12,9 +12,9 @@
           super(name);
       }
       public void test1ComplexDocLitPortEchoSOAPStructFault() throws Exception {
  -        test.wsdl.interop4.groupH.complexDocLit.ComplexDocLitPortType binding;
  +        ComplexDocLitPortType binding;
           try {
  -            binding = new test.wsdl.interop4.groupH.complexDocLit.ComplexDocLitServiceLocator().getComplexDocLitPort();
  +            binding = new ComplexDocLitServiceLocator().getComplexDocLitPort();
           }
           catch (javax.xml.rpc.ServiceException jre) {
               if(jre.getLinkedCause()!=null)
  @@ -24,20 +24,26 @@
           assertTrue("binding is null", binding != null);
   
           // Test operation
  -        try {
  -            test.wsdl.interop4.groupH.complexDocLit.EchoSOAPStructFaultResponse value = null;
  -            value = binding.echoSOAPStructFault(new test.wsdl.interop4.groupH.complexDocLit.SOAPStruct());
  -        }
  -        catch (test.wsdl.interop4.groupH.complexDocLit.SOAPStructFault e1) {
  -            throw new junit.framework.AssertionFailedError("ComplexFault Exception caught: " + e1);
  +        SOAPStruct soapStruct = new SOAPStruct();
  +        soapStruct.setVarFloat(1.1F);
  +        soapStruct.setVarInt(3);
  +        soapStruct.setVarString("Fault test");
  +        
  +        try {
  +            binding.echoSOAPStructFault(soapStruct);
  +        }
  +        catch (SOAPStructFault e1) {
  +            assertEquals("SOAPStruct values not equal",
  +                         soapStruct, e1.getSoapStruct());
  +            return;
           }
  -            // TBD - validate results
  +        fail("Should have caught exception!");
       }
   
       public void test2ComplexDocLitPortEchoBaseStructFault() throws Exception {
  -        test.wsdl.interop4.groupH.complexDocLit.ComplexDocLitPortType binding;
  +        ComplexDocLitPortType binding;
           try {
  -            binding = new test.wsdl.interop4.groupH.complexDocLit.ComplexDocLitServiceLocator().getComplexDocLitPort();
  +            binding = new ComplexDocLitServiceLocator().getComplexDocLitPort();
           }
           catch (javax.xml.rpc.ServiceException jre) {
               if(jre.getLinkedCause()!=null)
  @@ -47,20 +53,26 @@
           assertTrue("binding is null", binding != null);
   
           // Test operation
  -        try {
  -            test.wsdl.interop4.groupH.complexDocLit.EchoBaseStructFaultResponse value = null;
  -            value = binding.echoBaseStructFault(new test.wsdl.interop4.groupH.complexDocLit.BaseStruct());
  -        }
  -        catch (test.wsdl.interop4.groupH.complexDocLit.BaseStruct e1) {
  -            throw new junit.framework.AssertionFailedError("ComplexFault Exception caught: " + e1);
  +        short s = 30;
  +        SOAPStruct soapStruct = new SOAPStruct();
  +        soapStruct.setVarFloat(1.1F);
  +        soapStruct.setVarInt(3);
  +        soapStruct.setVarString("Fault test");
  +        BaseStruct param = new BaseStruct(soapStruct, s);
  +        try {
  +            binding.echoBaseStructFault(param);
  +        }
  +        catch (BaseStruct e1) {
  +            assertEquals("BaseStruct values not equal", param, e1);
  +            return;
           }
  -            // TBD - validate results
  +        fail("Should have caught exception!");
       }
   
       public void test3ComplexDocLitPortEchoExtendedStructFault() throws Exception {
  -        test.wsdl.interop4.groupH.complexDocLit.ComplexDocLitPortType binding;
  +        ComplexDocLitPortType binding;
           try {
  -            binding = new test.wsdl.interop4.groupH.complexDocLit.ComplexDocLitServiceLocator().getComplexDocLitPort();
  +            binding = new ComplexDocLitServiceLocator().getComplexDocLitPort();
           }
           catch (javax.xml.rpc.ServiceException jre) {
               if(jre.getLinkedCause()!=null)
  @@ -70,20 +82,34 @@
           assertTrue("binding is null", binding != null);
   
           // Test operation
  -        try {
  -            test.wsdl.interop4.groupH.complexDocLit.EchoExtendedStructFaultResponse value = null;
  -            value = binding.echoExtendedStructFault(new test.wsdl.interop4.groupH.complexDocLit.ExtendedStruct());
  -        }
  -        catch (test.wsdl.interop4.groupH.complexDocLit.ExtendedStruct e1) {
  -            throw new junit.framework.AssertionFailedError("ComplexFault Exception caught: " + e1);
  +        ExtendedStruct extended = new ExtendedStruct();
  +        SOAPStruct soapStruct = new SOAPStruct();
  +        soapStruct.setVarFloat(1.1F);
  +        soapStruct.setVarInt(3);
  +        soapStruct.setVarString("Fault test");
  +        
  +        extended.setIntMessage(1);
  +        extended.setAnotherIntMessage(2);
  +        extended.setStructMessage(soapStruct);
  +        extended.setShortMessage((short)5);
  +        extended.setStringMessage("This is an ExtendedStruct");
  +        
  +        
  +        try {
  +            binding.echoExtendedStructFault(extended);
  +        }
  +        catch (ExtendedStruct e1) {
  +            assertEquals("ExtendedStruct values not equal", extended, e1);
  +            return;
           }
  -            // TBD - validate results
  +
  +        fail("Should have caught exception!");
       }
   
       public void test4ComplexDocLitPortEchoMultipleFaults1() throws Exception {
  -        test.wsdl.interop4.groupH.complexDocLit.ComplexDocLitPortType binding;
  +        ComplexDocLitPortType binding;
           try {
  -            binding = new test.wsdl.interop4.groupH.complexDocLit.ComplexDocLitServiceLocator().getComplexDocLitPort();
  +            binding = new ComplexDocLitServiceLocator().getComplexDocLitPort();
           }
           catch (javax.xml.rpc.ServiceException jre) {
               if(jre.getLinkedCause()!=null)
  @@ -93,23 +119,49 @@
           assertTrue("binding is null", binding != null);
   
           // Test operation
  -        try {
  -            test.wsdl.interop4.groupH.complexDocLit.EchoMultipleFaults1Response value = null;
  -            value = binding.echoMultipleFaults1(new test.wsdl.interop4.groupH.complexDocLit.EchoMultipleFaults1Request());
  -        }
  -        catch (test.wsdl.interop4.groupH.complexDocLit.BaseStruct e1) {
  -            throw new junit.framework.AssertionFailedError("ComplexFault2 Exception caught: " + e1);
  +        BaseStruct base = new BaseStruct();
  +        base.setShortMessage((short)4);
  +        
  +        SOAPStruct soapStruct = new SOAPStruct();
  +        soapStruct.setVarFloat(1.1F);
  +        soapStruct.setVarInt(3);
  +        soapStruct.setVarString("Fault test");
  +        
  +        base.setStructMessage(soapStruct);
  +        
  +        SOAPStruct struct = new SOAPStruct();
  +        struct.setVarFloat(1.1F);
  +        struct.setVarInt(5);
  +        struct.setVarString("Twas a dark and stormy night...");
  +
  +        for (int i = 1; i < 3; i++) {
  +            try {
  +                EchoMultipleFaults1Request param = 
  +                        new EchoMultipleFaults1Request();
  +                param.setWhichFault(i);
  +                param.setParam1(struct);
  +                param.setParam2(base);
  +                binding.echoMultipleFaults1(param);
  +            }
  +            catch (BaseStruct e1) {
  +                assertEquals("Wrong fault thrown: " + e1.getClass(), 2, i);
  +                assertEquals("Bad data echoed", base, e1);
  +                continue;
  +            }
  +            catch (SOAPStructFault e2) {
  +                assertEquals("Wrong fault thrown: " + e2.getClass(), 1, i);
  +                assertEquals("Bad data echoed", struct, e2.getSoapStruct());
  +                continue;
  +            }
  +            
  +            fail("Should have caught exception!");
           }
  -        catch (test.wsdl.interop4.groupH.complexDocLit.SOAPStructFault e2) {
  -            throw new junit.framework.AssertionFailedError("ComplexFault1 Exception caught: " + e2);
  -        }
  -            // TBD - validate results
       }
   
       public void test5ComplexDocLitPortEchoMultipleFaults2() throws Exception {
  -        test.wsdl.interop4.groupH.complexDocLit.ComplexDocLitPortType binding;
  +        ComplexDocLitPortType binding;
           try {
  -            binding = new test.wsdl.interop4.groupH.complexDocLit.ComplexDocLitServiceLocator().getComplexDocLitPort();
  +            binding = new ComplexDocLitServiceLocator().getComplexDocLitPort();
           }
           catch (javax.xml.rpc.ServiceException jre) {
               if(jre.getLinkedCause()!=null)
  @@ -118,21 +170,60 @@
           }
           assertTrue("binding is null", binding != null);
   
  +        SOAPStruct struct = new SOAPStruct();
  +        struct.setVarFloat(1.1F);
  +        struct.setVarInt(5);
  +        struct.setVarString("Twas a dark and stormy night...");
  +        
           // Test operation
  -        try {
  -            test.wsdl.interop4.groupH.complexDocLit.EchoMultipleFaults2Response value = null;
  -            value = binding.echoMultipleFaults2(new test.wsdl.interop4.groupH.complexDocLit.EchoMultipleFaults2Request());
  -        }
  -        catch (test.wsdl.interop4.groupH.complexDocLit.MoreExtendedStruct e1) {
  -            throw new junit.framework.AssertionFailedError("ComplexFault3 Exception caught: " + e1);
  -        }
  -        catch (test.wsdl.interop4.groupH.complexDocLit.ExtendedStruct e2) {
  -            throw new junit.framework.AssertionFailedError("ComplexFault2 Exception caught: " + e2);
  -        }
  -        catch (test.wsdl.interop4.groupH.complexDocLit.BaseStruct e3) {
  -            throw new junit.framework.AssertionFailedError("ComplexFault1 Exception caught: " + e3);
  +        BaseStruct base = new BaseStruct();
  +        base.setShortMessage((short)4);
  +        base.setStructMessage(struct);
  +        
  +        ExtendedStruct extended = new ExtendedStruct();
  +        extended.setIntMessage(1);
  +        extended.setAnotherIntMessage(2);
  +        extended.setShortMessage((short)5);
  +        extended.setStringMessage("This is an ExtendedStruct");
  +        extended.setStructMessage(struct);
  +        
  +        MoreExtendedStruct moreExtended = new MoreExtendedStruct();
  +        moreExtended.setBooleanMessage(true);
  +        moreExtended.setIntMessage(2);
  +        moreExtended.setAnotherIntMessage(3);
  +        moreExtended.setShortMessage((short)9);
  +        moreExtended.setStringMessage("This is a MoreExtendedStruct");
  +        moreExtended.setStructMessage(struct);
  +        
  +        // Test operation multiple times
  +        for (int i = 1; i < 4; i++) {
  +            try {
  +                EchoMultipleFaults2Request param = 
  +                        new EchoMultipleFaults2Request();
  +                param.setWhichFault(i);
  +                param.setParam1(base);
  +                param.setParam2(extended);
  +                param.setParam3(moreExtended);
  +                binding.echoMultipleFaults2(param);
  +            }
  +            catch (MoreExtendedStruct e3) {
  +                assertEquals("Wrong fault thrown: " + e3.getClass(), 3, i);
  +                assertEquals("Bad data echoed", moreExtended, e3);
  +                continue;
  +            }
  +            catch (ExtendedStruct e2) {
  +                assertEquals("Wrong fault thrown: " + e2.getClass(), 2, i);
  +                assertEquals("Bad data echoed", extended, e2);
  +                continue;
  +            }
  +            catch (BaseStruct e1) {
  +                assertEquals("Wrong fault thrown: " + e1.getClass(), 1, i);
  +                assertEquals("Bad data echoed", base, e1);
  +                continue;
  +            }
  +        
  +            fail("Should have caught exception!");
           }
  -            // TBD - validate results
       }
   
   }
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.2   +3 -3      xml-axis/java/test/wsdl/interop4/groupH/complexRPCenc/Attic/ComplexRpcEncServiceTestCase.java
  
  Index: ComplexRpcEncServiceTestCase.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/test/wsdl/interop4/groupH/complexRPCenc/Attic/ComplexRpcEncServiceTestCase.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- ComplexRpcEncServiceTestCase.java	7 Oct 2002 03:42:28 -0000	1.1.2.1
  +++ ComplexRpcEncServiceTestCase.java	7 Oct 2002 04:12:23 -0000	1.1.2.2
  @@ -173,17 +173,17 @@
               try {
                   binding.echoMultipleFaults2(i, base, extended, moreExtended);
               }
  -            catch (test.wsdl.interop4.groupH.complexRPCenc.MoreExtendedStruct e3) {
  +            catch (MoreExtendedStruct e3) {
                   assertEquals("Wrong fault thrown: " + e3.getClass(), 3, i);
                   assertEquals("Bad data echoed", moreExtended, e3);
                   continue;
               }
  -            catch (test.wsdl.interop4.groupH.complexRPCenc.ExtendedStruct e2) {
  +            catch (ExtendedStruct e2) {
                   assertEquals("Wrong fault thrown: " + e2.getClass(), 2, i);
                   assertEquals("Bad data echoed", extended, e2);
                   continue;
               }
  -            catch (test.wsdl.interop4.groupH.complexRPCenc.BaseStruct e1) {
  +            catch (BaseStruct e1) {
                   assertEquals("Wrong fault thrown: " + e1.getClass(), 1, i);
                   assertEquals("Bad data echoed", base, e1);
                   continue;