diff --git a/src/test/java/com/restfb/testutils/BatchRequestAssert.java b/src/test/java/com/restfb/testutils/BatchRequestAssert.java index c63bf4213..b52cdfdf5 100644 --- a/src/test/java/com/restfb/testutils/BatchRequestAssert.java +++ b/src/test/java/com/restfb/testutils/BatchRequestAssert.java @@ -22,10 +22,11 @@ package com.restfb.testutils; import org.assertj.core.api.AbstractAssert; -import org.assertj.core.util.Objects; import com.restfb.batch.BatchRequest; +import java.util.Objects; + public class BatchRequestAssert extends AbstractAssert { private BatchRequestAssert(BatchRequest batchRequest) { @@ -39,7 +40,7 @@ public static BatchRequestAssert assertThat(BatchRequest actual) { public BatchRequestAssert hasMethod(String method) { isNotNull(); - if (!Objects.areEqual(actual.getMethod(), method)) { + if (!Objects.deepEquals(actual.getMethod(), method)) { failWithMessage("Expected http method should be <%s> but was <%s>", method, actual.getMethod()); } @@ -49,7 +50,7 @@ public BatchRequestAssert hasMethod(String method) { public BatchRequestAssert hasName(String name) { isNotNull(); - if (!Objects.areEqual(actual.getName(), name)) { + if (!Objects.deepEquals(actual.getName(), name)) { failWithMessage("Expected name should be <%s> but was <%s>", name, actual.getName()); } @@ -59,7 +60,7 @@ public BatchRequestAssert hasName(String name) { public BatchRequestAssert hasRelativeUrl(String relativeUrl) { isNotNull(); - if (!Objects.areEqual(actual.getRelativeUrl(), relativeUrl)) { + if (!Objects.deepEquals(actual.getRelativeUrl(), relativeUrl)) { failWithMessage("Expected relative URL should be <%s> but was <%s>", relativeUrl, actual.getRelativeUrl()); } @@ -69,7 +70,7 @@ public BatchRequestAssert hasRelativeUrl(String relativeUrl) { public BatchRequestAssert hasBody(String body) { isNotNull(); - if (!Objects.areEqual(actual.getBody(), body)) { + if (!Objects.deepEquals(actual.getBody(), body)) { failWithMessage("Expected relative URL should be <%s> but was <%s>", body, actual.getBody()); } @@ -79,7 +80,7 @@ public BatchRequestAssert hasBody(String body) { public BatchRequestAssert hasDependsOn(String dependsOn) { isNotNull(); - if (!Objects.areEqual(actual.getDependsOn(), dependsOn)) { + if (!Objects.deepEquals(actual.getDependsOn(), dependsOn)) { failWithMessage("Expected 'depends on' should be <%s> but was <%s>", dependsOn, actual.getDependsOn()); } @@ -89,7 +90,7 @@ public BatchRequestAssert hasDependsOn(String dependsOn) { public BatchRequestAssert hasAttachedFiles(String attachedFiles) { isNotNull(); - if (!Objects.areEqual(actual.getAttachedFiles(), attachedFiles)) { + if (!Objects.deepEquals(actual.getAttachedFiles(), attachedFiles)) { failWithMessage("Expected attached files should be <%s> but was <%s>", attachedFiles, actual.getAttachedFiles()); } @@ -99,7 +100,7 @@ public BatchRequestAssert hasAttachedFiles(String attachedFiles) { public BatchRequestAssert isOmitResponseOnSuccess() { isNotNull(); - if (!Objects.areEqual(actual.isOmitResponseOnSuccess(), true)) { + if (!Objects.deepEquals(actual.isOmitResponseOnSuccess(), true)) { failWithMessage("Expected omitResponseOnSuccess should be <%s> but was <%s>", true, actual.isOmitResponseOnSuccess()); } diff --git a/src/test/java/com/restfb/testutils/BinaryAttachmentAssert.java b/src/test/java/com/restfb/testutils/BinaryAttachmentAssert.java index dbad2c430..d5f2c0092 100644 --- a/src/test/java/com/restfb/testutils/BinaryAttachmentAssert.java +++ b/src/test/java/com/restfb/testutils/BinaryAttachmentAssert.java @@ -22,10 +22,11 @@ package com.restfb.testutils; import org.assertj.core.api.AbstractAssert; -import org.assertj.core.util.Objects; import com.restfb.BinaryAttachment; +import java.util.Objects; + public class BinaryAttachmentAssert extends AbstractAssert { public BinaryAttachmentAssert(BinaryAttachment actual) { @@ -39,7 +40,7 @@ public static BinaryAttachmentAssert assertThat(BinaryAttachment actual) { public BinaryAttachmentAssert hasFileName(String filename) { isNotNull(); - if (!Objects.areEqual(actual.getFilename(), filename)) { + if (!Objects.deepEquals(actual.getFilename(), filename)) { failWithMessage("Expected filename should be <%s> but was <%s>", filename, actual.getFilename()); } @@ -49,7 +50,7 @@ public BinaryAttachmentAssert hasFileName(String filename) { public BinaryAttachmentAssert hasContentType(String contentType) { isNotNull(); - if (!Objects.areEqual(actual.getContentType(), contentType)) { + if (!Objects.deepEquals(actual.getContentType(), contentType)) { failWithMessage("Expected content type should be <%s> but was <%s>", contentType, actual.getContentType()); } diff --git a/src/test/java/com/restfb/testutils/FakeWebRequestorAssert.java b/src/test/java/com/restfb/testutils/FakeWebRequestorAssert.java index 35b1e3386..41849a302 100644 --- a/src/test/java/com/restfb/testutils/FakeWebRequestorAssert.java +++ b/src/test/java/com/restfb/testutils/FakeWebRequestorAssert.java @@ -24,7 +24,8 @@ import com.restfb.FakeWebRequestor; import org.assertj.core.api.AbstractAssert; -import org.assertj.core.util.Objects; + +import java.util.Objects; public class FakeWebRequestorAssert extends AbstractAssert { @@ -39,7 +40,7 @@ public static FakeWebRequestorAssert assertThat(FakeWebRequestor actual) { public FakeWebRequestorAssert isSavedUrlEqualTo(String url) { isNotNull(); - if (!Objects.areEqual(actual.getSavedUrl(), url)) { + if (!Objects.deepEquals(actual.getSavedUrl(), url)) { failWithMessage("Expected saved url should be <%s> but was <%s>", url, actual.getSavedUrl()); } @@ -49,7 +50,7 @@ public FakeWebRequestorAssert isSavedUrlEqualTo(String url) { public FakeWebRequestorAssert isParametersEqualTo(String parameters) { isNotNull(); - if (!Objects.areEqual(actual.getParameters(), parameters)) { + if (!Objects.deepEquals(actual.getParameters(), parameters)) { failWithMessage("Expected parameters should be <%s> but was <%s>", parameters, actual.getParameters()); } diff --git a/src/test/java/com/restfb/testutils/ParameterAssert.java b/src/test/java/com/restfb/testutils/ParameterAssert.java index ad7132f2f..26bd89f21 100644 --- a/src/test/java/com/restfb/testutils/ParameterAssert.java +++ b/src/test/java/com/restfb/testutils/ParameterAssert.java @@ -24,7 +24,8 @@ import com.restfb.Parameter; import org.assertj.core.api.AbstractAssert; -import org.assertj.core.util.Objects; + +import java.util.Objects; public class ParameterAssert extends AbstractAssert { @@ -39,7 +40,7 @@ public static ParameterAssert assertThat(Parameter actual) { public ParameterAssert hasName(String name) { isNotNull(); - if (!Objects.areEqual(actual.name, name)) { + if (!Objects.deepEquals(actual.name, name)) { failWithMessage("Expected name should be <%s> but was <%s>", name, actual.name); } @@ -49,7 +50,7 @@ public ParameterAssert hasName(String name) { public ParameterAssert hasValue(Object value) { isNotNull(); - if (!Objects.areEqual(actual.value, value)) { + if (!Objects.deepEquals(actual.value, value)) { failWithMessage("Expected value should be <%s> but was <%s>", value, actual.value); }