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 2013/03/19 23:06:07 UTC
svn commit: r1458540 [1/2] - in /webservices/axiom/trunk/modules:
axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/
axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/
axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/attr/ axi...
Author: veithen
Date: Tue Mar 19 22:06:05 2013
New Revision: 1458540
URL: http://svn.apache.org/r1458540
Log:
Some refactorings of the test suite.
Added:
webservices/axiom/trunk/modules/axiom-testutils/src/main/java/org/apache/axiom/testutils/suite/Dimension.java
- copied, changed from r1458519, webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/strategy/Strategy.java
webservices/axiom/trunk/modules/axiom-testutils/src/main/java/org/apache/axiom/testutils/suite/MatrixTestCase.java
- copied, changed from r1458519, webservices/axiom/trunk/modules/axiom-testutils/src/main/java/org/apache/axiom/testutils/suite/TestCaseEx.java
webservices/axiom/trunk/modules/axiom-testutils/src/main/java/org/apache/axiom/testutils/suite/MatrixTestSuiteBuilder.java
- copied, changed from r1458519, webservices/axiom/trunk/modules/axiom-testutils/src/main/java/org/apache/axiom/testutils/suite/TestSuiteBuilder.java
Removed:
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/strategy/Strategy.java
webservices/axiom/trunk/modules/axiom-testutils/src/main/java/org/apache/axiom/testutils/suite/TestCaseEx.java
webservices/axiom/trunk/modules/axiom-testutils/src/main/java/org/apache/axiom/testutils/suite/TestSuiteBuilder.java
Modified:
webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/DialectTestCase.java
webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/DialectTestSuiteBuilder.java
webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/EventSpecificTestCase.java
webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetEncodingFromDetection.java
webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetNamespaceContext.java
webservices/axiom/trunk/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/DOMTestCase.java
webservices/axiom/trunk/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/DOMTestSuiteBuilder.java
webservices/axiom/trunk/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/attr/TestCloneNode.java
webservices/axiom/trunk/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestCloneNode.java
webservices/axiom/trunk/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestCreateAttributeNS.java
webservices/axiom/trunk/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestCreateAttributeNSInvalid.java
webservices/axiom/trunk/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TransformerTestCase.java
webservices/axiom/trunk/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/ReplaceChildTestCase.java
webservices/axiom/trunk/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestCloneNodeWithAttributes.java
webservices/axiom/trunk/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestSetAttributeNS.java
webservices/axiom/trunk/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestSetAttributeNSInvalid.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/AxiomTestCase.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/ConformanceTestCase.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/OMTestSuiteBuilder.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateOMBuilderFromDOM.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateOMBuilderFromSAXSource.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestGetDocumentElement.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/OMContainerFactory.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/OMElementFactory.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/TestGetXMLStreamReader.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/TestSerialize.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestDigest.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestRemoveChildren.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddChildWithSameParent.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetDescendants.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespaceContext.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespaceNormalized.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderClose.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderCommentEvent.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderGetDataHandlerFromElement.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderGetElementTextFromParser.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderGetNamespaceContext.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderOnNonRootElement.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderWithIncompleteDescendant.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestRemoveChildren.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSerialization.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/CreateOMElementTestCase.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestDetach.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestDetachFirstChild.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/LazyNameTestCase.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/OMSourcedElementVariant.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestCloneNonDestructive.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerialize.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSetLocalName.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/xop/TestSerialize.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/xpath/TestAXIOMXPath.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/OMDOMTestSuiteBuilder.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPTestCase.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPTestSuiteBuilder.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/FirstElementNameWithParserTestCase.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFaultNoFault.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultNoFault.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/BadInputTest.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/MessageTest.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestClone.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetSOAPBodyFirstElementLocalNameAndNS.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetSOAPBodyFirstElementLocalNameAndNSWithParser.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestSerialize.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/SOAPFaultChild.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateSOAPFaultChild.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/fault/TestChildOrder.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestSetMustUnderstandBoolean.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestClone.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestCloneIncomplete.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/xpath/TestXPathAppliedToSOAPEnvelope.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/envelope/TestMTOMForwardStreaming.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/strategy/BuilderFactory.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/strategy/ElementContext.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/strategy/ExpansionStrategy.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/strategy/serialization/SerializationStrategy.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/strategy/serialization/SerializeFromSAXSource.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/strategy/serialization/SerializeFromXMLStreamReader.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/strategy/serialization/SerializeToOutputStream.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/strategy/serialization/SerializeToWriter.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/strategy/serialization/SerializeToXMLStreamWriter.java
Modified: webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/DialectTestCase.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/DialectTestCase.java?rev=1458540&r1=1458539&r2=1458540&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/DialectTestCase.java (original)
+++ webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/DialectTestCase.java Tue Mar 19 22:06:05 2013
@@ -18,13 +18,13 @@
*/
package org.apache.axiom.util.stax.dialect;
-import org.apache.axiom.testutils.suite.TestCaseEx;
+import org.apache.axiom.testutils.suite.MatrixTestCase;
-public abstract class DialectTestCase extends TestCaseEx {
+public abstract class DialectTestCase extends MatrixTestCase {
protected final StAXImplementation staxImpl;
public DialectTestCase(StAXImplementation staxImpl) {
this.staxImpl = staxImpl;
- addTestProperty("implementation", staxImpl.getName());
+ addTestParameter("implementation", staxImpl.getName());
}
}
Modified: webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/DialectTestSuiteBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/DialectTestSuiteBuilder.java?rev=1458540&r1=1458539&r2=1458540&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/DialectTestSuiteBuilder.java (original)
+++ webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/DialectTestSuiteBuilder.java Tue Mar 19 22:06:05 2013
@@ -25,9 +25,9 @@ import java.util.List;
import javax.xml.stream.XMLStreamConstants;
import org.apache.axiom.testutils.conformance.ConformanceTestFile;
-import org.apache.axiom.testutils.suite.TestSuiteBuilder;
+import org.apache.axiom.testutils.suite.MatrixTestSuiteBuilder;
-public class DialectTestSuiteBuilder extends TestSuiteBuilder {
+public class DialectTestSuiteBuilder extends MatrixTestSuiteBuilder {
private final List/*<StAXImplementation>*/ implementations = new ArrayList();
public void addImplementation(StAXImplementation implementation) {
Modified: webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/EventSpecificTestCase.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/EventSpecificTestCase.java?rev=1458540&r1=1458539&r2=1458540&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/EventSpecificTestCase.java (original)
+++ webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/EventSpecificTestCase.java Tue Mar 19 22:06:05 2013
@@ -36,7 +36,7 @@ public abstract class EventSpecificTestC
public EventSpecificTestCase(StAXImplementation staxImpl, int event) {
super(staxImpl);
this.event = event;
- addTestProperty("event", XMLEventUtils.getEventTypeString(event));
+ addTestParameter("event", XMLEventUtils.getEventTypeString(event));
}
protected final void runTest() throws Throwable {
Modified: webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetEncodingFromDetection.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetEncodingFromDetection.java?rev=1458540&r1=1458539&r2=1458540&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetEncodingFromDetection.java (original)
+++ webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetEncodingFromDetection.java Tue Mar 19 22:06:05 2013
@@ -40,7 +40,7 @@ public class TestGetEncodingFromDetectio
super(staxImpl);
this.javaEncoding = javaEncoding;
this.xmlEncodings = new HashSet(Arrays.asList(xmlEncodings));
- addTestProperty("javaEncoding", javaEncoding);
+ addTestParameter("javaEncoding", javaEncoding);
}
public TestGetEncodingFromDetection(StAXImplementation staxImpl, String javaEncoding, String xmlEncoding) {
Modified: webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetNamespaceContext.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetNamespaceContext.java?rev=1458540&r1=1458539&r2=1458540&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetNamespaceContext.java (original)
+++ webservices/axiom/trunk/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetNamespaceContext.java Tue Mar 19 22:06:05 2013
@@ -36,7 +36,7 @@ public class TestGetNamespaceContext ext
public TestGetNamespaceContext(StAXImplementation staxImpl, ConformanceTestFile testResource) {
super(staxImpl);
this.testResource = testResource;
- addTestProperty("file", testResource.getShortName());
+ addTestParameter("file", testResource.getShortName());
}
// Copy & paste from XMLStreamReaderComparator
Modified: webservices/axiom/trunk/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/DOMTestCase.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/DOMTestCase.java?rev=1458540&r1=1458539&r2=1458540&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/DOMTestCase.java (original)
+++ webservices/axiom/trunk/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/DOMTestCase.java Tue Mar 19 22:06:05 2013
@@ -20,9 +20,9 @@ package org.apache.axiom.ts.dom;
import javax.xml.parsers.DocumentBuilderFactory;
-import org.apache.axiom.testutils.suite.TestCaseEx;
+import org.apache.axiom.testutils.suite.MatrixTestCase;
-public abstract class DOMTestCase extends TestCaseEx {
+public abstract class DOMTestCase extends MatrixTestCase {
protected final DocumentBuilderFactory dbf;
public DOMTestCase(DocumentBuilderFactory dbf) {
Modified: webservices/axiom/trunk/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/DOMTestSuiteBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/DOMTestSuiteBuilder.java?rev=1458540&r1=1458539&r2=1458540&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/DOMTestSuiteBuilder.java (original)
+++ webservices/axiom/trunk/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/DOMTestSuiteBuilder.java Tue Mar 19 22:06:05 2013
@@ -23,9 +23,9 @@ import javax.xml.namespace.QName;
import javax.xml.parsers.DocumentBuilderFactory;
import org.apache.axiom.testutils.conformance.ConformanceTestFile;
-import org.apache.axiom.testutils.suite.TestSuiteBuilder;
+import org.apache.axiom.testutils.suite.MatrixTestSuiteBuilder;
-public class DOMTestSuiteBuilder extends TestSuiteBuilder {
+public class DOMTestSuiteBuilder extends MatrixTestSuiteBuilder {
private static final QName[] validAttrQNames = new QName[] {
new QName("urn:ns2", "attr", "q"),
new QName("", "attr", ""),
Modified: webservices/axiom/trunk/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/attr/TestCloneNode.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/attr/TestCloneNode.java?rev=1458540&r1=1458539&r2=1458540&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/attr/TestCloneNode.java (original)
+++ webservices/axiom/trunk/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/attr/TestCloneNode.java Tue Mar 19 22:06:05 2013
@@ -31,7 +31,7 @@ public class TestCloneNode extends DOMTe
public TestCloneNode(DocumentBuilderFactory dbf, boolean deep) {
super(dbf);
this.deep = deep;
- addTestProperty("deep", String.valueOf(deep));
+ addTestParameter("deep", String.valueOf(deep));
}
protected void runTest() throws Throwable {
Modified: webservices/axiom/trunk/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestCloneNode.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestCloneNode.java?rev=1458540&r1=1458539&r2=1458540&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestCloneNode.java (original)
+++ webservices/axiom/trunk/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestCloneNode.java Tue Mar 19 22:06:05 2013
@@ -32,7 +32,7 @@ public class TestCloneNode extends DOMTe
public TestCloneNode(DocumentBuilderFactory dbf, ConformanceTestFile file) {
super(dbf);
this.file = file;
- addTestProperty("file", file.getShortName());
+ addTestParameter("file", file.getShortName());
}
protected void runTest() throws Throwable {
Modified: webservices/axiom/trunk/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestCreateAttributeNS.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestCreateAttributeNS.java?rev=1458540&r1=1458539&r2=1458540&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestCreateAttributeNS.java (original)
+++ webservices/axiom/trunk/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestCreateAttributeNS.java Tue Mar 19 22:06:05 2013
@@ -32,8 +32,8 @@ public class TestCreateAttributeNS exten
public TestCreateAttributeNS(DocumentBuilderFactory dbf, QName qname) {
super(dbf);
this.qname = qname;
- addTestProperty("ns", qname.getNamespaceURI());
- addTestProperty("name", DOMUtils.getQualifiedName(qname));
+ addTestParameter("ns", qname.getNamespaceURI());
+ addTestParameter("name", DOMUtils.getQualifiedName(qname));
}
protected void runTest() throws Throwable {
Modified: webservices/axiom/trunk/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestCreateAttributeNSInvalid.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestCreateAttributeNSInvalid.java?rev=1458540&r1=1458539&r2=1458540&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestCreateAttributeNSInvalid.java (original)
+++ webservices/axiom/trunk/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TestCreateAttributeNSInvalid.java Tue Mar 19 22:06:05 2013
@@ -32,8 +32,8 @@ public class TestCreateAttributeNSInvali
public TestCreateAttributeNSInvalid(DocumentBuilderFactory dbf, QName qname) {
super(dbf);
this.qname = qname;
- addTestProperty("ns", qname.getNamespaceURI());
- addTestProperty("name", DOMUtils.getQualifiedName(qname));
+ addTestParameter("ns", qname.getNamespaceURI());
+ addTestParameter("name", DOMUtils.getQualifiedName(qname));
}
protected void runTest() throws Throwable {
Modified: webservices/axiom/trunk/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TransformerTestCase.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TransformerTestCase.java?rev=1458540&r1=1458539&r2=1458540&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TransformerTestCase.java (original)
+++ webservices/axiom/trunk/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/document/TransformerTestCase.java Tue Mar 19 22:06:05 2013
@@ -28,6 +28,6 @@ public abstract class TransformerTestCas
public TransformerTestCase(DocumentBuilderFactory dbf, Class transformerFactoryClass) {
super(dbf);
this.transformerFactoryClass = transformerFactoryClass;
- addTestProperty("transformerFactory", transformerFactoryClass.getName());
+ addTestParameter("transformerFactory", transformerFactoryClass.getName());
}
}
Modified: webservices/axiom/trunk/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/ReplaceChildTestCase.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/ReplaceChildTestCase.java?rev=1458540&r1=1458539&r2=1458540&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/ReplaceChildTestCase.java (original)
+++ webservices/axiom/trunk/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/ReplaceChildTestCase.java Tue Mar 19 22:06:05 2013
@@ -31,7 +31,7 @@ public abstract class ReplaceChildTestCa
public ReplaceChildTestCase(DocumentBuilderFactory dbf, boolean newChildHasSiblings) {
super(dbf);
this.newChildHasSiblings = newChildHasSiblings;
- addTestProperty("newChildHasSiblings", String.valueOf(newChildHasSiblings));
+ addTestParameter("newChildHasSiblings", String.valueOf(newChildHasSiblings));
}
protected final void runTest() throws Throwable {
Modified: webservices/axiom/trunk/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestCloneNodeWithAttributes.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestCloneNodeWithAttributes.java?rev=1458540&r1=1458539&r2=1458540&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestCloneNodeWithAttributes.java (original)
+++ webservices/axiom/trunk/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestCloneNodeWithAttributes.java Tue Mar 19 22:06:05 2013
@@ -35,7 +35,7 @@ public class TestCloneNodeWithAttributes
public TestCloneNodeWithAttributes(DocumentBuilderFactory dbf, boolean deep) {
super(dbf);
this.deep = deep;
- addTestProperty("deep", String.valueOf(deep));
+ addTestParameter("deep", String.valueOf(deep));
}
protected void runTest() throws Throwable {
Modified: webservices/axiom/trunk/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestSetAttributeNS.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestSetAttributeNS.java?rev=1458540&r1=1458539&r2=1458540&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestSetAttributeNS.java (original)
+++ webservices/axiom/trunk/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestSetAttributeNS.java Tue Mar 19 22:06:05 2013
@@ -36,8 +36,8 @@ public class TestSetAttributeNS extends
super(dbf);
this.qname = qname;
this.value = value;
- addTestProperty("ns", qname.getNamespaceURI());
- addTestProperty("name", DOMUtils.getQualifiedName(qname));
+ addTestParameter("ns", qname.getNamespaceURI());
+ addTestParameter("name", DOMUtils.getQualifiedName(qname));
}
protected void runTest() throws Throwable {
Modified: webservices/axiom/trunk/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestSetAttributeNSInvalid.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestSetAttributeNSInvalid.java?rev=1458540&r1=1458539&r2=1458540&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestSetAttributeNSInvalid.java (original)
+++ webservices/axiom/trunk/modules/axiom-dom-testsuite/src/main/java/org/apache/axiom/ts/dom/element/TestSetAttributeNSInvalid.java Tue Mar 19 22:06:05 2013
@@ -33,8 +33,8 @@ public class TestSetAttributeNSInvalid e
public TestSetAttributeNSInvalid(DocumentBuilderFactory dbf, QName qname) {
super(dbf);
this.qname = qname;
- addTestProperty("ns", qname.getNamespaceURI());
- addTestProperty("name", DOMUtils.getQualifiedName(qname));
+ addTestParameter("ns", qname.getNamespaceURI());
+ addTestParameter("name", DOMUtils.getQualifiedName(qname));
}
protected void runTest() throws Throwable {
Modified: webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/AxiomTestCase.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/AxiomTestCase.java?rev=1458540&r1=1458539&r2=1458540&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/AxiomTestCase.java (original)
+++ webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/AxiomTestCase.java Tue Mar 19 22:06:05 2013
@@ -25,11 +25,11 @@ import javax.xml.stream.XMLInputFactory;
import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.util.StAXParserConfiguration;
-import org.apache.axiom.testutils.suite.TestCaseEx;
+import org.apache.axiom.testutils.suite.MatrixTestCase;
import org.apache.axiom.util.stax.dialect.StAXDialect;
import org.apache.commons.io.output.NullOutputStream;
-public abstract class AxiomTestCase extends TestCaseEx {
+public abstract class AxiomTestCase extends MatrixTestCase {
public static final StAXParserConfiguration TEST_PARSER_CONFIGURATION = new StAXParserConfiguration() {
public XMLInputFactory configure(XMLInputFactory factory, StAXDialect dialect) {
// For the tests, preserve as much of the syntactic structure of the test documents
Modified: webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/ConformanceTestCase.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/ConformanceTestCase.java?rev=1458540&r1=1458539&r2=1458540&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/ConformanceTestCase.java (original)
+++ webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/ConformanceTestCase.java Tue Mar 19 22:06:05 2013
@@ -32,6 +32,6 @@ public abstract class ConformanceTestCas
public ConformanceTestCase(OMMetaFactory metaFactory, ConformanceTestFile file) {
super(metaFactory);
this.file = file;
- addTestProperty("file", file.getShortName());
+ addTestParameter("file", file.getShortName());
}
}
Modified: webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/OMTestSuiteBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/OMTestSuiteBuilder.java?rev=1458540&r1=1458539&r2=1458540&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/OMTestSuiteBuilder.java (original)
+++ webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/OMTestSuiteBuilder.java Tue Mar 19 22:06:05 2013
@@ -24,7 +24,7 @@ import javax.xml.namespace.QName;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.testutils.conformance.ConformanceTestFile;
-import org.apache.axiom.testutils.suite.TestSuiteBuilder;
+import org.apache.axiom.testutils.suite.MatrixTestSuiteBuilder;
import org.apache.axiom.ts.om.container.OMContainerFactory;
import org.apache.axiom.ts.om.container.OMElementFactory;
import org.apache.axiom.ts.om.factory.CreateOMElementParentSupplier;
@@ -43,7 +43,7 @@ import org.apache.axiom.ts.strategy.seri
import org.apache.axiom.ts.strategy.serialization.SerializeToWriter;
import org.apache.axiom.ts.strategy.serialization.SerializeToXMLStreamWriter;
-public class OMTestSuiteBuilder extends TestSuiteBuilder {
+public class OMTestSuiteBuilder extends MatrixTestSuiteBuilder {
private static final BuilderFactory[] builderFactories = {
BuilderFactory.PARSER,
BuilderFactory.DOM,
Modified: webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateOMBuilderFromDOM.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateOMBuilderFromDOM.java?rev=1458540&r1=1458539&r2=1458540&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateOMBuilderFromDOM.java (original)
+++ webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateOMBuilderFromDOM.java Tue Mar 19 22:06:05 2013
@@ -41,7 +41,7 @@ public class TestCreateOMBuilderFromDOM
super(metaFactory, file);
this.expandEntityReferences = expandEntityReferences;
if (expandEntityReferences != null) {
- addTestProperty("expandEntityReferences", expandEntityReferences.toString());
+ addTestParameter("expandEntityReferences", expandEntityReferences.toString());
}
}
Modified: webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateOMBuilderFromSAXSource.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateOMBuilderFromSAXSource.java?rev=1458540&r1=1458539&r2=1458540&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateOMBuilderFromSAXSource.java (original)
+++ webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateOMBuilderFromSAXSource.java Tue Mar 19 22:06:05 2013
@@ -41,7 +41,7 @@ public class TestCreateOMBuilderFromSAXS
super(metaFactory, file);
this.expandEntityReferences = expandEntityReferences;
if (expandEntityReferences != null) {
- addTestProperty("expandEntityReferences", expandEntityReferences.toString());
+ addTestParameter("expandEntityReferences", expandEntityReferences.toString());
}
}
Modified: webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestGetDocumentElement.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestGetDocumentElement.java?rev=1458540&r1=1458539&r2=1458540&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestGetDocumentElement.java (original)
+++ webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestGetDocumentElement.java Tue Mar 19 22:06:05 2013
@@ -41,8 +41,8 @@ public class TestGetDocumentElement exte
super(metaFactory);
this.builderFactory = builderFactory;
this.discardDocument = discardDocument;
- builderFactory.addTestProperties(this);
- addTestProperty("discardDocument", String.valueOf(discardDocument));
+ builderFactory.addTestParameters(this);
+ addTestParameter("discardDocument", String.valueOf(discardDocument));
}
protected void runTest() throws Throwable {
Modified: webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/OMContainerFactory.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/OMContainerFactory.java?rev=1458540&r1=1458539&r2=1458540&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/OMContainerFactory.java (original)
+++ webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/OMContainerFactory.java Tue Mar 19 22:06:05 2013
@@ -25,17 +25,17 @@ 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.ts.AxiomTestCase;
-import org.apache.axiom.ts.strategy.Strategy;
+import org.apache.axiom.testutils.suite.Dimension;
+import org.apache.axiom.testutils.suite.MatrixTestCase;
import org.xml.sax.InputSource;
/**
* Extracts an {@link OMContainer} instance from a test file.
*/
-public interface OMContainerFactory extends Strategy {
+public interface OMContainerFactory extends Dimension {
OMContainerFactory DOCUMENT = new OMContainerFactory() {
- public void addTestProperties(AxiomTestCase testCase) {
- testCase.addTestProperty("container", "document");
+ public void addTestParameters(MatrixTestCase testCase) {
+ testCase.addTestParameter("container", "document");
}
public InputSource getControl(InputStream testFileContent) {
Modified: webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/OMElementFactory.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/OMElementFactory.java?rev=1458540&r1=1458539&r2=1458540&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/OMElementFactory.java (original)
+++ webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/OMElementFactory.java Tue Mar 19 22:06:05 2013
@@ -30,7 +30,7 @@ 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.ts.AxiomTestCase;
+import org.apache.axiom.testutils.suite.MatrixTestCase;
import org.apache.xalan.processor.TransformerFactoryImpl;
import org.w3c.dom.Document;
import org.xml.sax.InputSource;
@@ -42,9 +42,9 @@ public class OMElementFactory implements
this.detached = detached;
}
- public void addTestProperties(AxiomTestCase testCase) {
- testCase.addTestProperty("container", "element");
- testCase.addTestProperty("detached", Boolean.toString(detached));
+ public void addTestParameters(MatrixTestCase testCase) {
+ testCase.addTestParameter("container", "element");
+ testCase.addTestParameter("detached", Boolean.toString(detached));
}
public InputSource getControl(InputStream testFileContent) throws Exception {
Modified: webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/TestGetXMLStreamReader.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/TestGetXMLStreamReader.java?rev=1458540&r1=1458539&r2=1458540&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/TestGetXMLStreamReader.java (original)
+++ webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/TestGetXMLStreamReader.java Tue Mar 19 22:06:05 2013
@@ -47,9 +47,9 @@ public class TestGetXMLStreamReader exte
this.builderFactory = builderFactory;
this.containerFactory = containerFactory;
this.cache = cache;
- builderFactory.addTestProperties(this);
- containerFactory.addTestProperties(this);
- addTestProperty("cache", Boolean.toString(cache));
+ builderFactory.addTestParameters(this);
+ containerFactory.addTestParameters(this);
+ addTestParameter("cache", Boolean.toString(cache));
}
protected final void runTest() throws Throwable {
Modified: webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/TestSerialize.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/TestSerialize.java?rev=1458540&r1=1458539&r2=1458540&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/TestSerialize.java (original)
+++ webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/TestSerialize.java Tue Mar 19 22:06:05 2013
@@ -43,8 +43,8 @@ public class TestSerialize extends Confo
super(metaFactory, file);
this.containerFactory = containerFactory;
this.serializationStrategy = serializationStrategy;
- containerFactory.addTestProperties(this);
- serializationStrategy.addTestProperties(this);
+ containerFactory.addTestParameters(this);
+ serializationStrategy.addTestParameters(this);
}
protected void runTest() throws Throwable {
Modified: webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestDigest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestDigest.java?rev=1458540&r1=1458539&r2=1458540&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestDigest.java (original)
+++ webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestDigest.java Tue Mar 19 22:06:05 2013
@@ -33,7 +33,7 @@ public class TestDigest extends DigestTe
String algorithm, String expectedDigest) {
super(metaFactory, algorithm, expectedDigest);
this.file=file;
- addTestProperty("file", file);
+ addTestParameter("file", file);
}
protected OMInformationItem createInformationItem() throws Exception {
Modified: webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestRemoveChildren.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestRemoveChildren.java?rev=1458540&r1=1458539&r2=1458540&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestRemoveChildren.java (original)
+++ webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestRemoveChildren.java Tue Mar 19 22:06:05 2013
@@ -42,8 +42,8 @@ public class TestRemoveChildren extends
super(metaFactory);
this.complete = complete;
this.accessDocumentElement = accessDocumentElement;
- addTestProperty("complete", Boolean.toString(complete));
- addTestProperty("accessDocumentElement", Boolean.toString(complete));
+ addTestParameter("complete", Boolean.toString(complete));
+ addTestParameter("accessDocumentElement", Boolean.toString(complete));
}
protected void runTest() throws Throwable {
Modified: webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddChildWithSameParent.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddChildWithSameParent.java?rev=1458540&r1=1458539&r2=1458540&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddChildWithSameParent.java (original)
+++ webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestAddChildWithSameParent.java Tue Mar 19 22:06:05 2013
@@ -36,7 +36,7 @@ public class TestAddChildWithSameParent
public TestAddChildWithSameParent(OMMetaFactory metaFactory, boolean build) {
super(metaFactory);
this.build = build;
- addTestProperty("build", String.valueOf(build));
+ addTestParameter("build", String.valueOf(build));
}
protected void runTest() throws Throwable {
Modified: webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetDescendants.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetDescendants.java?rev=1458540&r1=1458539&r2=1458540&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetDescendants.java (original)
+++ webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetDescendants.java Tue Mar 19 22:06:05 2013
@@ -31,7 +31,7 @@ public class TestGetDescendants extends
public TestGetDescendants(OMMetaFactory metaFactory, boolean includeSelf) {
super(metaFactory);
this.includeSelf = includeSelf;
- addTestProperty("includeSelf", Boolean.toString(includeSelf));
+ addTestParameter("includeSelf", Boolean.toString(includeSelf));
}
protected void runTest() throws Throwable {
Modified: webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespaceContext.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespaceContext.java?rev=1458540&r1=1458539&r2=1458540&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespaceContext.java (original)
+++ webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespaceContext.java Tue Mar 19 22:06:05 2013
@@ -39,7 +39,7 @@ public class TestGetNamespaceContext ext
public TestGetNamespaceContext(OMMetaFactory metaFactory, boolean detached) {
super(metaFactory);
this.detached = detached;
- addTestProperty("detached", Boolean.toString(detached));
+ addTestParameter("detached", Boolean.toString(detached));
}
protected void runTest() throws Throwable {
Modified: webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespaceNormalized.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespaceNormalized.java?rev=1458540&r1=1458539&r2=1458540&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespaceNormalized.java (original)
+++ webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetNamespaceNormalized.java Tue Mar 19 22:06:05 2013
@@ -45,7 +45,7 @@ public class TestGetNamespaceNormalized
public TestGetNamespaceNormalized(OMMetaFactory metaFactory, boolean useNull) {
super(metaFactory);
this.useNull = useNull;
- addTestProperty("useNull", String.valueOf(useNull));
+ addTestParameter("useNull", String.valueOf(useNull));
}
protected void runTest() throws Throwable {
Modified: webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderClose.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderClose.java?rev=1458540&r1=1458539&r2=1458540&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderClose.java (original)
+++ webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderClose.java Tue Mar 19 22:06:05 2013
@@ -40,7 +40,7 @@ public class TestGetXMLStreamReaderClose
public TestGetXMLStreamReaderClose(OMMetaFactory metaFactory, boolean cache) {
super(metaFactory);
this.cache = cache;
- addTestProperty("cache", String.valueOf(cache));
+ addTestParameter("cache", String.valueOf(cache));
}
protected void runTest() throws Throwable {
Modified: webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderCommentEvent.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderCommentEvent.java?rev=1458540&r1=1458539&r2=1458540&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderCommentEvent.java (original)
+++ webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderCommentEvent.java Tue Mar 19 22:06:05 2013
@@ -37,8 +37,8 @@ public class TestGetXMLStreamReaderComme
super(metaFactory);
this.builderFactory = builderFactory;
this.cache = cache;
- builderFactory.addTestProperties(this);
- addTestProperty("cache", Boolean.toString(cache));
+ builderFactory.addTestParameters(this);
+ addTestParameter("cache", Boolean.toString(cache));
}
protected void runTest() throws Throwable {
Modified: webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderGetDataHandlerFromElement.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderGetDataHandlerFromElement.java?rev=1458540&r1=1458539&r2=1458540&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderGetDataHandlerFromElement.java (original)
+++ webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderGetDataHandlerFromElement.java Tue Mar 19 22:06:05 2013
@@ -45,7 +45,7 @@ public class TestGetXMLStreamReaderGetDa
public TestGetXMLStreamReaderGetDataHandlerFromElement(OMMetaFactory metaFactory, boolean cache) {
super(metaFactory);
this.cache = cache;
- addTestProperty("cache", String.valueOf(cache));
+ addTestParameter("cache", String.valueOf(cache));
}
protected void runTest() throws Throwable {
Modified: webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderGetElementTextFromParser.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderGetElementTextFromParser.java?rev=1458540&r1=1458539&r2=1458540&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderGetElementTextFromParser.java (original)
+++ webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderGetElementTextFromParser.java Tue Mar 19 22:06:05 2013
@@ -37,8 +37,8 @@ public class TestGetXMLStreamReaderGetEl
super(metaFactory);
this.builderFactory = builderFactory;
this.cache = cache;
- builderFactory.addTestProperties(this);
- addTestProperty("cache", Boolean.toString(cache));
+ builderFactory.addTestParameters(this);
+ addTestParameter("cache", Boolean.toString(cache));
}
protected void runTest() throws Throwable {
Modified: webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderGetNamespaceContext.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderGetNamespaceContext.java?rev=1458540&r1=1458539&r2=1458540&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderGetNamespaceContext.java (original)
+++ webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderGetNamespaceContext.java Tue Mar 19 22:06:05 2013
@@ -32,7 +32,7 @@ public class TestGetXMLStreamReaderGetNa
public TestGetXMLStreamReaderGetNamespaceContext(OMMetaFactory metaFactory, boolean cache) {
super(metaFactory);
this.cache = cache;
- addTestProperty("cache", Boolean.toString(cache));
+ addTestParameter("cache", Boolean.toString(cache));
}
protected void runTest() throws Throwable {
Modified: webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderOnNonRootElement.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderOnNonRootElement.java?rev=1458540&r1=1458539&r2=1458540&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderOnNonRootElement.java (original)
+++ webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderOnNonRootElement.java Tue Mar 19 22:06:05 2013
@@ -31,7 +31,7 @@ public class TestGetXMLStreamReaderOnNon
public TestGetXMLStreamReaderOnNonRootElement(OMMetaFactory metaFactory, boolean cache) {
super(metaFactory);
this.cache = cache;
- addTestProperty("cache", Boolean.toString(cache));
+ addTestParameter("cache", Boolean.toString(cache));
}
protected void runTest() throws Throwable {
Modified: webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderWithIncompleteDescendant.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderWithIncompleteDescendant.java?rev=1458540&r1=1458539&r2=1458540&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderWithIncompleteDescendant.java (original)
+++ webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderWithIncompleteDescendant.java Tue Mar 19 22:06:05 2013
@@ -47,7 +47,7 @@ public class TestGetXMLStreamReaderWithI
public TestGetXMLStreamReaderWithIncompleteDescendant(OMMetaFactory metaFactory, boolean cache) {
super(metaFactory);
this.cache = cache;
- addTestProperty("cache", String.valueOf(cache));
+ addTestParameter("cache", String.valueOf(cache));
}
protected void runTest() throws Throwable {
Modified: webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestRemoveChildren.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestRemoveChildren.java?rev=1458540&r1=1458539&r2=1458540&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestRemoveChildren.java (original)
+++ webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestRemoveChildren.java Tue Mar 19 22:06:05 2013
@@ -37,7 +37,7 @@ public class TestRemoveChildren extends
public TestRemoveChildren(OMMetaFactory metaFactory, boolean complete) {
super(metaFactory);
this.complete = complete;
- addTestProperty("complete", Boolean.toString(complete));
+ addTestParameter("complete", Boolean.toString(complete));
}
protected void runTest() throws Throwable {
Modified: webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSerialization.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSerialization.java?rev=1458540&r1=1458539&r2=1458540&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSerialization.java (original)
+++ webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestSerialization.java Tue Mar 19 22:06:05 2013
@@ -54,8 +54,8 @@ public class TestSerialization extends A
this.parent = parent;
this.children = children;
this.expected = expected;
- addTestProperty("parent", parent);
- addTestProperty("children", children);
+ addTestParameter("parent", parent);
+ addTestParameter("children", children);
}
private static OMNamespace createNamespace(OMFactory factory, String type) {
Modified: webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/CreateOMElementTestCase.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/CreateOMElementTestCase.java?rev=1458540&r1=1458539&r2=1458540&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/CreateOMElementTestCase.java (original)
+++ webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/CreateOMElementTestCase.java Tue Mar 19 22:06:05 2013
@@ -34,9 +34,9 @@ public abstract class CreateOMElementTes
super(metaFactory);
this.variant = variant;
this.parentSupplier = parentSupplier;
- addTestProperty("variant", variant.getName());
+ addTestParameter("variant", variant.getName());
if (parentSupplier != null) {
- addTestProperty("parent", parentSupplier.getName());
+ addTestParameter("parent", parentSupplier.getName());
}
}
}
Modified: webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestDetach.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestDetach.java?rev=1458540&r1=1458539&r2=1458540&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestDetach.java (original)
+++ webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestDetach.java Tue Mar 19 22:06:05 2013
@@ -40,8 +40,8 @@ public class TestDetach extends AxiomTes
super(metaFactory);
this.document = document;
this.build = build;
- addTestProperty("document", Boolean.toString(document));
- addTestProperty("build", Boolean.toString(build));
+ addTestParameter("document", Boolean.toString(document));
+ addTestParameter("build", Boolean.toString(build));
}
protected void runTest() throws Throwable {
Modified: webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestDetachFirstChild.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestDetachFirstChild.java?rev=1458540&r1=1458539&r2=1458540&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestDetachFirstChild.java (original)
+++ webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/node/TestDetachFirstChild.java Tue Mar 19 22:06:05 2013
@@ -33,7 +33,7 @@ public class TestDetachFirstChild extend
public TestDetachFirstChild(OMMetaFactory metaFactory, boolean build) {
super(metaFactory);
this.build = build;
- addTestProperty("build", Boolean.toString(build));
+ addTestParameter("build", Boolean.toString(build));
}
protected void runTest() throws Throwable {
Modified: webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/LazyNameTestCase.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/LazyNameTestCase.java?rev=1458540&r1=1458539&r2=1458540&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/LazyNameTestCase.java (original)
+++ webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/LazyNameTestCase.java Tue Mar 19 22:06:05 2013
@@ -32,10 +32,10 @@ public abstract class LazyNameTestCase e
super(metaFactory);
this.variant = variant;
this.qname = qname;
- addTestProperty("variant", variant.getName());
+ addTestParameter("variant", variant.getName());
variant.addTestProperties(this);
- addTestProperty("prefix", qname.getPrefix());
- addTestProperty("uri", qname.getNamespaceURI());
+ addTestParameter("prefix", qname.getPrefix());
+ addTestParameter("uri", qname.getNamespaceURI());
}
protected final void runTest() throws Throwable {
Modified: webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/OMSourcedElementVariant.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/OMSourcedElementVariant.java?rev=1458540&r1=1458539&r2=1458540&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/OMSourcedElementVariant.java (original)
+++ webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/OMSourcedElementVariant.java Tue Mar 19 22:06:05 2013
@@ -30,7 +30,7 @@ import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMSourcedElement;
import org.apache.axiom.om.ds.ByteArrayDataSource;
import org.apache.axiom.om.ds.WrappedTextNodeOMDataSourceFromReader;
-import org.apache.axiom.testutils.suite.TestCaseEx;
+import org.apache.axiom.testutils.suite.MatrixTestCase;
public abstract class OMSourcedElementVariant {
public static final OMSourcedElementVariant[] INSTANCES = {
@@ -47,8 +47,8 @@ public abstract class OMSourcedElementVa
}
},
new OMSourcedElementVariant("lossy-prefix", false, false, true) {
- public void addTestProperties(TestCaseEx test) {
- test.addTestProperty("method", "QName");
+ public void addTestProperties(MatrixTestCase test) {
+ test.addTestParameter("method", "QName");
}
public OMSourcedElement createOMSourcedElement(OMFactory factory, QName qname) throws Exception {
@@ -62,8 +62,8 @@ public abstract class OMSourcedElementVa
}
},
new OMSourcedElementVariant("lossy-prefix", false, false, true) {
- public void addTestProperties(TestCaseEx test) {
- test.addTestProperty("method", "OMNamespace");
+ public void addTestProperties(MatrixTestCase test) {
+ test.addTestParameter("method", "OMNamespace");
}
public OMSourcedElement createOMSourcedElement(OMFactory factory, QName qname) throws Exception {
@@ -124,7 +124,7 @@ public abstract class OMSourcedElementVa
return prefixRequiresExpansion && (namespaceURIRequiresExpansion || qname.getNamespaceURI().length() != 0);
}
- public void addTestProperties(TestCaseEx test) {
+ public void addTestProperties(MatrixTestCase test) {
// Empty. May be overridden in subclasses.
}
Modified: webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestCloneNonDestructive.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestCloneNonDestructive.java?rev=1458540&r1=1458539&r2=1458540&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestCloneNonDestructive.java (original)
+++ webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestCloneNonDestructive.java Tue Mar 19 22:06:05 2013
@@ -38,7 +38,7 @@ public class TestCloneNonDestructive ext
public TestCloneNonDestructive(OMMetaFactory metaFactory, boolean copyOMDataSources) {
super(metaFactory);
this.copyOMDataSources = copyOMDataSources;
- addTestProperty("copyOMDataSources", String.valueOf(copyOMDataSources));
+ addTestParameter("copyOMDataSources", String.valueOf(copyOMDataSources));
}
protected void runTest() throws Throwable {
Modified: webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerialize.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerialize.java?rev=1458540&r1=1458539&r2=1458540&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerialize.java (original)
+++ webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerialize.java Tue Mar 19 22:06:05 2013
@@ -82,13 +82,13 @@ public class TestSerialize extends Axiom
this.serializationStrategy = serializationStrategy;
this.serializeParent = serializeParent;
this.count = count;
- addTestProperty("push", String.valueOf(push));
- addTestProperty("destructive", String.valueOf(destructive));
- elementContext.addTestProperties(this);
- expansionStrategy.addTestProperties(this);
- serializationStrategy.addTestProperties(this);
- addTestProperty("serializeParent", String.valueOf(serializeParent));
- addTestProperty("count", String.valueOf(count));
+ addTestParameter("push", String.valueOf(push));
+ addTestParameter("destructive", String.valueOf(destructive));
+ elementContext.addTestParameters(this);
+ expansionStrategy.addTestParameters(this);
+ serializationStrategy.addTestParameters(this);
+ addTestParameter("serializeParent", String.valueOf(serializeParent));
+ addTestParameter("count", String.valueOf(count));
}
protected void runTest() throws Throwable {
Modified: webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSetLocalName.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSetLocalName.java?rev=1458540&r1=1458539&r2=1458540&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSetLocalName.java (original)
+++ webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSetLocalName.java Tue Mar 19 22:06:05 2013
@@ -38,7 +38,7 @@ public class TestSetLocalName extends Ax
public TestSetLocalName(OMMetaFactory metaFactory, boolean expand) {
super(metaFactory);
this.expand = expand;
- addTestProperty("expand", String.valueOf(expand));
+ addTestParameter("expand", String.valueOf(expand));
}
protected void runTest() throws Throwable {
Modified: webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/xop/TestSerialize.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/xop/TestSerialize.java?rev=1458540&r1=1458539&r2=1458540&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/xop/TestSerialize.java (original)
+++ webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/xop/TestSerialize.java Tue Mar 19 22:06:05 2013
@@ -40,7 +40,7 @@ public class TestSerialize extends Axiom
public TestSerialize(OMMetaFactory metaFactory, boolean base64) {
super(metaFactory);
this.base64 = base64;
- addTestProperty("base64", String.valueOf(base64));
+ addTestParameter("base64", String.valueOf(base64));
}
protected void runTest() throws Throwable {
Modified: webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/xpath/TestAXIOMXPath.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/xpath/TestAXIOMXPath.java?rev=1458540&r1=1458539&r2=1458540&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/xpath/TestAXIOMXPath.java (original)
+++ webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/xpath/TestAXIOMXPath.java Tue Mar 19 22:06:05 2013
@@ -27,7 +27,7 @@ public class TestAXIOMXPath extends Axio
public TestAXIOMXPath(OMMetaFactory metaFactory, String methodName) {
super(metaFactory);
test = new AXIOMXPathTestCase(methodName, metaFactory);
- addTestProperty("test", methodName.substring(4));
+ addTestParameter("test", methodName.substring(4));
}
protected void runTest() throws Throwable {
Modified: webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/OMDOMTestSuiteBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/OMDOMTestSuiteBuilder.java?rev=1458540&r1=1458539&r2=1458540&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/OMDOMTestSuiteBuilder.java (original)
+++ webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/OMDOMTestSuiteBuilder.java Tue Mar 19 22:06:05 2013
@@ -19,7 +19,7 @@
package org.apache.axiom.ts.omdom;
import org.apache.axiom.om.dom.DOMMetaFactory;
-import org.apache.axiom.testutils.suite.TestSuiteBuilder;
+import org.apache.axiom.testutils.suite.MatrixTestSuiteBuilder;
/**
* Builds a test suite for Axiom implementations that also implement DOM. Note that this test suite
@@ -27,7 +27,7 @@ import org.apache.axiom.testutils.suite.
* with a standard DOM implementation) should go to
* {@link org.apache.axiom.ts.dom.DOMTestSuiteBuilder}.
*/
-public class OMDOMTestSuiteBuilder extends TestSuiteBuilder {
+public class OMDOMTestSuiteBuilder extends MatrixTestSuiteBuilder {
private final DOMMetaFactory metaFactory;
public OMDOMTestSuiteBuilder(DOMMetaFactory metaFactory) {
Modified: webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPTestCase.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPTestCase.java?rev=1458540&r1=1458539&r2=1458540&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPTestCase.java (original)
+++ webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPTestCase.java Tue Mar 19 22:06:05 2013
@@ -44,7 +44,7 @@ public abstract class SOAPTestCase exten
public SOAPTestCase(OMMetaFactory metaFactory, SOAPSpec spec) {
super(metaFactory);
this.spec = spec;
- addTestProperty("spec", spec.getName());
+ addTestParameter("spec", spec.getName());
}
protected void setUp() throws Exception {
Modified: webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPTestSuiteBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPTestSuiteBuilder.java?rev=1458540&r1=1458539&r2=1458540&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPTestSuiteBuilder.java (original)
+++ webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/SOAPTestSuiteBuilder.java Tue Mar 19 22:06:05 2013
@@ -26,13 +26,13 @@ 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;
+import org.apache.axiom.testutils.suite.MatrixTestSuiteBuilder;
import org.apache.axiom.ts.soap.factory.SOAPFaultChild;
import org.apache.axiom.ts.strategy.ExpansionStrategy;
import org.apache.axiom.ts.strategy.Strategies;
import org.apache.axiom.ts.strategy.serialization.SerializationStrategy;
-public class SOAPTestSuiteBuilder extends TestSuiteBuilder {
+public class SOAPTestSuiteBuilder extends MatrixTestSuiteBuilder {
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", "soap11/processing-instruction.xml", "soap11/entity-reference.xml",
Modified: webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/FirstElementNameWithParserTestCase.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/FirstElementNameWithParserTestCase.java?rev=1458540&r1=1458539&r2=1458540&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/FirstElementNameWithParserTestCase.java (original)
+++ webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/FirstElementNameWithParserTestCase.java Tue Mar 19 22:06:05 2013
@@ -47,9 +47,9 @@ public abstract class FirstElementNameWi
SOAPSpec spec, QName qname, boolean supportsOptimization) {
super(metaFactory, spec);
this.qname = qname;
- addTestProperty("prefix", qname.getPrefix());
- addTestProperty("uri", qname.getNamespaceURI());
- addTestProperty("localName", qname.getLocalPart());
+ addTestParameter("prefix", qname.getPrefix());
+ addTestParameter("uri", qname.getNamespaceURI());
+ addTestParameter("localName", qname.getLocalPart());
this.supportsOptimization = supportsOptimization;
}
Modified: webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFaultNoFault.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFaultNoFault.java?rev=1458540&r1=1458539&r2=1458540&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFaultNoFault.java (original)
+++ webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFaultNoFault.java Tue Mar 19 22:06:05 2013
@@ -31,9 +31,9 @@ public class TestGetFaultNoFault extends
public TestGetFaultNoFault(OMMetaFactory metaFactory, SOAPSpec spec, QName qname) {
super(metaFactory, spec);
this.qname = qname;
- addTestProperty("prefix", qname.getPrefix());
- addTestProperty("uri", qname.getNamespaceURI());
- addTestProperty("localName", qname.getLocalPart());
+ addTestParameter("prefix", qname.getPrefix());
+ addTestParameter("uri", qname.getNamespaceURI());
+ addTestParameter("localName", qname.getLocalPart());
}
protected void runTest() throws Throwable {
Modified: webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultNoFault.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultNoFault.java?rev=1458540&r1=1458539&r2=1458540&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultNoFault.java (original)
+++ webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestHasFaultNoFault.java Tue Mar 19 22:06:05 2013
@@ -31,9 +31,9 @@ public class TestHasFaultNoFault extends
public TestHasFaultNoFault(OMMetaFactory metaFactory, SOAPSpec spec, QName qname) {
super(metaFactory, spec);
this.qname = qname;
- addTestProperty("prefix", qname.getPrefix());
- addTestProperty("uri", qname.getNamespaceURI());
- addTestProperty("localName", qname.getLocalPart());
+ addTestParameter("prefix", qname.getPrefix());
+ addTestParameter("uri", qname.getNamespaceURI());
+ addTestParameter("localName", qname.getLocalPart());
}
protected void runTest() throws Throwable {
Modified: webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/BadInputTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/BadInputTest.java?rev=1458540&r1=1458539&r2=1458540&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/BadInputTest.java (original)
+++ webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/BadInputTest.java Tue Mar 19 22:06:05 2013
@@ -32,7 +32,7 @@ public class BadInputTest extends AxiomT
public BadInputTest(OMMetaFactory metaFactory, String file) {
super(metaFactory);
this.file = file;
- addTestProperty("file", file);
+ addTestParameter("file", file);
}
protected void runTest() throws Throwable {
Modified: webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/MessageTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/MessageTest.java?rev=1458540&r1=1458539&r2=1458540&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/MessageTest.java (original)
+++ webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/MessageTest.java Tue Mar 19 22:06:05 2013
@@ -30,7 +30,7 @@ public class MessageTest extends AxiomTe
public MessageTest(OMMetaFactory metaFactory, String file) {
super(metaFactory);
this.file = file;
- addTestProperty("file", file);
+ addTestParameter("file", file);
}
protected void runTest() throws Throwable {
Modified: webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestClone.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestClone.java?rev=1458540&r1=1458539&r2=1458540&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestClone.java (original)
+++ webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestClone.java Tue Mar 19 22:06:05 2013
@@ -27,7 +27,7 @@ public class TestClone extends CloneTest
public TestClone(OMMetaFactory metaFactory, SOAPSpec spec, String file) {
super(metaFactory, spec);
this.file = file;
- addTestProperty("file", file);
+ addTestParameter("file", file);
}
protected void runTest() throws Throwable {
Modified: webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetSOAPBodyFirstElementLocalNameAndNS.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetSOAPBodyFirstElementLocalNameAndNS.java?rev=1458540&r1=1458539&r2=1458540&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetSOAPBodyFirstElementLocalNameAndNS.java (original)
+++ webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetSOAPBodyFirstElementLocalNameAndNS.java Tue Mar 19 22:06:05 2013
@@ -33,8 +33,8 @@ public class TestGetSOAPBodyFirstElement
public TestGetSOAPBodyFirstElementLocalNameAndNS(OMMetaFactory metaFactory, SOAPSpec spec, QName qname) {
super(metaFactory, spec);
this.qname = qname;
- addTestProperty("prefix", qname.getPrefix());
- addTestProperty("uri", qname.getNamespaceURI());
+ addTestParameter("prefix", qname.getPrefix());
+ addTestParameter("uri", qname.getNamespaceURI());
}
protected void runTest() throws Throwable {
Modified: webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetSOAPBodyFirstElementLocalNameAndNSWithParser.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetSOAPBodyFirstElementLocalNameAndNSWithParser.java?rev=1458540&r1=1458539&r2=1458540&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetSOAPBodyFirstElementLocalNameAndNSWithParser.java (original)
+++ webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestGetSOAPBodyFirstElementLocalNameAndNSWithParser.java Tue Mar 19 22:06:05 2013
@@ -44,8 +44,8 @@ public class TestGetSOAPBodyFirstElement
public TestGetSOAPBodyFirstElementLocalNameAndNSWithParser(OMMetaFactory metaFactory, SOAPSpec spec, QName qname) {
super(metaFactory, spec);
this.qname = qname;
- addTestProperty("prefix", qname.getPrefix());
- addTestProperty("uri", qname.getNamespaceURI());
+ addTestParameter("prefix", qname.getPrefix());
+ addTestParameter("uri", qname.getNamespaceURI());
}
protected void runTest() throws Throwable {
Modified: webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestSerialize.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestSerialize.java?rev=1458540&r1=1458539&r2=1458540&view=diff
==============================================================================
--- webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestSerialize.java (original)
+++ webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/envelope/TestSerialize.java Tue Mar 19 22:06:05 2013
@@ -40,9 +40,9 @@ public class TestSerialize extends Axiom
this.file = file;
this.expansionStrategy = expansionStrategy;
this.serializationStrategy = serializationStrategy;
- addTestProperty("file", file);
- expansionStrategy.addTestProperties(this);
- serializationStrategy.addTestProperties(this);
+ addTestParameter("file", file);
+ expansionStrategy.addTestParameters(this);
+ serializationStrategy.addTestParameters(this);
}
protected void runTest() throws Throwable {