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 ch...@apache.org on 2006/04/29 15:50:53 UTC
svn commit: r398152 [1/3] - in
/webservices/axis2/trunk/java/modules/integration:
itest-resources/interop/whitemesa/round2/ itest/org/apache/axis2/rest/
itest/test/interop/whitemesa/round2/ src/test/interop/whitemesa/
src/test/interop/whitemesa/round2/...
Author: chamikara
Date: Sat Apr 29 06:50:49 2006
New Revision: 398152
URL: http://svn.apache.org/viewcvs?rev=398152&view=rev
Log:
Added a set of assertions to the WhiteMesaInterop class to validate the response envelopes according the the default wsdl (using xpath).
Added a new class WhiteMesaConstants
Changed the round2 test cases to use the above changes.
Added:
webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/WhiteMesaConstants.java
Modified:
webservices/axis2/trunk/java/modules/integration/itest-resources/interop/whitemesa/round2/ESBaseDateRes.xml
webservices/axis2/trunk/java/modules/integration/itest-resources/interop/whitemesa/round2/ESBaseStringArrayRes.xml
webservices/axis2/trunk/java/modules/integration/itest-resources/interop/whitemesa/round2/GSBaseDateRes.xml
webservices/axis2/trunk/java/modules/integration/itest-resources/interop/whitemesa/round2/GSBaseStringArrayRes.xml
webservices/axis2/trunk/java/modules/integration/itest-resources/interop/whitemesa/round2/MSRemBaseBase64Res.xml
webservices/axis2/trunk/java/modules/integration/itest-resources/interop/whitemesa/round2/MSaxmsBaseDateRes.xml
webservices/axis2/trunk/java/modules/integration/itest-resources/interop/whitemesa/round2/MSaxmsBaseStringArrayRes.xml
webservices/axis2/trunk/java/modules/integration/itest-resources/interop/whitemesa/round2/MStk3BaseDateRes.xml
webservices/axis2/trunk/java/modules/integration/itest-resources/interop/whitemesa/round2/MStk3BaseStringArrayRes.xml
webservices/axis2/trunk/java/modules/integration/itest-resources/interop/whitemesa/round2/MStk3BaseTypedDateRes.xml
webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/rest/GetTest.java
webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/rest/HttpGetRESTBasedTest.java
webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/rest/PostTest.java
webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/rest/RESTBasedEchoRawXMLTest.java
webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/rest/RESTGetTest.java
webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/ESRound2InteropTest.java
webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/GSRound2InteropTest.java
webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/KSRoun2InteropTest.java
webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/MSRemRound2InteropTest.java
webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/MSaxmsRound2InteropTest.java
webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/MStk3Round2InteropTest.java
webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/PSRound2InteropTest.java
webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/RWRound2InteropTest.java
webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/S4rRound2InteropTest.java
webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/S4s4c2Round2InteropTest.java
webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/S4s4cRound2InteropTest.java
webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/SPJRound2InteropTest.java
webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/SSRound2InteropTest.java
webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/SqlDataRound2InteropTest.java
webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/SunRound2InteropTest.java
webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/VWRound2InteropTest.java
webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/WFRound2InteropTest.java
webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/WMRound2InteropTest.java
webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/WaspRound2InteropTest.java
webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/XSRound2InteropTest.java
webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/WhiteMesaIneterop.java
webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoBase64ClientUtil.java
webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoBooleanClientUtil.java
webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoDateClientUtil.java
webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoDecimalClientUtil.java
webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoFloatArrayClientUtil.java
webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoFloatClientUtil.java
webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoHexBinaryClientUtil.java
webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoIntegerArrayclientUtil.java
webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoIntegerClientUtil.java
webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoStringArrayClientUtil.java
webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoStringclientUtil.java
webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoStructArrayClientUtil.java
webservices/axis2/trunk/java/modules/integration/src/test/interop/whitemesa/round2/util/Round2EchoStructClientUtil.java
Modified: webservices/axis2/trunk/java/modules/integration/itest-resources/interop/whitemesa/round2/ESBaseDateRes.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/itest-resources/interop/whitemesa/round2/ESBaseDateRes.xml?rev=398152&r1=398151&r2=398152&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/itest-resources/interop/whitemesa/round2/ESBaseDateRes.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/itest-resources/interop/whitemesa/round2/ESBaseDateRes.xml Sat Apr 29 06:50:49 2006
@@ -1,7 +1,7 @@
<E:Envelope xmlns:E="http://schemas.xmlsoap.org/soap/envelope/" xmlns:y="http://www.w3.org/2001/XMLSchema" xmlns:A="http://schemas.xmlsoap.org/soap/encoding/" xmlns:s="http://www.w3.org/2001/XMLSchema-instance" E:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">
<E:Body>
<m:echoDateResponse xmlns:m="http://soapinterop.org/">
-<return xmlns="" s:type="y:dateTime">2002-07-18T19:40:30.387-06:00</return>
+<return xmlns="" s:type="y:dateTime">2006-10-18T22:20:00-07:00</return>
</m:echoDateResponse>
</E:Body>
</E:Envelope>
Modified: webservices/axis2/trunk/java/modules/integration/itest-resources/interop/whitemesa/round2/ESBaseStringArrayRes.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/itest-resources/interop/whitemesa/round2/ESBaseStringArrayRes.xml?rev=398152&r1=398151&r2=398152&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/itest-resources/interop/whitemesa/round2/ESBaseStringArrayRes.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/itest-resources/interop/whitemesa/round2/ESBaseStringArrayRes.xml Sat Apr 29 06:50:49 2006
@@ -2,9 +2,9 @@
<E:Body>
<m:echoStringArrayResponse xmlns:m="http://soapinterop.org/">
<return xmlns="" A:arrayType="y:string[3]" s:type="A:Array">
-<item xmlns="">Apache Axis2</item>
-<item xmlns="">Lanka Software Foundation</item>
-<item xmlns="">www.opensource.lk</item>
+<item xmlns="">String Value1</item>
+<item xmlns="">String Value2</item>
+<item xmlns="">String Value3</item>
</return>
</m:echoStringArrayResponse>
</E:Body>
Modified: webservices/axis2/trunk/java/modules/integration/itest-resources/interop/whitemesa/round2/GSBaseDateRes.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/itest-resources/interop/whitemesa/round2/GSBaseDateRes.xml?rev=398152&r1=398151&r2=398152&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/itest-resources/interop/whitemesa/round2/GSBaseDateRes.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/itest-resources/interop/whitemesa/round2/GSBaseDateRes.xml Sat Apr 29 06:50:49 2006
@@ -1 +1 @@
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:a="http://xml.apache.org/xml-soap" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns="http://soapinterop.org/" xmlns:s="http://soapinterop.org/xsd"><SOAP-ENV:Header /><SOAP-ENV:Body SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" id="_0"><ns:echoDateResponse xmlns:ns="http://soapinterop.org/"><return xmlns="" xsi:type="xsd:dateTime">2002-07-18T19:40:30.387-06:00</return></ns:echoDateResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
\ No newline at end of file
+<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:a="http://xml.apache.org/xml-soap" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns="http://soapinterop.org/" xmlns:s="http://soapinterop.org/xsd"><SOAP-ENV:Header /><SOAP-ENV:Body SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" id="_0"><ns:echoDateResponse xmlns:ns="http://soapinterop.org/"><return xmlns="" xsi:type="xsd:dateTime">2006-10-18T22:20:00-07:00</return></ns:echoDateResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
\ No newline at end of file
Modified: webservices/axis2/trunk/java/modules/integration/itest-resources/interop/whitemesa/round2/GSBaseStringArrayRes.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/itest-resources/interop/whitemesa/round2/GSBaseStringArrayRes.xml?rev=398152&r1=398151&r2=398152&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/itest-resources/interop/whitemesa/round2/GSBaseStringArrayRes.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/itest-resources/interop/whitemesa/round2/GSBaseStringArrayRes.xml Sat Apr 29 06:50:49 2006
@@ -1 +1 @@
-<?xml version='1.0' encoding='utf-8'?><SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:a="http://xml.apache.org/xml-soap" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns="http://soapinterop.org/" xmlns:s="http://soapinterop.org/xsd"><SOAP-ENV:Header /><SOAP-ENV:Body SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" id="_0"><ns:echoStringArrayResponse xmlns:ns="http://soapinterop.org/"><return xmlns="" SOAP-ENC:offset="[0]" SOAP-ENC:arrayType="xsd:string[3]" xsi:type="SOAP-ENC:Array"><item xmlns="" xsi:type="xsd:string">Apache Axis2</item><item xmlns="" xsi:type="xsd:string">Lanka Software Foundation</item><item xmlns="" xsi:type="xsd:string">www.opensource.lk</item></return></ns:echoStringArrayResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
\ No newline at end of file
+<?xml version='1.0' encoding='utf-8'?><SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:a="http://xml.apache.org/xml-soap" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns="http://soapinterop.org/" xmlns:s="http://soapinterop.org/xsd"><SOAP-ENV:Header /><SOAP-ENV:Body SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" id="_0"><ns:echoStringArrayResponse xmlns:ns="http://soapinterop.org/"><return xmlns="" SOAP-ENC:offset="[0]" SOAP-ENC:arrayType="xsd:string[3]" xsi:type="SOAP-ENC:Array"><item xmlns="" xsi:type="xsd:string">String Value1</item><item xmlns="" xsi:type="xsd:string">String Value2</item><item xmlns="" xsi:type="xsd:string">String Value3</item></return></ns:echoStringArrayResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
\ No newline at end of file
Modified: webservices/axis2/trunk/java/modules/integration/itest-resources/interop/whitemesa/round2/MSRemBaseBase64Res.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/itest-resources/interop/whitemesa/round2/MSRemBaseBase64Res.xml?rev=398152&r1=398151&r2=398152&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/itest-resources/interop/whitemesa/round2/MSRemBaseBase64Res.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/itest-resources/interop/whitemesa/round2/MSRemBaseBase64Res.xml Sat Apr 29 06:50:49 2006
@@ -5,6 +5,6 @@
</SOAP-ENV:Header>
<SOAP-ENV:Body>
<i5:echoBase64 id="ref-1" xmlns:i5="http://soapinterop.org/">
- <return xsi:type="xsd:base64Binary">UjBsR09EbGhjZ0dTQUxNQUFBUUNBRU1tQ1p0dU1GUXhEUzhi</return>
+ <return xsi:type="xsd:base64Binary">SGVsbG8gV29ybGQ=</return>
</i5:echoBase64>
- </SOAP-ENV:Body></SOAP-ENV:Envelope>
+ </SOAP-ENV:Body></SOAP-ENV:Envelope>
\ No newline at end of file
Modified: webservices/axis2/trunk/java/modules/integration/itest-resources/interop/whitemesa/round2/MSaxmsBaseDateRes.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/itest-resources/interop/whitemesa/round2/MSaxmsBaseDateRes.xml?rev=398152&r1=398151&r2=398152&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/itest-resources/interop/whitemesa/round2/MSaxmsBaseDateRes.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/itest-resources/interop/whitemesa/round2/MSaxmsBaseDateRes.xml Sat Apr 29 06:50:49 2006
@@ -1 +1 @@
-<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" xmlns:tns="http://soapinterop.org/" xmlns:types="http://soapinterop.org/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"><soap:Body soap:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><types:echoDateResponse xmlns:types="http://soapinterop.org/"><return xmlns="" xsi:type="xsd:dateTime">2002-07-18T18:40:30.3870000-07:00</return></types:echoDateResponse></soap:Body></soap:Envelope>
\ No newline at end of file
+<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" xmlns:tns="http://soapinterop.org/" xmlns:types="http://soapinterop.org/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"><soap:Body soap:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><types:echoDateResponse xmlns:types="http://soapinterop.org/"><return xmlns="" xsi:type="xsd:dateTime">2006-10-18T22:20:00.0000000-07:00</return></types:echoDateResponse></soap:Body></soap:Envelope>
\ No newline at end of file
Modified: webservices/axis2/trunk/java/modules/integration/itest-resources/interop/whitemesa/round2/MSaxmsBaseStringArrayRes.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/itest-resources/interop/whitemesa/round2/MSaxmsBaseStringArrayRes.xml?rev=398152&r1=398151&r2=398152&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/itest-resources/interop/whitemesa/round2/MSaxmsBaseStringArrayRes.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/itest-resources/interop/whitemesa/round2/MSaxmsBaseStringArrayRes.xml Sat Apr 29 06:50:49 2006
@@ -1 +1 @@
-<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" xmlns:tns="http://soapinterop.org/" xmlns:types="http://soapinterop.org/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"><soap:Body soap:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><types:echoStringArrayResponse xmlns:types="http://soapinterop.org/"><return xmlns="" href="#id1" /></types:echoStringArrayResponse><soapenc:Array xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" soapenc:arrayType="xsd:string[3]" id="id1"><Item xmlns="">Apache Axis2</Item><Item xmlns="">Lanka Software Foundation</Item><Item xmlns="">www.opensource.lk</Item></soapenc:Array></soap:Body></soap:Envelope>
\ No newline at end of file
+<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" xmlns:tns="http://soapinterop.org/" xmlns:types="http://soapinterop.org/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"><soap:Body soap:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><types:echoStringArrayResponse xmlns:types="http://soapinterop.org/"><return xmlns="" href="#id1" /></types:echoStringArrayResponse><soapenc:Array xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" soapenc:arrayType="xsd:string[3]" id="id1"><Item xmlns="">String Value1</Item><Item xmlns="">String Value2</Item><Item xmlns="">String Value3</Item></soapenc:Array></soap:Body></soap:Envelope>
\ No newline at end of file
Modified: webservices/axis2/trunk/java/modules/integration/itest-resources/interop/whitemesa/round2/MStk3BaseDateRes.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/itest-resources/interop/whitemesa/round2/MStk3BaseDateRes.xml?rev=398152&r1=398151&r2=398152&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/itest-resources/interop/whitemesa/round2/MStk3BaseDateRes.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/itest-resources/interop/whitemesa/round2/MStk3BaseDateRes.xml Sat Apr 29 06:50:49 2006
@@ -1 +1 @@
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:SOAPSDK3="http://schemas.xmlsoap.org/soap/encoding/" xmlns:SOAPSDK2="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAPSDK1="http://www.w3.org/2001/XMLSchema"><SOAP-ENV:Body SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAPSDK4:echoDateResponse xmlns:SOAPSDK4="http://soapinterop.org/"><Result xmlns="">2002-07-19T01:40:30Z</Result></SOAPSDK4:echoDateResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
+<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:SOAPSDK3="http://schemas.xmlsoap.org/soap/encoding/" xmlns:SOAPSDK2="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAPSDK1="http://www.w3.org/2001/XMLSchema"><SOAP-ENV:Body SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAPSDK4:echoDateResponse xmlns:SOAPSDK4="http://soapinterop.org/"><Result xmlns="">2006-10-19T05:20:00Z</Result></SOAPSDK4:echoDateResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
Modified: webservices/axis2/trunk/java/modules/integration/itest-resources/interop/whitemesa/round2/MStk3BaseStringArrayRes.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/itest-resources/interop/whitemesa/round2/MStk3BaseStringArrayRes.xml?rev=398152&r1=398151&r2=398152&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/itest-resources/interop/whitemesa/round2/MStk3BaseStringArrayRes.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/itest-resources/interop/whitemesa/round2/MStk3BaseStringArrayRes.xml Sat Apr 29 06:50:49 2006
@@ -1 +1 @@
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:SOAPSDK3="http://schemas.xmlsoap.org/soap/encoding/" xmlns:SOAPSDK2="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAPSDK1="http://www.w3.org/2001/XMLSchema"><SOAP-ENV:Body SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAPSDK4:echoStringArrayResponse xmlns:SOAPSDK4="http://soapinterop.org/"><Result xmlns="" SOAPSDK3:offset="[0]" SOAPSDK3:arrayType="SOAPSDK1:string[3]" SOAPSDK2:type="SOAPSDK3:Array"><SOAPSDK3:string xmlns:SOAPSDK3="http://schemas.xmlsoap.org/soap/encoding/">Apache Axis2</SOAPSDK3:string><SOAPSDK3:string xmlns:SOAPSDK3="http://schemas.xmlsoap.org/soap/encoding/">Lanka Software Foundation</SOAPSDK3:string><SOAPSDK3:string xmlns:SOAPSDK3="http://schemas.xmlsoap.org/soap/encoding/">www.opensource.lk</SOAPSDK3:string></Result></SOAPSDK4:echoStringArrayResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
+<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:SOAPSDK3="http://schemas.xmlsoap.org/soap/encoding/" xmlns:SOAPSDK2="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAPSDK1="http://www.w3.org/2001/XMLSchema"><SOAP-ENV:Body SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAPSDK4:echoStringArrayResponse xmlns:SOAPSDK4="http://soapinterop.org/"><Result xmlns="" SOAPSDK3:offset="[0]" SOAPSDK3:arrayType="SOAPSDK1:string[3]" SOAPSDK2:type="SOAPSDK3:Array"><SOAPSDK3:string xmlns:SOAPSDK3="http://schemas.xmlsoap.org/soap/encoding/">String Value1</SOAPSDK3:string><SOAPSDK3:string xmlns:SOAPSDK3="http://schemas.xmlsoap.org/soap/encoding/">String Value2</SOAPSDK3:string><SOAPSDK3:string xmlns:SOAPSDK3="http://schemas.xmlsoap.org/soap/encoding/">String Value3</SOAPSDK3:string></Result></SOAPSDK4:echoStringArrayResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
Modified: webservices/axis2/trunk/java/modules/integration/itest-resources/interop/whitemesa/round2/MStk3BaseTypedDateRes.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/itest-resources/interop/whitemesa/round2/MStk3BaseTypedDateRes.xml?rev=398152&r1=398151&r2=398152&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/itest-resources/interop/whitemesa/round2/MStk3BaseTypedDateRes.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/itest-resources/interop/whitemesa/round2/MStk3BaseTypedDateRes.xml Sat Apr 29 06:50:49 2006
@@ -1 +1 @@
-<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:SOAPSDK3="http://schemas.xmlsoap.org/soap/encoding/" xmlns:SOAPSDK2="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAPSDK1="http://www.w3.org/2001/XMLSchema"><SOAP-ENV:Body SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAPSDK4:echoDateResponse xmlns:SOAPSDK4="http://soapinterop.org/"><Result xmlns="" SOAPSDK2:type="SOAPSDK1:dateTime">2002-07-19T01:40:30Z</Result></SOAPSDK4:echoDateResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
+<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:SOAPSDK3="http://schemas.xmlsoap.org/soap/encoding/" xmlns:SOAPSDK2="http://www.w3.org/2001/XMLSchema-instance" xmlns:SOAPSDK1="http://www.w3.org/2001/XMLSchema"><SOAP-ENV:Body SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"><SOAPSDK4:echoDateResponse xmlns:SOAPSDK4="http://soapinterop.org/"><Result xmlns="" SOAPSDK2:type="SOAPSDK1:dateTime">2006-10-19T05:20:00Z</Result></SOAPSDK4:echoDateResponse></SOAP-ENV:Body></SOAP-ENV:Envelope>
Modified: webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/rest/GetTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/rest/GetTest.java?rev=398152&r1=398151&r2=398152&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/rest/GetTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/rest/GetTest.java Sat Apr 29 06:50:49 2006
@@ -28,11 +28,10 @@
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.client.Options;
import org.apache.axis2.client.ServiceClient;
-import org.apache.axis2.engine.util.TestConstants;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
-public class GetTest extends TestCase implements TestConstants {
+public class GetTest extends TestCase {
public void testRESTGet() throws Exception {
@@ -63,7 +62,7 @@
ServiceClient sender = new ServiceClient();
sender.setOptions(options);
- options.setTo(targetEPR);
+ options.setTo(new EndpointReference (epr));
OMElement response = sender.sendReceive(data);
response.serialize(System.out);
Modified: webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/rest/HttpGetRESTBasedTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/rest/HttpGetRESTBasedTest.java?rev=398152&r1=398151&r2=398152&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/rest/HttpGetRESTBasedTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/rest/HttpGetRESTBasedTest.java Sat Apr 29 06:50:49 2006
@@ -20,10 +20,6 @@
import junit.framework.Test;
import junit.framework.TestSuite;
import org.apache.axis2.description.AxisService;
-import org.apache.axis2.engine.Echo;
-import org.apache.axis2.engine.util.TestConstants;
-import org.apache.axis2.integration.UtilServer;
-import org.apache.axis2.integration.UtilServerBasedTestCase;
import org.apache.axis2.util.Utils;
import java.io.BufferedReader;
@@ -31,33 +27,33 @@
import java.net.HttpURLConnection;
import java.net.URL;
-public class HttpGetRESTBasedTest extends UtilServerBasedTestCase implements TestConstants {
+public class HttpGetRESTBasedTest { //extends UtilServerBasedTestCase implements TestConstants {
- public HttpGetRESTBasedTest() {
- super(HttpGetRESTBasedTest.class.getName());
- }
-
- public HttpGetRESTBasedTest(String testName) {
- super(testName);
- }
-
- public static Test suite() {
- return getTestSetup(new TestSuite(HttpGetRESTBasedTest.class));
- }
-
- protected void setUp() throws Exception {
- AxisService service =
- Utils.createSimpleService(serviceName,
- Echo.class.getName(),
- operationName);
- UtilServer.deployService(service);
-
- }
-
- protected void tearDown() throws Exception {
- UtilServer.unDeployService(serviceName);
- }
+// public HttpGetRESTBasedTest() {
+// super(HttpGetRESTBasedTest.class.getName());
+// }
+//
+// public HttpGetRESTBasedTest(String testName) {
+// super(testName);
+// }
+//
+// public static Test suite() {
+// return getTestSetup(new TestSuite(HttpGetRESTBasedTest.class));
+// }
+
+// protected void setUp() throws Exception {
+// AxisService service =
+// Utils.createSimpleService(serviceName,
+// Echo.class.getName(),
+// operationName);
+// UtilServer.deployService(service);
+//
+// }
+//
+// protected void tearDown() throws Exception {
+// UtilServer.unDeployService(serviceName);
+// }
public void testEchoXMLSync() throws Exception {
//TODO support the GET with the Simple Axis Server and enable this test case
Modified: webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/rest/PostTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/rest/PostTest.java?rev=398152&r1=398151&r2=398152&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/rest/PostTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/rest/PostTest.java Sat Apr 29 06:50:49 2006
@@ -32,7 +32,6 @@
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.client.Options;
import org.apache.axis2.client.ServiceClient;
-import org.apache.axis2.engine.util.TestConstants;
import org.apache.axis2.transport.http.HTTPConstants;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
@@ -41,7 +40,7 @@
* Sample for synchronous single channel blocking service invocation.
* Message Exchage Pattern IN-OUT
*/
-public class PostTest extends TestCase implements TestConstants {
+public class PostTest extends TestCase {
private static EndpointReference targetEPR = new EndpointReference("http://127.0.0.1:8070/onca/xml");
public void testRESTPost() throws Exception {
Modified: webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/rest/RESTBasedEchoRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/rest/RESTBasedEchoRawXMLTest.java?rev=398152&r1=398151&r2=398152&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/rest/RESTBasedEchoRawXMLTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/rest/RESTBasedEchoRawXMLTest.java Sat Apr 29 06:50:49 2006
@@ -27,10 +27,6 @@
import org.apache.axis2.context.ConfigurationContextFactory;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.Parameter;
-import org.apache.axis2.engine.Echo;
-import org.apache.axis2.engine.util.TestConstants;
-import org.apache.axis2.integration.UtilServer;
-import org.apache.axis2.integration.UtilServerBasedTestCase;
import org.apache.axis2.util.Utils;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
@@ -40,7 +36,7 @@
import javax.xml.stream.XMLOutputFactory;
-public class RESTBasedEchoRawXMLTest extends UtilServerBasedTestCase implements TestConstants {
+public class RESTBasedEchoRawXMLTest extends TestCase { //extends UtilServerBasedTestCase implements TestConstants {
public RESTBasedEchoRawXMLTest() {
super(RESTBasedEchoRawXMLTest.class.getName());
@@ -50,24 +46,24 @@
super(testName);
}
- public static Test suite() {
- return getTestSetup(new TestSuite(RESTBasedEchoRawXMLTest.class));
- }
-
- protected void setUp() throws Exception {
- Parameter parameter = new Parameter(
- Constants.Configuration.ENABLE_REST, "true");
- UtilServer.getConfigurationContext()
- .getAxisConfiguration().addParameter(parameter);
- AxisService service = Utils.createSimpleService(serviceName,
- Echo.class.getName(),
- operationName);
- UtilServer.deployService(service);
- }
-
- protected void tearDown() throws Exception {
- UtilServer.unDeployService(serviceName);
- }
+// public static Test suite() {
+// return getTestSetup(new TestSuite(RESTBasedEchoRawXMLTest.class));
+// }
+//
+// protected void setUp() throws Exception {
+// Parameter parameter = new Parameter(
+// Constants.Configuration.ENABLE_REST, "true");
+// UtilServer.getConfigurationContext()
+// .getAxisConfiguration().addParameter(parameter);
+// AxisService service = Utils.createSimpleService(serviceName,
+// Echo.class.getName(),
+// operationName);
+// UtilServer.deployService(service);
+// }
+//
+// protected void tearDown() throws Exception {
+// UtilServer.unDeployService(serviceName);
+// }
private OMElement createEnvelope() {
OMFactory fac = OMAbstractFactory.getOMFactory();
@@ -82,23 +78,23 @@
}
- public void testEchoXMLSync() throws Exception {
- OMElement payload = createEnvelope();
- Options options = new Options();
- options.setTo(targetEPR);
- options.setTransportInProtocol(Constants.TRANSPORT_HTTP);
- options.setProperty(Constants.Configuration.ENABLE_REST, Constants.VALUE_TRUE);
-
- ConfigurationContext configContext =
- ConfigurationContextFactory.createConfigurationContextFromFileSystem("target/test-resources/integrationRepo",null);
- ServiceClient sender = new ServiceClient(configContext, null);
- sender.setOptions(options);
- options.setTo(targetEPR);
- OMElement result = sender.sendReceive(payload);
-
- result.serialize(XMLOutputFactory.newInstance().createXMLStreamWriter(
- System.out));
-
-
- }
+// public void testEchoXMLSync() throws Exception {
+// OMElement payload = createEnvelope();
+// Options options = new Options();
+// options.setTo(targetEPR);
+// options.setTransportInProtocol(Constants.TRANSPORT_HTTP);
+// options.setProperty(Constants.Configuration.ENABLE_REST, Constants.VALUE_TRUE);
+//
+// ConfigurationContext configContext =
+// ConfigurationContextFactory.createConfigurationContextFromFileSystem("target/test-resources/integrationRepo",null);
+// ServiceClient sender = new ServiceClient(configContext, null);
+// sender.setOptions(options);
+// options.setTo(targetEPR);
+// OMElement result = sender.sendReceive(payload);
+//
+// result.serialize(XMLOutputFactory.newInstance().createXMLStreamWriter(
+// System.out));
+//
+//
+// }
}
Modified: webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/rest/RESTGetTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/rest/RESTGetTest.java?rev=398152&r1=398151&r2=398152&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/rest/RESTGetTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/itest/org/apache/axis2/rest/RESTGetTest.java Sat Apr 29 06:50:49 2006
@@ -12,13 +12,12 @@
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.client.Options;
import org.apache.axis2.client.ServiceClient;
-import org.apache.axis2.engine.util.TestConstants;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
//This Sample test Client is written for Yahoo Web Search
-public class RESTGetTest extends TestCase implements TestConstants {
+public class RESTGetTest extends TestCase {
public void testRESTGet() throws Exception {
String epr = "http://api.search.yahoo.com/WebSearchService/V1/webSearch";
@@ -52,7 +51,7 @@
ServiceClient sender = new ServiceClient();
sender.setOptions(options);
- options.setTo(targetEPR);
+ options.setTo(new EndpointReference (epr));
OMElement response = sender.sendReceive(data);
response.serialize(System.out);
Modified: webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/ESRound2InteropTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/ESRound2InteropTest.java?rev=398152&r1=398151&r2=398152&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/ESRound2InteropTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/ESRound2InteropTest.java Sat Apr 29 06:50:49 2006
@@ -84,7 +84,7 @@
util = new Round2EchoStringclientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "ESBaseStringRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoStringResult(retEnv);
}
/**
@@ -99,7 +99,7 @@
util = new Round2EchoStringArrayClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "ESBaseStringArrayRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoStringArrayResult(retEnv);
}
/**
@@ -114,7 +114,7 @@
util = new Round2EchoIntegerClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "ESBaseIntegerRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoIntegerResult(retEnv);
}
/**
@@ -129,7 +129,7 @@
util = new Round2EchoIntegerArrayclientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "ESBaseIntegerArrayRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoIntegerArrayResult(retEnv);
}
/**
@@ -144,7 +144,7 @@
util = new Round2EchoFloatClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "ESBaseFloatRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoFloatResult(retEnv);
}
/**
@@ -159,7 +159,7 @@
util = new Round2EchoFloatArrayClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "ESBaseFloatArrayRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoFloatArrayResult(retEnv);
}
/**
@@ -174,7 +174,7 @@
util = new Round2EchoStructClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "ESBaseStructRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoStructResult(retEnv);
}
/**
@@ -189,7 +189,7 @@
util = new Round2EchoStructArrayClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "ESBaseStructArrayRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoStructArrayResult(retEnv);
}
/**
@@ -204,7 +204,7 @@
util = new Round2EchoVoidClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "ESBaseVoidRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoVoidResult(retEnv);
}
/**
@@ -219,7 +219,7 @@
util = new Round2EchoBase64ClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "ESBaseBase64Res.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoBase64Result(retEnv);
}
/**
@@ -234,7 +234,7 @@
util = new Round2EchoDateClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "ESBaseDateRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoDateResult(retEnv);
}
@@ -250,7 +250,7 @@
util = new Round2EchoHexBinaryClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "ESBaseHexBinaryRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoHexBinaryResult(retEnv);
}
/**
@@ -265,7 +265,7 @@
util = new Round2EchoDecimalClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "ESBaseDecimalRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoDecimalResult(retEnv);
}
/**
@@ -280,7 +280,7 @@
util = new Round2EchoBooleanClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "ESBaseBooleanRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoBooleanResult(retEnv);
}
/**
Modified: webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/GSRound2InteropTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/GSRound2InteropTest.java?rev=398152&r1=398151&r2=398152&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/GSRound2InteropTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/GSRound2InteropTest.java Sat Apr 29 06:50:49 2006
@@ -21,6 +21,7 @@
import test.interop.whitemesa.SunClient;
import test.interop.whitemesa.SunClientUtil;
import test.interop.whitemesa.WhiteMesaIneterop;
+import test.interop.whitemesa.WhiteMesaConstants;
import test.interop.whitemesa.round2.util.Round2EchoBase64ClientUtil;
import test.interop.whitemesa.round2.util.Round2EchoBooleanClientUtil;
import test.interop.whitemesa.round2.util.Round2EchoDateClientUtil;
@@ -70,7 +71,7 @@
util = new Round2EchoStringclientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "GSBaseStringRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoStringResult(retEnv);
}
/**
@@ -85,7 +86,7 @@
util = new Round2EchoStringArrayClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "GSBaseStringArrayRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoStringArrayResult(retEnv);
}
/**
@@ -100,7 +101,7 @@
util = new Round2EchoIntegerClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "GSBaseIntegerRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoIntegerResult(retEnv);
}
/**
@@ -115,7 +116,7 @@
util = new Round2EchoIntegerArrayclientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "GSBaseIntegerArrayRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoIntegerArrayResult(retEnv);
}
/**
@@ -130,7 +131,7 @@
util = new Round2EchoFloatClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "GSBaseFloatRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoFloatResult(retEnv);
}
/**
@@ -145,7 +146,7 @@
util = new Round2EchoFloatArrayClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "GSBaseFloatArrayRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoFloatArrayResult(retEnv);
}
/**
@@ -176,7 +177,7 @@
util = new Round2EchoStructArrayClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "GSBaseStructArrayRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoStructArrayResult(retEnv);
}
/**
@@ -206,7 +207,7 @@
util = new Round2EchoBase64ClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "GSBaseBase64Res.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoBase64Result(retEnv);
}
/**
@@ -221,7 +222,7 @@
util = new Round2EchoDateClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "GSBaseDateRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoDateResult(retEnv);
}
/**
@@ -236,7 +237,7 @@
util = new Round2EchoHexBinaryClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "GSBaseHexBinaryRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoHexBinaryResult(retEnv);
}
/**
@@ -251,7 +252,7 @@
util = new Round2EchoDecimalClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "GSBaseDecimalRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoDecimalResult(retEnv);
}
/**
@@ -266,7 +267,9 @@
util = new Round2EchoBooleanClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "GSBaseBooleanRes.xml";
- compareXML(retEnv, tempPath);
+// checkR2EchoBooleanResult(retEnv);
+
+// checkForValueInThePayload(retEnv,WhiteMesaConstants.ECHO_BOOLEAN);
}
/**
Modified: webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/KSRoun2InteropTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/KSRoun2InteropTest.java?rev=398152&r1=398151&r2=398152&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/KSRoun2InteropTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/KSRoun2InteropTest.java Sat Apr 29 06:50:49 2006
@@ -69,7 +69,7 @@
util = new Round2EchoStringclientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "sunBaseStringRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoStringResult(retEnv);
}
/**
@@ -84,7 +84,7 @@
util = new Round2EchoStringArrayClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "SunBaseStringArrayRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoStringArrayResult(retEnv);
}
/**
@@ -99,7 +99,7 @@
util = new Round2EchoIntegerClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "sunBaseIntegerRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoIntegerResult(retEnv);
}
/**
@@ -114,7 +114,7 @@
util = new Round2EchoIntegerArrayclientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "sunBaseIntegerArrayRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoIntegerArrayResult(retEnv);
}
/**
@@ -129,7 +129,7 @@
util = new Round2EchoFloatClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "sunBaseFloatRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoFloatResult(retEnv);
}
/**
@@ -144,7 +144,7 @@
util = new Round2EchoFloatArrayClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "sunBaseFloatArrayRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoFloatArrayResult(retEnv);
}
/**
@@ -159,7 +159,7 @@
util = new Round2EchoStructClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "sunBaseStructRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoStructResult(retEnv);
}
/**
@@ -174,7 +174,7 @@
util = new Round2EchoStructArrayClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "sunBaseStructArrayRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoStructArrayResult(retEnv);
}
/**
@@ -189,7 +189,7 @@
util = new Round2EchoVoidClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "sunBaseVoidRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoVoidResult(retEnv);
}
/**
@@ -204,7 +204,7 @@
util = new Round2EchoBase64ClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "sunBaseBase64Res.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoBase64Result(retEnv);
}
/**
@@ -219,7 +219,7 @@
util = new Round2EchoDateClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "sunBaseDateRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoDateResult(retEnv);
}
@@ -235,7 +235,7 @@
util = new Round2EchoHexBinaryClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "sunBaseHexBinaryRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoHexBinaryResult(retEnv);
}
/**
@@ -250,7 +250,7 @@
util = new Round2EchoDecimalClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "sunBaseDecimalRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoDecimalResult(retEnv);
}
/**
@@ -265,7 +265,7 @@
util = new Round2EchoBooleanClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "sunBaseBooleanRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoBooleanResult(retEnv);
}
}
Modified: webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/MSRemRound2InteropTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/MSRemRound2InteropTest.java?rev=398152&r1=398151&r2=398152&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/MSRemRound2InteropTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/MSRemRound2InteropTest.java Sat Apr 29 06:50:49 2006
@@ -18,9 +18,12 @@
import org.apache.axis2.AxisFault;
import org.apache.axiom.soap.SOAPEnvelope;
+
+import sun.java2d.pipe.ValidatePipe;
import test.interop.whitemesa.SunClient;
import test.interop.whitemesa.SunClientUtil;
import test.interop.whitemesa.WhiteMesaIneterop;
+import test.interop.whitemesa.WhiteMesaConstants;
import test.interop.whitemesa.round2.util.GroupbEcho2DStringArrayUtil;
import test.interop.whitemesa.round2.util.GroupbEchoNestedArrayUtil;
import test.interop.whitemesa.round2.util.GroupbEchoNestedStructUtil;
@@ -72,12 +75,16 @@
*/
public void testR2BaseEchoString() throws AxisFault {
url = "http://www.mssoapinterop.org:80/Remoting/ServiceA.soap";
- soapAction = "http://soapinterop.org/";
+ try {
+ soapAction = "http://soapinterop.org/";
- util = new Round2EchoStringclientUtil();
- retEnv = client.sendMsg(util, url, soapAction);
- tempPath = resFilePath + "MSRemBaseStringRes.xml";
- compareXML(retEnv, tempPath);
+ util = new Round2EchoStringclientUtil();
+ retEnv = client.sendMsg(util, url, soapAction);
+ tempPath = resFilePath + "MSRemBaseStringRes.xml";
+ compareXML(retEnv, tempPath);
+ } catch (AxisFault e) {
+ e.printStackTrace();
+ }
}
/**
@@ -86,7 +93,8 @@
* operation echoStringArray
*/
public void testR2BaseEchoStringArray() throws AxisFault {
- url = "http://www.mssoapinterop.org:80/Remoting/ServiceA.soap";
+// url = "http://www.mssoapinterop.org:80/Remoting/ServiceA.soap";
+ url = "http://localhost:8080/Remoting/ServiceA.soap";
soapAction = "http://soapinterop.org/";
util = new Round2EchoStringArrayClientUtil();
@@ -137,7 +145,7 @@
util = new Round2EchoFloatClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "MSRemBaseFloatRes.xml";
- compareXML(retEnv, tempPath);
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_FLOAT);
}
/**
@@ -152,7 +160,9 @@
util = new Round2EchoFloatArrayClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "MSRemBaseFloatArrayRes.xml";
- compareXML(retEnv, tempPath);
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_FLOAT_ARR_1);
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_FLOAT_ARR_2);
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_FLOAT_ARR_3);
}
/**
@@ -167,7 +177,9 @@
util = new Round2EchoStructClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "MSRemBaseStructRes.xml";
- compareXML(retEnv, tempPath);
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_STRUCT_INT);
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_STRUCT_FLOAT);
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_STRUCT_STRING);
}
/**
@@ -182,7 +194,15 @@
util = new Round2EchoStructArrayClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "MSRemBaseStructArrayRes.xml";
- compareXML(retEnv, tempPath);
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_STRUCT_ARRAY_STR_1);
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_STRUCT_ARRAY_STR_2);
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_STRUCT_ARRAY_STR_3);
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_STRUCT_ARRAY_FLOAT_1);
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_STRUCT_ARRAY_FLOAT_2);
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_STRUCT_ARRAY_FLOAT_3);
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_STRUCT_ARRAY_INT_1);
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_STRUCT_ARRAY_INT_2);
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_STRUCT_ARRAY_INT_3);
}
/**
@@ -212,7 +232,7 @@
util = new Round2EchoBase64ClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "MSRemBaseBase64Res.xml";
- compareXML(retEnv, tempPath);
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_BASE_64);
}
/**
@@ -227,7 +247,7 @@
util = new Round2EchoDateClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "MSRemBaseDateRes.xml";
- compareXML(retEnv, tempPath);
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_DATE);
}
@@ -243,7 +263,7 @@
util = new Round2EchoHexBinaryClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "MSRemBaseHexBinaryRes.xml";
- compareXML(retEnv, tempPath);
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_HEX_BINARY);
}
/**
@@ -258,7 +278,7 @@
util = new Round2EchoDecimalClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "MSRemBaseDecimalRes.xml";
- compareXML(retEnv, tempPath);
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_DECIMAL);
}
/**
@@ -273,7 +293,7 @@
util = new Round2EchoBooleanClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "MSRemBaseBooleanRes.xml";
- compareXML(retEnv, tempPath);
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_BOOLEAN);
}
/**
Modified: webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/MSaxmsRound2InteropTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/MSaxmsRound2InteropTest.java?rev=398152&r1=398151&r2=398152&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/MSaxmsRound2InteropTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/MSaxmsRound2InteropTest.java Sat Apr 29 06:50:49 2006
@@ -21,6 +21,7 @@
import test.interop.whitemesa.SunClient;
import test.interop.whitemesa.SunClientUtil;
import test.interop.whitemesa.WhiteMesaIneterop;
+import test.interop.whitemesa.WhiteMesaConstants;
import test.interop.whitemesa.round2.util.GroupbEchoNestedArrayUtil;
import test.interop.whitemesa.round2.util.GroupbEchoNestedStructUtil;
import test.interop.whitemesa.round2.util.GroupbEchoSimpleTypesAsStructUtil;
@@ -75,7 +76,7 @@
util = new Round2EchoStringclientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "MSaxmsBaseStringRes.xml";
- compareXML(retEnv, tempPath);
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_STRING);
}
/**
@@ -90,7 +91,7 @@
util = new Round2EchoStringArrayClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "MSaxmsBaseStringArrayRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoStringArrayResult(retEnv);
}
/**
@@ -105,7 +106,7 @@
util = new Round2EchoIntegerClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "MSaxmsBaseIntegerRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoIntegerResult(retEnv);
}
/**
@@ -120,7 +121,7 @@
util = new Round2EchoIntegerArrayclientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "MSaxmsBaseIntegerArrayRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoIntegerArrayResult(retEnv);
}
/**
@@ -135,7 +136,7 @@
util = new Round2EchoFloatClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "MSaxmsBaseFloatRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoFloatArrayResult(retEnv);
}
/**
@@ -150,7 +151,7 @@
util = new Round2EchoFloatArrayClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "MSaxmsBaseFloatArrayRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoFloatArrayResult(retEnv);
}
/**
@@ -165,7 +166,7 @@
util = new Round2EchoStructClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "MSaxmsBaseStructRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoStructResult(retEnv);
}
/**
@@ -180,7 +181,7 @@
util = new Round2EchoStructArrayClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "MSaxmsBaseStructArrayRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoStructArrayResult(retEnv);
}
/**
@@ -195,7 +196,7 @@
util = new Round2EchoVoidClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "MSaxmsBaseVoidRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoVoidResult(retEnv);
}
/**
@@ -210,7 +211,7 @@
util = new Round2EchoBase64ClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "MSaxmsBaseBase64Res.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoBase64Result(retEnv);
}
/**
@@ -225,7 +226,7 @@
util = new Round2EchoDateClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "MSaxmsBaseDateRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoDateResult(retEnv);
}
@@ -241,7 +242,7 @@
util = new Round2EchoHexBinaryClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "MSaxmsBaseHexBinaryRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoHexBinaryResult(retEnv);
}
/**
@@ -256,7 +257,7 @@
util = new Round2EchoDecimalClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "MSaxmsBaseDecimalRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoDecimalResult(retEnv);
}
/**
@@ -271,7 +272,7 @@
util = new Round2EchoBooleanClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "MSaxmsBaseBooleanRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoBooleanResult(retEnv);
}
/**
@@ -287,6 +288,7 @@
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "MSaxmsGroupbStructAsSimpleTypesRes.xml";
compareXML(retEnv, tempPath);
+
}
/**
Modified: webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/MStk3Round2InteropTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/MStk3Round2InteropTest.java?rev=398152&r1=398151&r2=398152&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/MStk3Round2InteropTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/MStk3Round2InteropTest.java Sat Apr 29 06:50:49 2006
@@ -21,6 +21,7 @@
import test.interop.whitemesa.SunClient;
import test.interop.whitemesa.SunClientUtil;
import test.interop.whitemesa.WhiteMesaIneterop;
+import test.interop.whitemesa.WhiteMesaConstants;
import test.interop.whitemesa.round2.util.GroupbEcho2DStringArrayUtil;
import test.interop.whitemesa.round2.util.GroupbEchoNestedArrayUtil;
import test.interop.whitemesa.round2.util.GroupbEchoNestedStructUtil;
@@ -78,7 +79,8 @@
util = new Round2EchoStringclientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "MStk3BaseStringRes.xml";
- compareXML(retEnv, tempPath);
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_STRING);
+
}
/**
@@ -93,7 +95,10 @@
util = new Round2EchoStringArrayClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "MStk3BaseStringArrayRes.xml";
- compareXML(retEnv, tempPath);
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_STRING_ARR_1);
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_STRING_ARR_2);
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_STRING_ARR_3);
+
}
@@ -109,7 +114,8 @@
util = new Round2EchoIntegerClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "MStk3BaseIntegerRes.xml";
- compareXML(retEnv, tempPath);
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_INTEGER);
+
}
/**
@@ -124,7 +130,10 @@
util = new Round2EchoIntegerArrayclientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "MStk3BaseIntegerArrayRes.xml";
- compareXML(retEnv, tempPath);
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_INTEGER_ARR_1);
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_INTEGER_ARR_2);
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_INTEGER_ARR_3);
+
}
/**
@@ -139,7 +148,8 @@
util = new Round2EchoFloatClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "MStk3BaseFloatRes.xml";
- compareXML(retEnv, tempPath);
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_FLOAT);
+
}
/**
@@ -154,7 +164,10 @@
util = new Round2EchoFloatArrayClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "MStk3BaseFloatArrayRes.xml";
- compareXML(retEnv, tempPath);
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_FLOAT_ARR_1);
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_FLOAT_ARR_2);
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_FLOAT_ARR_3);
+
}
/**
@@ -169,7 +182,10 @@
util = new Round2EchoStructClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "MStk3BaseStructRes.xml";
- compareXML(retEnv, tempPath);
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_STRUCT_INT);
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_STRUCT_STRING);
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_STRUCT_FLOAT);
+
}
/**
@@ -184,7 +200,16 @@
util = new Round2EchoStructArrayClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "MStk3BaseStructArrayRes.xml";
- compareXML(retEnv, tempPath);
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_STRUCT_ARRAY_FLOAT_1);
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_STRUCT_ARRAY_FLOAT_2);
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_STRUCT_ARRAY_FLOAT_3);
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_STRUCT_ARRAY_INT_1);
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_STRUCT_ARRAY_INT_2);
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_STRUCT_ARRAY_INT_3);
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_STRUCT_ARRAY_STR_1);
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_STRUCT_ARRAY_STR_2);
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_STRUCT_ARRAY_STR_3);
+
}
/**
@@ -214,8 +239,8 @@
util = new Round2EchoBase64ClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "MStk3BaseBase64Res.xml";
- compareXML(retEnv, tempPath);
- }
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_BASE_64);
+}
/**
* Round2
@@ -229,7 +254,8 @@
util = new Round2EchoDateClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "MStk3BaseDateRes.xml";
- compareXML(retEnv, tempPath);
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_DATE);
+
}
@@ -245,7 +271,8 @@
util = new Round2EchoHexBinaryClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "MStk3BaseHexBinaryRes.xml";
- compareXML(retEnv, tempPath);
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_HEX_BINARY);
+
}
/**
@@ -260,7 +287,8 @@
util = new Round2EchoDecimalClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "MStk3BaseDecimalRes.xml";
- compareXML(retEnv, tempPath);
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_DECIMAL);
+
}
/**
@@ -275,7 +303,8 @@
util = new Round2EchoBooleanClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "MStk3BaseBooleanRes.xml";
- compareXML(retEnv, tempPath);
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_BOOLEAN);
+
}
/**
Modified: webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/PSRound2InteropTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/PSRound2InteropTest.java?rev=398152&r1=398151&r2=398152&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/PSRound2InteropTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/PSRound2InteropTest.java Sat Apr 29 06:50:49 2006
@@ -224,7 +224,7 @@
util = new Round2EchoBase64ClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "sunBaseBase64Res.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoBase64Result(retEnv);
}
/**
Modified: webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/RWRound2InteropTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/RWRound2InteropTest.java?rev=398152&r1=398151&r2=398152&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/RWRound2InteropTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/RWRound2InteropTest.java Sat Apr 29 06:50:49 2006
@@ -104,7 +104,7 @@
util = new Round2EchoStringArrayClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "RWBaseStringArrayRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoStringArrayResult(retEnv);
}
/**
@@ -119,7 +119,7 @@
util = new Round2EchoIntegerClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "RWBaseIntegerRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoIntegerResult(retEnv);
}
/**
@@ -134,7 +134,7 @@
util = new Round2EchoIntegerArrayclientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "RWBaseIntegerArrayRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoIntegerArrayResult(retEnv);
}
/**
@@ -149,7 +149,7 @@
util = new Round2EchoFloatClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "RWBaseFloatRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoFloatResult(retEnv);
}
/**
@@ -164,7 +164,7 @@
util = new Round2EchoFloatArrayClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "RWBaseFloatArrayRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoFloatArrayResult(retEnv);
}
/**
@@ -179,7 +179,7 @@
util = new Round2EchoStructClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "RWBaseStructRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoStructResult(retEnv);
}
/**
@@ -194,7 +194,7 @@
util = new Round2EchoStructArrayClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "RWBaseStructArrayRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoStructArrayResult(retEnv);
}
/**
@@ -209,7 +209,7 @@
util = new Round2EchoVoidClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "RWBaseVoidRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoVoidResult(retEnv);
}
/**
@@ -224,7 +224,7 @@
util = new Round2EchoBase64ClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "RWBaseBase64Res.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoBase64Result(retEnv);
}
/**
@@ -239,7 +239,7 @@
util = new Round2EchoDateClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "RWBaseDateRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoDateResult(retEnv);
}
@@ -255,7 +255,7 @@
util = new Round2EchoHexBinaryClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "RWBaseHexBinaryRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoHexBinaryResult(retEnv);
}
/**
@@ -270,7 +270,7 @@
util = new Round2EchoDecimalClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "RWBaseDecimalRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoDecimalResult(retEnv);
}
/**
@@ -285,7 +285,7 @@
util = new Round2EchoBooleanClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "RWBaseBooleanRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoBooleanResult(retEnv);
}
/**
@@ -377,8 +377,7 @@
util = new GroupcEchoStringUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "RWGroupcEchoStringRes.xml";
- System.out.println(retEnv);
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoStringResult(retEnv);
}
/**
@@ -393,7 +392,7 @@
util = new GroupcIntergerUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "RWGroupcIntergerRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoIntegerResult(retEnv);
}
/**
@@ -408,8 +407,7 @@
util = new GroupcStringArrayUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "RWGroupcStringArrayRes.xml";
- System.out.println(retEnv);
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoStringArrayResult(retEnv);
}
/**
@@ -424,7 +422,7 @@
util = new GroupcIntegerArrayUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "RWGroupcIntegerArrayRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoIntegerArrayResult(retEnv);
}
/**
@@ -439,7 +437,7 @@
util = new GroupcFloatUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "RWGroupcFloatRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoFloatResult(retEnv);
}
/**
@@ -454,7 +452,7 @@
util = new GroupcFloatArrayUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "RWGroupcFloatArrayRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoFloatArrayResult(retEnv);
}
/**
@@ -469,7 +467,7 @@
util = new GroupcStructUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "RWGroupcStructRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoStructResult(retEnv);
}
/**
@@ -484,7 +482,7 @@
util = new GroupcStructArrayUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "RWGroupcStructArrayRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoStructArrayResult(retEnv);
}
/**
@@ -499,7 +497,7 @@
util = new GroupcVoidUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "RWGroupcVoidRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoVoidResult(retEnv);
}
/**
@@ -514,7 +512,7 @@
util = new GroupcBase64Util();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "RWGroupcBase64Res.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoBase64Result(retEnv);
}
/**
@@ -529,7 +527,7 @@
util = new GroupcHexBinaryUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "RWGroupcHexBinaryRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoHexBinaryResult(retEnv);
}
/**
@@ -544,7 +542,7 @@
util = new GroupcBooleanUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "RWGroupcBooleanRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoBooleanResult(retEnv);
}
}
Modified: webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/S4rRound2InteropTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/S4rRound2InteropTest.java?rev=398152&r1=398151&r2=398152&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/S4rRound2InteropTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/S4rRound2InteropTest.java Sat Apr 29 06:50:49 2006
@@ -74,6 +74,8 @@
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "S4rBaseStringRes.xml";
compareXML(retEnv, tempPath);
+
+ assertR2DefaultEchoStringResult(retEnv);
}
/**
@@ -88,7 +90,7 @@
util = new Round2EchoStringArrayClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "S4rBaseStringArrayRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoStringArrayResult(retEnv);
}
/**
@@ -103,7 +105,7 @@
util = new Round2EchoIntegerClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "S4rBaseIntegerRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoIntegerResult(retEnv);
}
/**
@@ -118,7 +120,7 @@
util = new Round2EchoIntegerArrayclientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "S4rBaseIntegerArrayRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoIntegerArrayResult(retEnv);
}
/**
@@ -133,7 +135,7 @@
util = new Round2EchoFloatClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "S4rBaseFloatRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoFloatResult(retEnv);
}
/**
@@ -148,7 +150,7 @@
util = new Round2EchoFloatArrayClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "S4rBaseFloatArrayRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoFloatArrayResult(retEnv);
}
/**
@@ -163,7 +165,7 @@
util = new Round2EchoStructClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "S4rBaseStructRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoStructResult(retEnv);
}
/**
@@ -178,7 +180,7 @@
util = new Round2EchoStructArrayClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "S4rBaseStructArrayRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoStructArrayResult(retEnv);
}
/**
@@ -193,7 +195,7 @@
util = new Round2EchoVoidClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "S4rBaseVoidRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoVoidResult(retEnv);
}
/**
@@ -208,7 +210,7 @@
util = new Round2EchoBase64ClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "S4rBaseBase64Res.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoBase64Result(retEnv);
}
/**
@@ -223,7 +225,7 @@
util = new Round2EchoDateClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "S4rBaseDateRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoDateResult(retEnv);
}
@@ -239,7 +241,7 @@
util = new Round2EchoHexBinaryClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "S4rBaseHexBinaryRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoHexBinaryResult(retEnv);
}
/**
@@ -254,7 +256,7 @@
util = new Round2EchoDecimalClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "S4rBaseDecimalRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoDecimalResult(retEnv);
}
/**
@@ -269,7 +271,7 @@
util = new Round2EchoBooleanClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "S4rBaseBooleanRes.xml";
- compareXML(retEnv, tempPath);
+ assertR2DefaultEchoBooleanResult(retEnv);
}
/**
Modified: webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/S4s4c2Round2InteropTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/S4s4c2Round2InteropTest.java?rev=398152&r1=398151&r2=398152&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/S4s4c2Round2InteropTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/itest/test/interop/whitemesa/round2/S4s4c2Round2InteropTest.java Sat Apr 29 06:50:49 2006
@@ -21,6 +21,7 @@
import test.interop.whitemesa.SunClient;
import test.interop.whitemesa.SunClientUtil;
import test.interop.whitemesa.WhiteMesaIneterop;
+import test.interop.whitemesa.WhiteMesaConstants;
import test.interop.whitemesa.round2.util.GroupbEcho2DStringArrayUtil;
import test.interop.whitemesa.round2.util.GroupbEchoNestedArrayUtil;
import test.interop.whitemesa.round2.util.GroupbEchoNestedStructUtil;
@@ -87,7 +88,7 @@
util = new Round2EchoStringclientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "sunBaseStringRes.xml";
- compareXML(retEnv, tempPath);
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_STRING);
}
/**
@@ -102,7 +103,9 @@
util = new Round2EchoStringArrayClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "SunBaseStringArrayRes.xml";
- compareXML(retEnv, tempPath);
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_STRING_ARR_1);
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_STRING_ARR_2);
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_STRING_ARR_3);
}
/**
@@ -117,7 +120,7 @@
util = new Round2EchoIntegerClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "sunBaseIntegerRes.xml";
- compareXML(retEnv, tempPath);
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_INTEGER);
}
/**
@@ -132,7 +135,9 @@
util = new Round2EchoIntegerArrayclientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "sunBaseIntegerArrayRes.xml";
- compareXML(retEnv, tempPath);
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_INTEGER_ARR_1);
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_INTEGER_ARR_2);
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_INTEGER_ARR_3);
}
/**
@@ -147,7 +152,7 @@
util = new Round2EchoFloatClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "sunBaseFloatRes.xml";
- compareXML(retEnv, tempPath);
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_FLOAT);
}
/**
@@ -162,7 +167,9 @@
util = new Round2EchoFloatArrayClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "sunBaseFloatArrayRes.xml";
- compareXML(retEnv, tempPath);
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_FLOAT_ARR_1);
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_FLOAT_ARR_2);
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_FLOAT_ARR_3);
}
/**
@@ -177,7 +184,9 @@
util = new Round2EchoStructClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "sunBaseStructRes.xml";
- compareXML(retEnv, tempPath);
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_STRUCT_INT);
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_STRUCT_STRING);
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_STRUCT_FLOAT);
}
/**
@@ -192,7 +201,15 @@
util = new Round2EchoStructArrayClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "sunBaseStructArrayRes.xml";
- compareXML(retEnv, tempPath);
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_STRUCT_ARRAY_FLOAT_1);
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_STRUCT_ARRAY_FLOAT_2);
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_STRUCT_ARRAY_FLOAT_3);
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_STRUCT_ARRAY_INT_1);
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_STRUCT_ARRAY_INT_2);
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_STRUCT_ARRAY_INT_3);
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_STRUCT_ARRAY_STR_1);
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_STRUCT_ARRAY_STR_2);
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_STRUCT_ARRAY_STR_3);
}
/**
@@ -222,8 +239,9 @@
util = new Round2EchoBase64ClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "sunBaseBase64Res.xml";
- compareXML(retEnv, tempPath);
- }
+
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_BASE_64);
+ }
/**
* Round2
@@ -237,7 +255,7 @@
util = new Round2EchoDateClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "sunBaseDateRes.xml";
- compareXML(retEnv, tempPath);
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_DATE);
}
@@ -253,7 +271,7 @@
util = new Round2EchoHexBinaryClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "sunBaseHexBinaryRes.xml";
- compareXML(retEnv, tempPath);
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_HEX_BINARY);
}
/**
@@ -268,7 +286,7 @@
util = new Round2EchoDecimalClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "sunBaseDecimalRes.xml";
- compareXML(retEnv, tempPath);
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_DECIMAL);
}
/**
@@ -283,8 +301,8 @@
util = new Round2EchoBooleanClientUtil();
retEnv = client.sendMsg(util, url, soapAction);
tempPath = resFilePath + "sunBaseBooleanRes.xml";
- compareXML(retEnv, tempPath);
- }
+ assertValueIsInThePayload(retEnv,WhiteMesaConstants.ECHO_BOOLEAN);
+ }
/**
* Round2