ws-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From veit...@apache.org
Subject svn commit: r1678491 - in /webservices/axiom/trunk: modules/axiom-api/src/test/java/org/apache/axiom/om/impl/ testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/ testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/ ...
Date Sat, 09 May 2015 13:41:22 GMT
Author: veithen
Date: Sat May  9 13:41:22 2015
New Revision: 1678491

URL: http://svn.apache.org/r1678491
Log:
AXIOM-311: Reduce the number of dependencies between axiom-testsuite and axiom-api:tests.

Added:
    webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/DocumentElementExtractor.java
      - copied, changed from r1677906, webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/om/impl/DocumentElementExtractor.java
    webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/RootWhitespaceFilter.java
      - copied, changed from r1677906, webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/om/impl/RootWhitespaceFilter.java
    webservices/axiom/trunk/testing/axiom-testsuite/src/main/resources/org/apache/axiom/ts/om/builder/
    webservices/axiom/trunk/testing/axiom-testsuite/src/main/resources/org/apache/axiom/ts/om/builder/invalid_xml.xml
      - copied unchanged from r1677906, webservices/axiom/trunk/testing/axiom-testsuite/src/main/resources/invalid_xml.xml
    webservices/axiom/trunk/testing/xml-testsuite/src/main/resources/org/apache/axiom/ts/xml/simple.xml
      - copied unchanged from r1678089, webservices/axiom/trunk/testing/xml-testsuite/src/main/resources/org/apache/axiom/ts/xml/bulk/test.xml
Removed:
    webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/om/impl/DocumentElementExtractor.java
    webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/om/impl/RootWhitespaceFilter.java
    webservices/axiom/trunk/testing/axiom-testsuite/src/main/resources/invalid_xml.xml
    webservices/axiom/trunk/testing/xml-testsuite/src/main/resources/org/apache/axiom/ts/xml/bulk/test.xml
Modified:
    webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCloseWithInputStream.java
    webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCloseWithXMLStreamReader.java
    webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestInvalidXML.java
    webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/OMContainerFactory.java
    webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/OMElementFactory.java
    webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestBuild.java
    webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildElements.java
    webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildren.java
    webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenRemove1.java
    webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenRemove2.java
    webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenRemove3.java
    webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenRemove4.java
    webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/xpath/AXIOMXPathTestCase.java
    webservices/axiom/trunk/testing/xml-testsuite/src/main/java/org/apache/axiom/ts/xml/XMLSample.java

Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCloseWithInputStream.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCloseWithInputStream.java?rev=1678491&r1=1678490&r2=1678491&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCloseWithInputStream.java
(original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCloseWithInputStream.java
Sat May  9 13:41:22 2015
@@ -18,13 +18,12 @@
  */
 package org.apache.axiom.ts.om.builder;
 
-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.TestConstants;
 import org.apache.axiom.testutils.io.CloseSensorInputStream;
 import org.apache.axiom.ts.AxiomTestCase;
+import org.apache.axiom.ts.xml.XMLSample;
 
 public class TestCloseWithInputStream extends AxiomTestCase {
     public TestCloseWithInputStream(OMMetaFactory metaFactory) {
@@ -32,7 +31,7 @@ public class TestCloseWithInputStream ex
     }
 
     protected void runTest() throws Throwable {
-        CloseSensorInputStream in = new CloseSensorInputStream(AbstractTestCase.getTestResource(TestConstants.TEST));
+        CloseSensorInputStream in = new CloseSensorInputStream(XMLSample.SIMPLE.getAsStream());
         try {
             OMXMLParserWrapper builder = OMXMLBuilderFactory.createOMBuilder(metaFactory.getOMFactory(),
in);
             builder.getDocument().build();

Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCloseWithXMLStreamReader.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCloseWithXMLStreamReader.java?rev=1678491&r1=1678490&r2=1678491&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCloseWithXMLStreamReader.java
(original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCloseWithXMLStreamReader.java
Sat May  9 13:41:22 2015
@@ -23,12 +23,11 @@ import java.lang.ref.WeakReference;
 
 import javax.xml.stream.XMLStreamReader;
 
-import org.apache.axiom.om.AbstractTestCase;
 import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.om.OMXMLParserWrapper;
-import org.apache.axiom.om.TestConstants;
 import org.apache.axiom.om.util.StAXUtils;
 import org.apache.axiom.ts.AxiomTestCase;
+import org.apache.axiom.ts.xml.XMLSample;
 
 public class TestCloseWithXMLStreamReader extends AxiomTestCase {
     public TestCloseWithXMLStreamReader(OMMetaFactory metaFactory) {
@@ -36,7 +35,7 @@ public class TestCloseWithXMLStreamReade
     }
 
     protected void runTest() throws Throwable {
-        InputStream in = AbstractTestCase.getTestResource(TestConstants.TEST);
+        InputStream in = XMLSample.SIMPLE.getAsStream();
         try {
             XMLStreamReader reader = StAXUtils.createXMLStreamReader(in);
             OMXMLParserWrapper builder = metaFactory.createStAXOMBuilder(metaFactory.getOMFactory(),
reader);

Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestInvalidXML.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestInvalidXML.java?rev=1678491&r1=1678490&r2=1678491&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestInvalidXML.java
(original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestInvalidXML.java
Sat May  9 13:41:22 2015
@@ -20,7 +20,6 @@ package org.apache.axiom.ts.om.builder;
 
 import javax.xml.stream.XMLStreamReader;
 
-import org.apache.axiom.om.AbstractTestCase;
 import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.om.OMXMLBuilderFactory;
 import org.apache.axiom.om.OMXMLParserWrapper;
@@ -34,7 +33,8 @@ public class TestInvalidXML extends Axio
     }
 
     protected void runTest() throws Throwable {
-        XMLStreamReader originalReader = StAXUtils.createXMLStreamReader(AbstractTestCase.getTestResource("invalid_xml.xml"));
+        XMLStreamReader originalReader = StAXUtils.createXMLStreamReader(
+                TestInvalidXML.class.getResourceAsStream("invalid_xml.xml"));
         InvocationCounter invocationCounter = new InvocationCounter();
         XMLStreamReader reader = (XMLStreamReader)invocationCounter.createProxy(originalReader);
         

Copied: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/DocumentElementExtractor.java
(from r1677906, webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/om/impl/DocumentElementExtractor.java)
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/DocumentElementExtractor.java?p2=webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/DocumentElementExtractor.java&p1=webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/om/impl/DocumentElementExtractor.java&r1=1677906&r2=1678491&rev=1678491&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/om/impl/DocumentElementExtractor.java
(original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/DocumentElementExtractor.java
Sat May  9 13:41:22 2015
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.axiom.om.impl;
+package org.apache.axiom.ts.om.container;
 
 import javax.xml.stream.XMLStreamConstants;
 import javax.xml.stream.XMLStreamException;

Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/OMContainerFactory.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/OMContainerFactory.java?rev=1678491&r1=1678490&r2=1678491&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/OMContainerFactory.java
(original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/OMContainerFactory.java
Sat May  9 13:41:22 2015
@@ -24,7 +24,6 @@ import javax.xml.stream.XMLStreamReader;
 
 import org.apache.axiom.om.OMContainer;
 import org.apache.axiom.om.OMXMLParserWrapper;
-import org.apache.axiom.om.impl.RootWhitespaceFilter;
 import org.apache.axiom.testutils.suite.Dimension;
 import org.apache.axiom.testutils.suite.MatrixTestCase;
 import org.xml.sax.InputSource;

Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/OMElementFactory.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/OMElementFactory.java?rev=1678491&r1=1678490&r2=1678491&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/OMElementFactory.java
(original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/OMElementFactory.java
Sat May  9 13:41:22 2015
@@ -29,7 +29,6 @@ import javax.xml.transform.stream.Stream
 
 import org.apache.axiom.om.OMContainer;
 import org.apache.axiom.om.OMXMLParserWrapper;
-import org.apache.axiom.om.impl.DocumentElementExtractor;
 import org.apache.axiom.testutils.suite.MatrixTestCase;
 import org.apache.xalan.processor.TransformerFactoryImpl;
 import org.w3c.dom.Document;

Copied: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/RootWhitespaceFilter.java
(from r1677906, webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/om/impl/RootWhitespaceFilter.java)
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/RootWhitespaceFilter.java?p2=webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/RootWhitespaceFilter.java&p1=webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/om/impl/RootWhitespaceFilter.java&r1=1677906&r2=1678491&rev=1678491&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/om/impl/RootWhitespaceFilter.java
(original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/RootWhitespaceFilter.java
Sat May  9 13:41:22 2015
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.axiom.om.impl;
+package org.apache.axiom.ts.om.container;
 
 import javax.xml.stream.XMLStreamConstants;
 import javax.xml.stream.XMLStreamException;

Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestBuild.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestBuild.java?rev=1678491&r1=1678490&r2=1678491&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestBuild.java
(original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestBuild.java
Sat May  9 13:41:22 2015
@@ -18,13 +18,12 @@
  */
 package org.apache.axiom.ts.om.document;
 
-import org.apache.axiom.om.AbstractTestCase;
 import org.apache.axiom.om.OMDocument;
 import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.om.OMNode;
 import org.apache.axiom.om.OMXMLBuilderFactory;
-import org.apache.axiom.om.TestConstants;
 import org.apache.axiom.ts.AxiomTestCase;
+import org.apache.axiom.ts.xml.XMLSample;
 import org.apache.commons.io.input.CountingInputStream;
 
 public class TestBuild extends AxiomTestCase {
@@ -34,8 +33,7 @@ public class TestBuild extends AxiomTest
 
     @Override
     protected void runTest() throws Throwable {
-        CountingInputStream in = new CountingInputStream(AbstractTestCase.getTestResource(
-                TestConstants.REALLY_BIG_MESSAGE));
+        CountingInputStream in = new CountingInputStream(XMLSample.LARGE.getAsStream());
         OMDocument doc = OMXMLBuilderFactory.createOMBuilder(metaFactory.getOMFactory(),
in).getDocument();
         assertFalse(doc.isComplete());
         int countBeforeBuild = in.getCount();

Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildElements.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildElements.java?rev=1678491&r1=1678490&r2=1678491&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildElements.java
(original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildElements.java
Sat May  9 13:41:22 2015
@@ -18,13 +18,13 @@
  */
 package org.apache.axiom.ts.om.element;
 
+import java.io.StringReader;
 import java.util.Iterator;
 
-import org.apache.axiom.om.AbstractTestCase;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.om.OMNode;
-import org.apache.axiom.om.TestConstants;
+import org.apache.axiom.om.OMXMLBuilderFactory;
 import org.apache.axiom.ts.AxiomTestCase;
 
 /** Test the element iterator */
@@ -34,7 +34,8 @@ public class TestGetChildElements extend
     }
 
     protected void runTest() throws Throwable {
-        OMElement elt = AbstractTestCase.getTestResourceAsElement(metaFactory, TestConstants.SOAP_SOAPMESSAGE1);
+        OMElement elt = OMXMLBuilderFactory.createOMBuilder(metaFactory.getOMFactory(),
+                new StringReader("<root>a<b/><!--c--><d/>e</root>")).getDocumentElement();
         Iterator iter = elt.getChildElements();
         int counter = 0;
         while (iter.hasNext()) {

Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildren.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildren.java?rev=1678491&r1=1678490&r2=1678491&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildren.java
(original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildren.java
Sat May  9 13:41:22 2015
@@ -18,12 +18,12 @@
  */
 package org.apache.axiom.ts.om.element;
 
+import java.io.StringReader;
 import java.util.Iterator;
 
-import org.apache.axiom.om.AbstractTestCase;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMMetaFactory;
-import org.apache.axiom.om.TestConstants;
+import org.apache.axiom.om.OMXMLBuilderFactory;
 import org.apache.axiom.ts.AxiomTestCase;
 
 /** Test the plain iterator which includes all the children (including the texts) */
@@ -33,7 +33,8 @@ public class TestGetChildren extends Axi
     }
 
     protected void runTest() throws Throwable {
-        OMElement elt = AbstractTestCase.getTestResourceAsElement(metaFactory, TestConstants.SOAP_SOAPMESSAGE1);
+        OMElement elt = OMXMLBuilderFactory.createOMBuilder(metaFactory.getOMFactory(),
+                new StringReader("<root>a<b/><!--c--><d/>e</root>")).getDocumentElement();
         Iterator iter = elt.getChildren();
         int counter = 0;
         while (iter.hasNext()) {

Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenRemove1.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenRemove1.java?rev=1678491&r1=1678490&r2=1678491&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenRemove1.java
(original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenRemove1.java
Sat May  9 13:41:22 2015
@@ -18,12 +18,12 @@
  */
 package org.apache.axiom.ts.om.element;
 
+import java.io.StringReader;
 import java.util.Iterator;
 
-import org.apache.axiom.om.AbstractTestCase;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMMetaFactory;
-import org.apache.axiom.om.TestConstants;
+import org.apache.axiom.om.OMXMLBuilderFactory;
 import org.apache.axiom.ts.AxiomTestCase;
 
 /** test the remove exception behavior */
@@ -33,7 +33,8 @@ public class TestGetChildrenRemove1 exte
     }
 
     protected void runTest() throws Throwable {
-        OMElement elt = AbstractTestCase.getTestResourceAsElement(metaFactory, TestConstants.SOAP_SOAPMESSAGE1);
+        OMElement elt = OMXMLBuilderFactory.createOMBuilder(metaFactory.getOMFactory(),
+                new StringReader("<root><child/></root>")).getDocumentElement();
         Iterator iter = elt.getChildren();
 
         //this is supposed to throw an illegal state exception

Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenRemove2.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenRemove2.java?rev=1678491&r1=1678490&r2=1678491&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenRemove2.java
(original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenRemove2.java
Sat May  9 13:41:22 2015
@@ -18,12 +18,12 @@
  */
 package org.apache.axiom.ts.om.element;
 
+import java.io.StringReader;
 import java.util.Iterator;
 
-import org.apache.axiom.om.AbstractTestCase;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMMetaFactory;
-import org.apache.axiom.om.TestConstants;
+import org.apache.axiom.om.OMXMLBuilderFactory;
 import org.apache.axiom.ts.AxiomTestCase;
 
 /** test the remove exception behavior, consecutive remove calls */
@@ -33,7 +33,8 @@ public class TestGetChildrenRemove2 exte
     }
 
     protected void runTest() throws Throwable {
-        OMElement elt = AbstractTestCase.getTestResourceAsElement(metaFactory, TestConstants.SOAP_SOAPMESSAGE1);
+        OMElement elt = OMXMLBuilderFactory.createOMBuilder(metaFactory.getOMFactory(),
+                new StringReader("<root><child1/><child2/></root>")).getDocumentElement();
         Iterator iter = elt.getChildren();
         if (iter.hasNext()) {
             iter.next();

Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenRemove3.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenRemove3.java?rev=1678491&r1=1678490&r2=1678491&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenRemove3.java
(original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenRemove3.java
Sat May  9 13:41:22 2015
@@ -18,12 +18,12 @@
  */
 package org.apache.axiom.ts.om.element;
 
+import java.io.StringReader;
 import java.util.Iterator;
 
-import org.apache.axiom.om.AbstractTestCase;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMMetaFactory;
-import org.apache.axiom.om.TestConstants;
+import org.apache.axiom.om.OMXMLBuilderFactory;
 import org.apache.axiom.ts.AxiomTestCase;
 
 /** Remove all! */
@@ -33,7 +33,8 @@ public class TestGetChildrenRemove3 exte
     }
 
     protected void runTest() throws Throwable {
-        OMElement elt = AbstractTestCase.getTestResourceAsElement(metaFactory, TestConstants.SOAP_SOAPMESSAGE1);
+        OMElement elt = OMXMLBuilderFactory.createOMBuilder(metaFactory.getOMFactory(),
+                new StringReader("<root>a<b/><!--c--><d/>e</root>")).getDocumentElement();
         Iterator iter = elt.getChildren();
         while (iter.hasNext()) {
             iter.next();

Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenRemove4.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenRemove4.java?rev=1678491&r1=1678490&r2=1678491&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenRemove4.java
(original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenRemove4.java
Sat May  9 13:41:22 2015
@@ -18,12 +18,12 @@
  */
 package org.apache.axiom.ts.om.element;
 
+import java.io.StringReader;
 import java.util.Iterator;
 
-import org.apache.axiom.om.AbstractTestCase;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMMetaFactory;
-import org.apache.axiom.om.TestConstants;
+import org.apache.axiom.om.OMXMLBuilderFactory;
 import org.apache.axiom.ts.AxiomTestCase;
 
 /** test whether the children count reduces. */
@@ -33,7 +33,8 @@ public class TestGetChildrenRemove4 exte
     }
 
     protected void runTest() throws Throwable {
-        OMElement elt = AbstractTestCase.getTestResourceAsElement(metaFactory, TestConstants.SOAP_SOAPMESSAGE1);
+        OMElement elt = OMXMLBuilderFactory.createOMBuilder(metaFactory.getOMFactory(),
+                new StringReader("<root>a<b/><!--c--><d/>e</root>")).getDocumentElement();
         Iterator iter = elt.getChildren();
         int firstChildrenCount = 0;
         int secondChildrenCount = 0;

Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/xpath/AXIOMXPathTestCase.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/xpath/AXIOMXPathTestCase.java?rev=1678491&r1=1678490&r2=1678491&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/xpath/AXIOMXPathTestCase.java
(original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/xpath/AXIOMXPathTestCase.java
Sat May  9 13:41:22 2015
@@ -26,10 +26,10 @@ import javax.xml.stream.XMLStreamReader;
 import org.apache.axiom.om.OMDocument;
 import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.om.OMXMLBuilderFactory;
-import org.apache.axiom.om.impl.RootWhitespaceFilter;
 import org.apache.axiom.om.util.StAXUtils;
 import org.apache.axiom.om.xpath.DocumentNavigator;
 import org.apache.axiom.test.jaxen.JaxenXPathTestBase;
+import org.apache.axiom.ts.om.container.RootWhitespaceFilter;
 import org.jaxen.Navigator;
 
 public class AXIOMXPathTestCase extends JaxenXPathTestBase {

Modified: webservices/axiom/trunk/testing/xml-testsuite/src/main/java/org/apache/axiom/ts/xml/XMLSample.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/xml-testsuite/src/main/java/org/apache/axiom/ts/xml/XMLSample.java?rev=1678491&r1=1678490&r2=1678491&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/xml-testsuite/src/main/java/org/apache/axiom/ts/xml/XMLSample.java
(original)
+++ webservices/axiom/trunk/testing/xml-testsuite/src/main/java/org/apache/axiom/ts/xml/XMLSample.java
Sat May  9 13:41:22 2015
@@ -31,6 +31,11 @@ import org.apache.axiom.testing.multiton
 
 public final class XMLSample extends Multiton {
     /**
+     * A simple XML document without any particular features.
+     */
+    public static final XMLSample SIMPLE = new XMLSample("simple.xml");
+    
+    /**
      * An XML document that is larger than the input buffer of typical XML parsers.
      */
     public static final XMLSample LARGE = new XMLSample("large.xml");



Mime
View raw message