Author: veithen Date: Sun Apr 25 13:21:31 2010 New Revision: 937796 URL: http://svn.apache.org/viewvc?rev=937796&view=rev Log: WSCOMMONS-534: Moved the SOAP11EnvelopeTestBase#testDiscardHeader test case to SOAPEnvelopeTestBase, because the underlying issue that caused it to fail with SOAP 1.2 was solved by WSCOMMONS-535.
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/soap/SOAP11EnvelopeTestBase.java webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/soap/SOAPEnvelopeTestBase.java Modified: webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/soap/SOAP11EnvelopeTestBase.java URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/soap/SOAP11EnvelopeTestBase.java?rev=937796&r1=937795&r2=937796&view=diff ============================================================================== --- webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/soap/SOAP11EnvelopeTestBase.java (original) +++ webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/soap/SOAP11EnvelopeTestBase.java Sun Apr 25 13:21:31 2010 @@ -24,13 +24,4 @@ public class SOAP11EnvelopeTestBase exte public SOAP11EnvelopeTestBase(OMMetaFactory omMetaFactory) { super(omMetaFactory, SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI); } - - // TODO: this should actually go to SOAPEnvelopeTestBase because it applies equally well to SOAP 1.1 and 1.2; - // however, this causes a test failure in axiom-parser-tests with SJSXP - // Regression test for WSCOMMONS-235 (see r567512) - public void testDiscardHeader() throws Exception { - SOAPEnvelope envelope = getTestMessage(MESSAGE); - envelope.getHeader().discard(); - envelope.getBody().toStringWithConsume(); - } } Modified: webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/soap/SOAPEnvelopeTestBase.java URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/soap/SOAPEnvelopeTestBase.java?rev=937796&r1=937795&r2=937796&view=diff ============================================================================== --- webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/soap/SOAPEnvelopeTestBase.java (original) +++ webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/soap/SOAPEnvelopeTestBase.java Sun Apr 25 13:21:31 2010 @@ -86,4 +86,11 @@ public class SOAPEnvelopeTestBase extend soapFactory.createSOAPHeader(envelope); assertNull(envelope.getBody()); } + + // Regression test for WSCOMMONS-235 (see r567512) + public void testDiscardHeader() throws Exception { + SOAPEnvelope envelope = getTestMessage(MESSAGE); + envelope.getHeader().discard(); + envelope.getBody().toStringWithConsume(); + } }