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 2019/01/08 23:20:15 UTC
svn commit: r1850811 - in /webservices/axiom/branches/1.2.x: ./ testing/
testing/xml-truth/
testing/xml-truth/src/main/java/org/apache/axiom/truth/xml/XMLTruth.java
Author: veithen
Date: Tue Jan 8 23:20:14 2019
New Revision: 1850811
URL: http://svn.apache.org/viewvc?rev=1850811&view=rev
Log:
AXIOM-494: Merge r1850810 to the 1.2 branch.
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/xml-truth/ (props changed)
webservices/axiom/branches/1.2.x/testing/xml-truth/src/main/java/org/apache/axiom/truth/xml/XMLTruth.java
Propchange: webservices/axiom/branches/1.2.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 8 23:20:14 2019
@@ -14,4 +14,4 @@
/webservices/axiom/branches/maven-site-plugin-3.5:1731125-1732708
/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,1731522,1731541,1732710,1733743,1739812,1740914,1741786,1741791,1741979,1747866,1758113,1762239,1762241,1762243,1762287,1777898,1781319,1781488,1787644,1790322,1791831,1795059,1795067,1795081,1796489,1796558,1798352,1806321,1815009,1817725,1817727,1817735,1819411,1821701,1821707,1826041,1843069,1843073,1843075,1843350,1843517,1844631,1845037,1845039,1845623,1846359,1846362,1846368,1846677,1848452,1848486,1848490,1848720,1849251,1849743,1849758,1849791,1849806,1850517,1850796,1850798,1850800
+/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,1731541,1732710,1733743,1739812,1740914,1741786,1741791,1741979,1747866,1758113,1762239,1762241,1762243,1762287,1777898,1781319,1781488,1787644,1790322,1791831,1795059,1795067,1795081,1796489,1796558,1798352,1806321,1815009,1817725,1817727,1817735,1819411,1821701,1821707,1826041,1843069,1843073,1843075,1843350,1843517,1844631,1845037,1845039,1845623,1846359,1846362,1846368,1846677,1848452,1848486,1848490,1848720,1849251,1849743,1849758,1849791,1849806,1850517,1850796,1850798,1850800,1850810
Propchange: webservices/axiom/branches/1.2.x/testing/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 8 23:20:14 2019
@@ -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,1731522,1731541,1732710,1733743,1739812,1741979,1758113,1762241,1762243,1762287,1795067,1798352,1817725,1817727,1817735,1819411,1843073,1844631,1845039,1846362,1846368,1848490,1850517
+/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,1731541,1732710,1733743,1739812,1741979,1758113,1762241,1762243,1762287,1795067,1798352,1817725,1817727,1817735,1819411,1843073,1844631,1845039,1846362,1846368,1848490,1850517,1850810
Propchange: webservices/axiom/branches/1.2.x/testing/xml-truth/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 8 23:20:14 2019
@@ -12,4 +12,4 @@
/webservices/axiom/branches/attrs-aspects/testing/xml-truth:1685218-1686663
/webservices/axiom/branches/namespaceURIInterning/testing/xml-truth:1293148-1293587
/webservices/axiom/branches/osgi-redesign/testing/xml-truth:1180368-1180596
-/webservices/axiom/trunk/testing/xml-truth:1726096,1726101,1726474-1726475,1726489,1727220,1727422,1727435,1727496,1727513,1727529,1727549,1727660,1727688,1728022,1728240,1728929,1731373,1731376,1731378,1731406,1731522,1731541,1732654,1732710,1733743,1739812,1848490,1850517
+/webservices/axiom/trunk/testing/xml-truth:1726096,1726101,1726474-1726475,1726489,1727220,1727422,1727435,1727496,1727513,1727529,1727549,1727660,1727688,1728022,1728240,1728929,1731373,1731376,1731378,1731406,1731522,1731541,1732654,1732710,1733743,1739812,1848490,1850517,1850810
Modified: webservices/axiom/branches/1.2.x/testing/xml-truth/src/main/java/org/apache/axiom/truth/xml/XMLTruth.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/testing/xml-truth/src/main/java/org/apache/axiom/truth/xml/XMLTruth.java?rev=1850811&r1=1850810&r2=1850811&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/testing/xml-truth/src/main/java/org/apache/axiom/truth/xml/XMLTruth.java (original)
+++ webservices/axiom/branches/1.2.x/testing/xml-truth/src/main/java/org/apache/axiom/truth/xml/XMLTruth.java Tue Jan 8 23:20:14 2019
@@ -39,6 +39,7 @@ import org.w3c.dom.Element;
import org.xml.sax.InputSource;
import com.google.common.truth.FailureMetadata;
+import com.google.common.truth.SimpleSubjectBuilder;
import com.google.common.truth.Subject;
import com.google.common.truth.Truth;
@@ -232,7 +233,7 @@ public final class XMLTruth {
* the API to use (e.g. {@link Document}
* @param object
* an object implementing that API
- * @return an object that can be passed to {@link DelegatedVerb#that(Object)} or
+ * @return an object that can be passed to {@link SimpleSubjectBuilder#that(Object)} or
* {@link XMLSubject#hasSameContentAs(Object)}
*/
public static <T> Object xml(Class<T> type, T object) {