Author: veithen
Date: Tue Jun 17 07:54:29 2014
New Revision: 1603083
URL: http://svn.apache.org/r1603083
Log:
Add a new test message and simplify some Axiom SOAP test cases.
Added:
webservices/axiom/trunk/testsuites/soap-testsuite/src/main/resources/test-message/set/wsa.xml
(with props)
Removed:
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/header/TestExamineAllHeaderBlocksWithParser.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/header/TestExamineAllHeaderBlocksWithParser.java
Modified:
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPTestSuiteBuilder.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetHeaderWithParser.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestExamineAllHeaderBlocksWithParser.java
webservices/axiom/trunk/testsuites/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/TestMessageSet.java
Modified:
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPTestSuiteBuilder.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPTestSuiteBuilder.java?rev=1603083&r1=1603082&r2=1603083&view=diff
==============================================================================
---
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPTestSuiteBuilder.java
(original)
+++
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPTestSuiteBuilder.java
Tue Jun 17 07:54:29 2014
@@ -56,6 +56,8 @@ public class SOAPTestSuiteBuilder extend
TestMessageSet.NO_HEADER.getMessage(SOAPSpec.SOAP12),
new SimpleTestMessage(SOAPSpec.SOAP11, "soap/soap11/empty-header.xml"),
new SimpleTestMessage(SOAPSpec.SOAP12, "soap/soap12/empty-header.xml"),
+ TestMessageSet.WSA.getMessage(SOAPSpec.SOAP11),
+ TestMessageSet.WSA.getMessage(SOAPSpec.SOAP12),
};
private static final QName[] generalQNames = {
@@ -319,7 +321,6 @@ public class SOAPTestSuiteBuilder extend
addTest(new
org.apache.axiom.ts.soap11.faultreason.TestAddSOAPText(metaFactory));
addTest(new
org.apache.axiom.ts.soap11.faultreason.TestGetFirstSOAPText(metaFactory));
addTest(new
org.apache.axiom.ts.soap11.faultreason.TestGetTextWithCDATA(metaFactory));
- addTest(new
org.apache.axiom.ts.soap11.header.TestExamineAllHeaderBlocksWithParser(metaFactory));
addTest(new
org.apache.axiom.ts.soap11.header.TestExamineHeaderBlocksWithParser(metaFactory));
addTest(new
org.apache.axiom.ts.soap11.header.TestExamineMustUnderstandHeaderBlocksWithParser(metaFactory));
addTest(new
org.apache.axiom.ts.soap11.header.TestGetHeaderBlocksWithNSURIWithParser(metaFactory));
@@ -355,7 +356,6 @@ public class SOAPTestSuiteBuilder extend
addTest(new
org.apache.axiom.ts.soap12.faultsubcode.TestGetValueAsQNameWithParser(metaFactory));
addTest(new
org.apache.axiom.ts.soap12.faultsubcode.TestGetValueWithParser(metaFactory));
addTest(new
org.apache.axiom.ts.soap12.faulttext.TestGetLangWithParser(metaFactory));
- addTest(new
org.apache.axiom.ts.soap12.header.TestExamineAllHeaderBlocksWithParser(metaFactory));
addTest(new
org.apache.axiom.ts.soap12.header.TestExamineHeaderBlocksWithParser(metaFactory));
addTest(new
org.apache.axiom.ts.soap12.header.TestExamineMustUnderstandHeaderBlocks(metaFactory));
addTest(new
org.apache.axiom.ts.soap12.header.TestExamineMustUnderstandHeaderBlocksWithParser(metaFactory));
Modified:
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetHeaderWithParser.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetHeaderWithParser.java?rev=1603083&r1=1603082&r2=1603083&view=diff
==============================================================================
---
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetHeaderWithParser.java
(original)
+++
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetHeaderWithParser.java
Tue Jun 17 07:54:29 2014
@@ -24,6 +24,8 @@ import org.apache.axiom.soap.SOAPEnvelop
import org.apache.axiom.soap.SOAPHeader;
import org.apache.axiom.ts.soap.SOAPSpec;
import org.apache.axiom.ts.soap.SOAPTestCase;
+import org.apache.axiom.ts.soap.TestMessageAdapter;
+import org.apache.axiom.ts.soap.TestMessageSet;
public class TestGetHeaderWithParser extends SOAPTestCase {
public TestGetHeaderWithParser(OMMetaFactory metaFactory, SOAPSpec spec) {
@@ -31,7 +33,7 @@ public class TestGetHeaderWithParser ext
}
protected void runTest() throws Throwable {
- SOAPEnvelope envelope = getTestMessage(MESSAGE);
+ SOAPEnvelope envelope =
TestMessageSet.WSA.getMessage(spec).getAdapter(TestMessageAdapter.class).getSOAPEnvelope(metaFactory);
SOAPHeader header = envelope.getHeader();
assertEquals("Header Test : - Header local name mismatch",
SOAPConstants.HEADER_LOCAL_NAME, header.getLocalName());
Modified:
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestExamineAllHeaderBlocksWithParser.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestExamineAllHeaderBlocksWithParser.java?rev=1603083&r1=1603082&r2=1603083&view=diff
==============================================================================
---
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestExamineAllHeaderBlocksWithParser.java
(original)
+++
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestExamineAllHeaderBlocksWithParser.java
Tue Jun 17 07:54:29 2014
@@ -21,9 +21,12 @@ package org.apache.axiom.ts.soap.header;
import java.util.Iterator;
import org.apache.axiom.om.OMMetaFactory;
-import org.apache.axiom.soap.SOAPHeader;
+import org.apache.axiom.soap.SOAPEnvelope;
+import org.apache.axiom.soap.SOAPHeaderBlock;
import org.apache.axiom.ts.soap.SOAPSpec;
import org.apache.axiom.ts.soap.SOAPTestCase;
+import org.apache.axiom.ts.soap.TestMessageAdapter;
+import org.apache.axiom.ts.soap.TestMessageSet;
public class TestExamineAllHeaderBlocksWithParser extends SOAPTestCase {
public TestExamineAllHeaderBlocksWithParser(OMMetaFactory metaFactory,
SOAPSpec spec) {
@@ -31,14 +34,20 @@ public class TestExamineAllHeaderBlocksW
}
protected void runTest() throws Throwable {
- SOAPHeader header = getTestMessage(MESSAGE).getHeader();
- Iterator iterator = header.examineAllHeaderBlocks();
- int headerElementCount = 0;
- while (iterator.hasNext()) {
- iterator.next();
- headerElementCount++;
- }
- assertEquals("Number of header elements in the header differs from
expected value of 3",
- 3, headerElementCount);
+ SOAPEnvelope envelope =
TestMessageSet.WSA.getMessage(spec).getAdapter(TestMessageAdapter.class).getSOAPEnvelope(metaFactory);
+ Iterator iterator = envelope.getHeader().examineAllHeaderBlocks();
+ iterator.hasNext();
+ SOAPHeaderBlock headerBlock = (SOAPHeaderBlock)iterator.next();
+ assertEquals("MessageID", headerBlock.getLocalName());
+ assertTrue(iterator.hasNext());
+ headerBlock = (SOAPHeaderBlock)iterator.next();
+ assertEquals("ReplyTo", headerBlock.getLocalName());
+ assertTrue(iterator.hasNext());
+ headerBlock = (SOAPHeaderBlock)iterator.next();
+ assertEquals("To", headerBlock.getLocalName());
+ assertTrue(iterator.hasNext());
+ headerBlock = (SOAPHeaderBlock)iterator.next();
+ assertEquals("Action", headerBlock.getLocalName());
+ assertFalse(iterator.hasNext());
}
}
Modified:
webservices/axiom/trunk/testsuites/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/TestMessageSet.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/testsuites/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/TestMessageSet.java?rev=1603083&r1=1603082&r2=1603083&view=diff
==============================================================================
---
webservices/axiom/trunk/testsuites/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/TestMessageSet.java
(original)
+++
webservices/axiom/trunk/testsuites/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/TestMessageSet.java
Tue Jun 17 07:54:29 2014
@@ -27,6 +27,11 @@ public final class TestMessageSet extend
*/
public static final TestMessageSet NO_HEADER = new
TestMessageSet("no-header");
+ /**
+ * A SOAP request with WS-Addressing headers.
+ */
+ public static final TestMessageSet WSA = new TestMessageSet("wsa");
+
private final TestMessage soap11Message;
private final TestMessage soap12Message;
Added:
webservices/axiom/trunk/testsuites/soap-testsuite/src/main/resources/test-message/set/wsa.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/testsuites/soap-testsuite/src/main/resources/test-message/set/wsa.xml?rev=1603083&view=auto
==============================================================================
---
webservices/axiom/trunk/testsuites/soap-testsuite/src/main/resources/test-message/set/wsa.xml
(added)
+++
webservices/axiom/trunk/testsuites/soap-testsuite/src/main/resources/test-message/set/wsa.xml
Tue Jun 17 07:54:29 2014
@@ -0,0 +1,16 @@
+<S:Envelope xmlns:S="http://www.w3.org/2003/05/soap-envelope";
+ xmlns:wsa="http://www.w3.org/2005/08/addressing";>
+ <S:Header>
+ <wsa:MessageID>http://example.com/someuniquestring</wsa:MessageID>
+ <wsa:ReplyTo>
+ <wsa:Address>http://example.com/business/client1</wsa:Address>
+ </wsa:ReplyTo>
+ <wsa:To>mailto:[email protected]</wsa:To>
+ <wsa:Action>http://example.com/fabrikam/mail/Delete</wsa:Action>
+ </S:Header>
+ <S:Body>
+ <f:Delete xmlns:f="http://example.com/fabrikam";>
+ <maxCount>42</maxCount>
+ </f:Delete>
+ </S:Body>
+</S:Envelope>
Propchange:
webservices/axiom/trunk/testsuites/soap-testsuite/src/main/resources/test-message/set/wsa.xml
------------------------------------------------------------------------------
svn:eol-style = native
