Author: veithen
Date: Wed Oct 10 18:33:39 2012
New Revision: 1396721
URL: http://svn.apache.org/viewvc?rev=1396721&view=rev
Log:
* Fixed T12: the test was sending the wrong role. Also avoid the xsi:type on
the header.
* Enabled the test suite (running against the mock service).
Modified:
axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/test-doc/T12-request.xml
axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/test-doc/T12-response.xml
axis/axis1/java/trunk/interop/pom.xml
axis/axis1/java/trunk/interop/src/test/java/test/wsdl/soap12/assertion/WhiteMesaSoap12TestSvcTestCase.java
Modified:
axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/test-doc/T12-request.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/test-doc/T12-request.xml?rev=1396721&r1=1396720&r2=1396721&view=diff
==============================================================================
---
axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/test-doc/T12-request.xml
(original)
+++
axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/test-doc/T12-request.xml
Wed Oct 10 18:33:39 2012
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<soapenv:Envelope xmlns:soapenv="http://www.w3.org/2003/05/soap-envelope";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
<soapenv:Header>
- <ns1:Unknown soapenv:role="http://schemas.xmlsoap.org/soap/actor/next";
soapenv:mustUnderstand="true" xsi:type="xsd:string"
xmlns:ns1="http://example.org/ts-tests";>test header</ns1:Unknown>
+ <ns1:Unknown
soapenv:role="http://www.w3.org/2003/05/soap-envelope/role/ultimateReceiver";
soapenv:mustUnderstand="true" xmlns:ns1="http://example.org/ts-tests";>test
header</ns1:Unknown>
</soapenv:Header>
<soapenv:Body/>
</soapenv:Envelope>
\ No newline at end of file
Modified:
axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/test-doc/T12-response.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/test-doc/T12-response.xml?rev=1396721&r1=1396720&r2=1396721&view=diff
==============================================================================
---
axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/test-doc/T12-response.xml
(original)
+++
axis/axis1/java/trunk/interop-mock/src/main/resources/whitemesa/soap12/test-doc/T12-response.xml
Wed Oct 10 18:33:39 2012
@@ -1,4 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://www.w3.org/2003/05/soap-envelope";>
- <SOAP-ENV:Body />
+ <SOAP-ENV:Header>
+ <SOAP-ENV:NotUnderstood qname="ns:Unknown"
xmlns:SOAP-ENV="http://www.w3.org/2003/05/soap-envelope";
xmlns:ns="http://example.org/ts-tests"; />
+ </SOAP-ENV:Header>
+ <SOAP-ENV:Body>
+ <SOAP-ENV:Fault>
+ <SOAP-ENV:Code>
+ <SOAP-ENV:Value
xmlns:ns="http://www.w3.org/2003/05/soap-envelope";>ns:MustUnderstand</SOAP-ENV:Value>
+ </SOAP-ENV:Code>
+ <SOAP-ENV:Reason>
+ <SOAP-ENV:Text xml:lang="en">Headers: Mandatory header block not
understood.</SOAP-ENV:Text>
+ </SOAP-ENV:Reason>
+ </SOAP-ENV:Fault>
+ </SOAP-ENV:Body>
</SOAP-ENV:Envelope>
\ No newline at end of file
Modified: axis/axis1/java/trunk/interop/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/interop/pom.xml?rev=1396721&r1=1396720&r2=1396721&view=diff
==============================================================================
--- axis/axis1/java/trunk/interop/pom.xml (original)
+++ axis/axis1/java/trunk/interop/pom.xml Wed Oct 10 18:33:39 2012
@@ -195,10 +195,6 @@
<includes>
<include>**/*TestCase.java</include>
</includes>
- <excludes>
- <!-- TODO: need to create mock for this -->
-
<exclude>test/wsdl/soap12/assertion/**</exclude>
- </excludes>
<systemPropertyVariables>
<mock.httpPort>${mock.httpPort}</mock.httpPort>
</systemPropertyVariables>
Modified:
axis/axis1/java/trunk/interop/src/test/java/test/wsdl/soap12/assertion/WhiteMesaSoap12TestSvcTestCase.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/interop/src/test/java/test/wsdl/soap12/assertion/WhiteMesaSoap12TestSvcTestCase.java?rev=1396721&r1=1396720&r2=1396721&view=diff
==============================================================================
---
axis/axis1/java/trunk/interop/src/test/java/test/wsdl/soap12/assertion/WhiteMesaSoap12TestSvcTestCase.java
(original)
+++
axis/axis1/java/trunk/interop/src/test/java/test/wsdl/soap12/assertion/WhiteMesaSoap12TestSvcTestCase.java
Wed Oct 10 18:33:39 2012
@@ -25,7 +25,7 @@ import java.util.Iterator;
public class WhiteMesaSoap12TestSvcTestCase extends junit.framework.TestCase {
public final String TEST_NS = "http://example.org/ts-tests";;
- public final String BASE_URL = "http://localhost:9080";;
+ public final String BASE_URL = "http://localhost:"; +
System.getProperty("mock.httpPort", "9080");
public final String RPC_ENDPOINT = BASE_URL + "/soap12/test-rpc";
public final String DOC_ENDPOINT = BASE_URL + "/soap12/test-doc";
public final String INTERMEDIARY_ENDPOINT = BASE_URL +
"/soap12/test-intermediary";
@@ -653,7 +653,8 @@ public class WhiteMesaSoap12TestSvcTestC
call.setSOAPVersion(SOAPConstants.SOAP12_CONSTANTS);
SOAPEnvelope reqEnv = new SOAPEnvelope(SOAPConstants.SOAP12_CONSTANTS);
SOAPHeaderElement header = new SOAPHeaderElement(TEST_NS, "Unknown");
- header.setObjectValue("test header");
+ header.appendChild(new Text("test header"));
+ header.setRole(Constants.URI_SOAP12_ULTIMATE_ROLE);
header.setMustUnderstand(true);
reqEnv.addHeader(header);
try {
