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/12/30 12:47:28 UTC
svn commit: r1426917 -
/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/
Author: veithen
Date: Sun Dec 30 11:47:27 2012
New Revision: 1426917
URL: http://svn.apache.org/viewvc?rev=1426917&view=rev
Log:
Some refactorings to increase the flexibility of the test setup.
Added:
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestDocument.java (with props)
Removed:
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/OMSourcedElementTest.java
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestComplete.java
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestExpand.java
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName1DefaultPrefix.java
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName1QualifiedPrefix.java
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName1Unqualified.java
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName2DefaultPrefix.java
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName2QualifiedPrefix.java
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName2Unqualified.java
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName3DefaultPrefix.java
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName3QualifiedPrefix.java
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName3Unqualified.java
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName4DefaultPrefix.java
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName4QualifiedPrefix.java
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName4Unqualified.java
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerializeAndConsumeToStream.java
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerializeAndConsumeToWriter.java
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerializeAndConsumeToXMLWriter.java
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerializeAndConsumeToXMLWriterEmbedded.java
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerializeModifiedOMSEWithNonDestructiveDataSource.java
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerializeToStream.java
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerializeToWriter.java
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerializeToXMLWriter.java
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerializeToXMLWriterEmbedded.java
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerializeToXMLWriterFromReader.java
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerializeToXMLWriterFromReaderEmbedded.java
webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSetDataSourceOnAlreadyExpandedElement.java
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestComplete.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestComplete.java?rev=1426917&r1=1426916&r2=1426917&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestComplete.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestComplete.java Sun Dec 30 11:47:27 2012
@@ -22,12 +22,13 @@ import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.OMNamespace;
+import org.apache.axiom.ts.AxiomTestCase;
/**
* Make sure that the incomplete setting of an OMSE is not
* propogated to the root
**/
-public class TestComplete extends OMSourcedElementTest {
+public class TestComplete extends AxiomTestCase {
public TestComplete(OMMetaFactory metaFactory) {
super(metaFactory);
}
@@ -37,7 +38,7 @@ public class TestComplete extends OMSour
OMFactory f = metaFactory.getOMFactory();
OMNamespace ns = f.createOMNamespace("http://www.sosnoski.com/uwjws/library", "");
OMNamespace rootNS = f.createOMNamespace("http://sampleroot", "rootPrefix");
- OMElement child = f.createOMElement(new TestDataSource(testDocument), "library", ns);
+ OMElement child = f.createOMElement(new TestDataSource(TestDocument.DOCUMENT1.getContent()), "library", ns);
OMElement root = f.createOMElement("root", rootNS);
// Trigger expansion of the child OMSE
@@ -56,7 +57,7 @@ public class TestComplete extends OMSour
// Now repeat the test, but this time trigger the
// partial parsing of the child after adding it to the root.
- child = f.createOMElement(new TestDataSource(testDocument), "library", ns);
+ child = f.createOMElement(new TestDataSource(TestDocument.DOCUMENT1.getContent()), "library", ns);
root = f.createOMElement("root", rootNS);
root.addChild(child);
Added: webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestDocument.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestDocument.java?rev=1426917&view=auto
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestDocument.java (added)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestDocument.java Sun Dec 30 11:47:27 2012
@@ -0,0 +1,81 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.axiom.ts.om.sourcedelement;
+
+import javax.xml.namespace.QName;
+
+import org.apache.axiom.om.OMDataSource;
+import org.apache.axiom.om.OMFactory;
+import org.apache.axiom.om.OMNamespace;
+import org.apache.axiom.om.OMSourcedElement;
+
+/**
+ * Defines a set of test documents used to create {@link OMDataSource} and {@link OMSourcedElement}
+ * instances.
+ */
+final class TestDocument {
+ static final TestDocument DOCUMENT1 = new TestDocument(
+ "<library xmlns=\"http://www.sosnoski.com/uwjws/library\" books=\"1\">" +
+ "<type id=\"java\" category=\"professional\" deductable=\"true\">" +
+ "<name>Java Reference</name></type><type id=\"xml\" " +
+ "category=\"professional\" deductable=\"true\"><name>XML Reference</name>" +
+ "</type><book isbn=\"1930110111\" type=\"xml\"><title>XSLT Quickly</title>" +
+ "<author>DuCharme, Bob</author><publisher>Manning</publisher>" +
+ "<price>29.95</price></book></library>",
+ new QName("http://www.sosnoski.com/uwjws/library", "library", ""));
+
+ // Same as DOCUMENT1 except that an non-default prefix is used
+ static final TestDocument DOCUMENT2 = new TestDocument(
+ "<pre:library xmlns:pre=\"http://www.sosnoski.com/uwjws/library\" books=\"1\">" +
+ "<pre:type id=\"java\" category=\"professional\" deductable=\"true\">" +
+ "<pre:name>Java Reference</pre:name></pre:type><pre:type id=\"xml\" " +
+ "category=\"professional\" deductable=\"true\"><pre:name>XML Reference</pre:name>" +
+ "</pre:type><pre:book isbn=\"1930110111\" type=\"xml\"><pre:title>XSLT Quickly</pre:title>" +
+ "<pre:author>DuCharme, Bob</pre:author><pre:publisher>Manning</pre:publisher>" +
+ "<pre:price>29.95</pre:price></pre:book></pre:library>",
+ new QName("http://www.sosnoski.com/uwjws/library", "library", "pre"));
+
+ // Same as DOCUMENT1 except that the elements are unqualified
+ static final TestDocument DOCUMENT3 = new TestDocument(
+ "<library books=\"1\">" +
+ "<type id=\"java\" category=\"professional\" deductable=\"true\">" +
+ "<name>Java Reference</name></type><type id=\"xml\" " +
+ "category=\"professional\" deductable=\"true\"><name>XML Reference</name>" +
+ "</type><book isbn=\"1930110111\" type=\"xml\"><title>XSLT Quickly</title>" +
+ "<author>DuCharme, Bob</author><publisher>Manning</publisher>" +
+ "<price>29.95</price></book></library>",
+ new QName("library"));
+
+ private final String content;
+ private final QName qname;
+
+ private TestDocument(String content, QName qname) {
+ this.content = content;
+ this.qname = qname;
+ }
+
+ String getContent() {
+ return content;
+ }
+
+ OMSourcedElement createOMSourcedElement(OMFactory factory) {
+ OMNamespace ns = factory.createOMNamespace(qname.getNamespaceURI(), qname.getPrefix());
+ return factory.createOMElement(new TestDataSource(TestDocument.DOCUMENT1.getContent()), qname.getLocalPart(), ns);
+ }
+}
Propchange: webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestDocument.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestExpand.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestExpand.java?rev=1426917&r1=1426916&r2=1426917&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestExpand.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestExpand.java Sun Dec 30 11:47:27 2012
@@ -25,16 +25,19 @@ import javax.xml.namespace.QName;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.OMNode;
+import org.apache.axiom.om.OMSourcedElement;
+import org.apache.axiom.ts.AxiomTestCase;
/**
* Make sure the expanded OMSourcedElement behaves like a normal OMElement.
*/
-public class TestExpand extends OMSourcedElementTest {
+public class TestExpand extends AxiomTestCase {
public TestExpand(OMMetaFactory metaFactory) {
super(metaFactory);
}
protected void runTest() throws Throwable {
+ OMSourcedElement element = TestDocument.DOCUMENT1.createOMSourcedElement(metaFactory.getOMFactory());
element.getAllDeclaredNamespaces();
assertEquals("Expanded namespace count error", 1,
countItems(element.getAllDeclaredNamespaces()));
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName1DefaultPrefix.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName1DefaultPrefix.java?rev=1426917&r1=1426916&r2=1426917&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName1DefaultPrefix.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName1DefaultPrefix.java Sun Dec 30 11:47:27 2012
@@ -27,13 +27,14 @@ import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.util.StAXUtils;
+import org.apache.axiom.ts.AxiomTestCase;
/**
* Tests the OMSourcedElement localName, namespace and prefix settings before and after
* serialization Document: testDocument (which uses the default namespace) Type of
* Serialization: Serialize and cache Prefix test
*/
-public class TestName1DefaultPrefix extends OMSourcedElementTest {
+public class TestName1DefaultPrefix extends AxiomTestCase {
public TestName1DefaultPrefix(OMMetaFactory metaFactory) {
super(metaFactory);
}
@@ -46,7 +47,7 @@ public class TestName1DefaultPrefix exte
OMNamespace ns =
f.createOMNamespace("http://www.sosnoski.com/uwjws/library", null);
OMElement element =
- f.createOMElement(new TestDataSource(testDocument), "library", ns);
+ f.createOMElement(new TestDataSource(TestDocument.DOCUMENT1.getContent()), "library", ns);
OMElement root = f.createOMElement("root", rootNS);
root.addChild(element);
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName1QualifiedPrefix.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName1QualifiedPrefix.java?rev=1426917&r1=1426916&r2=1426917&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName1QualifiedPrefix.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName1QualifiedPrefix.java Sun Dec 30 11:47:27 2012
@@ -27,13 +27,14 @@ import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.util.StAXUtils;
+import org.apache.axiom.ts.AxiomTestCase;
/**
* Tests the OMSourcedElement localName, namespace and prefix settings before and after
* serialization Document: testDocument2 (which uses a qualified prefix) Type of Serialization:
* Serialize and cache Prefix test
*/
-public class TestName1QualifiedPrefix extends OMSourcedElementTest {
+public class TestName1QualifiedPrefix extends AxiomTestCase {
public TestName1QualifiedPrefix(OMMetaFactory metaFactory) {
super(metaFactory);
}
@@ -45,7 +46,7 @@ public class TestName1QualifiedPrefix ex
OMNamespace rootNS = f.createOMNamespace("http://sampleroot", "rootPrefix");
OMNamespace ns = f.createOMNamespace("http://www.sosnoski.com/uwjws/library", null);
OMElement element =
- f.createOMElement(new TestDataSource(testDocument2), "library", ns);
+ f.createOMElement(new TestDataSource(TestDocument.DOCUMENT2.getContent()), "library", ns);
OMElement root = f.createOMElement("root", rootNS);
root.addChild(element);
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName1Unqualified.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName1Unqualified.java?rev=1426917&r1=1426916&r2=1426917&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName1Unqualified.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName1Unqualified.java Sun Dec 30 11:47:27 2012
@@ -27,13 +27,14 @@ import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.util.StAXUtils;
+import org.apache.axiom.ts.AxiomTestCase;
/**
* Tests the OMSourcedElement localName, namespace and prefix settings before and after
* serialization Document: testDocument3 (which uses unqualified names) Type of Serialization:
* Serialize and cache Prefix test
*/
-public class TestName1Unqualified extends OMSourcedElementTest {
+public class TestName1Unqualified extends AxiomTestCase {
public TestName1Unqualified(OMMetaFactory metaFactory) {
super(metaFactory);
}
@@ -45,7 +46,7 @@ public class TestName1Unqualified extend
OMNamespace rootNS = f.createOMNamespace("http://sampleroot", "rootPrefix");
OMNamespace ns = f.createOMNamespace("", "");
OMElement element =
- f.createOMElement(new TestDataSource(testDocument3), "library", ns);
+ f.createOMElement(new TestDataSource(TestDocument.DOCUMENT3.getContent()), "library", ns);
OMElement root = f.createOMElement("root", rootNS);
root.addChild(element);
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName2DefaultPrefix.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName2DefaultPrefix.java?rev=1426917&r1=1426916&r2=1426917&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName2DefaultPrefix.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName2DefaultPrefix.java Sun Dec 30 11:47:27 2012
@@ -27,13 +27,14 @@ import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.util.StAXUtils;
+import org.apache.axiom.ts.AxiomTestCase;
/**
* Tests the OMSourcedElement localName, namespace and prefix settings before and after
* serialization Document: testDocument (which uses the default namespace) Type of
* Serialization: Serialize and consume Tests update of prefix
*/
-public class TestName2DefaultPrefix extends OMSourcedElementTest {
+public class TestName2DefaultPrefix extends AxiomTestCase {
public TestName2DefaultPrefix(OMMetaFactory metaFactory) {
super(metaFactory);
}
@@ -46,7 +47,7 @@ public class TestName2DefaultPrefix exte
OMNamespace ns =
f.createOMNamespace("http://www.sosnoski.com/uwjws/library", "DUMMYPREFIX");
OMElement element =
- f.createOMElement(new TestDataSource(testDocument), "library", ns);
+ f.createOMElement(new TestDataSource(TestDocument.DOCUMENT1.getContent()), "library", ns);
OMElement root = f.createOMElement("root", rootNS);
root.addChild(element);
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName2QualifiedPrefix.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName2QualifiedPrefix.java?rev=1426917&r1=1426916&r2=1426917&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName2QualifiedPrefix.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName2QualifiedPrefix.java Sun Dec 30 11:47:27 2012
@@ -27,13 +27,14 @@ import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.util.StAXUtils;
+import org.apache.axiom.ts.AxiomTestCase;
/**
* Tests the OMSourcedElement localName, namespace and prefix settings before and after
* serialization Document: testDocument2 (which uses a qualified prefix) Type of Serialization:
* Serialize and consume Tests update of prefix
*/
-public class TestName2QualifiedPrefix extends OMSourcedElementTest {
+public class TestName2QualifiedPrefix extends AxiomTestCase {
public TestName2QualifiedPrefix(OMMetaFactory metaFactory) {
super(metaFactory);
}
@@ -45,7 +46,7 @@ public class TestName2QualifiedPrefix ex
OMNamespace rootNS = f.createOMNamespace("http://sampleroot", "rootPrefix");
OMNamespace ns = f.createOMNamespace("http://www.sosnoski.com/uwjws/library", "");
OMElement element =
- f.createOMElement(new TestDataSource(testDocument2), "library", ns);
+ f.createOMElement(new TestDataSource(TestDocument.DOCUMENT2.getContent()), "library", ns);
OMElement root = f.createOMElement("root", rootNS);
root.addChild(element);
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName2Unqualified.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName2Unqualified.java?rev=1426917&r1=1426916&r2=1426917&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName2Unqualified.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName2Unqualified.java Sun Dec 30 11:47:27 2012
@@ -27,13 +27,14 @@ import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.util.StAXUtils;
+import org.apache.axiom.ts.AxiomTestCase;
/**
* Tests the OMSourcedElement localName, namespace and prefix settings before and after
* serialization Document: testDocument3 (which uses unqualified names) Type of Serialization:
* Serialize and consume Tests update of prefix
*/
-public class TestName2Unqualified extends OMSourcedElementTest {
+public class TestName2Unqualified extends AxiomTestCase {
public TestName2Unqualified(OMMetaFactory metaFactory) {
super(metaFactory);
}
@@ -45,7 +46,7 @@ public class TestName2Unqualified extend
OMNamespace rootNS = f.createOMNamespace("http://sampleroot", "rootPrefix");
OMNamespace ns = f.createOMNamespace("", "");
OMElement element =
- f.createOMElement(new TestDataSource(testDocument3), "library", ns);
+ f.createOMElement(new TestDataSource(TestDocument.DOCUMENT3.getContent()), "library", ns);
OMElement root = f.createOMElement("root", rootNS);
root.addChild(element);
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName3DefaultPrefix.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName3DefaultPrefix.java?rev=1426917&r1=1426916&r2=1426917&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName3DefaultPrefix.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName3DefaultPrefix.java Sun Dec 30 11:47:27 2012
@@ -27,6 +27,7 @@ import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.util.StAXUtils;
+import org.apache.axiom.ts.AxiomTestCase;
/**
* Tests the OMSourcedElement localName, namespace and prefix settings before and after
@@ -34,7 +35,7 @@ import org.apache.axiom.om.util.StAXUtil
* Serialization: Serialize and cache Tests attempt to rename namespace and localpart, which is
* not allowed
*/
-public class TestName3DefaultPrefix extends OMSourcedElementTest {
+public class TestName3DefaultPrefix extends AxiomTestCase {
public TestName3DefaultPrefix(OMMetaFactory metaFactory) {
super(metaFactory);
}
@@ -46,7 +47,7 @@ public class TestName3DefaultPrefix exte
OMNamespace rootNS = f.createOMNamespace("http://sampleroot", "rootPrefix");
OMNamespace ns = f.createOMNamespace("http://DUMMYNS", "DUMMYPREFIX");
OMElement element =
- f.createOMElement(new TestDataSource(testDocument), "DUMMYNAME", ns);
+ f.createOMElement(new TestDataSource(TestDocument.DOCUMENT1.getContent()), "DUMMYNAME", ns);
OMElement root = f.createOMElement("root", rootNS);
root.addChild(element);
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName3QualifiedPrefix.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName3QualifiedPrefix.java?rev=1426917&r1=1426916&r2=1426917&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName3QualifiedPrefix.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName3QualifiedPrefix.java Sun Dec 30 11:47:27 2012
@@ -27,13 +27,14 @@ import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.util.StAXUtils;
+import org.apache.axiom.ts.AxiomTestCase;
/**
* Tests the OMSourcedElement localName, namespace and prefix settings before and after
* serialization Document: testDocument2 (which uses a qualified prefix) Type of Serialization:
* Serialize and cache Tests attempt to rename namespace and localpart, which is not allowed
*/
-public class TestName3QualifiedPrefix extends OMSourcedElementTest {
+public class TestName3QualifiedPrefix extends AxiomTestCase {
public TestName3QualifiedPrefix(OMMetaFactory metaFactory) {
super(metaFactory);
}
@@ -45,7 +46,7 @@ public class TestName3QualifiedPrefix ex
OMNamespace rootNS = f.createOMNamespace("http://sampleroot", "rootPrefix");
OMNamespace ns = f.createOMNamespace("http://DUMMYNS", "DUMMYPREFIX");
OMElement element =
- f.createOMElement(new TestDataSource(testDocument2), "DUMMYNAME", ns);
+ f.createOMElement(new TestDataSource(TestDocument.DOCUMENT2.getContent()), "DUMMYNAME", ns);
OMElement root = f.createOMElement("root", rootNS);
root.addChild(element);
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName3Unqualified.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName3Unqualified.java?rev=1426917&r1=1426916&r2=1426917&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName3Unqualified.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName3Unqualified.java Sun Dec 30 11:47:27 2012
@@ -27,13 +27,14 @@ import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.util.StAXUtils;
+import org.apache.axiom.ts.AxiomTestCase;
/**
* Tests the OMSourcedElement localName, namespace and prefix settings before and after
* serialization Document: testDocument3 (which uses unqualified names) Type of Serialization:
* Serialize and cache Tests attempt to rename namespace and localpart, which is not allowed
*/
-public class TestName3Unqualified extends OMSourcedElementTest {
+public class TestName3Unqualified extends AxiomTestCase {
public TestName3Unqualified(OMMetaFactory metaFactory) {
super(metaFactory);
}
@@ -45,7 +46,7 @@ public class TestName3Unqualified extend
OMNamespace rootNS = f.createOMNamespace("http://sampleroot", "rootPrefix");
OMNamespace ns = f.createOMNamespace("http://DUMMYNS", "DUMMYPREFIX");
OMElement element =
- f.createOMElement(new TestDataSource(testDocument3), "DUMMYNAME", ns);
+ f.createOMElement(new TestDataSource(TestDocument.DOCUMENT3.getContent()), "DUMMYNAME", ns);
OMElement root = f.createOMElement("root", rootNS);
root.addChild(element);
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName4DefaultPrefix.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName4DefaultPrefix.java?rev=1426917&r1=1426916&r2=1426917&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName4DefaultPrefix.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName4DefaultPrefix.java Sun Dec 30 11:47:27 2012
@@ -27,6 +27,7 @@ import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.util.StAXUtils;
+import org.apache.axiom.ts.AxiomTestCase;
/**
* Tests the OMSourcedElement localName, namespace and prefix settings before and after
@@ -34,7 +35,7 @@ import org.apache.axiom.om.util.StAXUtil
* Serialization: Serialize and consume Tests that the namespace and localName are not affected
* by the serializeAndConsume
*/
-public class TestName4DefaultPrefix extends OMSourcedElementTest {
+public class TestName4DefaultPrefix extends AxiomTestCase {
public TestName4DefaultPrefix(OMMetaFactory metaFactory) {
super(metaFactory);
}
@@ -46,7 +47,7 @@ public class TestName4DefaultPrefix exte
OMNamespace rootNS = f.createOMNamespace("http://sampleroot", "rootPrefix");
OMNamespace ns = f.createOMNamespace("http://DUMMYNS", "DUMMYPREFIX");
OMElement element =
- f.createOMElement(new TestDataSource(testDocument), "DUMMYNAME", ns);
+ f.createOMElement(new TestDataSource(TestDocument.DOCUMENT1.getContent()), "DUMMYNAME", ns);
OMElement root = f.createOMElement("root", rootNS);
root.addChild(element);
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName4QualifiedPrefix.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName4QualifiedPrefix.java?rev=1426917&r1=1426916&r2=1426917&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName4QualifiedPrefix.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName4QualifiedPrefix.java Sun Dec 30 11:47:27 2012
@@ -27,13 +27,14 @@ import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.util.StAXUtils;
+import org.apache.axiom.ts.AxiomTestCase;
/**
* Tests the OMSourcedElement localName, namespace and prefix settings before and after
* serialization Document: testDocument2 (which uses a qualified prefix) Type of Serialization:
* Serialize and cache Tests attempt to rename namespace and localpart, which is not allowed
*/
-public class TestName4QualifiedPrefix extends OMSourcedElementTest {
+public class TestName4QualifiedPrefix extends AxiomTestCase {
public TestName4QualifiedPrefix(OMMetaFactory metaFactory) {
super(metaFactory);
}
@@ -45,7 +46,7 @@ public class TestName4QualifiedPrefix ex
OMNamespace rootNS = f.createOMNamespace("http://sampleroot", "rootPrefix");
OMNamespace ns = f.createOMNamespace("http://DUMMYNS", "");
OMElement element =
- f.createOMElement(new TestDataSource(testDocument2), "DUMMYNAME", ns);
+ f.createOMElement(new TestDataSource(TestDocument.DOCUMENT2.getContent()), "DUMMYNAME", ns);
OMElement root = f.createOMElement("root", rootNS);
root.addChild(element);
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName4Unqualified.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName4Unqualified.java?rev=1426917&r1=1426916&r2=1426917&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName4Unqualified.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestName4Unqualified.java Sun Dec 30 11:47:27 2012
@@ -27,13 +27,14 @@ import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.util.StAXUtils;
+import org.apache.axiom.ts.AxiomTestCase;
/**
* Tests the OMSourcedElement localName, namespace and prefix settings before and after
* serialization Document: testDocument3 (which uses unqualified names) Type of Serialization:
* Serialize and cache Tests attempt to rename namespace and localpart, which is not allowed
*/
-public class TestName4Unqualified extends OMSourcedElementTest {
+public class TestName4Unqualified extends AxiomTestCase {
public TestName4Unqualified(OMMetaFactory metaFactory) {
super(metaFactory);
}
@@ -45,7 +46,7 @@ public class TestName4Unqualified extend
OMNamespace rootNS = f.createOMNamespace("http://sampleroot", "rootPrefix");
OMNamespace ns = f.createOMNamespace("http://DUMMYNS", "");
OMElement element =
- f.createOMElement(new TestDataSource(testDocument3), "DUMMYNAME", ns);
+ f.createOMElement(new TestDataSource(TestDocument.DOCUMENT3.getContent()), "DUMMYNAME", ns);
OMElement root = f.createOMElement("root", rootNS);
root.addChild(element);
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerializeAndConsumeToStream.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerializeAndConsumeToStream.java?rev=1426917&r1=1426916&r2=1426917&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerializeAndConsumeToStream.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerializeAndConsumeToStream.java Sun Dec 30 11:47:27 2012
@@ -21,21 +21,24 @@ package org.apache.axiom.ts.om.sourcedel
import java.io.ByteArrayOutputStream;
import org.apache.axiom.om.OMMetaFactory;
+import org.apache.axiom.om.OMSourcedElement;
+import org.apache.axiom.ts.AxiomTestCase;
import org.custommonkey.xmlunit.XMLAssert;
import org.custommonkey.xmlunit.XMLUnit;
/**
* Test serialization of OMSourcedElementImpl to a Stream
*/
-public class TestSerializeAndConsumeToStream extends OMSourcedElementTest {
+public class TestSerializeAndConsumeToStream extends AxiomTestCase {
public TestSerializeAndConsumeToStream(OMMetaFactory metaFactory) {
super(metaFactory);
}
protected void runTest() throws Throwable {
+ OMSourcedElement element = TestDocument.DOCUMENT1.createOMSourcedElement(metaFactory.getOMFactory());
ByteArrayOutputStream bos = new ByteArrayOutputStream();
element.serializeAndConsume(bos);
- XMLAssert.assertXMLIdentical("Serialized text error", XMLUnit.compareXML(testDocument,
+ XMLAssert.assertXMLIdentical("Serialized text error", XMLUnit.compareXML(TestDocument.DOCUMENT1.getContent(),
new String(bos.toByteArray())), true);
assertFalse("Element expansion when serializing", element.isExpanded());
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerializeAndConsumeToWriter.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerializeAndConsumeToWriter.java?rev=1426917&r1=1426916&r2=1426917&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerializeAndConsumeToWriter.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerializeAndConsumeToWriter.java Sun Dec 30 11:47:27 2012
@@ -21,22 +21,25 @@ package org.apache.axiom.ts.om.sourcedel
import java.io.StringWriter;
import org.apache.axiom.om.OMMetaFactory;
+import org.apache.axiom.om.OMSourcedElement;
+import org.apache.axiom.ts.AxiomTestCase;
import org.custommonkey.xmlunit.XMLAssert;
import org.custommonkey.xmlunit.XMLUnit;
/**
* Test serialization of OMSourcedElementImpl to a Writer
*/
-public class TestSerializeAndConsumeToWriter extends OMSourcedElementTest {
+public class TestSerializeAndConsumeToWriter extends AxiomTestCase {
public TestSerializeAndConsumeToWriter(OMMetaFactory metaFactory) {
super(metaFactory);
}
protected void runTest() throws Throwable {
+ OMSourcedElement element = TestDocument.DOCUMENT1.createOMSourcedElement(metaFactory.getOMFactory());
StringWriter writer = new StringWriter();
element.serializeAndConsume(writer);
String result = writer.toString();
- XMLAssert.assertXMLIdentical("Serialized text error", XMLUnit.compareXML(testDocument, result), true);
+ XMLAssert.assertXMLIdentical("Serialized text error", XMLUnit.compareXML(TestDocument.DOCUMENT1.getContent(), result), true);
assertFalse("Element expansion when serializing", element.isExpanded());
}
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerializeAndConsumeToXMLWriter.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerializeAndConsumeToXMLWriter.java?rev=1426917&r1=1426916&r2=1426917&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerializeAndConsumeToXMLWriter.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerializeAndConsumeToXMLWriter.java Sun Dec 30 11:47:27 2012
@@ -23,24 +23,27 @@ import java.io.StringWriter;
import javax.xml.stream.XMLStreamWriter;
import org.apache.axiom.om.OMMetaFactory;
+import org.apache.axiom.om.OMSourcedElement;
import org.apache.axiom.om.util.StAXUtils;
+import org.apache.axiom.ts.AxiomTestCase;
import org.custommonkey.xmlunit.XMLAssert;
import org.custommonkey.xmlunit.XMLUnit;
/**
* Test serialization of OMSourcedElementImpl to an XMLWriter
*/
-public class TestSerializeAndConsumeToXMLWriter extends OMSourcedElementTest {
+public class TestSerializeAndConsumeToXMLWriter extends AxiomTestCase {
public TestSerializeAndConsumeToXMLWriter(OMMetaFactory metaFactory) {
super(metaFactory);
}
protected void runTest() throws Throwable {
+ OMSourcedElement element = TestDocument.DOCUMENT1.createOMSourcedElement(metaFactory.getOMFactory());
StringWriter writer = new StringWriter();
XMLStreamWriter xmlwriter = StAXUtils.createXMLStreamWriter(writer);
element.serializeAndConsume(writer);
xmlwriter.flush();
- XMLAssert.assertXMLIdentical("Serialized text error", XMLUnit.compareXML(testDocument, writer.toString()), true);
+ XMLAssert.assertXMLIdentical("Serialized text error", XMLUnit.compareXML(TestDocument.DOCUMENT1.getContent(), writer.toString()), true);
assertFalse("Element expansion when serializing", element.isExpanded());
}
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerializeAndConsumeToXMLWriterEmbedded.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerializeAndConsumeToXMLWriterEmbedded.java?rev=1426917&r1=1426916&r2=1426917&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerializeAndConsumeToXMLWriterEmbedded.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerializeAndConsumeToXMLWriterEmbedded.java Sun Dec 30 11:47:27 2012
@@ -22,18 +22,27 @@ import java.io.StringWriter;
import javax.xml.stream.XMLStreamWriter;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
+import org.apache.axiom.om.OMSourcedElement;
import org.apache.axiom.om.util.StAXUtils;
+import org.apache.axiom.ts.AxiomTestCase;
/**
* Tests OMSourcedElement serialization when the root (parent) is serialized.
*/
-public class TestSerializeAndConsumeToXMLWriterEmbedded extends OMSourcedElementTest {
+public class TestSerializeAndConsumeToXMLWriterEmbedded extends AxiomTestCase {
public TestSerializeAndConsumeToXMLWriterEmbedded(OMMetaFactory metaFactory) {
super(metaFactory);
}
protected void runTest() throws Throwable {
+ OMFactory f = metaFactory.getOMFactory();
+ OMSourcedElement element = TestDocument.DOCUMENT1.createOMSourcedElement(f);
+ OMElement root = f.createOMElement("root", f.createOMNamespace("http://sampleroot", "rootPrefix"));
+ root.addChild(element);
+
StringWriter writer = new StringWriter();
XMLStreamWriter xmlwriter = StAXUtils.createXMLStreamWriter(writer);
root.serializeAndConsume(writer);
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerializeModifiedOMSEWithNonDestructiveDataSource.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerializeModifiedOMSEWithNonDestructiveDataSource.java?rev=1426917&r1=1426916&r2=1426917&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerializeModifiedOMSEWithNonDestructiveDataSource.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerializeModifiedOMSEWithNonDestructiveDataSource.java Sun Dec 30 11:47:27 2012
@@ -26,8 +26,9 @@ import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.ds.CharArrayDataSource;
+import org.apache.axiom.ts.AxiomTestCase;
-public class TestSerializeModifiedOMSEWithNonDestructiveDataSource extends OMSourcedElementTest {
+public class TestSerializeModifiedOMSEWithNonDestructiveDataSource extends AxiomTestCase {
public TestSerializeModifiedOMSEWithNonDestructiveDataSource(OMMetaFactory metaFactory) {
super(metaFactory);
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerializeToStream.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerializeToStream.java?rev=1426917&r1=1426916&r2=1426917&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerializeToStream.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerializeToStream.java Sun Dec 30 11:47:27 2012
@@ -21,27 +21,30 @@ package org.apache.axiom.ts.om.sourcedel
import java.io.ByteArrayOutputStream;
import org.apache.axiom.om.OMMetaFactory;
+import org.apache.axiom.om.OMSourcedElement;
+import org.apache.axiom.ts.AxiomTestCase;
import org.custommonkey.xmlunit.XMLAssert;
import org.custommonkey.xmlunit.XMLUnit;
/**
* Test serialization of OMSourcedElementImpl to a Stream
*/
-public class TestSerializeToStream extends OMSourcedElementTest {
+public class TestSerializeToStream extends AxiomTestCase {
public TestSerializeToStream(OMMetaFactory metaFactory) {
super(metaFactory);
}
protected void runTest() throws Throwable {
+ OMSourcedElement element = TestDocument.DOCUMENT1.createOMSourcedElement(metaFactory.getOMFactory());
ByteArrayOutputStream bos = new ByteArrayOutputStream();
element.serialize(bos);
String newText = new String(bos.toByteArray());
- XMLAssert.assertXMLIdentical("Serialized text error", XMLUnit.compareXML(testDocument, newText), true);
+ XMLAssert.assertXMLIdentical("Serialized text error", XMLUnit.compareXML(TestDocument.DOCUMENT1.getContent(), newText), true);
assertTrue("Element not expanded when serializing", element.isExpanded());
bos = new ByteArrayOutputStream();
element.serialize(bos);
- XMLAssert.assertXMLIdentical("Serialized text error", XMLUnit.compareXML(testDocument,
+ XMLAssert.assertXMLIdentical("Serialized text error", XMLUnit.compareXML(TestDocument.DOCUMENT1.getContent(),
new String(bos.toByteArray())), true);
assertTrue("Element not expanded when serializing", element.isExpanded());
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerializeToWriter.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerializeToWriter.java?rev=1426917&r1=1426916&r2=1426917&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerializeToWriter.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerializeToWriter.java Sun Dec 30 11:47:27 2012
@@ -21,28 +21,31 @@ package org.apache.axiom.ts.om.sourcedel
import java.io.StringWriter;
import org.apache.axiom.om.OMMetaFactory;
+import org.apache.axiom.om.OMSourcedElement;
+import org.apache.axiom.ts.AxiomTestCase;
import org.custommonkey.xmlunit.XMLAssert;
import org.custommonkey.xmlunit.XMLUnit;
/**
* Test serialization of OMSourcedElementImpl to a Writer
*/
-public class TestSerializeToWriter extends OMSourcedElementTest {
+public class TestSerializeToWriter extends AxiomTestCase {
public TestSerializeToWriter(OMMetaFactory metaFactory) {
super(metaFactory);
}
protected void runTest() throws Throwable {
+ OMSourcedElement element = TestDocument.DOCUMENT1.createOMSourcedElement(metaFactory.getOMFactory());
StringWriter writer = new StringWriter();
element.serialize(writer);
String result = writer.toString();
- XMLAssert.assertXMLIdentical("Serialized text error", XMLUnit.compareXML(testDocument, result), true);
+ XMLAssert.assertXMLIdentical("Serialized text error", XMLUnit.compareXML(TestDocument.DOCUMENT1.getContent(), result), true);
assertTrue("Element not expanded when serializing", element.isExpanded());
writer = new StringWriter();
element.serialize(writer);
result = writer.toString();
- XMLAssert.assertXMLIdentical("Serialized text error", XMLUnit.compareXML(testDocument, result), true);
+ XMLAssert.assertXMLIdentical("Serialized text error", XMLUnit.compareXML(TestDocument.DOCUMENT1.getContent(), result), true);
assertTrue("Element not expanded when serializing", element.isExpanded());
}
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerializeToXMLWriter.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerializeToXMLWriter.java?rev=1426917&r1=1426916&r2=1426917&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerializeToXMLWriter.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerializeToXMLWriter.java Sun Dec 30 11:47:27 2012
@@ -23,31 +23,34 @@ import java.io.StringWriter;
import javax.xml.stream.XMLStreamWriter;
import org.apache.axiom.om.OMMetaFactory;
+import org.apache.axiom.om.OMSourcedElement;
import org.apache.axiom.om.util.StAXUtils;
+import org.apache.axiom.ts.AxiomTestCase;
import org.custommonkey.xmlunit.XMLAssert;
import org.custommonkey.xmlunit.XMLUnit;
/**
* Test serialization of OMSourcedElementImpl to an XMLWriter
*/
-public class TestSerializeToXMLWriter extends OMSourcedElementTest {
+public class TestSerializeToXMLWriter extends AxiomTestCase {
public TestSerializeToXMLWriter(OMMetaFactory metaFactory) {
super(metaFactory);
}
protected void runTest() throws Throwable {
+ OMSourcedElement element = TestDocument.DOCUMENT1.createOMSourcedElement(metaFactory.getOMFactory());
StringWriter writer = new StringWriter();
XMLStreamWriter xmlwriter = StAXUtils.createXMLStreamWriter(writer);
element.serialize(writer);
xmlwriter.flush();
- XMLAssert.assertXMLIdentical("Serialized text error", XMLUnit.compareXML(testDocument, writer.toString()), true);
+ XMLAssert.assertXMLIdentical("Serialized text error", XMLUnit.compareXML(TestDocument.DOCUMENT1.getContent(), writer.toString()), true);
assertTrue("Element not expanded when serializing", element.isExpanded());
writer = new StringWriter();
xmlwriter = StAXUtils.createXMLStreamWriter(writer);
element.serialize(writer);
xmlwriter.flush();
- XMLAssert.assertXMLIdentical("Serialized text error", XMLUnit.compareXML(testDocument, writer.toString()), true);
+ XMLAssert.assertXMLIdentical("Serialized text error", XMLUnit.compareXML(TestDocument.DOCUMENT1.getContent(), writer.toString()), true);
assertTrue("Element not expanded when serializing", element.isExpanded());
}
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerializeToXMLWriterEmbedded.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerializeToXMLWriterEmbedded.java?rev=1426917&r1=1426916&r2=1426917&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerializeToXMLWriterEmbedded.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerializeToXMLWriterEmbedded.java Sun Dec 30 11:47:27 2012
@@ -22,18 +22,27 @@ import java.io.StringWriter;
import javax.xml.stream.XMLStreamWriter;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
+import org.apache.axiom.om.OMSourcedElement;
import org.apache.axiom.om.util.StAXUtils;
+import org.apache.axiom.ts.AxiomTestCase;
/**
* Tests OMSourcedElement serialization when the root (parent) is serialized.
*/
-public class TestSerializeToXMLWriterEmbedded extends OMSourcedElementTest {
+public class TestSerializeToXMLWriterEmbedded extends AxiomTestCase {
public TestSerializeToXMLWriterEmbedded(OMMetaFactory metaFactory) {
super(metaFactory);
}
protected void runTest() throws Throwable {
+ OMFactory f = metaFactory.getOMFactory();
+ OMSourcedElement element = TestDocument.DOCUMENT1.createOMSourcedElement(f);
+ OMElement root = f.createOMElement("root", f.createOMNamespace("http://sampleroot", "rootPrefix"));
+ root.addChild(element);
+
StringWriter writer = new StringWriter();
XMLStreamWriter xmlwriter = StAXUtils.createXMLStreamWriter(writer);
root.serialize(writer);
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerializeToXMLWriterFromReader.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerializeToXMLWriterFromReader.java?rev=1426917&r1=1426916&r2=1426917&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerializeToXMLWriterFromReader.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerializeToXMLWriterFromReader.java Sun Dec 30 11:47:27 2012
@@ -26,19 +26,22 @@ import javax.xml.stream.XMLStreamWriter;
import org.apache.axiom.om.OMDocument;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.OMNode;
+import org.apache.axiom.om.OMSourcedElement;
import org.apache.axiom.om.OMXMLBuilderFactory;
import org.apache.axiom.om.OMXMLParserWrapper;
import org.apache.axiom.om.util.StAXUtils;
+import org.apache.axiom.ts.AxiomTestCase;
/**
* Tests OMSourcedElement getReader support
*/
-public class TestSerializeToXMLWriterFromReader extends OMSourcedElementTest {
+public class TestSerializeToXMLWriterFromReader extends AxiomTestCase {
public TestSerializeToXMLWriterFromReader(OMMetaFactory metaFactory) {
super(metaFactory);
}
protected void runTest() throws Throwable {
+ OMSourcedElement element = TestDocument.DOCUMENT1.createOMSourcedElement(metaFactory.getOMFactory());
StringWriter writer = new StringWriter();
XMLStreamWriter xmlwriter = StAXUtils.createXMLStreamWriter(writer);
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerializeToXMLWriterFromReaderEmbedded.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerializeToXMLWriterFromReaderEmbedded.java?rev=1426917&r1=1426916&r2=1426917&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerializeToXMLWriterFromReaderEmbedded.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerializeToXMLWriterFromReaderEmbedded.java Sun Dec 30 11:47:27 2012
@@ -24,21 +24,30 @@ import java.util.Iterator;
import javax.xml.stream.XMLStreamWriter;
import org.apache.axiom.om.OMDocument;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.OMNode;
+import org.apache.axiom.om.OMSourcedElement;
import org.apache.axiom.om.OMXMLBuilderFactory;
import org.apache.axiom.om.OMXMLParserWrapper;
import org.apache.axiom.om.util.StAXUtils;
+import org.apache.axiom.ts.AxiomTestCase;
/**
* Tests OMSourcedElement processing when the getReader() of the parent is accessed.
*/
-public class TestSerializeToXMLWriterFromReaderEmbedded extends OMSourcedElementTest {
+public class TestSerializeToXMLWriterFromReaderEmbedded extends AxiomTestCase {
public TestSerializeToXMLWriterFromReaderEmbedded(OMMetaFactory metaFactory) {
super(metaFactory);
}
protected void runTest() throws Throwable {
+ OMFactory f = metaFactory.getOMFactory();
+ OMSourcedElement element = TestDocument.DOCUMENT1.createOMSourcedElement(f);
+ OMElement root = f.createOMElement("root", f.createOMNamespace("http://sampleroot", "rootPrefix"));
+ root.addChild(element);
+
StringWriter writer = new StringWriter();
XMLStreamWriter xmlwriter = StAXUtils.createXMLStreamWriter(writer);
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSetDataSourceOnAlreadyExpandedElement.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSetDataSourceOnAlreadyExpandedElement.java?rev=1426917&r1=1426916&r2=1426917&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSetDataSourceOnAlreadyExpandedElement.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSetDataSourceOnAlreadyExpandedElement.java Sun Dec 30 11:47:27 2012
@@ -19,18 +19,21 @@
package org.apache.axiom.ts.om.sourcedelement;
import org.apache.axiom.om.OMMetaFactory;
+import org.apache.axiom.om.OMSourcedElement;
+import org.apache.axiom.ts.AxiomTestCase;
-public class TestSetDataSourceOnAlreadyExpandedElement extends OMSourcedElementTest {
+public class TestSetDataSourceOnAlreadyExpandedElement extends AxiomTestCase {
public TestSetDataSourceOnAlreadyExpandedElement(OMMetaFactory metaFactory) {
super(metaFactory);
}
protected void runTest() throws Throwable {
+ OMSourcedElement element = TestDocument.DOCUMENT1.createOMSourcedElement(metaFactory.getOMFactory());
// Make sure the OMSourcedElement is expanded
element.getFirstOMChild();
assertTrue(element.isExpanded());
// Now set a new data source
- element.setDataSource(new TestDataSource(testDocument2));
+ element.setDataSource(new TestDataSource(TestDocument.DOCUMENT2.getContent()));
assertFalse(element.isExpanded());
// getNextOMSibling should not expand the element
assertNull(element.getNextOMSibling());