You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2014/05/29 01:24:23 UTC
svn commit: r1598171 - in /webservices/axiom/trunk/modules:
axiom-api/src/test/java/org/apache/axiom/soap/
axiom-impl/src/test/java/org/apache/axiom/soap/impl/llom/
axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/
axiom-testsuite/src/main/java/o...
Author: veithen
Date: Wed May 28 23:24:22 2014
New Revision: 1598171
URL: http://svn.apache.org/r1598171
Log:
Refactored some SOAPHeaderBlock test cases to integrate them into the reusable test suite.
Added:
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/headerblock/
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/headerblock/TestGetMustUnderstandWithParser.java
- copied, changed from r1593113, webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/soap/SOAP11HeaderBlockTestBase.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/headerblock/TestGetRoleWithParser.java
- copied, changed from r1593113, webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/soap/SOAPHeaderBlockTestBase.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/headerblock/TestSetMustUnderstandStringTrueFalse.java (contents, props changed)
- copied, changed from r1593113, webservices/axiom/trunk/modules/axiom-impl/src/test/java/org/apache/axiom/soap/impl/llom/SOAP12HeaderBlockTest.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/headerblock/
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/headerblock/TestGetMustUnderstandWithParser.java (contents, props changed)
- copied, changed from r1593113, webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/soap/SOAP11HeaderBlockTestBase.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/headerblock/TestGetRelayWithParser.java
- copied, changed from r1593113, webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/soap/SOAPHeaderBlockTestBase.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/headerblock/TestGetRoleWithParser.java (contents, props changed)
- copied, changed from r1593113, webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/soap/SOAPHeaderBlockTestBase.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/headerblock/TestSetMustUnderstandStringTrueFalse.java (with props)
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/headerblock/TestSetRelay.java (with props)
Removed:
webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/soap/SOAP11HeaderBlockTestBase.java
webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/soap/SOAP12HeaderBlockTestBase.java
webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/soap/SOAPHeaderBlockTestBase.java
webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/soap/UnifiedSOAPTestCase.java
webservices/axiom/trunk/modules/axiom-impl/src/test/java/org/apache/axiom/soap/impl/llom/SOAP11HeaderBlockTest.java
webservices/axiom/trunk/modules/axiom-impl/src/test/java/org/apache/axiom/soap/impl/llom/SOAP12HeaderBlockTest.java
Modified:
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPTestSuiteBuilder.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=1598171&r1=1598170&r2=1598171&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 Wed May 28 23:24:22 2014
@@ -278,6 +278,9 @@ public class SOAPTestSuiteBuilder extend
addTest(new org.apache.axiom.ts.soap11.header.TestExamineMustUnderstandHeaderBlocksWithParser(metaFactory));
addTest(new org.apache.axiom.ts.soap11.header.TestGetHeaderBlocksWithNSURIWithParser(metaFactory));
addTest(new org.apache.axiom.ts.soap11.header.TestGetHeadersToProcessWithParser(metaFactory));
+ addTest(new org.apache.axiom.ts.soap11.headerblock.TestGetMustUnderstandWithParser(metaFactory));
+ addTest(new org.apache.axiom.ts.soap11.headerblock.TestGetRoleWithParser(metaFactory));
+ addTest(new org.apache.axiom.ts.soap11.headerblock.TestSetMustUnderstandStringTrueFalse(metaFactory));
if (supportsOMSourcedElement) {
addTest(new org.apache.axiom.ts.soap11.misc.TestElementPullStreamAndOMExpansion(metaFactory));
addTest(new org.apache.axiom.ts.soap11.misc.TestElementPullStreamAndOMExpansion2(metaFactory));
@@ -313,6 +316,11 @@ public class SOAPTestSuiteBuilder extend
addTest(new org.apache.axiom.ts.soap12.header.TestExamineMustUnderstandHeaderBlocksWithParser(metaFactory));
addTest(new org.apache.axiom.ts.soap12.header.TestGetHeaderBlocksWithNSURIWithParser(metaFactory));
addTest(new org.apache.axiom.ts.soap12.header.TestGetHeadersToProcessWithParser(metaFactory));
+ addTest(new org.apache.axiom.ts.soap12.headerblock.TestGetMustUnderstandWithParser(metaFactory));
+ addTest(new org.apache.axiom.ts.soap12.headerblock.TestGetRelayWithParser(metaFactory));
+ addTest(new org.apache.axiom.ts.soap12.headerblock.TestGetRoleWithParser(metaFactory));
+ addTest(new org.apache.axiom.ts.soap12.headerblock.TestSetMustUnderstandStringTrueFalse(metaFactory));
+ addTest(new org.apache.axiom.ts.soap12.headerblock.TestSetRelay(metaFactory));
addTest(new org.apache.axiom.ts.soap12.mtom.TestGetXMLStreamReaderMTOMEncoded(metaFactory, true));
addTest(new org.apache.axiom.ts.soap12.mtom.TestGetXMLStreamReaderMTOMEncoded(metaFactory, false));
}
Copied: webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/headerblock/TestGetMustUnderstandWithParser.java (from r1593113, webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/soap/SOAP11HeaderBlockTestBase.java)
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/headerblock/TestGetMustUnderstandWithParser.java?p2=webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/headerblock/TestGetMustUnderstandWithParser.java&p1=webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/soap/SOAP11HeaderBlockTestBase.java&r1=1593113&r2=1598171&rev=1598171&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/soap/SOAP11HeaderBlockTestBase.java (original)
+++ webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/headerblock/TestGetMustUnderstandWithParser.java Wed May 28 23:24:22 2014
@@ -16,38 +16,21 @@
* specific language governing permissions and limitations
* under the License.
*/
-
-package org.apache.axiom.soap;
+package org.apache.axiom.ts.soap11.headerblock;
import java.util.Iterator;
import org.apache.axiom.om.OMMetaFactory;
-
-public class SOAP11HeaderBlockTestBase extends SOAPHeaderBlockTestBase {
- public SOAP11HeaderBlockTestBase(OMMetaFactory omMetaFactory) {
- super(omMetaFactory, SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI);
- }
-
- public void testSetMustUnderstandStringTrueFalse() {
- SOAPHeaderBlock soapHeaderBlock = createSOAPHeaderBlock();
- try {
- soapHeaderBlock.setMustUnderstand("true");
- } catch (Exception e) {
- fail(
- "SOAP HeaderBlock Test : - MustUnderstand value can not be set to any value rather than 1 or 0");
- }
- }
-
- // SOAPHeaderBlock Test (With Parser)
- public void testGetRoleWithParser() {
- Iterator iterator = getTestMessage(MESSAGE).getHeader().examineAllHeaderBlocks();
- assertTrue(
- "SOAP HeaderBlock Test With Parser : - getRole method returns incorrect role value",
- ((SOAPHeaderBlock) iterator.next()).getRole().equals(
- "http://schemas.xmlsoap.org/soap/actor/next"));
+import org.apache.axiom.soap.SOAPHeaderBlock;
+import org.apache.axiom.ts.soap.SOAPSpec;
+import org.apache.axiom.ts.soap.SOAPTestCase;
+
+public class TestGetMustUnderstandWithParser extends SOAPTestCase {
+ public TestGetMustUnderstandWithParser(OMMetaFactory metaFactory) {
+ super(metaFactory, SOAPSpec.SOAP11);
}
- public void testGetMustUnderstandWithParser() {
+ protected void runTest() throws Throwable {
Iterator iterator = getTestMessage(MESSAGE).getHeader().examineAllHeaderBlocks();
iterator.next();
assertTrue(
Copied: webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/headerblock/TestGetRoleWithParser.java (from r1593113, webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/soap/SOAPHeaderBlockTestBase.java)
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/headerblock/TestGetRoleWithParser.java?p2=webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/headerblock/TestGetRoleWithParser.java&p1=webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/soap/SOAPHeaderBlockTestBase.java&r1=1593113&r2=1598171&rev=1598171&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/soap/SOAPHeaderBlockTestBase.java (original)
+++ webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/headerblock/TestGetRoleWithParser.java Wed May 28 23:24:22 2014
@@ -16,21 +16,25 @@
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.axiom.ts.soap11.headerblock;
-package org.apache.axiom.soap;
+import java.util.Iterator;
import org.apache.axiom.om.OMMetaFactory;
-import org.apache.axiom.om.OMNamespace;
+import org.apache.axiom.soap.SOAPHeaderBlock;
+import org.apache.axiom.ts.soap.SOAPSpec;
+import org.apache.axiom.ts.soap.SOAPTestCase;
-public class SOAPHeaderBlockTestBase extends UnifiedSOAPTestCase {
- public SOAPHeaderBlockTestBase(OMMetaFactory omMetaFactory, String envelopeNamespaceURI) {
- super(omMetaFactory, envelopeNamespaceURI);
+public class TestGetRoleWithParser extends SOAPTestCase {
+ public TestGetRoleWithParser(OMMetaFactory metaFactory) {
+ super(metaFactory, SOAPSpec.SOAP11);
}
-
- protected SOAPHeaderBlock createSOAPHeaderBlock() {
- OMNamespace namespace = soapFactory.createOMNamespace("http://www.example.org", "test");;
- SOAPEnvelope soapEnvelope = soapFactory.createSOAPEnvelope();
- SOAPHeader soapHeader = soapFactory.createSOAPHeader(soapEnvelope);
- return soapFactory.createSOAPHeaderBlock("testHeaderBlock", namespace, soapHeader);
+
+ protected void runTest() throws Throwable {
+ Iterator iterator = getTestMessage(MESSAGE).getHeader().examineAllHeaderBlocks();
+ assertTrue(
+ "SOAP HeaderBlock Test With Parser : - getRole method returns incorrect role value",
+ ((SOAPHeaderBlock) iterator.next()).getRole().equals(
+ "http://schemas.xmlsoap.org/soap/actor/next"));
}
}
Copied: webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/headerblock/TestSetMustUnderstandStringTrueFalse.java (from r1593113, webservices/axiom/trunk/modules/axiom-impl/src/test/java/org/apache/axiom/soap/impl/llom/SOAP12HeaderBlockTest.java)
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/headerblock/TestSetMustUnderstandStringTrueFalse.java?p2=webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/headerblock/TestSetMustUnderstandStringTrueFalse.java&p1=webservices/axiom/trunk/modules/axiom-impl/src/test/java/org/apache/axiom/soap/impl/llom/SOAP12HeaderBlockTest.java&r1=1593113&r2=1598171&rev=1598171&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-impl/src/test/java/org/apache/axiom/soap/impl/llom/SOAP12HeaderBlockTest.java (original)
+++ webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/headerblock/TestSetMustUnderstandStringTrueFalse.java Wed May 28 23:24:22 2014
@@ -16,14 +16,25 @@
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.axiom.ts.soap11.headerblock;
-package org.apache.axiom.soap.impl.llom;
+import org.apache.axiom.om.OMMetaFactory;
+import org.apache.axiom.soap.SOAPHeaderBlock;
+import org.apache.axiom.ts.soap.SOAPSpec;
+import org.apache.axiom.ts.soap.SOAPTestCase;
-import org.apache.axiom.om.impl.llom.factory.OMLinkedListMetaFactory;
-import org.apache.axiom.soap.SOAP12HeaderBlockTestBase;
+public class TestSetMustUnderstandStringTrueFalse extends SOAPTestCase {
+ public TestSetMustUnderstandStringTrueFalse(OMMetaFactory metaFactory) {
+ super(metaFactory, SOAPSpec.SOAP11);
+ }
-public class SOAP12HeaderBlockTest extends SOAP12HeaderBlockTestBase {
- public SOAP12HeaderBlockTest() {
- super(new OMLinkedListMetaFactory());
+ protected void runTest() throws Throwable {
+ SOAPHeaderBlock soapHeaderBlock = createSOAPHeaderBlock();
+ try {
+ soapHeaderBlock.setMustUnderstand("true");
+ } catch (Exception e) {
+ fail(
+ "SOAP HeaderBlock Test : - MustUnderstand value can not be set to any value rather than 1 or 0");
+ }
}
}
Propchange: webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/headerblock/TestSetMustUnderstandStringTrueFalse.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/headerblock/TestGetMustUnderstandWithParser.java (from r1593113, webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/soap/SOAP11HeaderBlockTestBase.java)
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/headerblock/TestGetMustUnderstandWithParser.java?p2=webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/headerblock/TestGetMustUnderstandWithParser.java&p1=webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/soap/SOAP11HeaderBlockTestBase.java&r1=1593113&r2=1598171&rev=1598171&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/soap/SOAP11HeaderBlockTestBase.java (original)
+++ webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/headerblock/TestGetMustUnderstandWithParser.java Wed May 28 23:24:22 2014
@@ -16,45 +16,28 @@
* specific language governing permissions and limitations
* under the License.
*/
-
-package org.apache.axiom.soap;
+package org.apache.axiom.ts.soap12.headerblock;
import java.util.Iterator;
import org.apache.axiom.om.OMMetaFactory;
-
-public class SOAP11HeaderBlockTestBase extends SOAPHeaderBlockTestBase {
- public SOAP11HeaderBlockTestBase(OMMetaFactory omMetaFactory) {
- super(omMetaFactory, SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI);
- }
-
- public void testSetMustUnderstandStringTrueFalse() {
- SOAPHeaderBlock soapHeaderBlock = createSOAPHeaderBlock();
- try {
- soapHeaderBlock.setMustUnderstand("true");
- } catch (Exception e) {
- fail(
- "SOAP HeaderBlock Test : - MustUnderstand value can not be set to any value rather than 1 or 0");
- }
- }
-
- // SOAPHeaderBlock Test (With Parser)
- public void testGetRoleWithParser() {
- Iterator iterator = getTestMessage(MESSAGE).getHeader().examineAllHeaderBlocks();
- assertTrue(
- "SOAP HeaderBlock Test With Parser : - getRole method returns incorrect role value",
- ((SOAPHeaderBlock) iterator.next()).getRole().equals(
- "http://schemas.xmlsoap.org/soap/actor/next"));
+import org.apache.axiom.soap.SOAPHeaderBlock;
+import org.apache.axiom.ts.soap.SOAPSpec;
+import org.apache.axiom.ts.soap.SOAPTestCase;
+
+public class TestGetMustUnderstandWithParser extends SOAPTestCase {
+ public TestGetMustUnderstandWithParser(OMMetaFactory metaFactory) {
+ super(metaFactory, SOAPSpec.SOAP12);
}
- public void testGetMustUnderstandWithParser() {
+ protected void runTest() throws Throwable {
Iterator iterator = getTestMessage(MESSAGE).getHeader().examineAllHeaderBlocks();
- iterator.next();
assertTrue(
"SOAP HeaderBlock Test With Parser : - getMustUnderstand method returns incorrect value",
((SOAPHeaderBlock) iterator.next()).getMustUnderstand());
assertFalse(
"SOAP HeaderBlock Test With Parser : - getMustUnderstand method returns incorrect value",
((SOAPHeaderBlock) iterator.next()).getMustUnderstand());
+ ((SOAPHeaderBlock) iterator.next()).getMustUnderstand();
}
}
Propchange: webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/headerblock/TestGetMustUnderstandWithParser.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/headerblock/TestGetRelayWithParser.java (from r1593113, webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/soap/SOAPHeaderBlockTestBase.java)
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/headerblock/TestGetRelayWithParser.java?p2=webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/headerblock/TestGetRelayWithParser.java&p1=webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/soap/SOAPHeaderBlockTestBase.java&r1=1593113&r2=1598171&rev=1598171&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/soap/SOAPHeaderBlockTestBase.java (original)
+++ webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/headerblock/TestGetRelayWithParser.java Wed May 28 23:24:22 2014
@@ -16,21 +16,24 @@
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.axiom.ts.soap12.headerblock;
-package org.apache.axiom.soap;
+import java.util.Iterator;
import org.apache.axiom.om.OMMetaFactory;
-import org.apache.axiom.om.OMNamespace;
+import org.apache.axiom.soap.SOAPHeaderBlock;
+import org.apache.axiom.ts.soap.SOAPSpec;
+import org.apache.axiom.ts.soap.SOAPTestCase;
-public class SOAPHeaderBlockTestBase extends UnifiedSOAPTestCase {
- public SOAPHeaderBlockTestBase(OMMetaFactory omMetaFactory, String envelopeNamespaceURI) {
- super(omMetaFactory, envelopeNamespaceURI);
+public class TestGetRelayWithParser extends SOAPTestCase {
+ public TestGetRelayWithParser(OMMetaFactory metaFactory) {
+ super(metaFactory, SOAPSpec.SOAP12);
}
-
- protected SOAPHeaderBlock createSOAPHeaderBlock() {
- OMNamespace namespace = soapFactory.createOMNamespace("http://www.example.org", "test");;
- SOAPEnvelope soapEnvelope = soapFactory.createSOAPEnvelope();
- SOAPHeader soapHeader = soapFactory.createSOAPHeader(soapEnvelope);
- return soapFactory.createSOAPHeaderBlock("testHeaderBlock", namespace, soapHeader);
+
+ protected void runTest() throws Throwable {
+ Iterator iterator = getTestMessage(MESSAGE).getHeader().examineAllHeaderBlocks();
+ assertFalse(((SOAPHeaderBlock) iterator.next()).getRelay());
+ assertTrue(((SOAPHeaderBlock) iterator.next()).getRelay());
+ assertFalse(((SOAPHeaderBlock) iterator.next()).getRelay());
}
}
Copied: webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/headerblock/TestGetRoleWithParser.java (from r1593113, webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/soap/SOAPHeaderBlockTestBase.java)
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/headerblock/TestGetRoleWithParser.java?p2=webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/headerblock/TestGetRoleWithParser.java&p1=webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/soap/SOAPHeaderBlockTestBase.java&r1=1593113&r2=1598171&rev=1598171&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/soap/SOAPHeaderBlockTestBase.java (original)
+++ webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/headerblock/TestGetRoleWithParser.java Wed May 28 23:24:22 2014
@@ -16,21 +16,25 @@
* specific language governing permissions and limitations
* under the License.
*/
+package org.apache.axiom.ts.soap12.headerblock;
-package org.apache.axiom.soap;
+import java.util.Iterator;
import org.apache.axiom.om.OMMetaFactory;
-import org.apache.axiom.om.OMNamespace;
+import org.apache.axiom.soap.SOAPHeaderBlock;
+import org.apache.axiom.ts.soap.SOAPSpec;
+import org.apache.axiom.ts.soap.SOAPTestCase;
-public class SOAPHeaderBlockTestBase extends UnifiedSOAPTestCase {
- public SOAPHeaderBlockTestBase(OMMetaFactory omMetaFactory, String envelopeNamespaceURI) {
- super(omMetaFactory, envelopeNamespaceURI);
+public class TestGetRoleWithParser extends SOAPTestCase {
+ public TestGetRoleWithParser(OMMetaFactory metaFactory) {
+ super(metaFactory, SOAPSpec.SOAP12);
}
-
- protected SOAPHeaderBlock createSOAPHeaderBlock() {
- OMNamespace namespace = soapFactory.createOMNamespace("http://www.example.org", "test");;
- SOAPEnvelope soapEnvelope = soapFactory.createSOAPEnvelope();
- SOAPHeader soapHeader = soapFactory.createSOAPHeader(soapEnvelope);
- return soapFactory.createSOAPHeaderBlock("testHeaderBlock", namespace, soapHeader);
+
+ protected void runTest() throws Throwable {
+ Iterator iterator = getTestMessage(MESSAGE).getHeader().examineAllHeaderBlocks();
+ assertTrue(
+ "SOAP HeaderBlock Test With Parser : - getRole method returns incorrect role value",
+ ((SOAPHeaderBlock) iterator.next()).getRole().equals(
+ "http://www.w3.org/2003/05/soap-envelope/role/ultimateReceiver"));
}
}
Propchange: webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/headerblock/TestGetRoleWithParser.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/headerblock/TestSetMustUnderstandStringTrueFalse.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/headerblock/TestSetMustUnderstandStringTrueFalse.java?rev=1598171&view=auto
==============================================================================
--- webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/headerblock/TestSetMustUnderstandStringTrueFalse.java (added)
+++ webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/headerblock/TestSetMustUnderstandStringTrueFalse.java Wed May 28 23:24:22 2014
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.axiom.ts.soap12.headerblock;
+
+import org.apache.axiom.om.OMMetaFactory;
+import org.apache.axiom.soap.SOAPHeaderBlock;
+import org.apache.axiom.ts.soap.SOAPSpec;
+import org.apache.axiom.ts.soap.SOAPTestCase;
+
+public class TestSetMustUnderstandStringTrueFalse extends SOAPTestCase {
+ public TestSetMustUnderstandStringTrueFalse(OMMetaFactory metaFactory) {
+ super(metaFactory, SOAPSpec.SOAP12);
+ }
+
+ protected void runTest() throws Throwable {
+ SOAPHeaderBlock soapHeaderBlock = createSOAPHeaderBlock();
+ soapHeaderBlock.setMustUnderstand("true");
+ assertTrue(
+ "SOAP HeaderBlock Test : - After setting MustUnderstand \"true\" calling setMustUnderstand method , getMustUnderstand method returns false",
+ soapHeaderBlock.getMustUnderstand());
+ soapHeaderBlock.setMustUnderstand("false");
+ assertFalse(
+ "SOAP HeaderBlock Test : - After setting MustUnderstand \"0\" calling setMustUnderstand method , getMustUnderstand method returns true",
+ soapHeaderBlock.getMustUnderstand());
+ }
+}
Propchange: webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/headerblock/TestSetMustUnderstandStringTrueFalse.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/headerblock/TestSetRelay.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/headerblock/TestSetRelay.java?rev=1598171&view=auto
==============================================================================
--- webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/headerblock/TestSetRelay.java (added)
+++ webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/headerblock/TestSetRelay.java Wed May 28 23:24:22 2014
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.axiom.ts.soap12.headerblock;
+
+import org.apache.axiom.om.OMMetaFactory;
+import org.apache.axiom.om.OMNamespace;
+import org.apache.axiom.soap.SOAPEnvelope;
+import org.apache.axiom.soap.SOAPHeader;
+import org.apache.axiom.soap.SOAPHeaderBlock;
+import org.apache.axiom.ts.soap.SOAPSpec;
+import org.apache.axiom.ts.soap.SOAPTestCase;
+
+public class TestSetRelay extends SOAPTestCase {
+ public TestSetRelay(OMMetaFactory metaFactory) {
+ super(metaFactory, SOAPSpec.SOAP12);
+ }
+
+ protected void runTest() throws Throwable {
+ SOAPEnvelope env = soapFactory.createSOAPEnvelope();
+ SOAPHeader header = soapFactory.createSOAPHeader(env);
+ soapFactory.createSOAPBody(env);
+ OMNamespace ns = soapFactory.createOMNamespace("http://ns1", "ns1");
+ SOAPHeaderBlock relayHeader = header.addHeaderBlock("foo", ns);
+ relayHeader.setText("hey there");
+ relayHeader.setRelay(true);
+
+ String envString = env.toString();
+ assertTrue("No relay header after setRelay(true)",
+ envString.indexOf("relay=\"true\"") >= 0);
+ }
+}
Propchange: webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/headerblock/TestSetRelay.java
------------------------------------------------------------------------------
svn:eol-style = native