This is an automated email from the ASF dual-hosted git repository.
veithen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ws-axiom.git
The following commit(s) were added to refs/heads/master by this push:
new 392975082 Migrate axiom-testsuite from Google Truth to AssertJ
392975082 is described below
commit 392975082eb470b50a0a86497b3b14589bac33b2
Author: Andreas Veithen-Knowles <[email protected]>
AuthorDate: Sat Mar 14 08:53:13 2026 +0000
Migrate axiom-testsuite from Google Truth to AssertJ
---
.../org/apache/axiom/ts/om/builder/TestCloseWithSystemId.java | 2 +-
...estCreateOMBuilderFromDOMWithNSUnawareUnprefixedAttribute.java | 2 +-
.../org/apache/axiom/ts/om/builder/TestDetachWithSAXSource.java | 2 +-
.../java/org/apache/axiom/ts/om/builder/TestDetachWithStream.java | 2 +-
.../main/java/org/apache/axiom/ts/om/builder/TestInvalidXML.java | 2 +-
.../java/org/apache/axiom/ts/om/container/TestGetBuilderNull.java | 2 +-
.../java/org/apache/axiom/ts/om/container/TestGetDescendants.java | 2 +-
.../src/main/java/org/apache/axiom/ts/om/cross/TestAddChild.java | 4 ++--
.../main/java/org/apache/axiom/ts/om/cross/TestInsertSibling.java | 4 ++--
.../java/org/apache/axiom/ts/om/document/TestSerializeUTF16.java | 2 +-
.../ts/om/document/TestSerializeWithIgnoreXMLDeclaration.java | 2 +-
.../java/org/apache/axiom/ts/om/document/TestSerializeXML11.java | 2 +-
.../apache/axiom/ts/om/document/TestSerializeXMLDeclaration.java | 2 +-
.../axiom/ts/om/document/TestSetOMDocumentElementReplaceSame.java | 6 +++---
.../src/main/java/org/apache/axiom/ts/om/element/TestClose.java | 2 +-
.../axiom/ts/om/element/TestDeclareNamespaceWithEmptyPrefix.java | 2 +-
.../axiom/ts/om/element/TestGetAllDeclaredNamespacesRemove.java | 4 ++--
.../apache/axiom/ts/om/element/TestGetChildrenWithLocalName.java | 2 +-
.../org/apache/axiom/ts/om/element/TestGetChildrenWithName4.java | 2 +-
.../axiom/ts/om/element/TestGetDescendantsRemoveSubtree.java | 2 +-
.../axiom/ts/om/element/TestGetTextAsStreamWithoutCaching.java | 2 +-
.../TestGetXMLStreamReaderWithPreserveNamespaceContext.java | 4 ++--
.../TestGetXMLStreamReaderWithPreserveNamespaceContext2.java | 2 +-
.../ts/om/factory/TestCreateOMElementWithNamespaceInScope4.java | 2 +-
.../org/apache/axiom/ts/om/sourcedelement/TestAddAttribute.java | 6 +++---
.../apache/axiom/ts/om/sourcedelement/TestBlobOMDataSource.java | 6 +++---
.../apache/axiom/ts/om/sourcedelement/TestDeclareNamespace.java | 4 ++--
.../java/org/apache/axiom/ts/om/sourcedelement/TestDiscard.java | 4 ++--
.../apache/axiom/ts/om/sourcedelement/TestGetAllAttributes.java | 2 +-
.../axiom/ts/om/sourcedelement/TestGetAllDeclaredNamespaces.java | 2 +-
.../org/apache/axiom/ts/om/sourcedelement/TestGetAttribute.java | 2 +-
.../apache/axiom/ts/om/sourcedelement/TestGetAttributeValue.java | 2 +-
.../TestGetSAXSourceWithPushOMDataSourceThrowingException.java | 2 +-
.../org/apache/axiom/ts/om/sourcedelement/TestSetDataSource.java | 4 ++--
.../apache/axiom/ts/om/sourcedelement/TestStringOMDataSource.java | 2 +-
.../src/main/java/org/apache/axiom/ts/om/xop/TestSetOptimize.java | 2 +-
.../org/apache/axiom/ts/om/xop/TestSetOptimizePlainOMText.java | 2 +-
.../axiom/ts/omdom/attr/TestSetValueOnNamespaceDeclaration.java | 2 +-
.../apache/axiom/ts/omdom/document/TestAppendChildForbidden.java | 2 +-
.../apache/axiom/ts/omdom/document/TestInsertBeforeForbidden.java | 2 +-
.../apache/axiom/ts/omdom/element/TestRemoveAttributeNode.java | 4 ++--
.../org/apache/axiom/ts/omdom/text/TestGetNodeValueBinary.java | 2 +-
.../axiom/ts/soap/body/FirstElementNameWithParserTestCase.java | 2 +-
.../ts/soap/body/TestGetFirstElementLocalNameWithParser2.java | 2 +-
.../body/TestGetFirstElementLocalNameWithParserNoLookahead.java | 2 +-
.../axiom/ts/soap/body/TestSerializeWithXSITypeAttribute.java | 2 +-
.../axiom/ts/soap/factory/TestCreateSOAPFaultWithException.java | 4 ++--
.../apache/axiom/ts/soap/faultreason/TestGetFaultReasonText.java | 2 +-
.../axiom/ts/soap/header/TestAddChildWithPlainOMElement.java | 2 +-
.../axiom/ts/soap/header/TestExamineHeaderBlocksWithParser.java | 2 +-
.../header/TestExamineMustUnderstandHeaderBlocksWithParser.java | 2 +-
.../ts/soap/header/TestGetHeaderBlocksWithNSURIWithParser.java | 2 +-
.../apache/axiom/ts/soap/header/TestGetHeaderBlocksWithName.java | 2 +-
.../apache/axiom/ts/soap/headerblock/TestBlobOMDataSource.java | 8 ++++----
.../main/java/org/apache/axiom/ts/soap/headerblock/TestClone.java | 2 +-
.../headerblock/TestCloneProcessedWithoutPreservingModel.java | 2 +-
.../ts/soap/headerblock/TestSetAttributeNamespacePrefix.java | 2 +-
.../axiom/ts/soap12/faultreason/TestAddSOAPTextMultiple.java | 6 +++---
.../ts/soap12/faultreason/TestGetAllSoapTextsWithParser.java | 2 +-
.../axiom/ts/soap12/faultreason/TestGetFaultReasonText.java | 2 +-
.../soap12/faultreason/TestGetFaultReasonTextCaseSensitivity.java | 2 +-
.../faultreason/TestGetFaultReasonTextWithoutLangAttribute.java | 2 +-
.../java/org/apache/axiom/ts/soap12/mtom/TestBuilderDetach.java | 2 +-
.../axiom/ts/soap12/mtom/TestGetXMLStreamReaderMTOMEncoded.java | 2 +-
.../axiom/ts/soapdom/header/TestExamineAllHeaderBlocks.java | 2 +-
65 files changed, 85 insertions(+), 85 deletions(-)
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCloseWithSystemId.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCloseWithSystemId.java
index d4f633009..ddd64540d 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCloseWithSystemId.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCloseWithSystemId.java
@@ -18,7 +18,7 @@
*/
package org.apache.axiom.ts.om.builder;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import javax.xml.transform.stream.StreamSource;
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateOMBuilderFromDOMWithNSUnawareUnprefixedAttribute.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateOMBuilderFromDOMWithNSUnawareUnprefixedAttribute.java
index e370cca96..18207ab6e 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateOMBuilderFromDOMWithNSUnawareUnprefixedAttribute.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestCreateOMBuilderFromDOMWithNSUnawareUnprefixedAttribute.java
@@ -18,7 +18,7 @@
*/
package org.apache.axiom.ts.om.builder;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import javax.xml.namespace.QName;
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestDetachWithSAXSource.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestDetachWithSAXSource.java
index ccfb8409c..3fb5efd9a 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestDetachWithSAXSource.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestDetachWithSAXSource.java
@@ -18,7 +18,7 @@
*/
package org.apache.axiom.ts.om.builder;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import javax.xml.transform.sax.SAXSource;
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestDetachWithStream.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestDetachWithStream.java
index 7bf824d7d..5731b653e 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestDetachWithStream.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestDetachWithStream.java
@@ -18,7 +18,7 @@
*/
package org.apache.axiom.ts.om.builder;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.OMXMLBuilderFactory;
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestInvalidXML.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestInvalidXML.java
index 007b542c1..c3ad77be6 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestInvalidXML.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestInvalidXML.java
@@ -18,7 +18,7 @@
*/
package org.apache.axiom.ts.om.builder;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import javax.xml.stream.XMLStreamReader;
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/TestGetBuilderNull.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/TestGetBuilderNull.java
index b86a10688..f8b0851ec 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/TestGetBuilderNull.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/TestGetBuilderNull.java
@@ -18,7 +18,7 @@
*/
package org.apache.axiom.ts.om.container;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMMetaFactory;
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/TestGetDescendants.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/TestGetDescendants.java
index 6589d7cdd..ccf777f74 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/TestGetDescendants.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/TestGetDescendants.java
@@ -18,7 +18,7 @@
*/
package org.apache.axiom.ts.om.container;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.util.Iterator;
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/cross/TestAddChild.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/cross/TestAddChild.java
index 4d8272806..7b43793dd 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/cross/TestAddChild.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/cross/TestAddChild.java
@@ -18,7 +18,7 @@
*/
package org.apache.axiom.ts.om.cross;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import org.apache.axiom.om.OMElement;
@@ -29,7 +29,7 @@ public class TestAddChild extends CrossOMTestCase {
OMElement orgChild =
altMetaFactory.getOMFactory().createOMElement("child", null);
parent.addChild(orgChild);
OMElement child = (OMElement) parent.getFirstOMChild();
- assertThat(child).isNotSameInstanceAs(orgChild);
+ assertThat(child).isNotSameAs(orgChild);
assertThat(child.getLocalName()).isEqualTo("child");
}
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/cross/TestInsertSibling.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/cross/TestInsertSibling.java
index ca0d05cbb..375016e93 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/cross/TestInsertSibling.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/cross/TestInsertSibling.java
@@ -18,7 +18,7 @@
*/
package org.apache.axiom.ts.om.cross;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import com.google.inject.Inject;
import com.google.inject.name.Named;
@@ -46,7 +46,7 @@ public class TestInsertSibling extends CrossOMTestCase {
}
OMComment sibling =
(OMComment) (before ? child.getPreviousOMSibling() :
child.getNextOMSibling());
- assertThat(sibling).isNotSameInstanceAs(orgSibling);
+ assertThat(sibling).isNotSameAs(orgSibling);
assertThat(sibling.getValue()).isEqualTo("test");
}
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestSerializeUTF16.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestSerializeUTF16.java
index 98cc81db5..511f620f8 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestSerializeUTF16.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestSerializeUTF16.java
@@ -18,7 +18,7 @@
*/
package org.apache.axiom.ts.om.document;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.io.ByteArrayOutputStream;
import java.nio.charset.StandardCharsets;
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestSerializeWithIgnoreXMLDeclaration.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestSerializeWithIgnoreXMLDeclaration.java
index e85af09fd..3ce7a0176 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestSerializeWithIgnoreXMLDeclaration.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestSerializeWithIgnoreXMLDeclaration.java
@@ -18,7 +18,7 @@
*/
package org.apache.axiom.ts.om.document;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.io.ByteArrayOutputStream;
import java.nio.charset.StandardCharsets;
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestSerializeXML11.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestSerializeXML11.java
index 4c5dc2256..2389d3055 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestSerializeXML11.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestSerializeXML11.java
@@ -18,7 +18,7 @@
*/
package org.apache.axiom.ts.om.document;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.io.ByteArrayOutputStream;
import java.nio.charset.StandardCharsets;
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestSerializeXMLDeclaration.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestSerializeXMLDeclaration.java
index 49c35c5eb..ad9577856 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestSerializeXMLDeclaration.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestSerializeXMLDeclaration.java
@@ -18,7 +18,7 @@
*/
package org.apache.axiom.ts.om.document;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.io.ByteArrayOutputStream;
import java.nio.charset.StandardCharsets;
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestSetOMDocumentElementReplaceSame.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestSetOMDocumentElementReplaceSame.java
index 9eccac79a..cc3d7d3ec 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestSetOMDocumentElementReplaceSame.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestSetOMDocumentElementReplaceSame.java
@@ -18,7 +18,7 @@
*/
package org.apache.axiom.ts.om.document;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import org.apache.axiom.om.OMDocument;
import org.apache.axiom.om.OMElement;
@@ -41,9 +41,9 @@ public class TestSetOMDocumentElementReplaceSame extends
AxiomTestCase {
OMDocument document = factory.createOMDocument();
OMElement root = factory.createOMElement("root", null, document);
document.setOMDocumentElement(root);
- assertThat(document.getOMDocumentElement()).isSameInstanceAs(root);
+ assertThat(document.getOMDocumentElement()).isSameAs(root);
assertThat(root.getPreviousOMSibling()).isNull();
assertThat(root.getNextOMSibling()).isNull();
- assertThat(root.getParent()).isSameInstanceAs(document);
+ assertThat(root.getParent()).isSameAs(document);
}
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestClose.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestClose.java
index d25753b1d..aafd7f36a 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestClose.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestClose.java
@@ -18,7 +18,7 @@
*/
package org.apache.axiom.ts.om.element;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.util.Iterator;
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDeclareNamespaceWithEmptyPrefix.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDeclareNamespaceWithEmptyPrefix.java
index 3c6fe5191..13bf91865 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDeclareNamespaceWithEmptyPrefix.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestDeclareNamespaceWithEmptyPrefix.java
@@ -18,7 +18,7 @@
*/
package org.apache.axiom.ts.om.element;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.util.Iterator;
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAllDeclaredNamespacesRemove.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAllDeclaredNamespacesRemove.java
index 70c45e7a0..0836e6f3d 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAllDeclaredNamespacesRemove.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetAllDeclaredNamespacesRemove.java
@@ -18,7 +18,7 @@
*/
package org.apache.axiom.ts.om.element;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.util.Arrays;
import java.util.HashSet;
@@ -59,7 +59,7 @@ public class TestGetAllDeclaredNamespacesRemove extends
AxiomTestCase {
}
seenPrefixes.add(prefix);
}
- assertThat(seenPrefixes).containsAtLeastElementsIn(prefixes);
+ assertThat(seenPrefixes).containsAll(prefixes);
for (String prefix : prefixes) {
OMNamespace ns = element.findNamespaceURI(prefix);
if (prefix.equals(prefixToRemove)) {
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenWithLocalName.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenWithLocalName.java
index 0b875bb7d..89a6f218b 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenWithLocalName.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenWithLocalName.java
@@ -18,7 +18,7 @@
*/
package org.apache.axiom.ts.om.element;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.util.Iterator;
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenWithName4.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenWithName4.java
index b39c94f41..60db594c6 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenWithName4.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetChildrenWithName4.java
@@ -18,7 +18,7 @@
*/
package org.apache.axiom.ts.om.element;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import javax.xml.namespace.QName;
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetDescendantsRemoveSubtree.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetDescendantsRemoveSubtree.java
index 3eaca2f1d..9af9df1b8 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetDescendantsRemoveSubtree.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetDescendantsRemoveSubtree.java
@@ -18,7 +18,7 @@
*/
package org.apache.axiom.ts.om.element;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.io.StringReader;
import java.util.Iterator;
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetTextAsStreamWithoutCaching.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetTextAsStreamWithoutCaching.java
index a108b1992..2983f9d13 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetTextAsStreamWithoutCaching.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetTextAsStreamWithoutCaching.java
@@ -18,7 +18,7 @@
*/
package org.apache.axiom.ts.om.element;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderWithPreserveNamespaceContext.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderWithPreserveNamespaceContext.java
index 04093d89c..84bb5fadd 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderWithPreserveNamespaceContext.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderWithPreserveNamespaceContext.java
@@ -18,7 +18,7 @@
*/
package org.apache.axiom.ts.om.element;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.io.InputStream;
import java.util.HashSet;
@@ -70,7 +70,7 @@ public class
TestGetXMLStreamReaderWithPreserveNamespaceContext extends AxiomTes
prefixes.add(reader.getNamespacePrefix(i));
}
if (preserveNamespaceContext) {
- assertThat(prefixes).containsExactly("soapenv", "xsd", "xsi",
"ns", "p");
+ assertThat(prefixes).containsExactlyInAnyOrder("soapenv", "xsd",
"xsi", "ns", "p");
} else {
assertThat(prefixes).containsExactly("ns");
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderWithPreserveNamespaceContext2.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderWithPreserveNamespaceContext2.java
index 6ff6dc160..7b40a5dd9 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderWithPreserveNamespaceContext2.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetXMLStreamReaderWithPreserveNamespaceContext2.java
@@ -18,7 +18,7 @@
*/
package org.apache.axiom.ts.om.element;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import javax.xml.stream.XMLStreamReader;
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithNamespaceInScope4.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithNamespaceInScope4.java
index fff0426e9..ce46c97a6 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithNamespaceInScope4.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMElementWithNamespaceInScope4.java
@@ -18,7 +18,7 @@
*/
package org.apache.axiom.ts.om.factory;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestAddAttribute.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestAddAttribute.java
index a5da7d382..8fad422d1 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestAddAttribute.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestAddAttribute.java
@@ -18,7 +18,7 @@
*/
package org.apache.axiom.ts.om.sourcedelement;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.util.Iterator;
@@ -58,11 +58,11 @@ public class TestAddAttribute extends AxiomTestCase {
// Force expansion; this should not overwrite the attribute we just
added
assertThat(element.getFirstOMChild()).isNotNull();
OMAttribute attr2 = element.getAttribute(new QName("attr"));
- assertThat(attr2).isSameInstanceAs(attr);
+ assertThat(attr2).isSameAs(attr);
assertThat(attr2.getAttributeValue()).isEqualTo("newvalue");
Iterator<OMAttribute> it = element.getAllAttributes();
assertThat(it.hasNext()).isTrue();
- assertThat(it.next()).isSameInstanceAs(attr);
+ assertThat(it.next()).isSameAs(attr);
assertThat(it.hasNext()).isFalse();
}
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestBlobOMDataSource.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestBlobOMDataSource.java
index 0132fadb5..f613f3c0a 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestBlobOMDataSource.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestBlobOMDataSource.java
@@ -18,7 +18,7 @@
*/
package org.apache.axiom.ts.om.sourcedelement;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import javax.xml.stream.XMLStreamReader;
@@ -56,7 +56,7 @@ public class TestBlobOMDataSource extends AxiomTestCase {
assertTrue("Expected OMSourcedElement child", firstChild instanceof
OMSourcedElement);
OMSourcedElement child = (OMSourcedElement) firstChild;
assertTrue("OMSourcedElement is expanded. This is unexpected",
!child.isExpanded());
- assertThat(child.getDataSource()).isSameInstanceAs(ds);
+ assertThat(child.getDataSource()).isSameAs(ds);
// A BlobOMDataSource does not consume the backing object when read.
// Thus getting the XMLStreamReader of the BlobOMDataSource should not
@@ -85,6 +85,6 @@ public class TestBlobOMDataSource extends AxiomTestCase {
!child.isExpanded());
// Test getting the raw bytes from the BlobOMDataSource.
- assertThat(child.getDataSource()).isSameInstanceAs(ds);
+ assertThat(child.getDataSource()).isSameAs(ds);
}
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestDeclareNamespace.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestDeclareNamespace.java
index c944dac75..7b0143aff 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestDeclareNamespace.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestDeclareNamespace.java
@@ -18,7 +18,7 @@
*/
package org.apache.axiom.ts.om.sourcedelement;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.util.Iterator;
@@ -56,7 +56,7 @@ public class TestDeclareNamespace extends AxiomTestCase {
assertThat(ns.getNamespaceURI()).isEqualTo("urn:ns2");
Iterator<OMNamespace> it = element.getAllDeclaredNamespaces();
assertThat(it.hasNext()).isTrue();
- assertThat(it.next()).isSameInstanceAs(ns);
+ assertThat(it.next()).isSameAs(ns);
assertThat(it.hasNext()).isFalse();
}
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestDiscard.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestDiscard.java
index a38ad62ca..8319a91cb 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestDiscard.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestDiscard.java
@@ -18,7 +18,7 @@
*/
package org.apache.axiom.ts.om.sourcedelement;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.apache.axiom.ts.dimension.ExpansionStrategy.DONT_EXPAND;
import org.apache.axiom.om.OMElement;
@@ -49,7 +49,7 @@ public class TestDiscard extends AxiomTestCase {
OMElement child2 = factory.createOMElement("child2", null, parent);
expansionStrategy.apply(omse);
omse.discard();
- assertThat(child1.getNextOMSibling()).isSameInstanceAs(child2);
+ assertThat(child1.getNextOMSibling()).isSameAs(child2);
assertThat(ds.hasUnclosedReaders()).isFalse();
assertThat(ds.getReaderRequestCount()).isEqualTo(expansionStrategy ==
DONT_EXPAND ? 0 : 1);
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetAllAttributes.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetAllAttributes.java
index 1213bd610..a126d7d05 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetAllAttributes.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetAllAttributes.java
@@ -18,7 +18,7 @@
*/
package org.apache.axiom.ts.om.sourcedelement;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.util.Iterator;
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetAllDeclaredNamespaces.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetAllDeclaredNamespaces.java
index 1ca196bea..282453795 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetAllDeclaredNamespaces.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetAllDeclaredNamespaces.java
@@ -18,7 +18,7 @@
*/
package org.apache.axiom.ts.om.sourcedelement;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.util.Iterator;
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetAttribute.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetAttribute.java
index e297cdaf8..1afba4330 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetAttribute.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetAttribute.java
@@ -18,7 +18,7 @@
*/
package org.apache.axiom.ts.om.sourcedelement;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import javax.xml.namespace.QName;
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetAttributeValue.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetAttributeValue.java
index 959dd29f1..1052cbca6 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetAttributeValue.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetAttributeValue.java
@@ -18,7 +18,7 @@
*/
package org.apache.axiom.ts.om.sourcedelement;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import javax.xml.namespace.QName;
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetSAXSourceWithPushOMDataSourceThrowingException.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetSAXSourceWithPushOMDataSourceThrowingException.java
index cff6ec82f..ac936720b 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetSAXSourceWithPushOMDataSourceThrowingException.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetSAXSourceWithPushOMDataSourceThrowingException.java
@@ -18,7 +18,7 @@
*/
package org.apache.axiom.ts.om.sourcedelement;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamWriter;
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSetDataSource.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSetDataSource.java
index 9d1867451..df788ce40 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSetDataSource.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSetDataSource.java
@@ -18,7 +18,7 @@
*/
package org.apache.axiom.ts.om.sourcedelement;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.io.StringWriter;
@@ -59,7 +59,7 @@ public class TestSetDataSource extends AxiomTestCase {
assertTrue("Expected OMSourcedElement child", firstChild instanceof
OMSourcedElement);
OMSourcedElement child = (OMSourcedElement) firstChild;
assertTrue("OMSourcedElement is expanded. This is unexpected",
!child.isExpanded());
-
assertThat(child.getDataSource()).isSameInstanceAs(nonDestructiveOMDataSource1);
+
assertThat(child.getDataSource()).isSameAs(nonDestructiveOMDataSource1);
// Write out the body
StringWriter sw = new StringWriter();
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestStringOMDataSource.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestStringOMDataSource.java
index 4742d217f..76818c0fa 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestStringOMDataSource.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestStringOMDataSource.java
@@ -18,7 +18,7 @@
*/
package org.apache.axiom.ts.om.sourcedelement;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.io.StringWriter;
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/xop/TestSetOptimize.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/xop/TestSetOptimize.java
index 059670d7b..7ea8b62d1 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/xop/TestSetOptimize.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/xop/TestSetOptimize.java
@@ -18,7 +18,7 @@
*/
package org.apache.axiom.ts.om.xop;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.apache.axiom.ts.xml.XOPSample.XOP_SPEC_SAMPLE;
import java.io.ByteArrayOutputStream;
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/xop/TestSetOptimizePlainOMText.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/xop/TestSetOptimizePlainOMText.java
index bf4824e0a..a93d56f97 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/xop/TestSetOptimizePlainOMText.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/xop/TestSetOptimizePlainOMText.java
@@ -18,7 +18,7 @@
*/
package org.apache.axiom.ts.om.xop;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.io.OutputStream;
import java.io.StringWriter;
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/attr/TestSetValueOnNamespaceDeclaration.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/attr/TestSetValueOnNamespaceDeclaration.java
index 2e66bb2ad..c45199bea 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/attr/TestSetValueOnNamespaceDeclaration.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/attr/TestSetValueOnNamespaceDeclaration.java
@@ -18,7 +18,7 @@
*/
package org.apache.axiom.ts.omdom.attr;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.util.Iterator;
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/document/TestAppendChildForbidden.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/document/TestAppendChildForbidden.java
index 019328fa5..036f36d5d 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/document/TestAppendChildForbidden.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/document/TestAppendChildForbidden.java
@@ -18,7 +18,7 @@
*/
package org.apache.axiom.ts.omdom.document;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.io.StringReader;
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/document/TestInsertBeforeForbidden.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/document/TestInsertBeforeForbidden.java
index 03a4a0ccd..311b5a96a 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/document/TestInsertBeforeForbidden.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/document/TestInsertBeforeForbidden.java
@@ -18,7 +18,7 @@
*/
package org.apache.axiom.ts.omdom.document;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.io.StringReader;
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/element/TestRemoveAttributeNode.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/element/TestRemoveAttributeNode.java
index ad90da719..245ea86ac 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/element/TestRemoveAttributeNode.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/element/TestRemoveAttributeNode.java
@@ -18,7 +18,7 @@
*/
package org.apache.axiom.ts.omdom.element;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMElement;
@@ -40,6 +40,6 @@ public class TestRemoveAttributeNode extends OMDOMTestCase {
OMAttribute attr = element.addAttribute("attr", "value", null);
((Element) element).removeAttributeNode((Attr) attr);
assertThat(((Attr) attr).getOwnerDocument())
- .isSameInstanceAs(((Element) element).getOwnerDocument());
+ .isSameAs(((Element) element).getOwnerDocument());
}
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/text/TestGetNodeValueBinary.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/text/TestGetNodeValueBinary.java
index e7ce415dc..9cde5bc70 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/text/TestGetNodeValueBinary.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/text/TestGetNodeValueBinary.java
@@ -18,7 +18,7 @@
*/
package org.apache.axiom.ts.omdom.text;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.io.ByteArrayInputStream;
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/FirstElementNameWithParserTestCase.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/FirstElementNameWithParserTestCase.java
index 494f3e0c7..cff87d6c1 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/FirstElementNameWithParserTestCase.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/FirstElementNameWithParserTestCase.java
@@ -18,7 +18,7 @@
*/
package org.apache.axiom.ts.soap.body;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.io.StringReader;
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFirstElementLocalNameWithParser2.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFirstElementLocalNameWithParser2.java
index aa7bfd882..1a56acfb3 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFirstElementLocalNameWithParser2.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFirstElementLocalNameWithParser2.java
@@ -18,7 +18,7 @@
*/
package org.apache.axiom.ts.soap.body;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.soap.SOAPBody;
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFirstElementLocalNameWithParserNoLookahead.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFirstElementLocalNameWithParserNoLookahead.java
index 22306b908..2199196e6 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFirstElementLocalNameWithParserNoLookahead.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestGetFirstElementLocalNameWithParserNoLookahead.java
@@ -18,7 +18,7 @@
*/
package org.apache.axiom.ts.soap.body;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.io.StringReader;
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestSerializeWithXSITypeAttribute.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestSerializeWithXSITypeAttribute.java
index 244fcf7c3..09e3ff39c 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestSerializeWithXSITypeAttribute.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/body/TestSerializeWithXSITypeAttribute.java
@@ -18,7 +18,7 @@
*/
package org.apache.axiom.ts.soap.body;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import javax.xml.namespace.QName;
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateSOAPFaultWithException.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateSOAPFaultWithException.java
index 3154d9ab2..1ae6ca89a 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateSOAPFaultWithException.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/factory/TestCreateSOAPFaultWithException.java
@@ -18,7 +18,7 @@
*/
package org.apache.axiom.ts.soap.factory;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.util.Iterator;
@@ -49,7 +49,7 @@ public class TestCreateSOAPFaultWithException extends
SOAPTestCase {
SOAPFault fault = soapFactory.createSOAPFault(body, new
Exception("Testing soap fault"));
if (body != null) {
assertThat(body.hasFault()).isTrue();
- assertThat(body.getFault()).isSameInstanceAs(fault);
+ assertThat(body.getFault()).isSameAs(fault);
}
assertThat(fault.isComplete()).isTrue();
SOAPFaultDetail detail = fault.getDetail();
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultreason/TestGetFaultReasonText.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultreason/TestGetFaultReasonText.java
index d29f7708c..78b8e47ce 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultreason/TestGetFaultReasonText.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/faultreason/TestGetFaultReasonText.java
@@ -18,7 +18,7 @@
*/
package org.apache.axiom.ts.soap.faultreason;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.util.Locale;
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestAddChildWithPlainOMElement.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestAddChildWithPlainOMElement.java
index 304819759..d879a75a5 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestAddChildWithPlainOMElement.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestAddChildWithPlainOMElement.java
@@ -18,7 +18,7 @@
*/
package org.apache.axiom.ts.soap.header;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.util.Iterator;
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestExamineHeaderBlocksWithParser.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestExamineHeaderBlocksWithParser.java
index faad9ac6e..05a558086 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestExamineHeaderBlocksWithParser.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestExamineHeaderBlocksWithParser.java
@@ -18,7 +18,7 @@
*/
package org.apache.axiom.ts.soap.header;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.util.Iterator;
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestExamineMustUnderstandHeaderBlocksWithParser.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestExamineMustUnderstandHeaderBlocksWithParser.java
index cda33e378..e69491824 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestExamineMustUnderstandHeaderBlocksWithParser.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestExamineMustUnderstandHeaderBlocksWithParser.java
@@ -18,7 +18,7 @@
*/
package org.apache.axiom.ts.soap.header;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.util.Iterator;
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestGetHeaderBlocksWithNSURIWithParser.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestGetHeaderBlocksWithNSURIWithParser.java
index 3d1ec5428..3b9473f11 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestGetHeaderBlocksWithNSURIWithParser.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestGetHeaderBlocksWithNSURIWithParser.java
@@ -18,7 +18,7 @@
*/
package org.apache.axiom.ts.soap.header;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.util.ArrayList;
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestGetHeaderBlocksWithName.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestGetHeaderBlocksWithName.java
index 04905211e..4afccfc64 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestGetHeaderBlocksWithName.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/header/TestGetHeaderBlocksWithName.java
@@ -18,7 +18,7 @@
*/
package org.apache.axiom.ts.soap.header;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.util.Iterator;
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestBlobOMDataSource.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestBlobOMDataSource.java
index 88e9f4b4c..23d4c720b 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestBlobOMDataSource.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestBlobOMDataSource.java
@@ -18,7 +18,7 @@
*/
package org.apache.axiom.ts.soap.headerblock;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import javax.xml.stream.XMLStreamReader;
@@ -60,12 +60,12 @@ public class TestBlobOMDataSource extends SOAPTestCase {
assertTrue("Expected OMSourcedElement child", firstChild instanceof
SOAPHeaderBlock);
SOAPHeaderBlock child = (SOAPHeaderBlock) firstChild;
assertTrue("OMSourcedElement is expanded. This is unexpected",
!child.isExpanded());
- assertThat(child.getDataSource()).isSameInstanceAs(ds);
+ assertThat(child.getDataSource()).isSameAs(ds);
// Make sure that getting the MustUnderstand property does not cause
expansion.
assertTrue(!child.getMustUnderstand());
assertTrue("OMSourcedElement is expanded. This is unexpected",
!child.isExpanded());
- assertThat(child.getDataSource()).isSameInstanceAs(ds);
+ assertThat(child.getDataSource()).isSameAs(ds);
// A BlobOMDataSource does not consume the backing object when read.
// Thus getting the XMLStreamReader of the BlobOMDataSource should not
@@ -82,6 +82,6 @@ public class TestBlobOMDataSource extends SOAPTestCase {
soapHeader.toString().indexOf(payload) > 0);
assertTrue("OMSourcedElement is expanded. This is unexpected",
!child.isExpanded());
- assertThat(child.getDataSource()).isSameInstanceAs(ds);
+ assertThat(child.getDataSource()).isSameAs(ds);
}
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestClone.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestClone.java
index 27ac6bbbc..8b443b3a8 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestClone.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestClone.java
@@ -18,7 +18,7 @@
*/
package org.apache.axiom.ts.soap.headerblock;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.OMNamespace;
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestCloneProcessedWithoutPreservingModel.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestCloneProcessedWithoutPreservingModel.java
index d0deac2bf..eeccf961d 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestCloneProcessedWithoutPreservingModel.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestCloneProcessedWithoutPreservingModel.java
@@ -18,7 +18,7 @@
*/
package org.apache.axiom.ts.soap.headerblock;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMMetaFactory;
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestSetAttributeNamespacePrefix.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestSetAttributeNamespacePrefix.java
index 2e17eeaa0..2eda26231 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestSetAttributeNamespacePrefix.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/headerblock/TestSetAttributeNamespacePrefix.java
@@ -18,7 +18,7 @@
*/
package org.apache.axiom.ts.soap.headerblock;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMMetaFactory;
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestAddSOAPTextMultiple.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestAddSOAPTextMultiple.java
index f1c884fcf..35cdd7101 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestAddSOAPTextMultiple.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestAddSOAPTextMultiple.java
@@ -18,7 +18,7 @@
*/
package org.apache.axiom.ts.soap12.faultreason;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.OMNode;
@@ -44,8 +44,8 @@ public class TestAddSOAPTextMultiple extends SOAPTestCase {
text2.setText("Systemfehler");
reason.addSOAPText(text2);
OMNode child = reason.getFirstOMChild();
- assertThat(child).isSameInstanceAs(text1);
+ assertThat(child).isSameAs(text1);
child = child.getNextOMSibling();
- assertThat(child).isSameInstanceAs(text2);
+ assertThat(child).isSameAs(text2);
}
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestGetAllSoapTextsWithParser.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestGetAllSoapTextsWithParser.java
index d44f79ed3..f1f8bdbf4 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestGetAllSoapTextsWithParser.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestGetAllSoapTextsWithParser.java
@@ -18,7 +18,7 @@
*/
package org.apache.axiom.ts.soap12.faultreason;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.util.List;
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestGetFaultReasonText.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestGetFaultReasonText.java
index 910a5826a..1432b2570 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestGetFaultReasonText.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestGetFaultReasonText.java
@@ -18,7 +18,7 @@
*/
package org.apache.axiom.ts.soap12.faultreason;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.util.Locale;
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestGetFaultReasonTextCaseSensitivity.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestGetFaultReasonTextCaseSensitivity.java
index 3b783ae1f..cf97120f7 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestGetFaultReasonTextCaseSensitivity.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestGetFaultReasonTextCaseSensitivity.java
@@ -18,7 +18,7 @@
*/
package org.apache.axiom.ts.soap12.faultreason;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.util.Locale;
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestGetFaultReasonTextWithoutLangAttribute.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestGetFaultReasonTextWithoutLangAttribute.java
index fc4b3213f..485bc89a2 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestGetFaultReasonTextWithoutLangAttribute.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/faultreason/TestGetFaultReasonTextWithoutLangAttribute.java
@@ -18,7 +18,7 @@
*/
package org.apache.axiom.ts.soap12.faultreason;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.util.Locale;
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/mtom/TestBuilderDetach.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/mtom/TestBuilderDetach.java
index 213a10f7f..8d2f264e5 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/mtom/TestBuilderDetach.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/mtom/TestBuilderDetach.java
@@ -18,7 +18,7 @@
*/
package org.apache.axiom.ts.soap12.mtom;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.util.Iterator;
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/mtom/TestGetXMLStreamReaderMTOMEncoded.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/mtom/TestGetXMLStreamReaderMTOMEncoded.java
index 05a72d651..2051a2388 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/mtom/TestGetXMLStreamReaderMTOMEncoded.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/mtom/TestGetXMLStreamReaderMTOMEncoded.java
@@ -18,7 +18,7 @@
*/
package org.apache.axiom.ts.soap12.mtom;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.io.InputStream;
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soapdom/header/TestExamineAllHeaderBlocks.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soapdom/header/TestExamineAllHeaderBlocks.java
index dfb02ce6e..0fc00bc26 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soapdom/header/TestExamineAllHeaderBlocks.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soapdom/header/TestExamineAllHeaderBlocks.java
@@ -18,7 +18,7 @@
*/
package org.apache.axiom.ts.soapdom.header;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.util.Iterator;
