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 2012/07/07 20:24:12 UTC
svn commit: r1358610 [9/10] - in /webservices/axiom/branches/AXIOM-201: ./
modules/axiom-api/
modules/axiom-api/src/main/java/org/apache/axiom/attachments/
modules/axiom-api/src/main/java/org/apache/axiom/locator/
modules/axiom-api/src/main/java/org/ap...
Modified: webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/serializer/ElementSerializerTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/serializer/ElementSerializerTest.java?rev=1358610&r1=1358609&r2=1358610&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/serializer/ElementSerializerTest.java (original)
+++ webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/serializer/ElementSerializerTest.java Sat Jul 7 18:24:00 2012
@@ -45,10 +45,6 @@ public class ElementSerializerTest exten
private OMXMLParserWrapper builder;
private File tempFile;
- public ElementSerializerTest(String testName) {
- super(testName);
- }
-
protected void setUp() throws Exception {
reader = StAXUtils.createXMLStreamReader(getTestResource(TestConstants.SOAP_SOAPMESSAGE));
tempFile = File.createTempFile("temp", "xml");
Modified: webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/serializer/OMFaultSerializerTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/serializer/OMFaultSerializerTest.java?rev=1358610&r1=1358609&r2=1358610&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/serializer/OMFaultSerializerTest.java (original)
+++ webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/serializer/OMFaultSerializerTest.java Sat Jul 7 18:24:00 2012
@@ -21,40 +21,21 @@ package org.apache.axiom.om.impl.seriali
import org.apache.axiom.om.AbstractTestCase;
import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.util.StAXUtils;
-import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
-
-import javax.xml.stream.XMLStreamReader;
+import org.apache.axiom.om.OMXMLBuilderFactory;
+import org.apache.axiom.soap.SOAPModelBuilder;
public class OMFaultSerializerTest extends AbstractTestCase {
- private XMLStreamReader reader1;
- private XMLStreamReader reader2;
-
- public OMFaultSerializerTest(String testName) {
- super(testName);
- }
-
- protected void setUp() throws Exception {
- reader1 = StAXUtils.createXMLStreamReader(getTestResource("soap/soap11/soapfault1.xml"));
- reader2 = StAXUtils.createXMLStreamReader(getTestResource("soap/soap11/soapfault2.xml"));
-
- }
-
- protected void tearDown() throws Exception {
- reader1.close();
- reader2.close();
- }
-
/**
* Test SOAPFault that does not disable the default namespace (i.e. does not use xmlns="")
*
* @throws Exception
*/
public void test1() throws Exception {
- StAXSOAPModelBuilder builder = new StAXSOAPModelBuilder(reader1, null);
+ SOAPModelBuilder builder = OMXMLBuilderFactory.createSOAPModelBuilder(getTestResource("soap/soap11/soapfault1.xml"), null);
OMElement ome = builder.getDocumentElement();
ome.toString();
// System.out.println(ome);
+ builder.close();
}
/**
@@ -63,10 +44,11 @@ public class OMFaultSerializerTest exten
* @throws Exception
*/
public void test2() throws Exception {
- StAXSOAPModelBuilder builder = new StAXSOAPModelBuilder(reader2, null);
+ SOAPModelBuilder builder = OMXMLBuilderFactory.createSOAPModelBuilder(getTestResource("soap/soap11/soapfault2.xml"), null);
OMElement ome = builder.getDocumentElement();
ome.toString();
// System.out.println(ome);
+ builder.close();
}
}
\ No newline at end of file
Modified: webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/serializer/OMSerializerTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/serializer/OMSerializerTest.java?rev=1358610&r1=1358609&r2=1358610&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/serializer/OMSerializerTest.java (original)
+++ webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/serializer/OMSerializerTest.java Sat Jul 7 18:24:00 2012
@@ -32,7 +32,6 @@ import org.apache.axiom.om.impl.serializ
import org.apache.axiom.om.util.StAXUtils;
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPEnvelope;
-import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamReader;
@@ -43,16 +42,10 @@ import java.io.PrintWriter;
import java.io.StringWriter;
public class OMSerializerTest extends AbstractTestCase {
- private XMLStreamReader reader;
private XMLStreamWriter writer;
private File tempFile;
- public OMSerializerTest(String testName) {
- super(testName);
- }
-
protected void setUp() throws Exception {
- reader = StAXUtils.createXMLStreamReader(getTestResource(TestConstants.SOAP_SOAPMESSAGE));
tempFile = File.createTempFile("temp", "xml");
// writer =
// XMLOutputFactory.newInstance().
@@ -62,6 +55,7 @@ public class OMSerializerTest extends Ab
}
public void testRawSerializer() throws Exception {
+ XMLStreamReader reader = StAXUtils.createXMLStreamReader(getTestResource(TestConstants.SOAP_SOAPMESSAGE));
StreamingOMSerializer serializer = new StreamingOMSerializer();
ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
writer = StAXUtils.createXMLStreamWriter(byteArrayOutputStream);
@@ -75,8 +69,8 @@ public class OMSerializerTest extends Ab
}
public void testElementPullStream1() throws Exception {
- OMXMLParserWrapper builder = OMXMLBuilderFactory.createStAXSOAPModelBuilder(
- reader);
+ OMXMLParserWrapper builder = OMXMLBuilderFactory.createSOAPModelBuilder(
+ getTestResource(TestConstants.SOAP_SOAPMESSAGE), null);
SOAPEnvelope env = (SOAPEnvelope) builder.getDocumentElement();
StreamingOMSerializer serializer = new StreamingOMSerializer();
ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
@@ -91,12 +85,13 @@ public class OMSerializerTest extends Ab
public void testElementPullStream1WithCacheOff() throws Exception {
- StAXSOAPModelBuilder soapBuilder = new StAXSOAPModelBuilder(reader, null);
+ OMXMLParserWrapper builder = OMXMLBuilderFactory.createSOAPModelBuilder(
+ getTestResource(TestConstants.SOAP_SOAPMESSAGE), null);
ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
writer = StAXUtils.createXMLStreamWriter(byteArrayOutputStream,
OMConstants.DEFAULT_CHAR_SET_ENCODING);
- SOAPEnvelope env = (SOAPEnvelope) soapBuilder.getDocumentElement();
+ SOAPEnvelope env = (SOAPEnvelope) builder.getDocumentElement();
env.serializeAndConsume(writer);
writer.flush();
@@ -124,8 +119,8 @@ public class OMSerializerTest extends Ab
}
public void testElementPullStream2() throws Exception {
- OMXMLParserWrapper builder = OMXMLBuilderFactory.createStAXSOAPModelBuilder(
- reader);
+ OMXMLParserWrapper builder = OMXMLBuilderFactory.createSOAPModelBuilder(
+ getTestResource(TestConstants.SOAP_SOAPMESSAGE), null);
ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
writer = StAXUtils.createXMLStreamWriter(byteArrayOutputStream);
@@ -152,7 +147,7 @@ public class OMSerializerTest extends Ab
*/
public void testElementPullStreamAndOMExpansion() throws Exception {
// Create a reader sourced from a message containing an interesting payload
- reader = StAXUtils.createXMLStreamReader(getTestResource("soap/OMElementTest.xml"));
+ XMLStreamReader reader = StAXUtils.createXMLStreamReader(getTestResource("soap/OMElementTest.xml"));
// Create a builder connected to the reader
StAXBuilder builder = (StAXBuilder)OMXMLBuilderFactory.createStAXSOAPModelBuilder(
@@ -207,7 +202,7 @@ public class OMSerializerTest extends Ab
*/
public void testElementPullStreamAndOMExpansion2() throws Exception {
// Create a reader sourced from a message containing an interesting payload
- reader = StAXUtils.createXMLStreamReader(getTestResource("soap/soapmessageWithXSI.xml"));
+ XMLStreamReader reader = StAXUtils.createXMLStreamReader(getTestResource("soap/soapmessageWithXSI.xml"));
// Create a builder connected to the reader
StAXBuilder builder = (StAXBuilder)OMXMLBuilderFactory.createStAXSOAPModelBuilder(
@@ -258,7 +253,7 @@ public class OMSerializerTest extends Ab
*/
public void testElementPullStreamAndOMExpansion3() throws Exception {
// Create a reader sourced from a message containing an interesting payload
- reader = StAXUtils.createXMLStreamReader(getTestResource("soap/noprettyprint.xml"));
+ XMLStreamReader reader = StAXUtils.createXMLStreamReader(getTestResource("soap/noprettyprint.xml"));
// Create a builder connected to the reader
StAXBuilder builder = (StAXBuilder)OMXMLBuilderFactory.createStAXSOAPModelBuilder(
@@ -314,7 +309,7 @@ public class OMSerializerTest extends Ab
final String USR_URI = "http://ws.apache.org/axis2/user";
final String USR_DEF = "xmlns:usr";
- reader =
+ XMLStreamReader reader =
XMLInputFactory.newInstance()
.createXMLStreamReader(getTestResource("soap/soapmessageWithXSI.xml"));
OMXMLParserWrapper builder =
@@ -346,7 +341,7 @@ public class OMSerializerTest extends Ab
final String USR_URI = "http://ws.apache.org/axis2/user";
final String USR_DEF = "xmlns:usr";
- reader =
+ XMLStreamReader reader =
XMLInputFactory.newInstance()
.createXMLStreamReader(getTestResource("soap/soapmessageWithXSI.xml"));
OMXMLParserWrapper builder =
@@ -371,7 +366,6 @@ public class OMSerializerTest extends Ab
}
protected void tearDown() throws Exception {
- reader.close();
tempFile.delete();
}
}
Modified: webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/streamwrapper/OMStaxStreamingWrapperTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/streamwrapper/OMStaxStreamingWrapperTest.java?rev=1358610&r1=1358609&r2=1358610&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/streamwrapper/OMStaxStreamingWrapperTest.java (original)
+++ webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/streamwrapper/OMStaxStreamingWrapperTest.java Sat Jul 7 18:24:00 2012
@@ -33,10 +33,6 @@ public class OMStaxStreamingWrapperTest
private File tempFile;
private XMLStreamReader parser;
- public OMStaxStreamingWrapperTest(String testName) {
- super(testName);
- }
-
protected void setUp() throws Exception {
OMXMLParserWrapper builder = OMXMLBuilderFactory.createSOAPModelBuilder(
getTestResource(TestConstants.SOAP_SOAPMESSAGE1), null);
Modified: webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/streamwrapper/OmStAXBuilderTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/streamwrapper/OmStAXBuilderTest.java?rev=1358610&r1=1358609&r2=1358610&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/streamwrapper/OmStAXBuilderTest.java (original)
+++ webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/streamwrapper/OmStAXBuilderTest.java Sat Jul 7 18:24:00 2012
@@ -32,10 +32,6 @@ public class OmStAXBuilderTest extends A
private OMXMLParserWrapper builder;
private File tempFile;
- public OmStAXBuilderTest(String testName) {
- super(testName);
- }
-
protected void setUp() throws Exception {
builder = OMXMLBuilderFactory.createSOAPModelBuilder(getTestResource(
TestConstants.SOAP_SOAPMESSAGE), null);
Modified: webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/traverse/OMChildrenWithSpecificAttributeIteratorTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/traverse/OMChildrenWithSpecificAttributeIteratorTest.java?rev=1358610&r1=1358609&r2=1358610&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/traverse/OMChildrenWithSpecificAttributeIteratorTest.java (original)
+++ webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/traverse/OMChildrenWithSpecificAttributeIteratorTest.java Sat Jul 7 18:24:00 2012
@@ -29,11 +29,6 @@ import javax.xml.namespace.QName;
import java.util.Iterator;
public class OMChildrenWithSpecificAttributeIteratorTest extends TestCase {
-
- public OMChildrenWithSpecificAttributeIteratorTest(String testName) {
- super(testName);
- }
-
public void testChildrenRetrievalWithDetaching() {
OMFactory factory = OMAbstractFactory.getOMFactory();
Modified: webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/om/util/OMElementHelperTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/om/util/OMElementHelperTest.java?rev=1358610&r1=1358609&r2=1358610&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/om/util/OMElementHelperTest.java (original)
+++ webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/om/util/OMElementHelperTest.java Sat Jul 7 18:24:00 2012
@@ -23,15 +23,12 @@ import org.apache.axiom.om.AbstractTestC
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMXMLBuilderFactory;
+import org.apache.axiom.om.TestConstants;
public class OMElementHelperTest extends AbstractTestCase {
-
- private String testXMLFilePath = "soap/soapmessage.xml";
-
-
public void testImportOMElement() throws Exception {
OMElement documentElement =
- OMXMLBuilderFactory.createOMBuilder(OMAbstractFactory.getOMFactory(), getTestResource(testXMLFilePath))
+ OMXMLBuilderFactory.createOMBuilder(OMAbstractFactory.getOMFactory(), getTestResource(TestConstants.SOAP_SOAPMESSAGE))
.getDocumentElement();
// first lets try to import an element created from llom in to llom factory. This should return the same element
Modified: webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/soap/SOAP11DefaultFaultConversionTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/soap/SOAP11DefaultFaultConversionTest.java?rev=1358610&r1=1358609&r2=1358610&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/soap/SOAP11DefaultFaultConversionTest.java (original)
+++ webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/soap/SOAP11DefaultFaultConversionTest.java Sat Jul 7 18:24:00 2012
@@ -21,8 +21,8 @@ package org.apache.axiom.soap;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMXMLBuilderFactory;
import org.apache.axiom.soap.SOAPEnvelope;
-import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
import junit.framework.TestCase;
@@ -55,10 +55,9 @@ public class SOAP11DefaultFaultConversio
envelope.build();
- factory = OMAbstractFactory.getMetaFactory(OMAbstractFactory.FEATURE_DOM).getSOAP11Factory();
-
- StAXSOAPModelBuilder stAXSOAPModelBuilder = new StAXSOAPModelBuilder(
- envelope.getXMLStreamReader(), factory,SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI);
+ SOAPModelBuilder stAXSOAPModelBuilder = OMXMLBuilderFactory.createStAXSOAPModelBuilder(
+ OMAbstractFactory.getMetaFactory(OMAbstractFactory.FEATURE_DOM),
+ envelope.getXMLStreamReader());
SOAPEnvelope env = stAXSOAPModelBuilder.getSOAPEnvelope();
env.getParent().build();
Modified: webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/soap/SOAP11FaultImplConversionTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/soap/SOAP11FaultImplConversionTest.java?rev=1358610&r1=1358609&r2=1358610&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/soap/SOAP11FaultImplConversionTest.java (original)
+++ webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/soap/SOAP11FaultImplConversionTest.java Sat Jul 7 18:24:00 2012
@@ -20,27 +20,23 @@
package org.apache.axiom.soap;
import org.apache.axiom.om.AbstractTestCase;
-import org.apache.axiom.om.util.StAXUtils;
-import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
+import org.apache.axiom.om.OMXMLBuilderFactory;
-import javax.xml.stream.XMLStreamReader;
import java.io.InputStream;
-
public class SOAP11FaultImplConversionTest extends AbstractTestCase {
private String soap11FaulXmlPath = "soap/soap11/soapfault2.xml";
public void testConversion() throws Exception {
InputStream is = getTestResource(soap11FaulXmlPath);
- XMLStreamReader reader = StAXUtils.createXMLStreamReader(is);
- SOAPEnvelope env = new StAXSOAPModelBuilder(reader, null).getSOAPEnvelope();
+ SOAPEnvelope env = OMXMLBuilderFactory.createSOAPModelBuilder(is, null).getSOAPEnvelope();
env.build();
SOAPEnvelope env2 =
- new StAXSOAPModelBuilder(env.getXMLStreamReader(), null).getSOAPEnvelope();
+ OMXMLBuilderFactory.createStAXSOAPModelBuilder(env.getXMLStreamReader()).getSOAPEnvelope();
env2.build();
Modified: webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/soap/SOAPFactoryTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/soap/SOAPFactoryTest.java?rev=1358610&r1=1358609&r2=1358610&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/soap/SOAPFactoryTest.java (original)
+++ webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/soap/SOAPFactoryTest.java Sat Jul 7 18:24:00 2012
@@ -20,27 +20,23 @@
package org.apache.axiom.soap;
import org.apache.axiom.om.AbstractTestCase;
-import org.apache.axiom.om.util.StAXUtils;
-import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.axiom.om.OMXMLBuilderFactory;
public class SOAPFactoryTest extends AbstractTestCase {
protected static final String SOAP11_FILE_NAME = "soap/soap11/message.xml";
protected static final String SOAP12_FILE_NAME = "soap/soap12/message.xml";
- private static Log log = LogFactory.getLog(SOAPFactoryTest.class);
public void testSOAPFactory() throws Exception {
SOAPEnvelope soapEnvelope =
- (SOAPEnvelope) new StAXSOAPModelBuilder(StAXUtils.
- createXMLStreamReader(getTestResource(SOAP11_FILE_NAME)), null)
+ (SOAPEnvelope) OMXMLBuilderFactory.createSOAPModelBuilder(
+ getTestResource(SOAP11_FILE_NAME), null)
.getDocumentElement();
assertNotNull(soapEnvelope);
soapEnvelope.close(false);
- soapEnvelope = (SOAPEnvelope) new StAXSOAPModelBuilder(StAXUtils.
- createXMLStreamReader(getTestResource(SOAP12_FILE_NAME)), null)
+ soapEnvelope = (SOAPEnvelope) OMXMLBuilderFactory.createSOAPModelBuilder(
+ getTestResource(SOAP12_FILE_NAME), null)
.getDocumentElement();
assertNotNull(soapEnvelope);
soapEnvelope.close(false);
Modified: webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/soap/SOAPMessageTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/soap/SOAPMessageTest.java?rev=1358610&r1=1358609&r2=1358610&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/soap/SOAPMessageTest.java (original)
+++ webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/soap/SOAPMessageTest.java Sat Jul 7 18:24:00 2012
@@ -23,14 +23,10 @@ import org.apache.axiom.om.OMTestCase;
import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
public class SOAPMessageTest extends OMTestCase {
-
- public SOAPMessageTest(String testName) {
- super(testName);
- }
-
public void testSOAPMessageCreation() throws Exception {
- StAXSOAPModelBuilder soapBuilder = getOMBuilder("");
- SOAPMessage soapMessage = soapBuilder.getSoapMessage();
+ SOAPModelBuilder soapBuilder = getOMBuilder("");
+ // TODO: avoid cast here
+ SOAPMessage soapMessage = ((StAXSOAPModelBuilder)soapBuilder).getSoapMessage();
assertNotNull(soapMessage);
assertNotNull(soapMessage.getSOAPEnvelope());
}
Modified: webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/soap/WrongEnvelopeNamespaceTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/soap/WrongEnvelopeNamespaceTest.java?rev=1358610&r1=1358609&r2=1358610&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/soap/WrongEnvelopeNamespaceTest.java (original)
+++ webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/soap/WrongEnvelopeNamespaceTest.java Sat Jul 7 18:24:00 2012
@@ -20,19 +20,13 @@
package org.apache.axiom.soap;
import org.apache.axiom.om.AbstractTestCase;
-import org.apache.axiom.om.impl.builder.StAXBuilder;
-import org.apache.axiom.om.util.StAXUtils;
-import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
-
-import javax.xml.stream.XMLStreamReader;
+import org.apache.axiom.om.OMXMLBuilderFactory;
public class WrongEnvelopeNamespaceTest extends AbstractTestCase {
public void testCode() {
try {
String filename = "soap/wrongEnvelopeNamespace.xml";
- XMLStreamReader xmlr = StAXUtils.createXMLStreamReader(
- getTestResource(filename));
- StAXBuilder builder = new StAXSOAPModelBuilder(xmlr, null); //exception here
+ OMXMLBuilderFactory.createSOAPModelBuilder(getTestResource(filename), null); //exception here
fail("Builder must fail here due to wrong SOAP namespace");
} catch (SOAPProcessingException e) {
assertTrue(true);
Modified: webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/soap/impl/llom/CharacterEncoding2Test.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/soap/impl/llom/CharacterEncoding2Test.java?rev=1358610&r1=1358609&r2=1358610&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/soap/impl/llom/CharacterEncoding2Test.java (original)
+++ webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/soap/impl/llom/CharacterEncoding2Test.java Sat Jul 7 18:24:00 2012
@@ -20,9 +20,9 @@
package org.apache.axiom.soap.impl.llom;
import org.apache.axiom.soap.SOAPEnvelope;
-import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
+import org.apache.axiom.soap.SOAPModelBuilder;
import org.apache.axiom.om.OMOutputFormat;
-import org.apache.axiom.om.util.StAXUtils;
+import org.apache.axiom.om.OMXMLBuilderFactory;
import org.custommonkey.xmlunit.XMLTestCase;
import java.io.ByteArrayInputStream;
@@ -49,8 +49,8 @@ public class CharacterEncoding2Test exte
public void testISO99591() throws Exception {
ByteArrayInputStream byteInStr = new ByteArrayInputStream(xml.getBytes("iso-8859-1"));
- StAXSOAPModelBuilder builder = new StAXSOAPModelBuilder(
- StAXUtils.createXMLStreamReader(byteInStr));
+ SOAPModelBuilder builder = OMXMLBuilderFactory.createSOAPModelBuilder(
+ byteInStr, null);
SOAPEnvelope envelope = builder.getSOAPEnvelope();
envelope.build();
Modified: webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/soap/impl/llom/CharacterEncodingTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/soap/impl/llom/CharacterEncodingTest.java?rev=1358610&r1=1358609&r2=1358610&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/soap/impl/llom/CharacterEncodingTest.java (original)
+++ webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/soap/impl/llom/CharacterEncodingTest.java Sat Jul 7 18:24:00 2012
@@ -24,10 +24,10 @@ import org.apache.axiom.om.OMAbstractFac
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMOutputFormat;
-import org.apache.axiom.om.util.StAXUtils;
+import org.apache.axiom.om.OMXMLBuilderFactory;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
-import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
+import org.apache.axiom.soap.SOAPModelBuilder;
import javax.xml.stream.FactoryConfigurationError;
import javax.xml.stream.XMLStreamException;
@@ -68,8 +68,8 @@ public class CharacterEncodingTest exten
ByteArrayInputStream byteInStr = new ByteArrayInputStream(byteOutStr.toByteArray());
- StAXSOAPModelBuilder builder = new StAXSOAPModelBuilder(
- StAXUtils.createXMLStreamReader(byteInStr, UTF_16), null);
+ SOAPModelBuilder builder = OMXMLBuilderFactory.createSOAPModelBuilder(
+ byteInStr, UTF_16);
SOAPEnvelope resultEnv = builder.getSOAPEnvelope();
Modified: webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/soap/impl/llom/OMElementTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/soap/impl/llom/OMElementTest.java?rev=1358610&r1=1358609&r2=1358610&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/soap/impl/llom/OMElementTest.java (original)
+++ webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/soap/impl/llom/OMElementTest.java Sat Jul 7 18:24:00 2012
@@ -29,7 +29,7 @@ import org.apache.axiom.om.OMTestCase;
import org.apache.axiom.om.OMText;
import org.apache.axiom.om.OMXMLBuilderFactory;
import org.apache.axiom.soap.SOAPEnvelope;
-import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
+import org.apache.axiom.soap.SOAPModelBuilder;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -46,11 +46,6 @@ public class OMElementTest extends OMTes
private OMElement firstElement;
private OMElement secondElement;
-
- public OMElementTest(String testName) {
- super(testName);
- }
-
/*
* @see TestCase#setUp()
*/
@@ -67,7 +62,7 @@ public class OMElementTest extends OMTes
public void testGetText() {
try {
- StAXSOAPModelBuilder soapBuilder = getOMBuilder(
+ SOAPModelBuilder soapBuilder = getOMBuilder(
"soap/OMElementTest.xml");
SOAPEnvelope soapEnvelope = (SOAPEnvelope) soapBuilder.getDocumentElement();
OMElement wsaTo = soapEnvelope.getHeader().getFirstChildWithName(
Modified: webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/soap/impl/llom/OMEnvelopeTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/soap/impl/llom/OMEnvelopeTest.java?rev=1358610&r1=1358609&r2=1358610&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/soap/impl/llom/OMEnvelopeTest.java (original)
+++ webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/soap/impl/llom/OMEnvelopeTest.java Sat Jul 7 18:24:00 2012
@@ -22,23 +22,10 @@ package org.apache.axiom.soap.impl.llom;
import org.apache.axiom.om.OMTestCase;
import org.apache.axiom.om.OMXMLBuilderFactory;
import org.apache.axiom.om.TestConstants;
-import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPHeader;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
public class OMEnvelopeTest extends OMTestCase {
- private static Log log = LogFactory.getLog(OMEnvelopeTest.class);
-
- public OMEnvelopeTest(String testName) {
- super(testName);
- }
-
- protected void setUp() throws Exception {
- super.setUp();
- }
-
public void testGetHeader1() {
SOAPHeader header = soapEnvelope.getHeader();
assertTrue("Header information retrieved not correct",
@@ -46,12 +33,6 @@ public class OMEnvelopeTest extends OMTe
header.getLocalName().equalsIgnoreCase("Header")));
}
- public void testGetBody1() {
- SOAPBody body = soapEnvelope.getBody();
- assertTrue("Header information retrieved not correct",
- (body != null && body.getLocalName().equalsIgnoreCase("Body")));
- }
-
private SOAPEnvelope getSecondEnvelope() throws Exception {
return OMXMLBuilderFactory.createSOAPModelBuilder(getTestResource(
TestConstants.SAMPLE1), null).getSOAPEnvelope();
@@ -64,11 +45,4 @@ public class OMEnvelopeTest extends OMTe
header.getLocalName().equalsIgnoreCase("Header")));
header.close(false);
}
-
- public void testGetBody2() throws Exception {
- SOAPBody body = getSecondEnvelope().getBody();
- assertTrue("Header information retrieved not correct",
- (body != null && body.getLocalName().equalsIgnoreCase("Body")));
- body.close(false);
- }
}
Modified: webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/soap/impl/llom/OMHeaderBlockTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/soap/impl/llom/OMHeaderBlockTest.java?rev=1358610&r1=1358609&r2=1358610&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/soap/impl/llom/OMHeaderBlockTest.java (original)
+++ webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/soap/impl/llom/OMHeaderBlockTest.java Sat Jul 7 18:24:00 2012
@@ -29,10 +29,6 @@ public class OMHeaderBlockTest extends O
SOAPHeader soapHeader;
SOAPHeaderBlock soapHeaderElement;
- public OMHeaderBlockTest(String testName) {
- super(testName);
- }
-
protected void setUp() throws Exception {
super.setUp();
soapHeader = soapEnvelope.getHeader();
@@ -48,15 +44,4 @@ public class OMHeaderBlockTest extends O
assertTrue("Actor was not properly set",
soapHeaderElement.getRole().equalsIgnoreCase(newActorURI));
}
-
- public void testSetAndGetMustUnderstand() {
- soapHeaderElement.setMustUnderstand(false);
- assertTrue("MustUnderstand was not properly set",
- !soapHeaderElement.getMustUnderstand());
- }
-
- public void testGetMustUnderstand() {
- //TODO Implement getMustUnderstand().
- }
-
}
Modified: webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11SerializerTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11SerializerTest.java?rev=1358610&r1=1358609&r2=1358610&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11SerializerTest.java (original)
+++ webservices/axiom/branches/AXIOM-201/modules/axiom-tests/src/test/java/org/apache/axiom/soap/impl/llom/soap11/SOAP11SerializerTest.java Sat Jul 7 18:24:00 2012
@@ -21,20 +21,10 @@ package org.apache.axiom.soap.impl.llom.
import org.apache.axiom.om.OMTestCase;
import org.apache.axiom.soap.SOAPEnvelope;
-import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
import javax.xml.stream.XMLStreamException;
public class SOAP11SerializerTest extends OMTestCase {
-
- public SOAP11SerializerTest(String testName) {
- super(testName);
- }
-
- protected StAXSOAPModelBuilder getOMBuilder(String fileName) throws Exception {
- return super.getOMBuilder(fileName);
- }
-
protected void setUp() throws Exception {
soapEnvelope =
(SOAPEnvelope) getOMBuilder("soap/soap11/soap11fault.xml")
Modified: webservices/axiom/branches/AXIOM-201/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/OMTestSuiteBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-201/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/OMTestSuiteBuilder.java?rev=1358610&r1=1358609&r2=1358610&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-201/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/OMTestSuiteBuilder.java (original)
+++ webservices/axiom/branches/AXIOM-201/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/OMTestSuiteBuilder.java Sat Jul 7 18:24:00 2012
@@ -20,8 +20,10 @@ package org.apache.axiom.ts.om;
import java.lang.reflect.Method;
-import org.apache.axiom.om.AbstractTestCase;
+import javax.xml.namespace.QName;
+
import org.apache.axiom.om.OMMetaFactory;
+import org.apache.axiom.testutils.conformance.Conformance;
import org.apache.axiom.testutils.suite.TestSuiteBuilder;
import org.apache.axiom.ts.om.container.OMContainerFactory;
import org.apache.axiom.ts.om.container.OMElementFactory;
@@ -29,6 +31,7 @@ import org.apache.axiom.ts.om.container.
import org.apache.axiom.ts.om.container.SerializeToOutputStream;
import org.apache.axiom.ts.om.factory.CreateOMElementParentSupplier;
import org.apache.axiom.ts.om.factory.CreateOMElementVariant;
+import org.apache.axiom.ts.om.sourcedelement.OMSourcedElementVariant;
import org.apache.axiom.ts.om.xpath.AXIOMXPathTestCase;
import org.apache.axiom.ts.om.xpath.TestAXIOMXPath;
@@ -42,6 +45,11 @@ public class OMTestSuiteBuilder extends
new SerializeToOutputStream(true),
new SerializeToOutputStream(false) };
+ private static final QName[] qnames = {
+ new QName("root"),
+ new QName("urn:test", "root", "p"),
+ new QName("urn:test", "root") };
+
private final OMMetaFactory metaFactory;
private final boolean supportsOMSourcedElement;
@@ -51,7 +59,7 @@ public class OMTestSuiteBuilder extends
}
protected void addTests() {
- String[] conformanceFiles = AbstractTestCase.getConformanceTestFiles();
+ String[] conformanceFiles = Conformance.getConformanceTestFiles();
addTest(new org.apache.axiom.ts.om.attribute.TestDigestWithNamespace(metaFactory));
addTest(new org.apache.axiom.ts.om.attribute.TestDigestWithoutNamespace(metaFactory));
addTest(new org.apache.axiom.ts.om.attribute.TestEqualsHashCode(metaFactory));
@@ -93,6 +101,7 @@ public class OMTestSuiteBuilder extends
}
}
}
+ addTest(new org.apache.axiom.ts.om.document.TestAddChildIncomplete(metaFactory));
addTest(new org.apache.axiom.ts.om.document.TestDigest(metaFactory, "digest1.xml", "MD5", "3e5d68c6607bc56c9c171560e4f19db9"));
addTest(new org.apache.axiom.ts.om.document.TestDigest(metaFactory, "digest2.xml", "SHA1", "3c47a807517d867d42ffacb2d3e9da81895d5aac"));
addTest(new org.apache.axiom.ts.om.document.TestDigest(metaFactory, "digest3.xml", "SHA", "41466144c1cab4234fb127cfb8cf92f9"));
@@ -120,11 +129,17 @@ public class OMTestSuiteBuilder extends
addTest(new org.apache.axiom.ts.om.element.TestAddAttributeWithoutNamespace(metaFactory));
addTest(new org.apache.axiom.ts.om.element.TestAddChild(metaFactory));
addTest(new org.apache.axiom.ts.om.element.TestAddChild2(metaFactory));
+ addTest(new org.apache.axiom.ts.om.element.TestAddChildIncomplete(metaFactory));
addTest(new org.apache.axiom.ts.om.element.TestAddChildWithParent(metaFactory));
addTest(new org.apache.axiom.ts.om.element.TestAddChildWithSameParent(metaFactory, true));
addTest(new org.apache.axiom.ts.om.element.TestAddChildWithSameParent(metaFactory, false));
addTest(new org.apache.axiom.ts.om.element.TestChildReDeclaringGrandParentsDefaultNSWithPrefix(metaFactory));
addTest(new org.apache.axiom.ts.om.element.TestChildReDeclaringParentsDefaultNSWithPrefix(metaFactory));
+ addTest(new org.apache.axiom.ts.om.element.TestCloneOMElement(metaFactory));
+ for (int i=0; i<conformanceFiles.length; i++) {
+ addTest(new org.apache.axiom.ts.om.element.TestCloneOMElement2(metaFactory, conformanceFiles[i]));
+ }
+ addTest(new org.apache.axiom.ts.om.element.TestCloneOMElementNamespaceRepairing(metaFactory));
addTest(new org.apache.axiom.ts.om.element.TestDeclareDefaultNamespace1(metaFactory));
addTest(new org.apache.axiom.ts.om.element.TestDeclareDefaultNamespace2(metaFactory));
addTest(new org.apache.axiom.ts.om.element.TestDeclareDefaultNamespaceConflict1(metaFactory));
@@ -137,6 +152,9 @@ public class OMTestSuiteBuilder extends
addTest(new org.apache.axiom.ts.om.element.TestDeclareNamespaceWithGeneratedPrefix3(metaFactory));
addTest(new org.apache.axiom.ts.om.element.TestDigestWithNamespace(metaFactory));
addTest(new org.apache.axiom.ts.om.element.TestDigestWithoutNamespace(metaFactory));
+ addTest(new org.apache.axiom.ts.om.element.TestDiscardDocumentElement(metaFactory));
+ addTest(new org.apache.axiom.ts.om.element.TestDiscardIncomplete(metaFactory));
+ addTest(new org.apache.axiom.ts.om.element.TestDiscardPartiallyBuilt(metaFactory));
addTest(new org.apache.axiom.ts.om.element.TestFindNamespaceByNamespaceURIMasked(metaFactory));
addTest(new org.apache.axiom.ts.om.element.TestFindNamespaceByPrefix(metaFactory));
addTest(new org.apache.axiom.ts.om.element.TestFindNamespaceCaseSensitivity(metaFactory));
@@ -263,6 +281,7 @@ public class OMTestSuiteBuilder extends
addTest(new org.apache.axiom.ts.om.factory.TestCreateOMAttributeNullPrefixNoNamespace(metaFactory));
addTest(new org.apache.axiom.ts.om.factory.TestCreateOMAttributeWithInvalidNamespace(metaFactory));
addTest(new org.apache.axiom.ts.om.factory.TestCreateOMCommentWithoutParent(metaFactory));
+ addTest(new org.apache.axiom.ts.om.factory.TestCreateOMDocTypeWithoutParent(metaFactory));
addTest(new org.apache.axiom.ts.om.factory.TestCreateOMDocument(metaFactory));
for (int i=0; i<CreateOMElementVariant.INSTANCES.length; i++) {
CreateOMElementVariant variant = CreateOMElementVariant.INSTANCES[i];
@@ -280,9 +299,11 @@ public class OMTestSuiteBuilder extends
}
}
if (variant.isSupportsContainer()) {
- addTest(new org.apache.axiom.ts.om.factory.TestCreateOMElementWithNamespaceInScope(metaFactory, variant));
+ addTest(new org.apache.axiom.ts.om.factory.TestCreateOMElementWithNamespaceInScope1(metaFactory, variant));
+ addTest(new org.apache.axiom.ts.om.factory.TestCreateOMElementWithNamespaceInScope2(metaFactory, variant));
}
if (variant.isSupportsContainer() && variant.isSupportsDefaultNamespace()) {
+ addTest(new org.apache.axiom.ts.om.factory.TestCreateOMElementWithNamespaceInScope3(metaFactory, variant));
addTest(new org.apache.axiom.ts.om.factory.TestCreateOMElementWithoutNamespace2(metaFactory, variant));
addTest(new org.apache.axiom.ts.om.factory.TestCreateOMElementWithoutNamespace3(metaFactory, variant));
}
@@ -297,6 +318,7 @@ public class OMTestSuiteBuilder extends
addTest(new org.apache.axiom.ts.om.factory.TestCreateOMProcessingInstructionWithoutParent(metaFactory));
addTest(new org.apache.axiom.ts.om.factory.TestCreateOMText(metaFactory));
addTest(new org.apache.axiom.ts.om.factory.TestCreateOMTextFromDataHandlerProvider(metaFactory));
+ addTest(new org.apache.axiom.ts.om.factory.TestCreateOMTextFromOMText(metaFactory));
addTest(new org.apache.axiom.ts.om.factory.TestCreateOMTextWithNullParent(metaFactory));
addTest(new org.apache.axiom.ts.om.factory.TestFactoryIsSingleton(metaFactory));
addTest(new org.apache.axiom.ts.om.factory.TestGetMetaFactory(metaFactory));
@@ -310,8 +332,10 @@ public class OMTestSuiteBuilder extends
addTest(new org.apache.axiom.ts.om.namespace.TestObjectEqualsWithDifferentURIs(metaFactory));
addTest(new org.apache.axiom.ts.om.node.TestDetach(metaFactory, true));
addTest(new org.apache.axiom.ts.om.node.TestDetach(metaFactory, false));
+ addTest(new org.apache.axiom.ts.om.node.TestDetachAfterBuilderClose(metaFactory));
addTest(new org.apache.axiom.ts.om.node.TestDetachFirstChild(metaFactory, true));
addTest(new org.apache.axiom.ts.om.node.TestDetachFirstChild(metaFactory, false));
+ addTest(new org.apache.axiom.ts.om.node.TestGetNextOMSiblingAfterDiscard(metaFactory));
addTest(new org.apache.axiom.ts.om.node.TestInsertSiblingAfter(metaFactory));
addTest(new org.apache.axiom.ts.om.node.TestInsertSiblingAfterLastChild(metaFactory));
addTest(new org.apache.axiom.ts.om.node.TestInsertSiblingAfterOnChild(metaFactory));
@@ -322,11 +346,32 @@ public class OMTestSuiteBuilder extends
addTest(new org.apache.axiom.ts.om.node.TestInsertSiblingBeforeOnOrphan(metaFactory));
addTest(new org.apache.axiom.ts.om.node.TestInsertSiblingBeforeOnSelf(metaFactory));
if (supportsOMSourcedElement) {
+ for (int i=0; i<OMSourcedElementVariant.INSTANCES.length; i++) {
+ OMSourcedElementVariant variant = OMSourcedElementVariant.INSTANCES[i];
+ for (int j=0; j<qnames.length; j++) {
+ QName qname = qnames[j];
+ addTest(new org.apache.axiom.ts.om.sourcedelement.TestGetLocalName(metaFactory, variant, qname));
+ addTest(new org.apache.axiom.ts.om.sourcedelement.TestGetNamespace(metaFactory, variant, qname));
+ addTest(new org.apache.axiom.ts.om.sourcedelement.TestGetPrefix(metaFactory, variant, qname));
+ addTest(new org.apache.axiom.ts.om.sourcedelement.TestGetNamespaceURI(metaFactory, variant, qname));
+ }
+ }
+ addTest(new org.apache.axiom.ts.om.sourcedelement.TestByteArrayDS(metaFactory));
+ addTest(new org.apache.axiom.ts.om.sourcedelement.TestCharArrayDS(metaFactory));
+ addTest(new org.apache.axiom.ts.om.sourcedelement.TestCloneOMElementNonDestructive(metaFactory, true));
+ addTest(new org.apache.axiom.ts.om.sourcedelement.TestCloneOMElementNonDestructive(metaFactory, false));
+ addTest(new org.apache.axiom.ts.om.sourcedelement.TestCloneOMElementUnknownName(metaFactory));
addTest(new org.apache.axiom.ts.om.sourcedelement.TestComplete(metaFactory));
addTest(new org.apache.axiom.ts.om.sourcedelement.TestExpand(metaFactory));
addTest(new org.apache.axiom.ts.om.sourcedelement.TestGetNamespaceNormalized(metaFactory));
addTest(new org.apache.axiom.ts.om.sourcedelement.TestGetNamespaceNormalized2(metaFactory));
+ addTest(new org.apache.axiom.ts.om.sourcedelement.TestGetNextOMSiblingIncomplete(metaFactory));
+ addTest(new org.apache.axiom.ts.om.sourcedelement.TestGetObject(metaFactory));
+ addTest(new org.apache.axiom.ts.om.sourcedelement.TestGetReaderException(metaFactory));
addTest(new org.apache.axiom.ts.om.sourcedelement.TestGetTextAsStreamWithNonDestructiveOMDataSource(metaFactory));
+ addTest(new org.apache.axiom.ts.om.sourcedelement.TestGetXMLStreamReaderWithPushOMDataSource(metaFactory, true));
+ addTest(new org.apache.axiom.ts.om.sourcedelement.TestGetXMLStreamReaderWithPushOMDataSource(metaFactory, false));
+ addTest(new org.apache.axiom.ts.om.sourcedelement.TestInputStreamDS(metaFactory));
addTest(new org.apache.axiom.ts.om.sourcedelement.TestName1DefaultPrefix(metaFactory));
addTest(new org.apache.axiom.ts.om.sourcedelement.TestName1QualifiedPrefix(metaFactory));
addTest(new org.apache.axiom.ts.om.sourcedelement.TestName1Unqualified(metaFactory));
@@ -352,7 +397,24 @@ public class OMTestSuiteBuilder extends
addTest(new org.apache.axiom.ts.om.sourcedelement.TestSerializeToXMLWriterFromReaderEmbedded(metaFactory));
addTest(new org.apache.axiom.ts.om.sourcedelement.TestSetDataSource(metaFactory));
addTest(new org.apache.axiom.ts.om.sourcedelement.TestSetDataSourceOnAlreadyExpandedElement(metaFactory));
+ addTest(new org.apache.axiom.ts.om.sourcedelement.TestSetLocalName(metaFactory, false));
+ addTest(new org.apache.axiom.ts.om.sourcedelement.TestSetLocalName(metaFactory, true));
+ addTest(new org.apache.axiom.ts.om.sourcedelement.TestWrappedTextNodeOMDataSourceFromReader(metaFactory));
addTest(new org.apache.axiom.ts.om.sourcedelement.TestWriteTextToWithNonDestructiveOMDataSource(metaFactory));
+ addTest(new org.apache.axiom.ts.om.sourcedelement.push.TestGetNamespaceContext(metaFactory));
+ addTest(new org.apache.axiom.ts.om.sourcedelement.push.TestWriteAttributeNoNamespace(metaFactory));
+ addTest(new org.apache.axiom.ts.om.sourcedelement.push.TestWriteCData(metaFactory));
+ addTest(new org.apache.axiom.ts.om.sourcedelement.push.TestWriteComment(metaFactory));
+ addTest(new org.apache.axiom.ts.om.sourcedelement.push.TestWriteDataHandler(metaFactory));
+ addTest(new org.apache.axiom.ts.om.sourcedelement.push.TestWriteDataHandlerProvider(metaFactory));
+ addTest(new org.apache.axiom.ts.om.sourcedelement.push.TestWriteEmptyElementAutoPrefix(metaFactory));
+ addTest(new org.apache.axiom.ts.om.sourcedelement.push.TestWriteNamespace(metaFactory, "", ""));
+ addTest(new org.apache.axiom.ts.om.sourcedelement.push.TestWriteNamespace(metaFactory, "", "urn:test"));
+ addTest(new org.apache.axiom.ts.om.sourcedelement.push.TestWriteNamespace(metaFactory, "p", "urn:test"));
+ addTest(new org.apache.axiom.ts.om.sourcedelement.push.TestWriteProcessingInstruction1(metaFactory));
+ addTest(new org.apache.axiom.ts.om.sourcedelement.push.TestWriteProcessingInstruction2(metaFactory));
+ addTest(new org.apache.axiom.ts.om.sourcedelement.push.TestWriteStartElementAutoPrefix(metaFactory));
+ addTest(new org.apache.axiom.ts.om.sourcedelement.push.TestWriteStartElementWithDefaultNamespaceDeclaredOnParent(metaFactory));
}
addTest(new org.apache.axiom.ts.om.pi.TestDigest(metaFactory));
addTest(new org.apache.axiom.ts.om.text.TestBase64Streaming(metaFactory));
Modified: webservices/axiom/branches/AXIOM-201/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/TestGetSAXSource.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-201/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/TestGetSAXSource.java?rev=1358610&r1=1358609&r2=1358610&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-201/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/TestGetSAXSource.java (original)
+++ webservices/axiom/branches/AXIOM-201/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/TestGetSAXSource.java Sat Jul 7 18:24:00 2012
@@ -22,25 +22,15 @@ import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.transform.TransformerFactory;
import javax.xml.transform.sax.SAXSource;
import javax.xml.transform.stream.StreamResult;
-import junit.framework.TestSuite;
-
import org.apache.axiom.om.AbstractTestCase;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.OMXMLBuilderFactory;
import org.apache.axiom.om.OMXMLParserWrapper;
-import org.apache.axiom.om.impl.builder.StAXOMBuilder;
-import org.apache.axiom.om.impl.jaxp.OMSource;
import org.apache.axiom.om.util.StAXParserConfiguration;
-import org.apache.axiom.ts.AxiomTestCase;
import org.apache.axiom.ts.ConformanceTestCase;
-import org.apache.axiom.util.stax.dialect.StAXDialect;
-import org.apache.axiom.util.stax.dialect.StAXDialectDetector;
import org.apache.xalan.processor.TransformerFactoryImpl;
import org.custommonkey.xmlunit.XMLAssert;
import org.custommonkey.xmlunit.XMLUnit;
Modified: webservices/axiom/branches/AXIOM-201/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMAttributeNullPrefixNoNamespace.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-201/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMAttributeNullPrefixNoNamespace.java?rev=1358610&r1=1358609&r2=1358610&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-201/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMAttributeNullPrefixNoNamespace.java (original)
+++ webservices/axiom/branches/AXIOM-201/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMAttributeNullPrefixNoNamespace.java Sat Jul 7 18:24:00 2012
@@ -19,9 +19,11 @@
package org.apache.axiom.ts.om.factory;
import org.apache.axiom.om.OMAttribute;
+import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.OMNamespace;
+import org.apache.axiom.om.OMNode;
import org.apache.axiom.ts.AxiomTestCase;
/**
@@ -40,5 +42,11 @@ public class TestCreateOMAttributeNullPr
OMNamespace ns = factory.createOMNamespace("", null);
OMAttribute attr = factory.createOMAttribute("attr", ns, "value");
assertNull(attr.getNamespace());
+
+ // An OMAttribute is neither an OMNode nor an OMContainer. For the latter this is in
+ // contrast to DOM where an Attr node is a parent node (containing Text and EntityReference
+ // nodes).
+ assertFalse(attr instanceof OMNode);
+ assertFalse(attr instanceof OMContainer);
}
}
Modified: webservices/axiom/branches/AXIOM-201/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName1DefaultPrefix.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-201/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName1DefaultPrefix.java?rev=1358610&r1=1358609&r2=1358610&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-201/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName1DefaultPrefix.java (original)
+++ webservices/axiom/branches/AXIOM-201/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName1DefaultPrefix.java Sat Jul 7 18:24:00 2012
@@ -41,20 +41,19 @@ public class TestName1DefaultPrefix exte
protected void runTest() throws Throwable {
OMFactory f = metaFactory.getOMFactory();
- // Create OMSE with a DUMMYPREFIX prefix even though the underlying element uses the default prefix
+ // Create OMSE with an unknown prefix
OMNamespace rootNS = f.createOMNamespace("http://sampleroot", "rootPrefix");
OMNamespace ns =
- f.createOMNamespace("http://www.sosnoski.com/uwjws/library", "DUMMYPREFIX");
+ f.createOMNamespace("http://www.sosnoski.com/uwjws/library", null);
OMElement element =
f.createOMElement(new TestDataSource(testDocument), "library", ns);
OMElement root = f.createOMElement("root", rootNS);
root.addChild(element);
- // Test getting the namespace, localpart and prefix. This should used not result in expansion
+ // Test getting the local name and namespace URI. This should used not result in expansion
assertTrue(element.getLocalName().equals("library"));
assertTrue(element.getNamespace().getNamespaceURI().equals(
"http://www.sosnoski.com/uwjws/library"));
- assertTrue(element.getNamespace().getPrefix().equals("DUMMYPREFIX"));
// Serialize and cache. This should cause expansion. The prefix should be updated to match the testDocument string
StringWriter writer = new StringWriter();
@@ -68,8 +67,6 @@ public class TestName1DefaultPrefix exte
"http://www.sosnoski.com/uwjws/library"));
assertTrue(element.getNamespace().getPrefix().equals(""));
assertTrue(element.getDefaultNamespace() != null);
- assertTrue(result.indexOf("DUMMYPREFIX") <
- 0); // Make sure that the serialized string does not contain DUMMYPREFIX
assertTrue("Serialized text error" + result, result.indexOf("1930110111") > 0);
// Serialize again
@@ -84,8 +81,6 @@ public class TestName1DefaultPrefix exte
"http://www.sosnoski.com/uwjws/library"));
assertTrue(element.getNamespace().getPrefix().equals(""));
assertTrue(element.getDefaultNamespace() != null);
- assertTrue(result.indexOf("DUMMYPREFIX") <
- 0); // Make sure that the serialized string does not contain DUMMYPREFIX
assertTrue("Serialized text error" + result, result.indexOf("1930110111") > 0);
}
}
Modified: webservices/axiom/branches/AXIOM-201/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName1QualifiedPrefix.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-201/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName1QualifiedPrefix.java?rev=1358610&r1=1358609&r2=1358610&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-201/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName1QualifiedPrefix.java (original)
+++ webservices/axiom/branches/AXIOM-201/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName1QualifiedPrefix.java Sat Jul 7 18:24:00 2012
@@ -41,19 +41,18 @@ public class TestName1QualifiedPrefix ex
protected void runTest() throws Throwable {
OMFactory f = metaFactory.getOMFactory();
- // Create OMSE with a DUMMYPREFIX prefix even though the underlying element uses the default prefix
+ // Create OMSE with an unknown prefix
OMNamespace rootNS = f.createOMNamespace("http://sampleroot", "rootPrefix");
- OMNamespace ns = f.createOMNamespace("http://www.sosnoski.com/uwjws/library", "");
+ OMNamespace ns = f.createOMNamespace("http://www.sosnoski.com/uwjws/library", null);
OMElement element =
f.createOMElement(new TestDataSource(testDocument2), "library", ns);
OMElement root = f.createOMElement("root", rootNS);
root.addChild(element);
- // Test getting the namespace, localpart and prefix. This should used not result in expansion
+ // Test getting the local name and namespace URI. This should used not result in expansion
assertTrue(element.getLocalName().equals("library"));
assertTrue(element.getNamespace().getNamespaceURI().equals(
"http://www.sosnoski.com/uwjws/library"));
- assertTrue(element.getNamespace().getPrefix().equals(""));
// Serialize and cache. This should cause expansion and update the name to match the testDocument string
StringWriter writer = new StringWriter();
Modified: webservices/axiom/branches/AXIOM-201/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/OMDOMTestSuiteBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-201/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/OMDOMTestSuiteBuilder.java?rev=1358610&r1=1358609&r2=1358610&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-201/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/OMDOMTestSuiteBuilder.java (original)
+++ webservices/axiom/branches/AXIOM-201/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/OMDOMTestSuiteBuilder.java Sat Jul 7 18:24:00 2012
@@ -41,10 +41,15 @@ public class OMDOMTestSuiteBuilder exten
addTest(new org.apache.axiom.ts.omdom.document.TestImportNode(metaFactory));
addTest(new org.apache.axiom.ts.omdom.element.TestAddAttributeReplace(metaFactory));
addTest(new org.apache.axiom.ts.omdom.element.TestAddChildFromForeignDocument(metaFactory));
+ addTest(new org.apache.axiom.ts.omdom.element.TestAppendChildIncomplete(metaFactory));
+ addTest(new org.apache.axiom.ts.omdom.element.TestCloneNodeIncomplete(metaFactory));
+ addTest(new org.apache.axiom.ts.omdom.element.TestCloneOMElement(metaFactory));
addTest(new org.apache.axiom.ts.omdom.element.TestDetach(metaFactory));
addTest(new org.apache.axiom.ts.omdom.element.TestGetNamespaceNormalized(metaFactory));
+ addTest(new org.apache.axiom.ts.omdom.element.TestInsertBeforeIncomplete(metaFactory));
addTest(new org.apache.axiom.ts.omdom.element.TestRemoveAttribute(metaFactory));
addTest(new org.apache.axiom.ts.omdom.element.TestRemoveChildIncomplete(metaFactory));
+ addTest(new org.apache.axiom.ts.omdom.factory.TestCreateOMAttribute(metaFactory));
addTest(new org.apache.axiom.ts.omdom.factory.TestCreateOMTextCDATASection(metaFactory));
addTest(new org.apache.axiom.ts.omdom.factory.TestCreateOMTextCDATASectionWithParent(metaFactory));
addTest(new org.apache.axiom.ts.omdom.node.TestInsertSiblingAfterFromForeignDocument(metaFactory));
Modified: webservices/axiom/branches/AXIOM-201/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPTestCase.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-201/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPTestCase.java?rev=1358610&r1=1358609&r2=1358610&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-201/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPTestCase.java (original)
+++ webservices/axiom/branches/AXIOM-201/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPTestCase.java Sat Jul 7 18:24:00 2012
@@ -34,6 +34,7 @@ import org.xml.sax.InputSource;
public abstract class SOAPTestCase extends AxiomTestCase {
protected static final String MESSAGE = "message.xml";
protected static final String MESSAGE_WITHOUT_HEADER = "message_without_header.xml";
+ protected static final String SOAP_MESSAGE = "soapmessage.xml";
protected final SOAPSpec spec;
protected SOAPFactory soapFactory;
Modified: webservices/axiom/branches/AXIOM-201/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPTestSuiteBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-201/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPTestSuiteBuilder.java?rev=1358610&r1=1358609&r2=1358610&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-201/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPTestSuiteBuilder.java (original)
+++ webservices/axiom/branches/AXIOM-201/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPTestSuiteBuilder.java Sat Jul 7 18:24:00 2012
@@ -18,22 +18,58 @@
*/
package org.apache.axiom.ts.soap;
+import javax.xml.namespace.QName;
+
import org.apache.axiom.om.OMMetaFactory;
+import org.apache.axiom.om.OMSourcedElement;
import org.apache.axiom.om.TestConstants;
+import org.apache.axiom.soap.SOAP11Constants;
+import org.apache.axiom.soap.SOAP12Constants;
+import org.apache.axiom.soap.SOAPConstants;
import org.apache.axiom.testutils.suite.TestSuiteBuilder;
public class SOAPTestSuiteBuilder extends TestSuiteBuilder {
- private static final String[] badSOAPFiles = { "wrongSoapNs.xml", "twoheaders.xml", "twoBodymessage.xml",
- "envelopeMissing.xml", "haederBodyWrongOrder.xml" };
+ private static final String[] badSOAPFiles = { "wrongSoapNs.xml", "notnamespaceQualified.xml", "soap11/twoheaders.xml", "soap11/twoBodymessage.xml",
+ "soap11/envelopeMissing.xml", "soap11/haederBodyWrongOrder.xml", "soap11/invalid-faultcode.xml", "soap11/invalid-faultstring.xml",
+ "soap11/invalid-faultactor.xml", "soap12/header-bad-case.xml", "soap12/header-no-namespace.xml" };
private static final String[] goodSOAPFiles = { TestConstants.WHITESPACE_MESSAGE,
TestConstants.MINIMAL_MESSAGE, TestConstants.REALLY_BIG_MESSAGE,
- TestConstants.EMPTY_BODY_MESSAGE };
+ TestConstants.EMPTY_BODY_MESSAGE, "soap/soap11/soapfault.xml", "soap/soap11/bodyNotQualified.xml",
+ "soap/soap11/faultstring-with-comment.xml"};
+
+ private static final QName[] generalQNames = {
+ new QName("root"),
+ new QName("urn:test", "root", "p"),
+ new QName("urn:test", "root") };
+
+ private static final QName[] noFaultQNames = {
+ new QName("root"),
+ new QName("urn:test", "root", "p"),
+ new QName("urn:test", "root"),
+ new QName("Fault"),
+ new QName("urn:test", "Fault", "p"),
+ new QName(SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI, "NoFault", SOAPConstants.SOAP_DEFAULT_NAMESPACE_PREFIX),
+ new QName(SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI, "NoFault", SOAPConstants.SOAP_DEFAULT_NAMESPACE_PREFIX) };
private final OMMetaFactory metaFactory;
+ private final boolean supportsOMSourcedElement;
+ private final boolean supportsBodyElementNameOptimization;
- public SOAPTestSuiteBuilder(OMMetaFactory metaFactory) {
+ /**
+ * Constructor.
+ *
+ * @param metaFactory
+ * @param supportsOMSourcedElement
+ * indicates whether the implementation supports {@link OMSourcedElement}
+ * @param supportsBodyElementNameOptimization
+ * indicates whether the implementation supports the optimization described by <a
+ * href="https://issues.apache.org/jira/browse/AXIOM-282">AXIOM-282</a>
+ */
+ public SOAPTestSuiteBuilder(OMMetaFactory metaFactory, boolean supportsOMSourcedElement, boolean supportsBodyElementNameOptimization) {
this.metaFactory = metaFactory;
+ this.supportsOMSourcedElement = supportsOMSourcedElement;
+ this.supportsBodyElementNameOptimization = supportsBodyElementNameOptimization;
}
private void addTests(SOAPSpec spec) {
@@ -41,24 +77,60 @@ public class SOAPTestSuiteBuilder extend
addTest(new org.apache.axiom.ts.soap.body.TestAddFault2(metaFactory, spec));
addTest(new org.apache.axiom.ts.soap.body.TestGetFault(metaFactory, spec));
addTest(new org.apache.axiom.ts.soap.body.TestGetFaultWithParser(metaFactory, spec));
+ for (int i=0; i<generalQNames.length; i++) {
+ QName qname = generalQNames[i];
+ addTest(new org.apache.axiom.ts.soap.body.TestGetFirstElementLocalNameWithParser(metaFactory, spec,
+ qname, supportsBodyElementNameOptimization));
+ addTest(new org.apache.axiom.ts.soap.body.TestGetFirstElementNSWithParser(metaFactory, spec,
+ qname, supportsBodyElementNameOptimization));
+ }
+ for (int i=0; i<noFaultQNames.length; i++) {
+ QName qname = noFaultQNames[i];
+ addTest(new org.apache.axiom.ts.soap.body.TestGetFaultNoFault(metaFactory, spec, qname));
+ addTest(new org.apache.axiom.ts.soap.body.TestHasFaultNoFault(metaFactory, spec, qname));
+ addTest(new org.apache.axiom.ts.soap.body.TestHasFaultWithParserNoFault(metaFactory, spec,
+ qname, supportsBodyElementNameOptimization));
+ }
+ addTest(new org.apache.axiom.ts.soap.body.TestGetFirstElementLocalNameEmptyBody(metaFactory, spec));
+ addTest(new org.apache.axiom.ts.soap.body.TestGetFirstElementNSEmptyBody(metaFactory, spec));
addTest(new org.apache.axiom.ts.soap.body.TestHasFault(metaFactory, spec));
+ addTest(new org.apache.axiom.ts.soap.body.TestHasFaultAfterReplace(metaFactory, spec));
+ if (supportsOMSourcedElement) {
+ addTest(new org.apache.axiom.ts.soap.body.TestHasFaultWithOMSEUnknownName(metaFactory, spec));
+ }
addTest(new org.apache.axiom.ts.soap.body.TestHasFaultWithParser(metaFactory, spec));
+ if (supportsBodyElementNameOptimization) {
+ addTest(new org.apache.axiom.ts.soap.builder.TestRegisterCustomBuilderForPayloadAfterSOAPFaultCheck(metaFactory, spec));
+ }
addTest(new org.apache.axiom.ts.soap.envelope.TestAddHeaderToIncompleteEnvelope(metaFactory, spec));
addTest(new org.apache.axiom.ts.soap.envelope.TestBodyHeaderOrder(metaFactory, spec));
+ if (supportsOMSourcedElement) {
+ addTest(new org.apache.axiom.ts.soap.envelope.TestCloneOMElementWithSourcedElement1(metaFactory, spec));
+ addTest(new org.apache.axiom.ts.soap.envelope.TestCloneOMElementWithSourcedElement2(metaFactory, spec));
+ }
addTest(new org.apache.axiom.ts.soap.envelope.TestDetach(metaFactory, spec));
- addTest(new org.apache.axiom.ts.soap.envelope.TestDiscardHeader(metaFactory, spec));
addTest(new org.apache.axiom.ts.soap.envelope.TestGetBody(metaFactory, spec));
addTest(new org.apache.axiom.ts.soap.envelope.TestGetBodyOnEmptyEnvelope(metaFactory, spec));
addTest(new org.apache.axiom.ts.soap.envelope.TestGetBodyOnEnvelopeWithHeaderOnly(metaFactory, spec));
addTest(new org.apache.axiom.ts.soap.envelope.TestGetBodyWithParser(metaFactory, spec));
addTest(new org.apache.axiom.ts.soap.envelope.TestGetHeader(metaFactory, spec));
addTest(new org.apache.axiom.ts.soap.envelope.TestGetHeaderWithParser(metaFactory, spec));
- addTest(new org.apache.axiom.ts.soap.envelope.TestGetSOAPBodyFirstElementLocalNameAndNS(metaFactory, spec));
- addTest(new org.apache.axiom.ts.soap.envelope.TestGetSOAPBodyFirstElementLocalNameAndNSWithParser(metaFactory, spec));
+ for (int i=0; i<generalQNames.length; i++) {
+ QName qname = generalQNames[i];
+ addTest(new org.apache.axiom.ts.soap.envelope.TestGetSOAPBodyFirstElementLocalNameAndNS(metaFactory, spec, qname));
+ addTest(new org.apache.axiom.ts.soap.envelope.TestGetSOAPBodyFirstElementLocalNameAndNSWithParser(metaFactory, spec, qname));
+ }
+ addTest(new org.apache.axiom.ts.soap.envelope.TestGetXMLStreamReaderWithoutCachingWithPartiallyBuiltHeaderBlock(metaFactory, spec));
addTest(new org.apache.axiom.ts.soap.envelope.TestHasFault(metaFactory, spec));
addTest(new org.apache.axiom.ts.soap.envelope.TestHasFaultWithParser(metaFactory, spec));
+ addTest(new org.apache.axiom.ts.soap.envelope.TestHasFaultWithParserOptimized(metaFactory, spec));
+ if (supportsOMSourcedElement) {
+ addTest(new org.apache.axiom.ts.soap.envelope.TestSerializeAndConsumeWithOMSEInBody(metaFactory, spec));
+ }
addTest(new org.apache.axiom.ts.soap.factory.TestCreateSOAPEnvelope(metaFactory, spec));
addTest(new org.apache.axiom.ts.soap.factory.TestCreateSOAPEnvelopeWithCustomPrefix(metaFactory, spec));
+ addTest(new org.apache.axiom.ts.soap.factory.TestCreateSOAPFault(metaFactory, spec));
+ addTest(new org.apache.axiom.ts.soap.factory.TestCreateSOAPFaultDetail(metaFactory, spec));
addTest(new org.apache.axiom.ts.soap.factory.TestFactoryIsSingleton(metaFactory, spec));
addTest(new org.apache.axiom.ts.soap.factory.TestGetDefaultEnvelope(metaFactory, spec));
addTest(new org.apache.axiom.ts.soap.factory.TestGetDefaultFaultEnvelope(metaFactory, spec));
@@ -78,6 +150,9 @@ public class SOAPTestSuiteBuilder extend
addTest(new org.apache.axiom.ts.soap.fault.TestSetException(metaFactory, spec));
addTest(new org.apache.axiom.ts.soap.fault.TestSetReason(metaFactory, spec));
addTest(new org.apache.axiom.ts.soap.fault.TestSetRole(metaFactory, spec));
+ addTest(new org.apache.axiom.ts.soap.fault.TestWrongParent1(metaFactory, spec));
+ addTest(new org.apache.axiom.ts.soap.fault.TestWrongParent2(metaFactory, spec));
+ addTest(new org.apache.axiom.ts.soap.fault.TestWrongParent3(metaFactory, spec));
addTest(new org.apache.axiom.ts.soap.faultdetail.TestAddDetailEntry(metaFactory, spec));
addTest(new org.apache.axiom.ts.soap.faultdetail.TestDetailEntriesUsingDefaultNamespaceWithParser(metaFactory, spec));
addTest(new org.apache.axiom.ts.soap.faultdetail.TestGetAllDetailEntries(metaFactory, spec));
@@ -88,12 +163,17 @@ public class SOAPTestSuiteBuilder extend
addTest(new org.apache.axiom.ts.soap.header.TestAddHeaderBlock(metaFactory, spec));
addTest(new org.apache.axiom.ts.soap.header.TestAddHeaderBlockWithoutNamespace1(metaFactory, spec));
addTest(new org.apache.axiom.ts.soap.header.TestAddHeaderBlockWithoutNamespace2(metaFactory, spec));
+ addTest(new org.apache.axiom.ts.soap.header.TestDiscardIncomplete(metaFactory, spec));
+ addTest(new org.apache.axiom.ts.soap.header.TestDiscardPartiallyBuilt(metaFactory, spec));
addTest(new org.apache.axiom.ts.soap.header.TestExamineAllHeaderBlocks(metaFactory, spec));
addTest(new org.apache.axiom.ts.soap.header.TestExamineAllHeaderBlocksWithParser(metaFactory, spec));
addTest(new org.apache.axiom.ts.soap.header.TestExamineHeaderBlocks(metaFactory, spec));
addTest(new org.apache.axiom.ts.soap.header.TestExtractAllHeaderBlocks(metaFactory, spec));
addTest(new org.apache.axiom.ts.soap.header.TestGetHeaderBlocksWithNSURI(metaFactory, spec));
addTest(new org.apache.axiom.ts.soap.header.TestGetHeadersToProcessWithNamespace(metaFactory, spec));
+ if (supportsOMSourcedElement) {
+ addTest(new org.apache.axiom.ts.soap.headerblock.TestByteArrayDS(metaFactory, spec));
+ }
addTest(new org.apache.axiom.ts.soap.headerblock.TestGetMustUnderstand(metaFactory, spec));
addTest(new org.apache.axiom.ts.soap.headerblock.TestGetRole(metaFactory, spec));
addTest(new org.apache.axiom.ts.soap.headerblock.TestGetVersion(metaFactory, spec));
@@ -102,6 +182,9 @@ public class SOAPTestSuiteBuilder extend
addTest(new org.apache.axiom.ts.soap.headerblock.TestSetMustUnderstandString01(metaFactory, spec));
addTest(new org.apache.axiom.ts.soap.headerblock.TestSetMustUnderstandWithInvalidValue(metaFactory, spec));
addTest(new org.apache.axiom.ts.soap.headerblock.TestSetRole(metaFactory, spec));
+ addTest(new org.apache.axiom.ts.soap.headerblock.TestWrongParent1(metaFactory, spec));
+ addTest(new org.apache.axiom.ts.soap.headerblock.TestWrongParent2(metaFactory, spec));
+ addTest(new org.apache.axiom.ts.soap.headerblock.TestWrongParent3(metaFactory, spec));
addTest(new org.apache.axiom.ts.soap.xpath.TestXPathAppliedToSOAPEnvelope(metaFactory, spec, true));
addTest(new org.apache.axiom.ts.soap.xpath.TestXPathAppliedToSOAPEnvelope(metaFactory, spec, false));
}
@@ -115,6 +198,15 @@ public class SOAPTestSuiteBuilder extend
for (int i=0; i<goodSOAPFiles.length; i++) {
addTest(new org.apache.axiom.ts.soap.builder.MessageTest(metaFactory, goodSOAPFiles[i]));
}
+ addTest(new org.apache.axiom.ts.soap.envelope.TestCloneOMElement(metaFactory, SOAPSpec.SOAP11, "sample1.xml"));
+ addTest(new org.apache.axiom.ts.soap.envelope.TestCloneOMElement(metaFactory, SOAPSpec.SOAP11, "soapmessage.xml"));
+ addTest(new org.apache.axiom.ts.soap.envelope.TestCloneOMElement(metaFactory, SOAPSpec.SOAP11, "soapmessage1.xml"));
+ addTest(new org.apache.axiom.ts.soap.envelope.TestCloneOMElement(metaFactory, SOAPSpec.SOAP11, "whitespacedMessage.xml"));
+ addTest(new org.apache.axiom.ts.soap.envelope.TestCloneOMElement(metaFactory, SOAPSpec.SOAP11, "minimalMessage.xml"));
+ addTest(new org.apache.axiom.ts.soap.envelope.TestCloneOMElement(metaFactory, SOAPSpec.SOAP11, "reallyReallyBigMessage.xml"));
+ addTest(new org.apache.axiom.ts.soap.envelope.TestCloneOMElement(metaFactory, SOAPSpec.SOAP11, "emtyBodymessage.xml"));
+ addTest(new org.apache.axiom.ts.soap.envelope.TestCloneOMElement(metaFactory, SOAPSpec.SOAP11, "soap11fault.xml"));
+ addTest(new org.apache.axiom.ts.soap11.builder.TestBuilder(metaFactory));
addTest(new org.apache.axiom.ts.soap11.envelope.TestAddElementAfterBody(metaFactory));
addTest(new org.apache.axiom.ts.soap11.fault.TestGetNode(metaFactory));
addTest(new org.apache.axiom.ts.soap11.fault.TestSetNode(metaFactory));
@@ -127,6 +219,7 @@ 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.soap12.builder.TestBuilder(metaFactory));
addTest(new org.apache.axiom.ts.soap12.envelope.TestAddElementAfterBody(metaFactory));
addTest(new org.apache.axiom.ts.soap12.envelope.TestBuildWithAttachments(metaFactory));
addTest(new org.apache.axiom.ts.soap12.envelope.TestMTOMForwardStreaming(metaFactory, true));
Modified: webservices/axiom/branches/AXIOM-201/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestAddFault2.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-201/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestAddFault2.java?rev=1358610&r1=1358609&r2=1358610&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-201/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestAddFault2.java (original)
+++ webservices/axiom/branches/AXIOM-201/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestAddFault2.java Sat Jul 7 18:24:00 2012
@@ -32,7 +32,7 @@ public class TestAddFault2 extends SOAPT
protected void runTest() throws Throwable {
SOAPEnvelope envelope = soapFactory.createSOAPEnvelope();
SOAPBody body = soapFactory.createSOAPBody(envelope);
- body.addFault(soapFactory.createSOAPFault(body));
+ body.addFault(soapFactory.createSOAPFault());
assertTrue(
"Body Test:- After calling addFault method, SOAP body has no fault",
body.hasFault());
Modified: webservices/axiom/branches/AXIOM-201/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/BadInputTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-201/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/BadInputTest.java?rev=1358610&r1=1358609&r2=1358610&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-201/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/BadInputTest.java (original)
+++ webservices/axiom/branches/AXIOM-201/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/BadInputTest.java Sat Jul 7 18:24:00 2012
@@ -47,35 +47,4 @@ public class BadInputTest extends AxiomT
return;
}
}
-
- //done
- // public void testNotnamespaceQualified() throws Exception {
- // try {
- // SOAPEnvelope soapEnvelope =
- // (SOAPEnvelope) OMTestUtils.getOMBuilder(new File(dir, "notnamespaceQualified.xml")).getDocumentElement();
- // OMTestUtils.walkThrough(soapEnvelope);
- // fail("this must failed gracefully with OMException or AxisFault");
- // } catch (OMException e) {
- // return;
- // } catch (AxisFault e) {
- // return;
- // }
- //
- // }
- //done
- // public void testBodyNotQualified() throws Exception {
- // try {
- // SOAPEnvelope soapEnvelope =
- // (SOAPEnvelope) OMTestUtils.getOMBuilder(new File(dir, "bodyNotQualified.xml")).getDocumentElement();
- // OMTestUtils.walkThrough(soapEnvelope);
- // fail("this must failed gracefully with OMException or AxisFault");
- // } catch (OMException e) {
- // //we are OK!
- // return;
- // } catch (AxisFault e) {
- // //we are OK here too!
- // return;
- // }
- //
- // }
}
Modified: webservices/axiom/branches/AXIOM-201/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/MessageTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-201/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/MessageTest.java?rev=1358610&r1=1358609&r2=1358610&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-201/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/MessageTest.java (original)
+++ webservices/axiom/branches/AXIOM-201/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/MessageTest.java Sat Jul 7 18:24:00 2012
@@ -18,11 +18,21 @@
*/
package org.apache.axiom.ts.soap.builder;
+import java.io.InputStream;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMResult;
+
import org.apache.axiom.om.AbstractTestCase;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.OMXMLBuilderFactory;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.ts.AxiomTestCase;
+import org.custommonkey.xmlunit.XMLAssert;
+import org.custommonkey.xmlunit.XMLUnit;
+import org.w3c.dom.Document;
public class MessageTest extends AxiomTestCase {
private final String file;
@@ -37,6 +47,20 @@ public class MessageTest extends AxiomTe
SOAPEnvelope soapEnvelope = OMXMLBuilderFactory.createSOAPModelBuilder(metaFactory,
AbstractTestCase.getTestResource(file), null).getSOAPEnvelope();
OMTestUtils.walkThrough(soapEnvelope);
+ DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+ dbf.setNamespaceAware(true);
+ DocumentBuilder db = dbf.newDocumentBuilder();
+ Document expected;
+ InputStream in = AbstractTestCase.getTestResource(file);
+ try {
+ expected = db.parse(in);
+ } finally {
+ in.close();
+ }
+ Document actual = db.newDocument();
+ // TODO: need to use getSAXSource (instead of toString) because of AXIOM-430
+ TransformerFactory.newInstance().newTransformer().transform(soapEnvelope.getSAXSource(true), new DOMResult(actual));
+ XMLAssert.assertXMLIdentical(XMLUnit.compareXML(expected, actual), true);
soapEnvelope.close(false);
}
}
Modified: webservices/axiom/branches/AXIOM-201/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/OMTestUtils.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-201/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/OMTestUtils.java?rev=1358610&r1=1358609&r2=1358610&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-201/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/OMTestUtils.java (original)
+++ webservices/axiom/branches/AXIOM-201/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/OMTestUtils.java Sat Jul 7 18:24:00 2012
@@ -19,7 +19,7 @@
package org.apache.axiom.ts.soap.builder;
-import junit.framework.TestCase;
+import junit.framework.Assert;
import java.util.Iterator;
@@ -27,25 +27,18 @@ import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNode;
public class OMTestUtils {
- public static void walkThrough(OMElement omEle) {
- Iterator attibIt = omEle.getAllAttributes();
- if (attibIt != null) {
- while (attibIt.hasNext()) {
- TestCase.assertNotNull("once the has next is not null, the " +
- "element should not be null",
- attibIt.next());
- }
+ public static void walkThrough(OMElement element) {
+ Assert.assertFalse("Expected " + element.getQName() + " to be incomplete", element.isComplete());
+ for (Iterator it = element.getAllAttributes(); it.hasNext(); ) {
+ Assert.assertNotNull(it.next());
}
- Iterator it = omEle.getChildren();
- if (it != null) {
- while (it.hasNext()) {
- OMNode ele = (OMNode) it.next();
- TestCase.assertNotNull("once the has next is not null, the " +
- "element should not be null", ele);
- if (ele instanceof OMElement) {
- walkThrough((OMElement) ele);
- }
+ OMNode child = element.getFirstOMChild();
+ while (child != null) {
+ if (child instanceof OMElement) {
+ walkThrough((OMElement)child);
}
+ child = child.getNextOMSibling();
}
+ Assert.assertTrue(element.isComplete());
}
}
Modified: webservices/axiom/branches/AXIOM-201/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetSOAPBodyFirstElementLocalNameAndNS.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-201/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetSOAPBodyFirstElementLocalNameAndNS.java?rev=1358610&r1=1358609&r2=1358610&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-201/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetSOAPBodyFirstElementLocalNameAndNS.java (original)
+++ webservices/axiom/branches/AXIOM-201/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetSOAPBodyFirstElementLocalNameAndNS.java Sat Jul 7 18:24:00 2012
@@ -18,22 +18,36 @@
*/
package org.apache.axiom.ts.soap.envelope;
+import javax.xml.namespace.QName;
+
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMMetaFactory;
+import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.ts.soap.SOAPSpec;
import org.apache.axiom.ts.soap.SOAPTestCase;
public class TestGetSOAPBodyFirstElementLocalNameAndNS extends SOAPTestCase {
- public TestGetSOAPBodyFirstElementLocalNameAndNS(OMMetaFactory metaFactory, SOAPSpec spec) {
+ private final QName qname;
+
+ public TestGetSOAPBodyFirstElementLocalNameAndNS(OMMetaFactory metaFactory, SOAPSpec spec, QName qname) {
super(metaFactory, spec);
+ this.qname = qname;
+ addTestProperty("prefix", qname.getPrefix());
+ addTestProperty("uri", qname.getNamespaceURI());
}
protected void runTest() throws Throwable {
SOAPEnvelope envelope = soapFactory.getDefaultEnvelope();
- OMElement bodyElement = soapFactory.createOMElement("myOperation", "urn:ns", "ns");
+ OMElement bodyElement = soapFactory.createOMElement(qname.getLocalPart(), qname.getNamespaceURI(), qname.getPrefix());
envelope.getBody().addChild(bodyElement);
- assertEquals(bodyElement.getLocalName(), envelope.getSOAPBodyFirstElementLocalName());
- assertEquals(bodyElement.getNamespace(), envelope.getSOAPBodyFirstElementNS());
+ assertEquals(qname.getLocalPart(), envelope.getSOAPBodyFirstElementLocalName());
+ OMNamespace ns = envelope.getSOAPBodyFirstElementNS();
+ if (qname.getNamespaceURI().length() == 0) {
+ assertNull(ns);
+ } else {
+ assertEquals(qname.getNamespaceURI(), ns.getNamespaceURI());
+ assertEquals(qname.getPrefix(), ns.getPrefix());
+ }
}
}