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 2016/02/21 12:54:12 UTC
svn commit: r1731523 - in /webservices/axiom/branches/1.2.x: ./ testing/
testing/axiom-testsuite/
testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/
testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/comment/
testing/axiom-testsuit...
Author: veithen
Date: Sun Feb 21 11:54:11 2016
New Revision: 1731523
URL: http://svn.apache.org/viewvc?rev=1731523&view=rev
Log:
Merge r1731522 to the 1.2 branch.
Added:
webservices/axiom/branches/1.2.x/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/comment/
- copied from r1731522, webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/comment/
webservices/axiom/branches/1.2.x/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/doctype/
- copied from r1731522, webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/doctype/
webservices/axiom/branches/1.2.x/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/entref/
- copied from r1731522, webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/entref/
webservices/axiom/branches/1.2.x/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/pi/TestSerialize.java
- copied unchanged from r1731522, webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/pi/TestSerialize.java
webservices/axiom/branches/1.2.x/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/text/TestSerialize.java
- copied unchanged from r1731522, webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/text/TestSerialize.java
Modified:
webservices/axiom/branches/1.2.x/ (props changed)
webservices/axiom/branches/1.2.x/testing/ (props changed)
webservices/axiom/branches/1.2.x/testing/axiom-testsuite/pom.xml
webservices/axiom/branches/1.2.x/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/OMTestSuiteBuilder.java
Propchange: webservices/axiom/branches/1.2.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 21 11:54:11 2016
@@ -12,4 +12,4 @@
/webservices/axiom/branches/attrs-aspects:1685218-1686663
/webservices/axiom/branches/namespaceURIInterning:1293148-1293587
/webservices/axiom/branches/osgi-redesign:1180368-1180596
-/webservices/axiom/trunk:1726096,1726101,1726419,1726474-1726475,1726489,1727220,1727422,1727435,1727496,1727541,1727549,1727640,1727660,1727688,1727743,1727755,1727758,1727761,1728022,1728240,1728929,1730261,1730278,1731157,1731314-1731315,1731373,1731376,1731378,1731406
+/webservices/axiom/trunk:1726096,1726101,1726419,1726474-1726475,1726489,1727220,1727422,1727435,1727496,1727541,1727549,1727640,1727660,1727688,1727743,1727755,1727758,1727761,1728022,1728240,1728929,1730261,1730278,1731157,1731314-1731315,1731373,1731376,1731378,1731406,1731522
Propchange: webservices/axiom/branches/1.2.x/testing/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 21 11:54:11 2016
@@ -12,4 +12,4 @@
/webservices/axiom/branches/attrs-aspects/testing:1685218-1686663
/webservices/axiom/branches/namespaceURIInterning/testing:1293148-1293587
/webservices/axiom/branches/osgi-redesign/testing:1180368-1180596
-/webservices/axiom/trunk/testing:1726096,1726101,1726474-1726475,1726489,1727220,1727422,1727435,1727496,1727513,1727529,1727549,1727660,1727688,1728022,1728240,1728929,1731373,1731376,1731378,1731406
+/webservices/axiom/trunk/testing:1726096,1726101,1726474-1726475,1726489,1727220,1727422,1727435,1727496,1727513,1727529,1727549,1727660,1727688,1728022,1728240,1728929,1731373,1731376,1731378,1731406,1731522
Modified: webservices/axiom/branches/1.2.x/testing/axiom-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/testing/axiom-testsuite/pom.xml?rev=1731523&r1=1731522&r2=1731523&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/testing/axiom-testsuite/pom.xml (original)
+++ webservices/axiom/branches/1.2.x/testing/axiom-testsuite/pom.xml Sun Feb 21 11:54:11 2016
@@ -94,6 +94,10 @@
<artifactId>jaxp-testsuite</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ </dependency>
</dependencies>
<build>
Modified: webservices/axiom/branches/1.2.x/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/OMTestSuiteBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/OMTestSuiteBuilder.java?rev=1731523&r1=1731522&r2=1731523&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/OMTestSuiteBuilder.java (original)
+++ webservices/axiom/branches/1.2.x/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/OMTestSuiteBuilder.java Sun Feb 21 11:54:11 2016
@@ -140,6 +140,7 @@ public class OMTestSuiteBuilder extends
addTest(new org.apache.axiom.ts.om.builder.TestRegisterCustomBuilderForPayloadJAXBWithXOP(metaFactory));
addTest(new org.apache.axiom.ts.om.builder.TestRootPartStreaming(metaFactory));
addTest(new org.apache.axiom.ts.om.builder.TestStandaloneConfiguration(metaFactory));
+ addTest(new org.apache.axiom.ts.om.comment.TestSerialize(metaFactory));
for (XMLSample file : getInstances(XMLSample.class)) {
for (OMContainerExtractor ce : getInstances(OMContainerExtractor.class)) {
for (BuilderFactory bf : getInstances(BuilderFactory.class)) {
@@ -162,6 +163,7 @@ public class OMTestSuiteBuilder extends
addTest(new org.apache.axiom.ts.om.container.TestGetDescendants(metaFactory, cf, true));
addTest(new org.apache.axiom.ts.om.container.TestGetDescendants(metaFactory, cf, false));
}
+ addTest(new org.apache.axiom.ts.om.doctype.TestSerialize(metaFactory));
addTest(new org.apache.axiom.ts.om.document.TestAddChildIncomplete(metaFactory));
addTest(new org.apache.axiom.ts.om.document.TestAddChildWithExistingDocumentElement(metaFactory));
addTest(new org.apache.axiom.ts.om.document.TestBuild(metaFactory));
@@ -434,6 +436,7 @@ public class OMTestSuiteBuilder extends
addTest(new org.apache.axiom.ts.om.element.sr.TestGetNamespaceContext(metaFactory, true));
addTest(new org.apache.axiom.ts.om.element.sr.TestGetNamespaceContext(metaFactory, false));
addTest(new org.apache.axiom.ts.om.element.sr.TestNextTag(metaFactory));
+ addTest(new org.apache.axiom.ts.om.entref.TestSerialize(metaFactory));
addTest(new org.apache.axiom.ts.om.factory.TestCreateOMAttributeGeneratedPrefix(metaFactory));
addTest(new org.apache.axiom.ts.om.factory.TestCreateOMAttributeInterfaces(metaFactory));
addTest(new org.apache.axiom.ts.om.factory.TestCreateOMAttributeNullPrefixNoNamespace(metaFactory));
@@ -609,6 +612,7 @@ public class OMTestSuiteBuilder extends
addTest(new org.apache.axiom.ts.om.sourcedelement.sr.TestCloseWithoutCaching(metaFactory, events));
}
addTest(new org.apache.axiom.ts.om.pi.TestDigest(metaFactory));
+ addTest(new org.apache.axiom.ts.om.pi.TestSerialize(metaFactory));
addTest(new org.apache.axiom.ts.om.text.TestBase64StreamingWithGetSAXSource(metaFactory));
addTest(new org.apache.axiom.ts.om.text.TestBase64StreamingWithSerialize(metaFactory));
addTest(new org.apache.axiom.ts.om.text.TestCloneBinary(metaFactory, false));
@@ -617,6 +621,7 @@ public class OMTestSuiteBuilder extends
addTest(new org.apache.axiom.ts.om.text.TestGetNamespace(metaFactory));
addTest(new org.apache.axiom.ts.om.text.TestGetNamespaceNoNamespace(metaFactory));
addTest(new org.apache.axiom.ts.om.text.TestGetTextCharactersFromDataHandler(metaFactory));
+ addTest(new org.apache.axiom.ts.om.text.TestSerialize(metaFactory));
addTest(new org.apache.axiom.ts.om.xop.TestSerialize(metaFactory, false));
addTest(new org.apache.axiom.ts.om.xop.TestSerialize(metaFactory, true));
addTest(new org.apache.axiom.ts.om.xop.TestSetOptimize(metaFactory, false));