Author: veithen
Date: Mon Jun 23 16:23:28 2014
New Revision: 1604852
URL: http://svn.apache.org/r1604852
Log:
* AXIOM-311: Eliminated the old soapmessage.xml test message and replaced it
with TestMessageSet.WSA.
* Addressed some cloning issues identified in the process.
Added:
webservices/axiom/trunk/testsuites/soap-testsuite/src/main/resources/test-message/set/comment-in-prolog.xml
(with props)
Removed:
webservices/axiom/trunk/modules/axiom-api/src/test/resources/soap/soap11/soapmessage.xml
webservices/axiom/trunk/modules/axiom-api/src/test/resources/soap/soap12/soapmessage.xml
Modified:
webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/om/TestConstants.java
webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultValueImpl.java
webservices/axiom/trunk/modules/axiom-impl/src/test/java/org/apache/axiom/soap/impl/llom/SOAPImplementationTest.java
webservices/axiom/trunk/modules/axiom-tests/pom.xml
webservices/axiom/trunk/modules/axiom-tests/src/test/java/org/apache/axiom/om/OMCachingTest.java
webservices/axiom/trunk/modules/axiom-tests/src/test/java/org/apache/axiom/om/OMTestCase.java
webservices/axiom/trunk/modules/axiom-tests/src/test/java/org/apache/axiom/om/factory/OMLinkedListImplFactoryTest.java
webservices/axiom/trunk/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/builder/CustomBuilderTest.java
webservices/axiom/trunk/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/serializer/ElementSerializerTest.java
webservices/axiom/trunk/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/serializer/OMSerializerTest.java
webservices/axiom/trunk/modules/axiom-tests/src/test/java/org/apache/axiom/om/util/OMElementHelperTest.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDiscardIncomplete.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPTestCase.java
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/TestMessageAdapter.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestCloneOMElement.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestCommentInProlog.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestRegisterCustomBuilderForPayloadAfterSOAPFaultCheck.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestClone.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetXMLStreamReaderWithoutCachingWithPartiallyBuiltHeaderBlock.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestDiscardPartiallyBuilt.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestCloneIncomplete.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestGetOMFactoryWithParser.java
webservices/axiom/trunk/testsuites/soap-testsuite/src/main/java/org/apache/axiom/ts/soap/TestMessageSet.java
Modified:
webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/om/TestConstants.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/om/TestConstants.java?rev=1604852&r1=1604851&r2=1604852&view=diff
==============================================================================
---
webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/om/TestConstants.java
(original)
+++
webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/om/TestConstants.java
Mon Jun 23 16:23:28 2014
@@ -22,7 +22,6 @@ package org.apache.axiom.om;
/** All the various files created 03-Nov-2005 12:02:12 */
public class TestConstants {
- public static final String SOAP_SOAPMESSAGE =
"soap/soap11/soapmessage.xml";
public static final String SOAP_SOAPMESSAGE1 =
"soap/soap11/soapmessage1.xml";
public static final String SAMPLE1 = "soap/soap11/sample1.xml";
public static final String TEST = "soap/test.xml";
Modified:
webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultValueImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultValueImpl.java?rev=1604852&r1=1604851&r2=1604852&view=diff
==============================================================================
---
webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultValueImpl.java
(original)
+++
webservices/axiom/trunk/modules/axiom-impl/src/main/java/org/apache/axiom/soap/impl/llom/soap12/SOAP12FaultValueImpl.java
Mon Jun 23 16:23:28 2014
@@ -19,10 +19,14 @@
package org.apache.axiom.soap.impl.llom.soap12;
+import org.apache.axiom.om.OMCloneOptions;
+import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMXMLParserWrapper;
import org.apache.axiom.soap.SOAP12Constants;
import org.apache.axiom.soap.SOAPFactory;
+import org.apache.axiom.soap.SOAPFaultCode;
+import org.apache.axiom.soap.SOAPFaultSubCode;
import org.apache.axiom.soap.SOAPFaultValue;
import org.apache.axiom.soap.SOAPProcessingException;
import org.apache.axiom.soap.impl.llom.SOAPElement;
@@ -52,4 +56,12 @@ public class SOAP12FaultValueImpl extend
parent.getClass());
}
}
+
+ protected OMElement createClone(OMCloneOptions options, OMContainer
targetParent) {
+ if (targetParent instanceof SOAPFaultCode) {
+ return
((SOAPFactory)factory).createSOAPFaultValue((SOAPFaultCode)targetParent);
+ } else {
+ return
((SOAPFactory)factory).createSOAPFaultValue((SOAPFaultSubCode)targetParent);
+ }
+ }
}
Modified:
webservices/axiom/trunk/modules/axiom-impl/src/test/java/org/apache/axiom/soap/impl/llom/SOAPImplementationTest.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-impl/src/test/java/org/apache/axiom/soap/impl/llom/SOAPImplementationTest.java?rev=1604852&r1=1604851&r2=1604852&view=diff
==============================================================================
---
webservices/axiom/trunk/modules/axiom-impl/src/test/java/org/apache/axiom/soap/impl/llom/SOAPImplementationTest.java
(original)
+++
webservices/axiom/trunk/modules/axiom-impl/src/test/java/org/apache/axiom/soap/impl/llom/SOAPImplementationTest.java
Mon Jun 23 16:23:28 2014
@@ -23,11 +23,15 @@ import junit.framework.TestSuite;
import org.apache.axiom.om.impl.llom.factory.OMLinkedListMetaFactory;
import org.apache.axiom.ts.soap.SOAPTestSuiteBuilder;
+import org.apache.axiom.ts.soap.envelope.TestClone;
public class SOAPImplementationTest extends TestCase {
public static TestSuite suite() {
SOAPTestSuiteBuilder builder = new SOAPTestSuiteBuilder(new
OMLinkedListMetaFactory(), true, true);
+ // TODO
+ builder.exclude(TestClone.class,
"(message=soap/soap11/soapfault2.xml)");
+
return builder.build();
}
}
Modified: webservices/axiom/trunk/modules/axiom-tests/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-tests/pom.xml?rev=1604852&r1=1604851&r2=1604852&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-tests/pom.xml (original)
+++ webservices/axiom/trunk/modules/axiom-tests/pom.xml Mon Jun 23 16:23:28 2014
@@ -86,6 +86,12 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>soap-testsuite</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>axiom-api</artifactId>
<classifier>tests</classifier>
<version>${project.version}</version>
Modified:
webservices/axiom/trunk/modules/axiom-tests/src/test/java/org/apache/axiom/om/OMCachingTest.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-tests/src/test/java/org/apache/axiom/om/OMCachingTest.java?rev=1604852&r1=1604851&r2=1604852&view=diff
==============================================================================
---
webservices/axiom/trunk/modules/axiom-tests/src/test/java/org/apache/axiom/om/OMCachingTest.java
(original)
+++
webservices/axiom/trunk/modules/axiom-tests/src/test/java/org/apache/axiom/om/OMCachingTest.java
Mon Jun 23 16:23:28 2014
@@ -21,14 +21,19 @@ package org.apache.axiom.om;
import javax.xml.stream.XMLStreamException;
-public class OMCachingTest extends AbstractTestCase {
+import org.apache.axiom.ts.soap.SOAPSpec;
+import org.apache.axiom.ts.soap.TestMessageSet;
+
+import junit.framework.TestCase;
+
+public class OMCachingTest extends TestCase {
/** This will first serialize the element without caching. Then it tries
to serialize again . */
public void testCachingOne() throws Exception {
OMElement documentElement = null;
try {
// first build the OM tree without caching and see whether up can
cosume it again
- OMXMLParserWrapper builder =
OMXMLBuilderFactory.createOMBuilder(getTestResource(TestConstants.SOAP_SOAPMESSAGE));
+ OMXMLParserWrapper builder =
OMXMLBuilderFactory.createOMBuilder(TestMessageSet.WSA.getMessage(SOAPSpec.SOAP11).getInputStream());
documentElement = builder.getDocumentElement();
String envelopeString = documentElement.toStringWithConsume();
} catch (XMLStreamException e) {
@@ -51,7 +56,7 @@ public class OMCachingTest extends Abstr
OMElement documentElement = null;
try {
// first build the OM tree without caching and see whether up can
cosume it again
- OMXMLParserWrapper builder =
OMXMLBuilderFactory.createOMBuilder(getTestResource(TestConstants.SOAP_SOAPMESSAGE));
+ OMXMLParserWrapper builder =
OMXMLBuilderFactory.createOMBuilder(TestMessageSet.WSA.getMessage(SOAPSpec.SOAP11).getInputStream());
documentElement = builder.getDocumentElement();
String envelopeString = documentElement.toString();
envelopeString = documentElement.toStringWithConsume();
Modified:
webservices/axiom/trunk/modules/axiom-tests/src/test/java/org/apache/axiom/om/OMTestCase.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-tests/src/test/java/org/apache/axiom/om/OMTestCase.java?rev=1604852&r1=1604851&r2=1604852&view=diff
==============================================================================
---
webservices/axiom/trunk/modules/axiom-tests/src/test/java/org/apache/axiom/om/OMTestCase.java
(original)
+++
webservices/axiom/trunk/modules/axiom-tests/src/test/java/org/apache/axiom/om/OMTestCase.java
Mon Jun 23 16:23:28 2014
@@ -19,9 +19,13 @@
package org.apache.axiom.om;
+import java.io.InputStream;
+
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPModelBuilder;
+import org.apache.axiom.ts.soap.SOAPSpec;
+import org.apache.axiom.ts.soap.TestMessageSet;
public abstract class OMTestCase extends AbstractTestCase {
protected SOAPModelBuilder builder;
@@ -46,10 +50,13 @@ public abstract class OMTestCase extends
}
protected SOAPModelBuilder getOMBuilder(String fileName) throws Exception {
+ InputStream in;
if ("".equals(fileName) || fileName == null) {
- fileName = TestConstants.SOAP_SOAPMESSAGE;
+ in =
TestMessageSet.WSA.getMessage(SOAPSpec.SOAP11).getInputStream();
+ } else {
+ in = getTestResource(fileName);
}
- builder =
OMXMLBuilderFactory.createSOAPModelBuilder(getTestResource(fileName), null);
+ builder = OMXMLBuilderFactory.createSOAPModelBuilder(in, null);
return builder;
}
}
Modified:
webservices/axiom/trunk/modules/axiom-tests/src/test/java/org/apache/axiom/om/factory/OMLinkedListImplFactoryTest.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-tests/src/test/java/org/apache/axiom/om/factory/OMLinkedListImplFactoryTest.java?rev=1604852&r1=1604851&r2=1604852&view=diff
==============================================================================
---
webservices/axiom/trunk/modules/axiom-tests/src/test/java/org/apache/axiom/om/factory/OMLinkedListImplFactoryTest.java
(original)
+++
webservices/axiom/trunk/modules/axiom-tests/src/test/java/org/apache/axiom/om/factory/OMLinkedListImplFactoryTest.java
Mon Jun 23 16:23:28 2014
@@ -34,6 +34,8 @@ import org.apache.axiom.soap.SOAPEnvelop
import org.apache.axiom.soap.SOAPFactory;
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.TestMessageSet;
import javax.xml.namespace.QName;
@@ -117,7 +119,7 @@ public class OMLinkedListImplFactoryTest
public void testCreateSOAPHeaderBlock() throws Exception {
OMXMLParserWrapper omBuilder =
OMXMLBuilderFactory.createSOAPModelBuilder(
- getTestResource(TestConstants.SOAP_SOAPMESSAGE), null);
+
TestMessageSet.WSA.getMessage(SOAPSpec.SOAP11).getInputStream(), null);
SOAPEnvelope soapEnvelope = (SOAPEnvelope)
omBuilder.getDocumentElement();
SOAPHeader soapHeader = soapEnvelope.getHeader();
SOAPHeaderBlock soapHeaderBlock = omFactory.createSOAPHeaderBlock(
Modified:
webservices/axiom/trunk/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/builder/CustomBuilderTest.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/builder/CustomBuilderTest.java?rev=1604852&r1=1604851&r2=1604852&view=diff
==============================================================================
---
webservices/axiom/trunk/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/builder/CustomBuilderTest.java
(original)
+++
webservices/axiom/trunk/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/builder/CustomBuilderTest.java
Mon Jun 23 16:23:28 2014
@@ -34,6 +34,8 @@ import org.apache.axiom.soap.SOAPFactory
import org.apache.axiom.soap.SOAPHeader;
import org.apache.axiom.soap.SOAPHeaderBlock;
import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
+import org.apache.axiom.ts.soap.SOAPSpec;
+import org.apache.axiom.ts.soap.TestMessageSet;
import javax.xml.namespace.QName;
@@ -53,7 +55,7 @@ public class CustomBuilderTest extends A
public void testHeaderCustomBuilder() throws Exception{
StAXSOAPModelBuilder builder =
(StAXSOAPModelBuilder)OMXMLBuilderFactory.createSOAPModelBuilder(
- getTestResource(TestConstants.SOAP_SOAPMESSAGE), null);
+
TestMessageSet.WSA.getMessage(SOAPSpec.SOAP11).getInputStream(), null);
builder.registerCustomBuilder(new
QName("http://schemas.xmlsoap.org/ws/2004/03/addressing","To";), 3, new
ByteArrayCustomBuilder("utf-8"));
SOAPEnvelope sourceEnv = (SOAPEnvelope) builder.getDocumentElement();
@@ -73,7 +75,7 @@ public class CustomBuilderTest extends A
* @throws Exception
*/
public void testSOAPMESSAGE() throws Exception {
-
copyAndCheck(createEnvelope(getTestResource(TestConstants.SOAP_SOAPMESSAGE)),
true);
+
copyAndCheck(createEnvelope(TestMessageSet.WSA.getMessage(SOAPSpec.SOAP11).getInputStream()),
true);
}
public void testWHITESPACE_MESSAGE() throws Exception {
Modified:
webservices/axiom/trunk/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/serializer/ElementSerializerTest.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/serializer/ElementSerializerTest.java?rev=1604852&r1=1604851&r2=1604852&view=diff
==============================================================================
---
webservices/axiom/trunk/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/serializer/ElementSerializerTest.java
(original)
+++
webservices/axiom/trunk/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/serializer/ElementSerializerTest.java
Mon Jun 23 16:23:28 2014
@@ -19,7 +19,6 @@
package org.apache.axiom.om.impl.serializer;
-import org.apache.axiom.om.AbstractTestCase;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
@@ -29,24 +28,25 @@ import org.apache.axiom.om.OMText;
import org.apache.axiom.om.OMXMLBuilderFactory;
import org.apache.axiom.om.OMXMLParserWrapper;
import org.apache.axiom.om.OMConstants;
-import org.apache.axiom.om.TestConstants;
import org.apache.axiom.om.util.StAXUtils;
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPEnvelope;
+import org.apache.axiom.ts.soap.SOAPSpec;
+import org.apache.axiom.ts.soap.TestMessageSet;
import org.apache.commons.io.output.NullOutputStream;
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
-import java.io.File;
-import java.io.FileOutputStream;
-public class ElementSerializerTest extends AbstractTestCase {
+import junit.framework.TestCase;
+
+public class ElementSerializerTest extends TestCase {
private XMLStreamReader reader;
private XMLStreamWriter writer;
private OMXMLParserWrapper builder;
protected void setUp() throws Exception {
- reader =
StAXUtils.createXMLStreamReader(getTestResource(TestConstants.SOAP_SOAPMESSAGE));
+ reader =
StAXUtils.createXMLStreamReader(TestMessageSet.WSA.getMessage(SOAPSpec.SOAP11).getInputStream());
writer = StAXUtils.createXMLStreamWriter(new NullOutputStream(),
OMConstants.DEFAULT_CHAR_SET_ENCODING);
builder =
Modified:
webservices/axiom/trunk/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/serializer/OMSerializerTest.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/serializer/OMSerializerTest.java?rev=1604852&r1=1604851&r2=1604852&view=diff
==============================================================================
---
webservices/axiom/trunk/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/serializer/OMSerializerTest.java
(original)
+++
webservices/axiom/trunk/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/serializer/OMSerializerTest.java
Mon Jun 23 16:23:28 2014
@@ -24,21 +24,23 @@ import org.apache.axiom.om.NodeUnavailab
import org.apache.axiom.om.OMXMLBuilderFactory;
import org.apache.axiom.om.OMXMLParserWrapper;
import org.apache.axiom.om.OMConstants;
-import org.apache.axiom.om.TestConstants;
import org.apache.axiom.om.impl.serialize.StreamingOMSerializer;
import org.apache.axiom.om.util.StAXUtils;
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPEnvelope;
+import org.apache.axiom.ts.soap.SOAPSpec;
+import org.apache.axiom.ts.soap.TestMessageSet;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
+
import java.io.ByteArrayOutputStream;
public class OMSerializerTest extends AbstractTestCase {
public void testElementPullStream1() throws Exception {
OMXMLParserWrapper builder =
OMXMLBuilderFactory.createSOAPModelBuilder(
- getTestResource(TestConstants.SOAP_SOAPMESSAGE), null);
+
TestMessageSet.WSA.getMessage(SOAPSpec.SOAP11).getInputStream(), null);
SOAPEnvelope env = (SOAPEnvelope) builder.getDocumentElement();
StreamingOMSerializer serializer = new StreamingOMSerializer();
ByteArrayOutputStream byteArrayOutputStream = new
ByteArrayOutputStream();
@@ -54,7 +56,7 @@ public class OMSerializerTest extends Ab
public void testElementPullStream1WithCacheOff() throws Exception {
OMXMLParserWrapper builder =
OMXMLBuilderFactory.createSOAPModelBuilder(
- getTestResource(TestConstants.SOAP_SOAPMESSAGE), null);
+
TestMessageSet.WSA.getMessage(SOAPSpec.SOAP11).getInputStream(), null);
ByteArrayOutputStream byteArrayOutputStream = new
ByteArrayOutputStream();
XMLStreamWriter writer =
StAXUtils.createXMLStreamWriter(byteArrayOutputStream,
OMConstants.DEFAULT_CHAR_SET_ENCODING);
@@ -81,7 +83,7 @@ public class OMSerializerTest extends Ab
public void testElementPullStream2() throws Exception {
OMXMLParserWrapper builder =
OMXMLBuilderFactory.createSOAPModelBuilder(
- getTestResource(TestConstants.SOAP_SOAPMESSAGE), null);
+
TestMessageSet.WSA.getMessage(SOAPSpec.SOAP11).getInputStream(), null);
ByteArrayOutputStream byteArrayOutputStream = new
ByteArrayOutputStream();
XMLStreamWriter writer =
StAXUtils.createXMLStreamWriter(byteArrayOutputStream);
Modified:
webservices/axiom/trunk/modules/axiom-tests/src/test/java/org/apache/axiom/om/util/OMElementHelperTest.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-tests/src/test/java/org/apache/axiom/om/util/OMElementHelperTest.java?rev=1604852&r1=1604851&r2=1604852&view=diff
==============================================================================
---
webservices/axiom/trunk/modules/axiom-tests/src/test/java/org/apache/axiom/om/util/OMElementHelperTest.java
(original)
+++
webservices/axiom/trunk/modules/axiom-tests/src/test/java/org/apache/axiom/om/util/OMElementHelperTest.java
Mon Jun 23 16:23:28 2014
@@ -19,16 +19,18 @@
package org.apache.axiom.om.util;
-import org.apache.axiom.om.AbstractTestCase;
+import junit.framework.TestCase;
+
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMXMLBuilderFactory;
-import org.apache.axiom.om.TestConstants;
+import org.apache.axiom.ts.soap.SOAPSpec;
+import org.apache.axiom.ts.soap.TestMessageSet;
-public class OMElementHelperTest extends AbstractTestCase {
+public class OMElementHelperTest extends TestCase {
public void testImportOMElement() throws Exception {
OMElement documentElement =
-
OMXMLBuilderFactory.createOMBuilder(OMAbstractFactory.getOMFactory(),
getTestResource(TestConstants.SOAP_SOAPMESSAGE))
+
OMXMLBuilderFactory.createOMBuilder(OMAbstractFactory.getOMFactory(),
TestMessageSet.WSA.getMessage(SOAPSpec.SOAP11).getInputStream())
.getDocumentElement();
// first lets try to import an element created from llom in to llom
factory. This should return the same element
Modified:
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDiscardIncomplete.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDiscardIncomplete.java?rev=1604852&r1=1604851&r2=1604852&view=diff
==============================================================================
---
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDiscardIncomplete.java
(original)
+++
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDiscardIncomplete.java
Mon Jun 23 16:23:28 2014
@@ -18,13 +18,13 @@
*/
package org.apache.axiom.ts.om.element;
-import org.apache.axiom.om.AbstractTestCase;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.OMXMLBuilderFactory;
import org.apache.axiom.om.OMXMLParserWrapper;
-import org.apache.axiom.om.TestConstants;
import org.apache.axiom.ts.AxiomTestCase;
+import org.apache.axiom.ts.soap.SOAPSpec;
+import org.apache.axiom.ts.soap.TestMessageSet;
/**
*Test the discard method
@@ -39,8 +39,9 @@ public class TestDiscardIncomplete exten
// first build the OM tree without caching and see whether we can
discard
// an element from it
+ // TODO: we shouldn't use a SOAP message here
OMXMLParserWrapper builder =
OMXMLBuilderFactory.createOMBuilder(metaFactory.getOMFactory(),
-
AbstractTestCase.getTestResource(TestConstants.SOAP_SOAPMESSAGE));
+
TestMessageSet.WSA.getMessage(SOAPSpec.SOAP11).getInputStream());
documentElement = builder.getDocumentElement();
documentElement.getFirstElement().discard();
Modified:
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPTestCase.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPTestCase.java?rev=1604852&r1=1604851&r2=1604852&view=diff
==============================================================================
---
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPTestCase.java
(original)
+++
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPTestCase.java
Mon Jun 23 16:23:28 2014
@@ -34,7 +34,6 @@ import org.xml.sax.InputSource;
public abstract class SOAPTestCase extends AxiomTestCase {
protected static final String MESSAGE = "message.xml";
- protected static final String SOAP_MESSAGE = "soapmessage.xml";
protected final SOAPSpec spec;
protected SOAPFactory soapFactory;
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=1604852&r1=1604851&r2=1604852&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
Mon Jun 23 16:23:28 2014
@@ -292,17 +292,10 @@ public class SOAPTestSuiteBuilder extend
for (int i=0; i<badSOAPFiles.length; i++) {
addTest(new
org.apache.axiom.ts.soap.builder.BadInputTest(metaFactory, badSOAPFiles[i]));
}
- for (int i=0; i<goodSOAPFiles.length; i++) {
- addTest(new
org.apache.axiom.ts.soap.builder.MessageTest(metaFactory, goodSOAPFiles[i]));
+ for (TestMessage msg : goodSOAPFiles) {
+ addTest(new
org.apache.axiom.ts.soap.builder.MessageTest(metaFactory, msg));
+ addTest(new
org.apache.axiom.ts.soap.envelope.TestClone(metaFactory, msg));
}
- addTest(new org.apache.axiom.ts.soap.envelope.TestClone(metaFactory,
SOAPSpec.SOAP11, "sample1.xml"));
- addTest(new org.apache.axiom.ts.soap.envelope.TestClone(metaFactory,
SOAPSpec.SOAP11, "soapmessage.xml"));
- addTest(new org.apache.axiom.ts.soap.envelope.TestClone(metaFactory,
SOAPSpec.SOAP11, "soapmessage1.xml"));
- addTest(new org.apache.axiom.ts.soap.envelope.TestClone(metaFactory,
SOAPSpec.SOAP11, "whitespacedMessage.xml"));
- addTest(new org.apache.axiom.ts.soap.envelope.TestClone(metaFactory,
SOAPSpec.SOAP11, "minimalMessage.xml"));
- addTest(new org.apache.axiom.ts.soap.envelope.TestClone(metaFactory,
SOAPSpec.SOAP11, "reallyReallyBigMessage.xml"));
- addTest(new org.apache.axiom.ts.soap.envelope.TestClone(metaFactory,
SOAPSpec.SOAP11, "emtyBodymessage.xml"));
- addTest(new org.apache.axiom.ts.soap.envelope.TestClone(metaFactory,
SOAPSpec.SOAP11, "soap11fault.xml"));
for (int i=0; i<goodSOAPFiles.length; i++) {
for (int j=0; j<expansionStrategies.length; j++) {
for (int k=0; k<serializationStrategies.length; k++) {
Modified:
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/TestMessageAdapter.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/TestMessageAdapter.java?rev=1604852&r1=1604851&r2=1604852&view=diff
==============================================================================
---
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/TestMessageAdapter.java
(original)
+++
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/TestMessageAdapter.java
Mon Jun 23 16:23:28 2014
@@ -22,6 +22,7 @@ import org.apache.axiom.om.OMMetaFactory
import org.apache.axiom.om.util.StAXParserConfiguration;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
+import org.apache.axiom.soap.SOAPMessage;
import org.apache.axiom.soap.SOAPModelBuilder;
import org.junit.Assert;
import org.xml.sax.InputSource;
@@ -41,6 +42,10 @@ public final class TestMessageAdapter {
return
metaFactory.createSOAPModelBuilder(StAXParserConfiguration.SOAP, new
InputSource(testMessage.getInputStream()));
}
+ public SOAPMessage getSOAPMessage(OMMetaFactory metaFactory) {
+ return getBuilder(metaFactory).getSOAPMessage();
+ }
+
public SOAPEnvelope getSOAPEnvelope(OMMetaFactory metaFactory) {
SOAPEnvelope envelope = getBuilder(metaFactory).getSOAPEnvelope();
// TODO: this is not the right place to assert this
Modified:
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestCloneOMElement.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestCloneOMElement.java?rev=1604852&r1=1604851&r2=1604852&view=diff
==============================================================================
---
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestCloneOMElement.java
(original)
+++
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestCloneOMElement.java
Mon Jun 23 16:23:28 2014
@@ -24,6 +24,8 @@ import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPEnvelope;
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;
import org.custommonkey.xmlunit.XMLAssert;
public class TestCloneOMElement extends SOAPTestCase {
@@ -32,7 +34,7 @@ public class TestCloneOMElement extends
}
protected void runTest() throws Throwable {
- SOAPEnvelope soapEnvelope = getTestMessage(SOAP_MESSAGE);
+ SOAPEnvelope soapEnvelope =
TestMessageSet.WSA.getMessage(spec).getAdapter(TestMessageAdapter.class).getSOAPEnvelope(metaFactory);
SOAPBody body = soapEnvelope.getBody();
OMElement firstClonedBodyElement = body.cloneOMElement();
Modified:
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestCommentInProlog.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestCommentInProlog.java?rev=1604852&r1=1604851&r2=1604852&view=diff
==============================================================================
---
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestCommentInProlog.java
(original)
+++
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestCommentInProlog.java
Mon Jun 23 16:23:28 2014
@@ -24,6 +24,8 @@ import org.apache.axiom.om.OMNode;
import org.apache.axiom.soap.SOAPMessage;
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;
/**
* Tests that the SOAP builder creates {@link OMComment} nodes for comments in
the XML prolog.
@@ -34,7 +36,7 @@ public class TestCommentInProlog extends
}
protected void runTest() throws Throwable {
- SOAPMessage message =
getBuilderForTestMessage(SOAP_MESSAGE).getSOAPMessage();
+ SOAPMessage message =
TestMessageSet.COMMENT_IN_PROLOG.getMessage(spec).getAdapter(TestMessageAdapter.class).getSOAPMessage(metaFactory);
OMNode firstChild = message.getFirstOMChild();
assertTrue(firstChild instanceof OMComment);
}
Modified:
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestRegisterCustomBuilderForPayloadAfterSOAPFaultCheck.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestRegisterCustomBuilderForPayloadAfterSOAPFaultCheck.java?rev=1604852&r1=1604851&r2=1604852&view=diff
==============================================================================
---
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestRegisterCustomBuilderForPayloadAfterSOAPFaultCheck.java
(original)
+++
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestRegisterCustomBuilderForPayloadAfterSOAPFaultCheck.java
Mon Jun 23 16:23:28 2014
@@ -28,6 +28,8 @@ import org.apache.axiom.soap.SOAPEnvelop
import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
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;
/**
* Tests that a custom builder registered with
@@ -42,7 +44,7 @@ public class TestRegisterCustomBuilderFo
}
protected void runTest() throws Throwable {
- SOAPEnvelope envelope = getTestMessage("soapmessage.xml");
+ SOAPEnvelope envelope =
TestMessageSet.WSA.getMessage(SOAPSpec.SOAP11).getAdapter(TestMessageAdapter.class).getSOAPEnvelope(metaFactory);
StAXSOAPModelBuilder builder =
(StAXSOAPModelBuilder)envelope.getBuilder();
// Do a fault check. This is normally done in the engine (Axiom) and
should
Modified:
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestClone.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestClone.java?rev=1604852&r1=1604851&r2=1604852&view=diff
==============================================================================
---
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestClone.java
(original)
+++
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestClone.java
Mon Jun 23 16:23:28 2014
@@ -19,18 +19,19 @@
package org.apache.axiom.ts.soap.envelope;
import org.apache.axiom.om.OMMetaFactory;
-import org.apache.axiom.ts.soap.SOAPSpec;
+import org.apache.axiom.ts.soap.TestMessage;
+import org.apache.axiom.ts.soap.TestMessageAdapter;
public class TestClone extends CloneTestCase {
- private final String file;
+ private final TestMessage message;
- public TestClone(OMMetaFactory metaFactory, SOAPSpec spec, String file) {
- super(metaFactory, spec);
- this.file = file;
- addTestParameter("file", file);
+ public TestClone(OMMetaFactory metaFactory, TestMessage message) {
+ super(metaFactory, message.getSOAPSpec());
+ this.message = message;
+ addTestParameter("message", message.getName());
}
protected void runTest() throws Throwable {
- copyAndCheck(getTestMessage(file));
+
copyAndCheck(message.getAdapter(TestMessageAdapter.class).getSOAPEnvelope(metaFactory));
}
}
Modified:
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetXMLStreamReaderWithoutCachingWithPartiallyBuiltHeaderBlock.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetXMLStreamReaderWithoutCachingWithPartiallyBuiltHeaderBlock.java?rev=1604852&r1=1604851&r2=1604852&view=diff
==============================================================================
---
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetXMLStreamReaderWithoutCachingWithPartiallyBuiltHeaderBlock.java
(original)
+++
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetXMLStreamReaderWithoutCachingWithPartiallyBuiltHeaderBlock.java
Mon Jun 23 16:23:28 2014
@@ -30,6 +30,8 @@ import org.apache.axiom.soap.SOAPEnvelop
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;
/**
* Tests the behavior of {@link
OMContainer#getXMLStreamReaderWithoutCaching()} on a
@@ -44,9 +46,9 @@ public class TestGetXMLStreamReaderWitho
}
protected void runTest() throws Throwable {
- SOAPEnvelope envelope = getTestMessage(SOAP_MESSAGE);
+ SOAPEnvelope envelope =
TestMessageSet.WSA.getMessage(spec).getAdapter(TestMessageAdapter.class).getSOAPEnvelope(metaFactory);
SOAPHeaderBlock headerBlock =
(SOAPHeaderBlock)envelope.getHeader().getFirstChildWithName(
- new QName("http://schemas.xmlsoap.org/ws/2004/03/addressing";,
"From"));
+ new QName("http://www.w3.org/2005/08/addressing";, "ReplyTo"));
headerBlock.getFirstElement().getFirstOMChild();
assertFalse(headerBlock.isComplete());
XMLStreamReader reader = envelope.getXMLStreamReaderWithoutCaching();
Modified:
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestDiscardPartiallyBuilt.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestDiscardPartiallyBuilt.java?rev=1604852&r1=1604851&r2=1604852&view=diff
==============================================================================
---
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestDiscardPartiallyBuilt.java
(original)
+++
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestDiscardPartiallyBuilt.java
Mon Jun 23 16:23:28 2014
@@ -28,6 +28,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;
/**
* Tests the behavior of {@link OMNode#discard()} on a {@link SOAPHeader} that
is partially built,
@@ -40,9 +42,9 @@ public class TestDiscardPartiallyBuilt e
}
protected void runTest() throws Throwable {
- SOAPEnvelope envelope = getTestMessage(SOAP_MESSAGE);
+ SOAPEnvelope envelope =
TestMessageSet.WSA.getMessage(spec).getAdapter(TestMessageAdapter.class).getSOAPEnvelope(metaFactory);
SOAPHeader header = envelope.getHeader();
- OMElement from = header.getFirstChildWithName(new
QName("http://schemas.xmlsoap.org/ws/2004/03/addressing";, "From"));
+ OMElement from = header.getFirstChildWithName(new
QName("http://www.w3.org/2005/08/addressing";, "ReplyTo"));
from.getFirstElement().getFirstOMChild();
assertFalse(from.isComplete()); // Just in case getFirstChildWithName
or getFirstElement did stupid things
Modified:
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestCloneIncomplete.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestCloneIncomplete.java?rev=1604852&r1=1604851&r2=1604852&view=diff
==============================================================================
---
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestCloneIncomplete.java
(original)
+++
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestCloneIncomplete.java
Mon Jun 23 16:23:28 2014
@@ -25,6 +25,8 @@ import org.apache.axiom.om.OMMetaFactory
import org.apache.axiom.soap.SOAPMessage;
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;
/**
* Tests that {@link OMInformationItem#clone(OMCloneOptions)} correctly clones
a {@link SOAPMessage}
@@ -41,7 +43,7 @@ public class TestCloneIncomplete extends
}
protected void runTest() throws Throwable {
- SOAPMessage message =
getBuilderForTestMessage(SOAP_MESSAGE).getSOAPMessage();
+ SOAPMessage message =
TestMessageSet.WSA.getMessage(spec).getAdapter(TestMessageAdapter.class).getSOAPMessage(metaFactory);
OMCloneOptions options = new OMCloneOptions();
options.setPreserveModel(preserveModel);
OMInformationItem clone = message.clone(options);
Modified:
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestGetOMFactoryWithParser.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestGetOMFactoryWithParser.java?rev=1604852&r1=1604851&r2=1604852&view=diff
==============================================================================
---
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestGetOMFactoryWithParser.java
(original)
+++
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestGetOMFactoryWithParser.java
Mon Jun 23 16:23:28 2014
@@ -24,6 +24,8 @@ import org.apache.axiom.soap.SOAPFactory
import org.apache.axiom.soap.SOAPMessage;
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;
/**
* Tests that {@link OMInformationItem#getOMFactory()} returns the expected
{@link SOAPFactory}
@@ -36,7 +38,7 @@ public class TestGetOMFactoryWithParser
}
protected void runTest() throws Throwable {
- SOAPMessage message =
getBuilderForTestMessage(SOAP_MESSAGE).getSOAPMessage();
+ SOAPMessage message =
TestMessageSet.WSA.getMessage(spec).getAdapter(TestMessageAdapter.class).getSOAPMessage(metaFactory);
assertSame(soapFactory, message.getOMFactory());
}
}
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=1604852&r1=1604851&r2=1604852&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
Mon Jun 23 16:23:28 2014
@@ -32,6 +32,11 @@ public final class TestMessageSet extend
*/
public static final TestMessageSet WSA = new TestMessageSet("wsa");
+ /**
+ * A simple SOAP request with a comment in the XML prolog.
+ */
+ public static final TestMessageSet COMMENT_IN_PROLOG = new
TestMessageSet("comment-in-prolog");
+
private final TestMessage soap11Message;
private final TestMessage soap12Message;
Added:
webservices/axiom/trunk/testsuites/soap-testsuite/src/main/resources/test-message/set/comment-in-prolog.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/testsuites/soap-testsuite/src/main/resources/test-message/set/comment-in-prolog.xml?rev=1604852&view=auto
==============================================================================
---
webservices/axiom/trunk/testsuites/soap-testsuite/src/main/resources/test-message/set/comment-in-prolog.xml
(added)
+++
webservices/axiom/trunk/testsuites/soap-testsuite/src/main/resources/test-message/set/comment-in-prolog.xml
Mon Jun 23 16:23:28 2014
@@ -0,0 +1,6 @@
+<!-- Some comment -->
+<soapenv:Envelope xmlns:soapenv="http://www.w3.org/2003/05/soap-envelope";>
+ <soapenv:Body>
+ <p:test xmlns:p="urn:test"/>
+ </soapenv:Body>
+</soapenv:Envelope>
Propchange:
webservices/axiom/trunk/testsuites/soap-testsuite/src/main/resources/test-message/set/comment-in-prolog.xml
------------------------------------------------------------------------------
svn:eol-style = native
