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 di...@apache.org on 2006/01/19 17:23:25 UTC

svn commit: r370523 - in /webservices/axis/trunk/c/tests/auto_build/testcases: client/cpp/ output/

Author: dicka
Date: Thu Jan 19 08:23:20 2006
New Revision: 370523

URL: http://svn.apache.org/viewcvs?rev=370523&view=rev
Log:
Correct expected request/response messages and output.
Also provide a little additional checking in testcase.

Modified:
    webservices/axis/trunk/c/tests/auto_build/testcases/client/cpp/ComplexTypeChoiceNestedSequenceClient.cpp
    webservices/axis/trunk/c/tests/auto_build/testcases/output/ComplexTypeChoiceNestedSequence.cpp.out
    webservices/axis/trunk/c/tests/auto_build/testcases/output/ComplexTypeChoiceNestedSequence.request
    webservices/axis/trunk/c/tests/auto_build/testcases/output/ComplexTypeChoiceNestedSequence_ServerResponse.expected

Modified: webservices/axis/trunk/c/tests/auto_build/testcases/client/cpp/ComplexTypeChoiceNestedSequenceClient.cpp
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/tests/auto_build/testcases/client/cpp/ComplexTypeChoiceNestedSequenceClient.cpp?rev=370523&r1=370522&r2=370523&view=diff
==============================================================================
--- webservices/axis/trunk/c/tests/auto_build/testcases/client/cpp/ComplexTypeChoiceNestedSequenceClient.cpp (original)
+++ webservices/axis/trunk/c/tests/auto_build/testcases/client/cpp/ComplexTypeChoiceNestedSequenceClient.cpp Thu Jan 19 08:23:20 2006
@@ -61,6 +61,7 @@
 					input->field1 = "hello";
 					input->field2 = "world";
 					input->field3 = "I am still here!";
+                        // As the final choice element this should be the only one present in serialized message
 					
 
 			
@@ -68,9 +69,22 @@
 					result = ws->asComplexType(input);
 					if ( result == NULL )
 						cout << "result object is null" << endl;
-					cout << "Result field1 is = " << result->field1 << endl;
-					cout << "Result field2 is = " << result->field2 << endl;
-					cout << "Result field3 is = " << result->field3 << endl; 
+                    if (result->field1)
+                    {
+					   cout << "Result field1 is = " << result->field1 << endl;
+                    }
+                    if (result->field2)
+                    {
+					   cout << "Result field2 is = " << result->field2 << endl;
+                    }
+                    if (result->field3)
+                    {
+					   cout << "Result field3 is = " << result->field3 << endl; 
+                    }
+                    if (result->field4)
+                    {
+                        cout << "Result field4 is = " << result->field4 << endl;
+                    }
 					
 
 					bSuccess = true;

Modified: webservices/axis/trunk/c/tests/auto_build/testcases/output/ComplexTypeChoiceNestedSequence.cpp.out
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/tests/auto_build/testcases/output/ComplexTypeChoiceNestedSequence.cpp.out?rev=370523&r1=370522&r2=370523&view=diff
==============================================================================
--- webservices/axis/trunk/c/tests/auto_build/testcases/output/ComplexTypeChoiceNestedSequence.cpp.out (original)
+++ webservices/axis/trunk/c/tests/auto_build/testcases/output/ComplexTypeChoiceNestedSequence.cpp.out Thu Jan 19 08:23:20 2006
@@ -1,2 +1,2 @@
-Result field1 is = hello
----------------------- TEST COMPLETE -----------------------------
\ No newline at end of file
+Result field3 is = I am still here!
+---------------------- TEST COMPLETE -----------------------------

Modified: webservices/axis/trunk/c/tests/auto_build/testcases/output/ComplexTypeChoiceNestedSequence.request
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/tests/auto_build/testcases/output/ComplexTypeChoiceNestedSequence.request?rev=370523&r1=370522&r2=370523&view=diff
==============================================================================
--- webservices/axis/trunk/c/tests/auto_build/testcases/output/ComplexTypeChoiceNestedSequence.request (original)
+++ webservices/axis/trunk/c/tests/auto_build/testcases/output/ComplexTypeChoiceNestedSequence.request Thu Jan 19 08:23:20 2006
@@ -2,17 +2,15 @@
 Host: 127.0.0.1:13260
 Content-Type: text/xml; charset=UTF-8
 SOAPAction: "http://complextype.test.apache.org"
-Content-Length: 485
+Content-Length: 448
+
+<?xml version='1.0' encoding='utf-8' ?>
+<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<SOAP-ENV:Body>
+<ns1:asComplexTypeRequest xmlns:ns1="http://xsd_byte.test.apache.org">
+<SimpleComplexType1><field3>I am still here!</field3>
+</SimpleComplexType1>
+</ns1:asComplexTypeRequest>
+</SOAP-ENV:Body>
+</SOAP-ENV:Envelope>
 
-<?xml version='1.0' encoding='utf-8' ?>
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-<SOAP-ENV:Body>
-<ns1:myOperation xmlns:ns1="http://complextype.test.apache.org">
-<ns1:aType><ns1:field1>hello</ns1:field1>
-<ns1:field2>world</ns1:field2>
-<ns1:field3>I am still here!</ns1:field3>
-</ns1:aType>
-</ns1:myOperation>
-</SOAP-ENV:Body>
-</SOAP-ENV:Envelope>
-

Modified: webservices/axis/trunk/c/tests/auto_build/testcases/output/ComplexTypeChoiceNestedSequence_ServerResponse.expected
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/tests/auto_build/testcases/output/ComplexTypeChoiceNestedSequence_ServerResponse.expected?rev=370523&r1=370522&r2=370523&view=diff
==============================================================================
--- webservices/axis/trunk/c/tests/auto_build/testcases/output/ComplexTypeChoiceNestedSequence_ServerResponse.expected (original)
+++ webservices/axis/trunk/c/tests/auto_build/testcases/output/ComplexTypeChoiceNestedSequence_ServerResponse.expected Thu Jan 19 08:23:20 2006
@@ -4,8 +4,8 @@
 Content-Language: en-US
 Transfer-Encoding: chunked
 
-2e0
+###
 <?xml version="1.0" encoding="UTF-8"?>
-<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><soapenv:Body><asComplexTypeResponse xmlns="http://xsd_byte.test.apache.org"><SimpleComplexType1 xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns1="http://xsd_byte.test.apache.org" xmlns=""><field1>hello</field1><field2>world</field2><field3>I am still here!</field3></SimpleComplexType1></asComplexTypeResponse></soapenv:Body></soapenv:Envelope>
+<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><soapenv:Body><asComplexTypeResponse xmlns="http://xsd_byte.test.apache.org"><SimpleComplexType1 xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns1="http://xsd_byte.test.apache.org" xmlns=""><field3>I am still here!</field3></SimpleComplexType1></asComplexTypeResponse></soapenv:Body></soapenv:Envelope>
 0