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/06 11:25:47 UTC
svn commit: r1850543 - in /webservices/axiom/branches/1.2.x: ./ testing/
testing/axiom-truth/src/main/java/org/apache/axiom/truth/ testing/xml-truth/
testing/xml-truth/src/main/java/org/apache/axiom/truth/xml/
Author: veithen
Date: Sun Jan 6 11:25:47 2019
New Revision: 1850543
URL: http://svn.apache.org/viewvc?rev=1850543&view=rev
Log:
AXIOM-494: Merge r1796489 and r1850517 to the 1.2 branch.
Modified:
webservices/axiom/branches/1.2.x/ (props changed)
webservices/axiom/branches/1.2.x/pom.xml
webservices/axiom/branches/1.2.x/testing/ (props changed)
webservices/axiom/branches/1.2.x/testing/axiom-truth/src/main/java/org/apache/axiom/truth/AbstractOMContainerSubject.java
webservices/axiom/branches/1.2.x/testing/axiom-truth/src/main/java/org/apache/axiom/truth/AxiomTruth.java
webservices/axiom/branches/1.2.x/testing/axiom-truth/src/main/java/org/apache/axiom/truth/OMAttributeSubject.java
webservices/axiom/branches/1.2.x/testing/axiom-truth/src/main/java/org/apache/axiom/truth/OMContainerSubject.java
webservices/axiom/branches/1.2.x/testing/axiom-truth/src/main/java/org/apache/axiom/truth/OMElementSubject.java
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/XMLSubject.java
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 Sun Jan 6 11:25:47 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,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
+/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
Modified: webservices/axiom/branches/1.2.x/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/pom.xml?rev=1850543&r1=1850542&r2=1850543&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/pom.xml (original)
+++ webservices/axiom/branches/1.2.x/pom.xml Sun Jan 6 11:25:47 2019
@@ -364,7 +364,7 @@
<dependency>
<groupId>com.google.truth</groupId>
<artifactId>truth</artifactId>
- <version>0.30</version>
+ <version>0.42</version>
</dependency>
<dependency>
<groupId>xalan</groupId>
Propchange: webservices/axiom/branches/1.2.x/testing/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jan 6 11:25:47 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
+/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
Modified: webservices/axiom/branches/1.2.x/testing/axiom-truth/src/main/java/org/apache/axiom/truth/AbstractOMContainerSubject.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/testing/axiom-truth/src/main/java/org/apache/axiom/truth/AbstractOMContainerSubject.java?rev=1850543&r1=1850542&r2=1850543&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/testing/axiom-truth/src/main/java/org/apache/axiom/truth/AbstractOMContainerSubject.java (original)
+++ webservices/axiom/branches/1.2.x/testing/axiom-truth/src/main/java/org/apache/axiom/truth/AbstractOMContainerSubject.java Sun Jan 6 11:25:47 2019
@@ -21,12 +21,12 @@ package org.apache.axiom.truth;
import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMNode;
-import com.google.common.truth.FailureStrategy;
+import com.google.common.truth.FailureMetadata;
import com.google.common.truth.Subject;
public abstract class AbstractOMContainerSubject<S extends AbstractOMContainerSubject<S,T>,T extends OMContainer> extends Subject<S,T> {
- public AbstractOMContainerSubject(FailureStrategy failureStrategy, T subject) {
- super(failureStrategy, subject);
+ public AbstractOMContainerSubject(FailureMetadata failureMetadata, T subject) {
+ super(failureMetadata, subject);
}
public final void hasNumberOfChildren(int expected) {
Modified: webservices/axiom/branches/1.2.x/testing/axiom-truth/src/main/java/org/apache/axiom/truth/AxiomTruth.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/testing/axiom-truth/src/main/java/org/apache/axiom/truth/AxiomTruth.java?rev=1850543&r1=1850542&r2=1850543&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/testing/axiom-truth/src/main/java/org/apache/axiom/truth/AxiomTruth.java (original)
+++ webservices/axiom/branches/1.2.x/testing/axiom-truth/src/main/java/org/apache/axiom/truth/AxiomTruth.java Sun Jan 6 11:25:47 2019
@@ -18,24 +18,41 @@
*/
package org.apache.axiom.truth;
+import com.google.common.truth.FailureMetadata;
+import com.google.common.truth.Subject;
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMElement;
-import com.google.common.truth.Truth;
+import static com.google.common.truth.Truth.assertAbout;
public final class AxiomTruth {
private AxiomTruth() {}
-
+
public static OMContainerSubject assertThat(OMContainer target) {
- return new OMContainerSubject(Truth.THROW_ASSERTION_ERROR, target);
+ return assertAbout(new Subject.Factory<OMContainerSubject, OMContainer>() {
+ @Override
+ public OMContainerSubject createSubject(FailureMetadata metadata, OMContainer actual) {
+ return new OMContainerSubject(metadata, actual);
+ }
+ }).that(target);
}
-
+
public static OMElementSubject assertThat(OMElement target) {
- return new OMElementSubject(Truth.THROW_ASSERTION_ERROR, target);
+ return assertAbout(new Subject.Factory<OMElementSubject, OMElement>() {
+ @Override
+ public OMElementSubject createSubject(FailureMetadata metadata, OMElement actual) {
+ return new OMElementSubject(metadata, actual);
+ }
+ }).that(target);
}
-
+
public static OMAttributeSubject assertThat(OMAttribute target) {
- return new OMAttributeSubject(Truth.THROW_ASSERTION_ERROR, target);
+ return assertAbout(new Subject.Factory<OMAttributeSubject, OMAttribute>() {
+ @Override
+ public OMAttributeSubject createSubject(FailureMetadata metadata, OMAttribute actual) {
+ return new OMAttributeSubject(metadata, actual);
+ }
+ }).that(target);
}
}
Modified: webservices/axiom/branches/1.2.x/testing/axiom-truth/src/main/java/org/apache/axiom/truth/OMAttributeSubject.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/testing/axiom-truth/src/main/java/org/apache/axiom/truth/OMAttributeSubject.java?rev=1850543&r1=1850542&r2=1850543&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/testing/axiom-truth/src/main/java/org/apache/axiom/truth/OMAttributeSubject.java (original)
+++ webservices/axiom/branches/1.2.x/testing/axiom-truth/src/main/java/org/apache/axiom/truth/OMAttributeSubject.java Sun Jan 6 11:25:47 2019
@@ -21,12 +21,12 @@ package org.apache.axiom.truth;
import org.apache.axiom.om.OMAttribute;
import com.google.common.base.Objects;
-import com.google.common.truth.FailureStrategy;
+import com.google.common.truth.FailureMetadata;
import com.google.common.truth.Subject;
public final class OMAttributeSubject extends Subject<OMAttributeSubject,OMAttribute>{
- OMAttributeSubject(FailureStrategy failureStrategy, OMAttribute subject) {
- super(failureStrategy, subject);
+ OMAttributeSubject(FailureMetadata failureMetadata, OMAttribute subject) {
+ super(failureMetadata, subject);
}
public void hasValue(String expected) {
Modified: webservices/axiom/branches/1.2.x/testing/axiom-truth/src/main/java/org/apache/axiom/truth/OMContainerSubject.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/testing/axiom-truth/src/main/java/org/apache/axiom/truth/OMContainerSubject.java?rev=1850543&r1=1850542&r2=1850543&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/testing/axiom-truth/src/main/java/org/apache/axiom/truth/OMContainerSubject.java (original)
+++ webservices/axiom/branches/1.2.x/testing/axiom-truth/src/main/java/org/apache/axiom/truth/OMContainerSubject.java Sun Jan 6 11:25:47 2019
@@ -20,10 +20,10 @@ package org.apache.axiom.truth;
import org.apache.axiom.om.OMContainer;
-import com.google.common.truth.FailureStrategy;
+import com.google.common.truth.FailureMetadata;
public final class OMContainerSubject extends AbstractOMContainerSubject<OMContainerSubject,OMContainer> {
- OMContainerSubject(FailureStrategy failureStrategy, OMContainer subject) {
- super(failureStrategy, subject);
+ OMContainerSubject(FailureMetadata failureMetadata, OMContainer subject) {
+ super(failureMetadata, subject);
}
}
Modified: webservices/axiom/branches/1.2.x/testing/axiom-truth/src/main/java/org/apache/axiom/truth/OMElementSubject.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/testing/axiom-truth/src/main/java/org/apache/axiom/truth/OMElementSubject.java?rev=1850543&r1=1850542&r2=1850543&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/testing/axiom-truth/src/main/java/org/apache/axiom/truth/OMElementSubject.java (original)
+++ webservices/axiom/branches/1.2.x/testing/axiom-truth/src/main/java/org/apache/axiom/truth/OMElementSubject.java Sun Jan 6 11:25:47 2019
@@ -23,11 +23,11 @@ import java.util.Iterator;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNamespace;
-import com.google.common.truth.FailureStrategy;
+import com.google.common.truth.FailureMetadata;
public final class OMElementSubject extends AbstractOMContainerSubject<OMElementSubject,OMElement> {
- OMElementSubject(FailureStrategy failureStrategy, OMElement subject) {
- super(failureStrategy, subject);
+ OMElementSubject(FailureMetadata failureMetadata, OMElement subject) {
+ super(failureMetadata, subject);
}
public void hasNoNamespaceDeclarations() {
Propchange: webservices/axiom/branches/1.2.x/testing/xml-truth/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jan 6 11:25:47 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
+/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
Modified: webservices/axiom/branches/1.2.x/testing/xml-truth/src/main/java/org/apache/axiom/truth/xml/XMLSubject.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/testing/xml-truth/src/main/java/org/apache/axiom/truth/xml/XMLSubject.java?rev=1850543&r1=1850542&r2=1850543&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/testing/xml-truth/src/main/java/org/apache/axiom/truth/xml/XMLSubject.java (original)
+++ webservices/axiom/branches/1.2.x/testing/xml-truth/src/main/java/org/apache/axiom/truth/xml/XMLSubject.java Sun Jan 6 11:25:47 2019
@@ -32,7 +32,7 @@ import org.apache.axiom.truth.xml.spi.Tr
import org.apache.axiom.truth.xml.spi.TraverserException;
import org.apache.axiom.truth.xml.spi.XML;
-import com.google.common.truth.FailureStrategy;
+import com.google.common.truth.FailureMetadata;
import com.google.common.truth.Subject;
/**
@@ -51,8 +51,8 @@ public final class XMLSubject extends Su
private boolean expandEntityReferences;
private boolean treatWhitespaceAsText;
- XMLSubject(FailureStrategy failureStrategy, Object subject) {
- super(failureStrategy, subject);
+ XMLSubject(FailureMetadata metadata, Object subject) {
+ super(metadata, subject);
xml = XMLTruth.xml(subject);
}
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=1850543&r1=1850542&r2=1850543&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 Sun Jan 6 11:25:47 2019
@@ -38,21 +38,19 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.xml.sax.InputSource;
-import com.google.common.truth.AbstractVerb.DelegatedVerb;
-import com.google.common.truth.FailureStrategy;
-import com.google.common.truth.SubjectFactory;
+import com.google.common.truth.FailureMetadata;
+import com.google.common.truth.Subject;
import com.google.common.truth.Truth;
/**
* Google Truth extension for XML.
*/
public final class XMLTruth {
- private static final SubjectFactory<XMLSubject,Object> SUBJECT_FACTORY = new SubjectFactory<XMLSubject,Object>() {
+ private static final Subject.Factory<XMLSubject,Object> SUBJECT_FACTORY = new Subject.Factory<XMLSubject,Object>() {
@Override
- public XMLSubject getSubject(FailureStrategy fs, Object that) {
- return new XMLSubject(fs, that);
+ public XMLSubject createSubject(FailureMetadata metadata, Object that) {
+ return new XMLSubject(metadata, that);
}
-
};
private static final List<XMLFactory<?>> factories;
@@ -217,11 +215,11 @@ public final class XMLTruth {
private XMLTruth() {}
/**
- * Get the {@link SubjectFactory} to be used with {@link Truth#assertAbout(SubjectFactory)}.
+ * Get the {@link Subject.Factory} to be used with {@link Truth#assertAbout(Subject.Factory)}.
*
- * @return a {@link SubjectFactory} for {@link XMLSubject} instances
+ * @return a {@link Subject.Factory} for {@link XMLSubject} instances
*/
- public static SubjectFactory<XMLSubject,Object> xml() {
+ public static Subject.Factory<XMLSubject, Object> xml() {
return SUBJECT_FACTORY;
}