ws-axis-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From perr...@apache.org
Subject cvs commit: ws-axis/c/tests/auto_build/testcases/wsdls InOut.wsdl
Date Tue, 22 Mar 2005 15:23:08 GMT
perryan     2005/03/22 07:23:07

  Modified:    c/tests/auto_build/testcases/client/cpp InOutClient.cpp
               c/tests/auto_build/testcases/output InOut.expected
               c/tests/auto_build/testcases/wsdls InOut.wsdl
  Log:
  Modified the WSDL to remove the multi element return type as there is a bug in WSDL2Ws at
present (see AXSICPP-565)
  Added a more complex  mixed parameter test, and added a nillable version of same operation
and pass nils
  
  Revision  Changes    Path
  1.2       +42 -1     ws-axis/c/tests/auto_build/testcases/client/cpp/InOutClient.cpp
  
  Index: InOutClient.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/client/cpp/InOutClient.cpp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- InOutClient.cpp	18 Mar 2005 12:21:04 -0000	1.1
  +++ InOutClient.cpp	22 Mar 2005 15:23:07 -0000	1.2
  @@ -39,10 +39,51 @@
   		ws.multiParametersNoReturn("Hey dude", 69, (xsd__double)17.19);
   		cout << "multiParametersNoReturn returned" << endl;
   
  +		xsd__int_Array intArray;
  +		intArray.m_Array = new xsd__int[3];
  +		intArray.m_Size = 3;
  +		intArray.m_Array[0]=37;
  +		intArray.m_Array[1]=0;
  +		intArray.m_Array[2]=43;
  +
  +		xsd__string_Array stringArray;
  +		stringArray.m_Array = new xsd__string[3];
  +		stringArray.m_Size = 3;
  +		stringArray.m_Array[0]="One";
  +		stringArray.m_Array[1]="Two";
  +		stringArray.m_Array[2]="Three";
  +
  +		ComplexType1 ct;
  +		ct.ctLong = (xsd__long)87654321;
  +		ct.ctString = "World";
  +		ct.ctIntArray = intArray;
  +
  +		cout << "multiComplexParametersIntReturn" << endl;
  +		int mcpir = ws.multiComplexParametersIntReturn("Hello", &ct, 27, 13.31, stringArray);
  +		cout << "multiComplexParametersIntReturn returned " << mcpir << endl;
  +
  +		stringArray.m_Array[0]="Four";
  +		stringArray.m_Array[1]=NULL;
  +		stringArray.m_Array[2]="Six";
  +
  +		ComplexNilType1 cnt;
  +		cnt.ctLong = (xsd__long)87654321;
  +		cnt.ctString = NULL;
  +		cnt.ctIntArray = intArray;
  +
  +		cout << "multiComplexParametersNilIntReturn" << endl;
  +		mcpir = ws.multiComplexParametersNilIntReturn(NULL, &cnt, NULL, NULL, stringArray);
  +		cout << "multiComplexParametersNilIntReturn returned " << mcpir <<
endl;
  +
  +		/* Commented out as there is a bug in WSDL2Ws.
  +		 * AXISCPP-565 is the Jira against this problem.
  +         *
   		cout << "noParametersMultiReturn" << endl;
   		ws.noParametersMultiReturn(&moDouble, &moInt, &moString);
   		cout << "noParametersMultiReturn returned " << *moDouble << " " <<
*moInt << " " << moString << endl;
  -
  +		 *
  +		 * Removed from WSDL for time being.
  +		 */
   
           int_in.m_Array = new xsd__int[ARRAYSIZE];
           int_in.m_Size = ARRAYSIZE;
  
  
  
  1.2       +4 -2      ws-axis/c/tests/auto_build/testcases/output/InOut.expected
  
  Index: InOut.expected
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/output/InOut.expected,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- InOut.expected	18 Mar 2005 12:21:04 -0000	1.1
  +++ InOut.expected	22 Mar 2005 15:23:07 -0000	1.2
  @@ -4,8 +4,10 @@
   noParametersIntReturn returned 27
   multiParametersNoReturn
   multiParametersNoReturn returned
  -noParametersMultiReturn
  -noParametersMultiReturn returned 39.41 99 Well Done
  +multiComplexParametersIntReturn
  +multiComplexParametersIntReturn returned 41
  +multiComplexParametersNilIntReturn
  +multiComplexParametersNilIntReturn returned 42
   multiArrayParametersIntReturn
   multiArrayParametersIntReturn returned 43
   ---------------------- TEST COMPLETE -----------------------------
  
  
  
  1.2       +132 -22   ws-axis/c/tests/auto_build/testcases/wsdls/InOut.wsdl
  
  Index: InOut.wsdl
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/tests/auto_build/testcases/wsdls/InOut.wsdl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- InOut.wsdl	18 Mar 2005 12:21:05 -0000	1.1
  +++ InOut.wsdl	22 Mar 2005 15:23:07 -0000	1.2
  @@ -38,26 +38,62 @@
        <sequence/>
       </complexType>
      </element>
  -   <element name="noParametersMultiReturn">
  +   <element name="multiComplexParametersIntReturn">
       <complexType>
  -     <sequence/>
  +     <sequence>
  +      <element name="arg_0_3" nillable="true" type="xsd:string"/>
  +      <element name="arg_1_3" nillable="true" type="impl:ComplexType1"/>
  +      <element name="arg_2_3" type="xsd:int"/>
  +      <element name="arg_3_3" type="xsd:double"/>
  +      <element maxOccurs="unbounded" name="arg_4_3" type="xsd:string"/>
  +     </sequence>
  +    </complexType>
  +   </element>
  +   <complexType name="ComplexType1">
  +    <sequence>
  +     <element name="ctLong" type="xsd:long"/>
  +     <element maxOccurs="unbounded" name="ctIntArray" type="xsd:int"/>
  +     <element name="ctString" nillable="true" type="xsd:string"/>
  +    </sequence>
  +   </complexType>
  +   <element name="multiComplexParametersIntReturnResponse">
  +    <complexType>
  +     <sequence>
  +      <element name="multiComplexParametersIntReturnReturn" type="xsd:int"/>
  +     </sequence>
  +    </complexType>
  +   </element>
  +   <element name="multiComplexParametersNilIntReturn">
  +    <complexType>
  +     <sequence>
  +      <element name="arg_0_4" nillable="true" type="xsd:string"/>
  +      <element name="arg_1_4" nillable="true" type="impl:ComplexNilType1"/>
  +      <element name="arg_2_4" nillable="true" type="xsd:int"/>
  +      <element name="arg_3_4" nillable="true" type="xsd:double"/>
  +      <element maxOccurs="unbounded" name="arg_4_4" nillable="true" type="xsd:string"/>
  +     </sequence>
       </complexType>
      </element>
  -   <element name="noParametersMultiReturnResponse">
  +   <complexType name="ComplexNilType1">
  +    <sequence>
  +     <element name="ctLong" nillable="true" type="xsd:long"/>
  +     <element maxOccurs="unbounded" name="ctIntArray" nillable="true" type="xsd:int"/>
  +     <element name="ctString" nillable="true" type="xsd:string"/>
  +    </sequence>
  +   </complexType>
  +   <element name="multiComplexParametersNilIntReturnResponse">
       <complexType>
        <sequence>
  -      <element name="returnDouble" type="xsd:double"/>
  -      <element name="returnInt" type="xsd:int"/>
  -      <element name="returnString" nillable="true" type="xsd:string"/>
  +      <element name="multiComplexParametersNilIntReturnReturn" type="xsd:int"/>
        </sequence>
       </complexType>
      </element>
      <element name="multiArrayParametersIntReturn">
       <complexType>
        <sequence>
  -      <element maxOccurs="unbounded" minOccurs="0" name="arg_0_4" type="xsd:int"/>
  -      <element maxOccurs="unbounded" minOccurs="0" name="arg_1_4" type="xsd:double"/>
  -      <element maxOccurs="unbounded" minOccurs="0" name="arg_2_4" type="xsd:string"/>
  +      <element maxOccurs="unbounded" minOccurs="0" name="arg_0_5" type="xsd:int"/>
  +      <element maxOccurs="unbounded" minOccurs="0" name="arg_1_5" type="xsd:double"/>
  +      <element maxOccurs="unbounded" minOccurs="0" name="arg_2_5" type="xsd:string"/>
        </sequence>
       </complexType>
      </element>
  @@ -72,70 +108,125 @@
    </wsdl:types>
   
      <wsdl:message name="noParametersIntReturnResponse">
  +
         <wsdl:part element="impl:noParametersIntReturnResponse" name="parameters"/>
  +
      </wsdl:message>
   
      <wsdl:message name="noParametersNoReturnRequest">
  +
         <wsdl:part element="impl:noParametersNoReturn" name="parameters"/>
  +
  +   </wsdl:message>
  +
  +   <wsdl:message name="multiComplexParametersIntReturnResponse">
  +
  +      <wsdl:part element="impl:multiComplexParametersIntReturnResponse" name="parameters"/>
  +
      </wsdl:message>
   
      <wsdl:message name="multiArrayParametersIntReturnRequest">
  +
         <wsdl:part element="impl:multiArrayParametersIntReturn" name="parameters"/>
  +
  +   </wsdl:message>
  +
  +   <wsdl:message name="multiComplexParametersNilIntReturnResponse">
  +
  +      <wsdl:part element="impl:multiComplexParametersNilIntReturnResponse" name="parameters"/>
  +
      </wsdl:message>
   
      <wsdl:message name="noParametersNoReturnResponse">
  +
         <wsdl:part element="impl:noParametersNoReturnResponse" name="parameters"/>
  -   </wsdl:message>
   
  -   <wsdl:message name="noParametersMultiReturnRequest">
  -      <wsdl:part element="impl:noParametersMultiReturn" name="parameters"/>
      </wsdl:message>
   
      <wsdl:message name="multiParametersNoReturnRequest">
  +
         <wsdl:part element="impl:multiParametersNoReturn" name="parameters"/>
  +
      </wsdl:message>
   
      <wsdl:message name="noParametersIntReturnRequest">
  +
         <wsdl:part element="impl:noParametersIntReturn" name="parameters"/>
  +
  +   </wsdl:message>
  +
  +   <wsdl:message name="multiComplexParametersIntReturnRequest">
  +
  +      <wsdl:part element="impl:multiComplexParametersIntReturn" name="parameters"/>
  +
  +   </wsdl:message>
  +
  +   <wsdl:message name="multiComplexParametersNilIntReturnRequest">
  +
  +      <wsdl:part element="impl:multiComplexParametersNilIntReturn" name="parameters"/>
  +
      </wsdl:message>
   
      <wsdl:message name="multiArrayParametersIntReturnResponse">
  +
         <wsdl:part element="impl:multiArrayParametersIntReturnResponse" name="parameters"/>
  -   </wsdl:message>
   
  -   <wsdl:message name="noParametersMultiReturnResponse">
  -      <wsdl:part element="impl:noParametersMultiReturnResponse" name="parameters"/>
      </wsdl:message>
   
      <wsdl:message name="multiParametersNoReturnResponse">
  +
         <wsdl:part element="impl:multiParametersNoReturnResponse" name="parameters"/>
  +
      </wsdl:message>
   
      <wsdl:portType name="InOut">
   
         <wsdl:operation name="noParametersNoReturn">
  +
            <wsdl:input message="impl:noParametersNoReturnRequest" name="noParametersNoReturnRequest"/>
  +
            <wsdl:output message="impl:noParametersNoReturnResponse" name="noParametersNoReturnResponse"/>
  +
         </wsdl:operation>
   
         <wsdl:operation name="noParametersIntReturn">
  +
            <wsdl:input message="impl:noParametersIntReturnRequest" name="noParametersIntReturnRequest"/>
  +
            <wsdl:output message="impl:noParametersIntReturnResponse" name="noParametersIntReturnResponse"/>
  +
         </wsdl:operation>
   
         <wsdl:operation name="multiParametersNoReturn">
  +
            <wsdl:input message="impl:multiParametersNoReturnRequest" name="multiParametersNoReturnRequest"/>
  +
            <wsdl:output message="impl:multiParametersNoReturnResponse" name="multiParametersNoReturnResponse"/>
  +
  +      </wsdl:operation>
  +
  +      <wsdl:operation name="multiComplexParametersIntReturn">
  +
  +         <wsdl:input message="impl:multiComplexParametersIntReturnRequest" name="multiComplexParametersIntReturnRequest"/>
  +
  +         <wsdl:output message="impl:multiComplexParametersIntReturnResponse" name="multiComplexParametersIntReturnResponse"/>
  +
         </wsdl:operation>
   
  -      <wsdl:operation name="noParametersMultiReturn">
  -         <wsdl:input message="impl:noParametersMultiReturnRequest" name="noParametersMultiReturnRequest"/>
  -         <wsdl:output message="impl:noParametersMultiReturnResponse" name="noParametersMultiReturnResponse"/>
  +      <wsdl:operation name="multiComplexParametersNilIntReturn">
  +
  +         <wsdl:input message="impl:multiComplexParametersNilIntReturnRequest" name="multiComplexParametersNilIntReturnRequest"/>
  +
  +         <wsdl:output message="impl:multiComplexParametersNilIntReturnResponse" name="multiComplexParametersNilIntReturnResponse"/>
  +
         </wsdl:operation>
   
         <wsdl:operation name="multiArrayParametersIntReturn">
  +
            <wsdl:input message="impl:multiArrayParametersIntReturnRequest" name="multiArrayParametersIntReturnRequest"/>
  +
            <wsdl:output message="impl:multiArrayParametersIntReturnResponse" name="multiArrayParametersIntReturnResponse"/>
  +
         </wsdl:operation>
   
      </wsdl:portType>
  @@ -198,17 +289,35 @@
   
         </wsdl:operation>
   
  -      <wsdl:operation name="noParametersMultiReturn">
  +      <wsdl:operation name="multiComplexParametersIntReturn">
  +
  +         <wsdlsoap:operation soapAction=""/>
  +
  +         <wsdl:input name="multiComplexParametersIntReturnRequest">
  +
  +            <wsdlsoap:body use="literal"/>
  +
  +         </wsdl:input>
  +
  +         <wsdl:output name="multiComplexParametersIntReturnResponse">
  +
  +            <wsdlsoap:body use="literal"/>
  +
  +         </wsdl:output>
  +
  +      </wsdl:operation>
  +
  +      <wsdl:operation name="multiComplexParametersNilIntReturn">
   
            <wsdlsoap:operation soapAction=""/>
   
  -         <wsdl:input name="noParametersMultiReturnRequest">
  +         <wsdl:input name="multiComplexParametersNilIntReturnRequest">
   
               <wsdlsoap:body use="literal"/>
   
            </wsdl:input>
   
  -         <wsdl:output name="noParametersMultiReturnResponse">
  +         <wsdl:output name="multiComplexParametersNilIntReturnResponse">
   
               <wsdlsoap:body use="literal"/>
   
  @@ -240,10 +349,11 @@
   
         <wsdl:port binding="impl:InOutSoapBinding" name="InOut">
   
  -         <wsdlsoap:address location="http://lion:9080/InOut/services/InOut"/>
  +         <wsdlsoap:address location="http://localhost:9080/InOut/services/InOut"/>
   
         </wsdl:port>
   
      </wsdl:service>
   
   </wsdl:definitions>
  +
  
  
  

Mime
View raw message