You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2021/03/07 12:37:19 UTC
[axis-axis2-java-core] branch master updated: Migrate from Google
Truth to AssertJ
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/axis-axis2-java-core.git
The following commit(s) were added to refs/heads/master by this push:
new b8bcf57 Migrate from Google Truth to AssertJ
b8bcf57 is described below
commit b8bcf5789af5a04049b40f648e4602a692ede3cf
Author: Andreas Veithen <an...@gmail.com>
AuthorDate: Sun Mar 7 12:37:06 2021 +0000
Migrate from Google Truth to AssertJ
---
databinding-tests/jaxbri-tests/pom.xml | 5 +++++
.../java/org/apache/axis2/jaxbri/axis2_5919/FaultServiceTest.java | 2 +-
modules/adb-tests/pom.xml | 5 +++++
.../java/org/apache/axis2/databinding/axis2_5741/ServiceTest.java | 2 +-
.../java/org/apache/axis2/databinding/axis2_5749/ServiceTest.java | 2 +-
.../java/org/apache/axis2/databinding/axis2_5750/ServiceTest.java | 2 +-
.../java/org/apache/axis2/databinding/axis2_5758/ServiceTest.java | 5 +++--
.../java/org/apache/axis2/databinding/axis2_5799/ServiceTest.java | 2 +-
.../java/org/apache/axis2/databinding/axis2_5809/ServiceTest.java | 2 +-
.../java/org/apache/axis2/databinding/axis2_5887/ParseTest.java | 2 +-
.../org/apache/axis2/schema/axis2_5771/IgnoreUnexpectedTest.java | 4 ++--
modules/adb/pom.xml | 5 +++++
.../test/org/apache/axis2/databinding/utils/ConverterUtilTest.java | 4 ++--
modules/integration/pom.xml | 4 ++--
.../test/org/apache/axis2/engine/ThirdPartyResponseRawXMLTest.java | 2 +-
.../integration/test/org/apache/axis2/integration/TestingUtils.java | 2 +-
modules/jaxbri-codegen/pom.xml | 4 ++--
.../java/org/apache/axis2/jaxbri/CodeGenerationUtilityTest.java | 2 +-
modules/jaxws-integration/pom.xml | 5 +++++
.../java/org/apache/axis2/jaxws/sample/AddNumbersHandlerTests.java | 2 +-
.../apache/axis2/jaxws/xmlhttp/DispatchXMessageDataSourceTests.java | 2 +-
modules/jaxws/pom.xml | 5 +++++
.../datasource/jaxb/JAXBCustomBuilderDisableStreamingTests.java | 2 +-
.../org/apache/axis2/jaxws/attachments/MTOMSerializationTests.java | 2 +-
.../org/apache/axis2/jaxws/handler/HandlerPrePostInvokerTests.java | 2 +-
modules/kernel/pom.xml | 4 ++--
.../axis2/deployment/repository/util/DeploymentFileDataTest.java | 2 +-
.../apache/axis2/transport/http/XFormURLEncodedFormatterTest.java | 2 +-
modules/kernel/test/org/apache/axis2/util/UtilsTest.java | 2 +-
modules/saaj/pom.xml | 4 ++--
modules/saaj/test/org/apache/axis2/saaj/AttachmentTest.java | 2 +-
.../test/org/apache/axis2/saaj/integration/IntegrationTest.java | 2 +-
modules/samples/jaxws-interop/pom.xml | 4 ++--
.../test/java/org/apache/axis2/jaxws/interop/InteropSampleTest.java | 2 +-
modules/transport/jms/pom.xml | 4 ++--
.../src/test/java/org/apache/axis2/transport/jms/JMSUtilsTest.java | 4 ++--
pom.xml | 6 +++---
systests/webapp-tests/pom.xml | 4 ++--
.../test/java/org/apache/axis2/webapp/AxisAdminServletITCase.java | 2 +-
.../src/test/java/org/apache/axis2/webapp/NoSessionITCase.java | 2 +-
40 files changed, 74 insertions(+), 48 deletions(-)
diff --git a/databinding-tests/jaxbri-tests/pom.xml b/databinding-tests/jaxbri-tests/pom.xml
index 269fe08..aa8e4d7 100644
--- a/databinding-tests/jaxbri-tests/pom.xml
+++ b/databinding-tests/jaxbri-tests/pom.xml
@@ -49,6 +49,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.xmlunit</groupId>
<artifactId>xmlunit-legacy</artifactId>
<scope>test</scope>
diff --git a/databinding-tests/jaxbri-tests/src/test/java/org/apache/axis2/jaxbri/axis2_5919/FaultServiceTest.java b/databinding-tests/jaxbri-tests/src/test/java/org/apache/axis2/jaxbri/axis2_5919/FaultServiceTest.java
index ca1d8ae..7bfb1d4 100644
--- a/databinding-tests/jaxbri-tests/src/test/java/org/apache/axis2/jaxbri/axis2_5919/FaultServiceTest.java
+++ b/databinding-tests/jaxbri-tests/src/test/java/org/apache/axis2/jaxbri/axis2_5919/FaultServiceTest.java
@@ -18,7 +18,7 @@
*/
package org.apache.axis2.jaxbri.axis2_5919;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.fail;
import org.apache.axis2.testutils.Axis2Server;
diff --git a/modules/adb-tests/pom.xml b/modules/adb-tests/pom.xml
index c9f1da2..bbcc9cf 100644
--- a/modules/adb-tests/pom.xml
+++ b/modules/adb-tests/pom.xml
@@ -54,6 +54,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.xmlunit</groupId>
<artifactId>xmlunit-legacy</artifactId>
<scope>test</scope>
diff --git a/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5741/ServiceTest.java b/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5741/ServiceTest.java
index 387b29c..de2b789 100644
--- a/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5741/ServiceTest.java
+++ b/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5741/ServiceTest.java
@@ -18,7 +18,7 @@
*/
package org.apache.axis2.databinding.axis2_5741;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import javax.xml.ws.BindingProvider;
diff --git a/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5749/ServiceTest.java b/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5749/ServiceTest.java
index 305c605..1f032a2 100644
--- a/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5749/ServiceTest.java
+++ b/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5749/ServiceTest.java
@@ -18,7 +18,7 @@
*/
package org.apache.axis2.databinding.axis2_5749;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import javax.xml.ws.BindingProvider;
diff --git a/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5750/ServiceTest.java b/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5750/ServiceTest.java
index 6750d5c..0bf2b59 100644
--- a/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5750/ServiceTest.java
+++ b/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5750/ServiceTest.java
@@ -18,7 +18,7 @@
*/
package org.apache.axis2.databinding.axis2_5750;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import org.apache.axis2.databinding.axis2_5750.client.FixedValue;
import org.apache.axis2.databinding.axis2_5750.client.FixedValueServiceStub;
diff --git a/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5758/ServiceTest.java b/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5758/ServiceTest.java
index 2c75b86..2e1cc68 100644
--- a/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5758/ServiceTest.java
+++ b/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5758/ServiceTest.java
@@ -18,7 +18,8 @@
*/
package org.apache.axis2.databinding.axis2_5758;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.data.Offset.offset;
import org.apache.axis2.databinding.axis2_5758.client.StockQuoteServiceStub;
import org.apache.axis2.databinding.axis2_5758.client.TradePriceRequest;
@@ -42,6 +43,6 @@ public class ServiceTest {
request.setTickerSymbol(null);
assertThat(stub.getLastTradePrice(request).getPrice()).isNaN();
request.setTickerSymbol("GOOG");
- assertThat(stub.getLastTradePrice(request).getPrice()).isWithin(0.001f).of(100.0f);
+ assertThat(stub.getLastTradePrice(request).getPrice()).isCloseTo(100.0f, offset(0.001f));
}
}
diff --git a/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5799/ServiceTest.java b/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5799/ServiceTest.java
index 780c3a7..29de03b 100644
--- a/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5799/ServiceTest.java
+++ b/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5799/ServiceTest.java
@@ -18,7 +18,7 @@
*/
package org.apache.axis2.databinding.axis2_5799;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import org.apache.axis2.databinding.axis2_5799.client.ComplexTypeWithAttribute;
import org.apache.axis2.databinding.axis2_5799.client.EchoServiceStub;
diff --git a/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5809/ServiceTest.java b/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5809/ServiceTest.java
index 0aab151..8814090 100644
--- a/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5809/ServiceTest.java
+++ b/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5809/ServiceTest.java
@@ -18,7 +18,7 @@
*/
package org.apache.axis2.databinding.axis2_5809;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.fail;
import org.apache.axis2.AxisFault;
diff --git a/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5887/ParseTest.java b/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5887/ParseTest.java
index 79f771a..7969361 100644
--- a/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5887/ParseTest.java
+++ b/modules/adb-tests/src/test/java/org/apache/axis2/databinding/axis2_5887/ParseTest.java
@@ -18,7 +18,7 @@
*/
package org.apache.axis2.databinding.axis2_5887;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.io.InputStream;
diff --git a/modules/adb-tests/src/test/java/org/apache/axis2/schema/axis2_5771/IgnoreUnexpectedTest.java b/modules/adb-tests/src/test/java/org/apache/axis2/schema/axis2_5771/IgnoreUnexpectedTest.java
index 10e0599..4d7463e 100644
--- a/modules/adb-tests/src/test/java/org/apache/axis2/schema/axis2_5771/IgnoreUnexpectedTest.java
+++ b/modules/adb-tests/src/test/java/org/apache/axis2/schema/axis2_5771/IgnoreUnexpectedTest.java
@@ -18,7 +18,7 @@
*/
package org.apache.axis2.schema.axis2_5771;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
@@ -36,7 +36,7 @@ public class IgnoreUnexpectedTest {
Handler handler = mock(Handler.class);
logger.addHandler(handler);
try {
- assertThat(CabinType.Factory.fromValue(value)).isSameInstanceAs(expected);
+ assertThat(CabinType.Factory.fromValue(value)).isSameAs(expected);
if (expected == null) {
verify(handler).publish(any(LogRecord.class));
} else {
diff --git a/modules/adb/pom.xml b/modules/adb/pom.xml
index 2fd0123..d34f72b 100644
--- a/modules/adb/pom.xml
+++ b/modules/adb/pom.xml
@@ -60,6 +60,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.xmlunit</groupId>
<artifactId>xmlunit-legacy</artifactId>
<scope>test</scope>
diff --git a/modules/adb/test/org/apache/axis2/databinding/utils/ConverterUtilTest.java b/modules/adb/test/org/apache/axis2/databinding/utils/ConverterUtilTest.java
index 9f3f0bf..7a6e889 100644
--- a/modules/adb/test/org/apache/axis2/databinding/utils/ConverterUtilTest.java
+++ b/modules/adb/test/org/apache/axis2/databinding/utils/ConverterUtilTest.java
@@ -21,7 +21,7 @@ package org.apache.axis2.databinding.utils;
import junit.framework.TestCase;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.math.BigDecimal;
import java.math.BigInteger;
@@ -581,6 +581,6 @@ public class ConverterUtilTest extends TestCase {
String totalDigitsFromXsd = "3";
String decimalNotationString = ConverterUtil.convertToStandardDecimalNotation(totalDigitsFromXsd).toPlainString();
long result = ConverterUtil.compare(value, decimalNotationString);
- assertThat(result).isAtLeast(0L);
+ assertThat(result).isGreaterThanOrEqualTo(0L);
}
}
diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml
index fe28760..b57160c 100644
--- a/modules/integration/pom.xml
+++ b/modules/integration/pom.xml
@@ -103,8 +103,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.google.truth</groupId>
- <artifactId>truth</artifactId>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/modules/integration/test/org/apache/axis2/engine/ThirdPartyResponseRawXMLTest.java b/modules/integration/test/org/apache/axis2/engine/ThirdPartyResponseRawXMLTest.java
index 7ea5e1a..9a47d3b 100644
--- a/modules/integration/test/org/apache/axis2/engine/ThirdPartyResponseRawXMLTest.java
+++ b/modules/integration/test/org/apache/axis2/engine/ThirdPartyResponseRawXMLTest.java
@@ -41,7 +41,7 @@ import org.apache.axis2.testutils.PortAllocator;
import org.apache.axis2.transport.http.SimpleHTTPServer;
import org.apache.axis2.util.Utils;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.util.concurrent.ArrayBlockingQueue;
import java.util.concurrent.BlockingQueue;
diff --git a/modules/integration/test/org/apache/axis2/integration/TestingUtils.java b/modules/integration/test/org/apache/axis2/integration/TestingUtils.java
index c6608f5..6f88edc 100644
--- a/modules/integration/test/org/apache/axis2/integration/TestingUtils.java
+++ b/modules/integration/test/org/apache/axis2/integration/TestingUtils.java
@@ -25,7 +25,7 @@ import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNamespace;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.io.File;
import java.io.IOException;
diff --git a/modules/jaxbri-codegen/pom.xml b/modules/jaxbri-codegen/pom.xml
index 3c9b9f5..1be0057 100644
--- a/modules/jaxbri-codegen/pom.xml
+++ b/modules/jaxbri-codegen/pom.xml
@@ -74,8 +74,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.google.truth</groupId>
- <artifactId>truth</artifactId>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/modules/jaxbri-codegen/src/test/java/org/apache/axis2/jaxbri/CodeGenerationUtilityTest.java b/modules/jaxbri-codegen/src/test/java/org/apache/axis2/jaxbri/CodeGenerationUtilityTest.java
index b76225f..b61e30f 100644
--- a/modules/jaxbri-codegen/src/test/java/org/apache/axis2/jaxbri/CodeGenerationUtilityTest.java
+++ b/modules/jaxbri-codegen/src/test/java/org/apache/axis2/jaxbri/CodeGenerationUtilityTest.java
@@ -19,7 +19,7 @@
package org.apache.axis2.jaxbri;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.assertEquals;
import java.io.File;
diff --git a/modules/jaxws-integration/pom.xml b/modules/jaxws-integration/pom.xml
index 234e1c5..e156f9b 100644
--- a/modules/jaxws-integration/pom.xml
+++ b/modules/jaxws-integration/pom.xml
@@ -86,6 +86,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-testutils</artifactId>
<version>${project.version}</version>
diff --git a/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/sample/AddNumbersHandlerTests.java b/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/sample/AddNumbersHandlerTests.java
index 359d636..370f4f3 100644
--- a/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/sample/AddNumbersHandlerTests.java
+++ b/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/sample/AddNumbersHandlerTests.java
@@ -19,7 +19,7 @@
package org.apache.axis2.jaxws.sample;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.apache.axis2.jaxws.framework.TestUtils.await;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
diff --git a/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/xmlhttp/DispatchXMessageDataSourceTests.java b/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/xmlhttp/DispatchXMessageDataSourceTests.java
index e94ae22..c996e21 100644
--- a/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/xmlhttp/DispatchXMessageDataSourceTests.java
+++ b/modules/jaxws-integration/src/test/java/org/apache/axis2/jaxws/xmlhttp/DispatchXMessageDataSourceTests.java
@@ -40,7 +40,7 @@ import javax.xml.ws.Service;
import javax.xml.ws.handler.MessageContext;
import javax.xml.ws.http.HTTPBinding;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
diff --git a/modules/jaxws/pom.xml b/modules/jaxws/pom.xml
index 695cf62..714fe3e 100644
--- a/modules/jaxws/pom.xml
+++ b/modules/jaxws/pom.xml
@@ -98,6 +98,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.xmlunit</groupId>
<artifactId>xmlunit-legacy</artifactId>
<scope>test</scope>
diff --git a/modules/jaxws/test/org/apache/axis2/datasource/jaxb/JAXBCustomBuilderDisableStreamingTests.java b/modules/jaxws/test/org/apache/axis2/datasource/jaxb/JAXBCustomBuilderDisableStreamingTests.java
index f31b363..af4a0ef 100644
--- a/modules/jaxws/test/org/apache/axis2/datasource/jaxb/JAXBCustomBuilderDisableStreamingTests.java
+++ b/modules/jaxws/test/org/apache/axis2/datasource/jaxb/JAXBCustomBuilderDisableStreamingTests.java
@@ -18,7 +18,7 @@
*/
package org.apache.axis2.datasource.jaxb;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
import org.apache.axiom.soap.SOAPBody;
diff --git a/modules/jaxws/test/org/apache/axis2/jaxws/attachments/MTOMSerializationTests.java b/modules/jaxws/test/org/apache/axis2/jaxws/attachments/MTOMSerializationTests.java
index 2e7b146..93b5f8d 100644
--- a/modules/jaxws/test/org/apache/axis2/jaxws/attachments/MTOMSerializationTests.java
+++ b/modules/jaxws/test/org/apache/axis2/jaxws/attachments/MTOMSerializationTests.java
@@ -52,7 +52,7 @@ import javax.imageio.stream.ImageInputStream;
import javax.xml.soap.SOAPElement;
import javax.xml.soap.SOAPMessage;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.awt.*;
import java.io.ByteArrayOutputStream;
diff --git a/modules/jaxws/test/org/apache/axis2/jaxws/handler/HandlerPrePostInvokerTests.java b/modules/jaxws/test/org/apache/axis2/jaxws/handler/HandlerPrePostInvokerTests.java
index f221eda..9179ade 100644
--- a/modules/jaxws/test/org/apache/axis2/jaxws/handler/HandlerPrePostInvokerTests.java
+++ b/modules/jaxws/test/org/apache/axis2/jaxws/handler/HandlerPrePostInvokerTests.java
@@ -34,7 +34,7 @@ import javax.xml.ws.handler.Handler;
import javax.xml.ws.handler.soap.SOAPHandler;
import javax.xml.ws.handler.soap.SOAPMessageContext;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.util.ArrayList;
import java.util.Set;
diff --git a/modules/kernel/pom.xml b/modules/kernel/pom.xml
index b45cebd..a60d21a 100644
--- a/modules/kernel/pom.xml
+++ b/modules/kernel/pom.xml
@@ -96,8 +96,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.google.truth</groupId>
- <artifactId>truth</artifactId>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/modules/kernel/test/org/apache/axis2/deployment/repository/util/DeploymentFileDataTest.java b/modules/kernel/test/org/apache/axis2/deployment/repository/util/DeploymentFileDataTest.java
index f6ae470..a789d2d 100644
--- a/modules/kernel/test/org/apache/axis2/deployment/repository/util/DeploymentFileDataTest.java
+++ b/modules/kernel/test/org/apache/axis2/deployment/repository/util/DeploymentFileDataTest.java
@@ -18,7 +18,7 @@
*/
package org.apache.axis2.deployment.repository.util;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
import java.io.File;
diff --git a/modules/kernel/test/org/apache/axis2/transport/http/XFormURLEncodedFormatterTest.java b/modules/kernel/test/org/apache/axis2/transport/http/XFormURLEncodedFormatterTest.java
index 6ca8c74..fb45df8 100644
--- a/modules/kernel/test/org/apache/axis2/transport/http/XFormURLEncodedFormatterTest.java
+++ b/modules/kernel/test/org/apache/axis2/transport/http/XFormURLEncodedFormatterTest.java
@@ -18,7 +18,7 @@
*/
package org.apache.axis2.transport.http;
-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/modules/kernel/test/org/apache/axis2/util/UtilsTest.java b/modules/kernel/test/org/apache/axis2/util/UtilsTest.java
index ceed432..bc66e82 100644
--- a/modules/kernel/test/org/apache/axis2/util/UtilsTest.java
+++ b/modules/kernel/test/org/apache/axis2/util/UtilsTest.java
@@ -18,7 +18,7 @@
*/
package org.apache.axis2.util;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import org.apache.axis2.Constants;
import org.apache.axis2.description.AxisService;
diff --git a/modules/saaj/pom.xml b/modules/saaj/pom.xml
index 8dd458c..2f800a5 100644
--- a/modules/saaj/pom.xml
+++ b/modules/saaj/pom.xml
@@ -80,8 +80,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.google.truth</groupId>
- <artifactId>truth</artifactId>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/modules/saaj/test/org/apache/axis2/saaj/AttachmentTest.java b/modules/saaj/test/org/apache/axis2/saaj/AttachmentTest.java
index 9cdb933..e2854b3 100644
--- a/modules/saaj/test/org/apache/axis2/saaj/AttachmentTest.java
+++ b/modules/saaj/test/org/apache/axis2/saaj/AttachmentTest.java
@@ -36,7 +36,7 @@ import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPMessage;
import javax.xml.transform.stream.StreamSource;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.awt.*;
import java.io.ByteArrayInputStream;
diff --git a/modules/saaj/test/org/apache/axis2/saaj/integration/IntegrationTest.java b/modules/saaj/test/org/apache/axis2/saaj/integration/IntegrationTest.java
index 6bde161..9c5eedd 100644
--- a/modules/saaj/test/org/apache/axis2/saaj/integration/IntegrationTest.java
+++ b/modules/saaj/test/org/apache/axis2/saaj/integration/IntegrationTest.java
@@ -58,7 +58,7 @@ import javax.xml.soap.SOAPHeaderElement;
import javax.xml.soap.SOAPMessage;
import javax.xml.soap.SOAPPart;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
diff --git a/modules/samples/jaxws-interop/pom.xml b/modules/samples/jaxws-interop/pom.xml
index 04124ca..a548cbe 100644
--- a/modules/samples/jaxws-interop/pom.xml
+++ b/modules/samples/jaxws-interop/pom.xml
@@ -43,8 +43,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.google.truth</groupId>
- <artifactId>truth</artifactId>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/modules/samples/jaxws-interop/src/test/java/org/apache/axis2/jaxws/interop/InteropSampleTest.java b/modules/samples/jaxws-interop/src/test/java/org/apache/axis2/jaxws/interop/InteropSampleTest.java
index 6c11cfa..7aa0abf 100644
--- a/modules/samples/jaxws-interop/src/test/java/org/apache/axis2/jaxws/interop/InteropSampleTest.java
+++ b/modules/samples/jaxws-interop/src/test/java/org/apache/axis2/jaxws/interop/InteropSampleTest.java
@@ -18,7 +18,7 @@
*/
package org.apache.axis2.jaxws.interop;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import javax.xml.ws.BindingProvider;
diff --git a/modules/transport/jms/pom.xml b/modules/transport/jms/pom.xml
index 3b802d6..79c5b52 100644
--- a/modules/transport/jms/pom.xml
+++ b/modules/transport/jms/pom.xml
@@ -179,8 +179,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.google.truth</groupId>
- <artifactId>truth</artifactId>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/modules/transport/jms/src/test/java/org/apache/axis2/transport/jms/JMSUtilsTest.java b/modules/transport/jms/src/test/java/org/apache/axis2/transport/jms/JMSUtilsTest.java
index da548b7..bed8055 100644
--- a/modules/transport/jms/src/test/java/org/apache/axis2/transport/jms/JMSUtilsTest.java
+++ b/modules/transport/jms/src/test/java/org/apache/axis2/transport/jms/JMSUtilsTest.java
@@ -18,7 +18,7 @@
*/
package org.apache.axis2.transport.jms;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -35,6 +35,6 @@ public class JMSUtilsTest {
Session session = mock(Session.class);
MessageConsumer consumer = mock(MessageConsumer.class);
when(session.createConsumer(queue, null)).thenReturn(consumer);
- assertThat(JMSUtils.createConsumer(session, queue, null)).isSameInstanceAs(consumer);
+ assertThat(JMSUtils.createConsumer(session, queue, null)).isSameAs(consumer);
}
}
diff --git a/pom.xml b/pom.xml
index a1dfa30..9a14682 100644
--- a/pom.xml
+++ b/pom.xml
@@ -740,9 +740,9 @@
<version>${axiom.version}</version>
</dependency>
<dependency>
- <groupId>com.google.truth</groupId>
- <artifactId>truth</artifactId>
- <version>1.1.2</version>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <version>3.19.0</version>
</dependency>
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
diff --git a/systests/webapp-tests/pom.xml b/systests/webapp-tests/pom.xml
index 47adb2f..f46cf1b 100644
--- a/systests/webapp-tests/pom.xml
+++ b/systests/webapp-tests/pom.xml
@@ -42,8 +42,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.google.truth</groupId>
- <artifactId>truth</artifactId>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/systests/webapp-tests/src/test/java/org/apache/axis2/webapp/AxisAdminServletITCase.java b/systests/webapp-tests/src/test/java/org/apache/axis2/webapp/AxisAdminServletITCase.java
index 96cbc29..a522074 100644
--- a/systests/webapp-tests/src/test/java/org/apache/axis2/webapp/AxisAdminServletITCase.java
+++ b/systests/webapp-tests/src/test/java/org/apache/axis2/webapp/AxisAdminServletITCase.java
@@ -18,7 +18,7 @@
*/
package org.apache.axis2.webapp;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import org.apache.commons.io.IOUtils;
import org.junit.Before;
diff --git a/systests/webapp-tests/src/test/java/org/apache/axis2/webapp/NoSessionITCase.java b/systests/webapp-tests/src/test/java/org/apache/axis2/webapp/NoSessionITCase.java
index 04b02a2..68857cc 100644
--- a/systests/webapp-tests/src/test/java/org/apache/axis2/webapp/NoSessionITCase.java
+++ b/systests/webapp-tests/src/test/java/org/apache/axis2/webapp/NoSessionITCase.java
@@ -18,7 +18,7 @@
*/
package org.apache.axis2.webapp;
-import static com.google.common.truth.Truth.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.util.Arrays;
import java.util.Collection;