JAMES-2479 upgrade json-unit and switch to assertj version
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/cfd46a14 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/cfd46a14 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/cfd46a14 Branch: refs/heads/master Commit: cfd46a149a1b34be1040a11d88a58ff0e2e0a6ce Parents: acf75a3 Author: Matthieu Baechler <matth...@apache.org> Authored: Fri Jul 20 09:49:16 2018 +0200 Committer: Matthieu Baechler <matth...@apache.org> Committed: Fri Jul 27 10:16:54 2018 +0200 ---------------------------------------------------------------------- event-sourcing/event-store-cassandra/pom.xml | 8 +------ .../cassandra/JsonEventSerializerTest.java | 2 +- mailbox/cassandra/pom.xml | 8 +------ mailbox/elasticsearch/pom.xml | 8 +------ .../json/MessageToElasticSearchJsonTest.java | 2 +- mailbox/plugin/quota-mailing-cassandra/pom.xml | 8 +------ .../mailbox/quota/cassandra/dto/DTOTest.java | 2 +- .../plugin/quota-search-elasticsearch/pom.xml | 2 +- .../json/QuotaRatioToElasticSearchJsonTest.java | 2 +- mailbox/store/pom.xml | 8 +------ .../store/json/MailboxACLJsonConverterTest.java | 22 ++++++++++---------- mailet/icalendar/pom.xml | 8 +------ .../mailets/ICALToJsonAttributeTest.java | 2 +- mailet/standard/pom.xml | 2 +- .../transport/mailets/ContactExtractorTest.java | 2 +- pom.xml | 4 ++-- server/data/data-cassandra/pom.xml | 2 +- .../dlp/eventsourcing/cassandra/DTOTest.java | 2 +- server/mailet/integration-testing/pom.xml | 2 +- .../transport/mailets/ContactExtractorTest.java | 2 +- server/protocols/jmap/pom.xml | 2 +- .../jmap/json/ParsingWritingObjectsTest.java | 2 +- server/protocols/webadmin/webadmin-data/pom.xml | 2 +- .../routes/DLPConfigurationRoutesTest.java | 2 +- .../protocols/webadmin/webadmin-mailbox/pom.xml | 2 +- .../webadmin/routes/DomainQuotaRoutesTest.java | 2 +- .../webadmin/routes/UserQuotaRoutesTest.java | 2 +- .../webadmin/webadmin-mailrepository/pom.xml | 2 +- .../routes/MailRepositoriesRoutesTest.java | 2 +- 29 files changed, 40 insertions(+), 76 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/cfd46a14/event-sourcing/event-store-cassandra/pom.xml ---------------------------------------------------------------------- diff --git a/event-sourcing/event-store-cassandra/pom.xml b/event-sourcing/event-store-cassandra/pom.xml index a07ff79..64b6e12 100644 --- a/event-sourcing/event-store-cassandra/pom.xml +++ b/event-sourcing/event-store-cassandra/pom.xml @@ -89,13 +89,7 @@ </dependency> <dependency> <groupId>net.javacrumbs.json-unit</groupId> - <artifactId>json-unit</artifactId> - <version>1.5.5</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>net.javacrumbs.json-unit</groupId> - <artifactId>json-unit-fluent</artifactId> + <artifactId>json-unit-assertj</artifactId> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/cfd46a14/event-sourcing/event-store-cassandra/src/test/java/org/apache/james/eventsourcing/eventstore/cassandra/JsonEventSerializerTest.java ---------------------------------------------------------------------- diff --git a/event-sourcing/event-store-cassandra/src/test/java/org/apache/james/eventsourcing/eventstore/cassandra/JsonEventSerializerTest.java b/event-sourcing/event-store-cassandra/src/test/java/org/apache/james/eventsourcing/eventstore/cassandra/JsonEventSerializerTest.java index 1664ab1..eadb69e 100644 --- a/event-sourcing/event-store-cassandra/src/test/java/org/apache/james/eventsourcing/eventstore/cassandra/JsonEventSerializerTest.java +++ b/event-sourcing/event-store-cassandra/src/test/java/org/apache/james/eventsourcing/eventstore/cassandra/JsonEventSerializerTest.java @@ -19,7 +19,7 @@ package org.apache.james.eventsourcing.eventstore.cassandra; -import static net.javacrumbs.jsonunit.fluent.JsonFluentAssert.assertThatJson; +import static net.javacrumbs.jsonunit.assertj.JsonAssertions.assertThatJson; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; http://git-wip-us.apache.org/repos/asf/james-project/blob/cfd46a14/mailbox/cassandra/pom.xml ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/pom.xml b/mailbox/cassandra/pom.xml index 185e7d9..fb2f3c9 100644 --- a/mailbox/cassandra/pom.xml +++ b/mailbox/cassandra/pom.xml @@ -129,13 +129,7 @@ </dependency> <dependency> <groupId>net.javacrumbs.json-unit</groupId> - <artifactId>json-unit</artifactId> - <version>1.5.5</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>net.javacrumbs.json-unit</groupId> - <artifactId>json-unit-fluent</artifactId> + <artifactId>json-unit-assertj</artifactId> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/cfd46a14/mailbox/elasticsearch/pom.xml ---------------------------------------------------------------------- diff --git a/mailbox/elasticsearch/pom.xml b/mailbox/elasticsearch/pom.xml index c6b2dfd..22263b5 100644 --- a/mailbox/elasticsearch/pom.xml +++ b/mailbox/elasticsearch/pom.xml @@ -130,13 +130,7 @@ </dependency> <dependency> <groupId>net.javacrumbs.json-unit</groupId> - <artifactId>json-unit</artifactId> - <version>1.5.5</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>net.javacrumbs.json-unit</groupId> - <artifactId>json-unit-fluent</artifactId> + <artifactId>json-unit-assertj</artifactId> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/cfd46a14/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/json/MessageToElasticSearchJsonTest.java ---------------------------------------------------------------------- diff --git a/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/json/MessageToElasticSearchJsonTest.java b/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/json/MessageToElasticSearchJsonTest.java index 2e72092..a7d1943 100644 --- a/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/json/MessageToElasticSearchJsonTest.java +++ b/mailbox/elasticsearch/src/test/java/org/apache/james/mailbox/elasticsearch/json/MessageToElasticSearchJsonTest.java @@ -19,9 +19,9 @@ package org.apache.james.mailbox.elasticsearch.json; +import static net.javacrumbs.jsonunit.assertj.JsonAssertions.assertThatJson; import static net.javacrumbs.jsonunit.core.Option.IGNORING_ARRAY_ORDER; import static net.javacrumbs.jsonunit.core.Option.IGNORING_VALUES; -import static net.javacrumbs.jsonunit.fluent.JsonFluentAssert.assertThatJson; import static org.assertj.core.api.Assertions.assertThatThrownBy; import java.io.IOException; http://git-wip-us.apache.org/repos/asf/james-project/blob/cfd46a14/mailbox/plugin/quota-mailing-cassandra/pom.xml ---------------------------------------------------------------------- diff --git a/mailbox/plugin/quota-mailing-cassandra/pom.xml b/mailbox/plugin/quota-mailing-cassandra/pom.xml index e0a85d4..849b385 100644 --- a/mailbox/plugin/quota-mailing-cassandra/pom.xml +++ b/mailbox/plugin/quota-mailing-cassandra/pom.xml @@ -120,13 +120,7 @@ </dependency> <dependency> <groupId>net.javacrumbs.json-unit</groupId> - <artifactId>json-unit</artifactId> - <version>1.5.5</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>net.javacrumbs.json-unit</groupId> - <artifactId>json-unit-fluent</artifactId> + <artifactId>json-unit-assertj</artifactId> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/cfd46a14/mailbox/plugin/quota-mailing-cassandra/src/test/java/org/apache/james/mailbox/quota/cassandra/dto/DTOTest.java ---------------------------------------------------------------------- diff --git a/mailbox/plugin/quota-mailing-cassandra/src/test/java/org/apache/james/mailbox/quota/cassandra/dto/DTOTest.java b/mailbox/plugin/quota-mailing-cassandra/src/test/java/org/apache/james/mailbox/quota/cassandra/dto/DTOTest.java index 93a9a35..7556e38 100644 --- a/mailbox/plugin/quota-mailing-cassandra/src/test/java/org/apache/james/mailbox/quota/cassandra/dto/DTOTest.java +++ b/mailbox/plugin/quota-mailing-cassandra/src/test/java/org/apache/james/mailbox/quota/cassandra/dto/DTOTest.java @@ -19,7 +19,7 @@ package org.apache.james.mailbox.quota.cassandra.dto; -import static net.javacrumbs.jsonunit.fluent.JsonFluentAssert.assertThatJson; +import static net.javacrumbs.jsonunit.assertj.JsonAssertions.assertThatJson; import static org.apache.james.mailbox.quota.model.QuotaThresholdFixture._75; import static org.apache.james.mailbox.quota.model.QuotaThresholdFixture._80; import static org.assertj.core.api.Assertions.assertThat; http://git-wip-us.apache.org/repos/asf/james-project/blob/cfd46a14/mailbox/plugin/quota-search-elasticsearch/pom.xml ---------------------------------------------------------------------- diff --git a/mailbox/plugin/quota-search-elasticsearch/pom.xml b/mailbox/plugin/quota-search-elasticsearch/pom.xml index 2441a9c..a65bbf8 100644 --- a/mailbox/plugin/quota-search-elasticsearch/pom.xml +++ b/mailbox/plugin/quota-search-elasticsearch/pom.xml @@ -123,7 +123,7 @@ </dependency> <dependency> <groupId>net.javacrumbs.json-unit</groupId> - <artifactId>json-unit-fluent</artifactId> + <artifactId>json-unit-assertj</artifactId> <scope>test</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/james-project/blob/cfd46a14/mailbox/plugin/quota-search-elasticsearch/src/test/java/org/apache/james/quota/search/elasticsearch/json/QuotaRatioToElasticSearchJsonTest.java ---------------------------------------------------------------------- diff --git a/mailbox/plugin/quota-search-elasticsearch/src/test/java/org/apache/james/quota/search/elasticsearch/json/QuotaRatioToElasticSearchJsonTest.java b/mailbox/plugin/quota-search-elasticsearch/src/test/java/org/apache/james/quota/search/elasticsearch/json/QuotaRatioToElasticSearchJsonTest.java index cdd618e..6684a16 100644 --- a/mailbox/plugin/quota-search-elasticsearch/src/test/java/org/apache/james/quota/search/elasticsearch/json/QuotaRatioToElasticSearchJsonTest.java +++ b/mailbox/plugin/quota-search-elasticsearch/src/test/java/org/apache/james/quota/search/elasticsearch/json/QuotaRatioToElasticSearchJsonTest.java @@ -18,8 +18,8 @@ ****************************************************************/ package org.apache.james.quota.search.elasticsearch.json; +import static net.javacrumbs.jsonunit.assertj.JsonAssertions.assertThatJson; import static net.javacrumbs.jsonunit.core.Option.IGNORING_ARRAY_ORDER; -import static net.javacrumbs.jsonunit.fluent.JsonFluentAssert.assertThatJson; import java.io.IOException; import java.time.Instant; http://git-wip-us.apache.org/repos/asf/james-project/blob/cfd46a14/mailbox/store/pom.xml ---------------------------------------------------------------------- diff --git a/mailbox/store/pom.xml b/mailbox/store/pom.xml index 754b6e7..00b476e 100644 --- a/mailbox/store/pom.xml +++ b/mailbox/store/pom.xml @@ -102,13 +102,7 @@ </dependency> <dependency> <groupId>net.javacrumbs.json-unit</groupId> - <artifactId>json-unit</artifactId> - <version>1.5.5</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>net.javacrumbs.json-unit</groupId> - <artifactId>json-unit-fluent</artifactId> + <artifactId>json-unit-assertj</artifactId> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/cfd46a14/mailbox/store/src/test/java/org/apache/james/mailbox/store/json/MailboxACLJsonConverterTest.java ---------------------------------------------------------------------- diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/json/MailboxACLJsonConverterTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/json/MailboxACLJsonConverterTest.java index fb8dcbb..2de43b6 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/json/MailboxACLJsonConverterTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/json/MailboxACLJsonConverterTest.java @@ -19,7 +19,7 @@ package org.apache.james.mailbox.store.json; -import static net.javacrumbs.jsonunit.fluent.JsonFluentAssert.assertThatJson; +import static net.javacrumbs.jsonunit.assertj.JsonAssertions.assertThatJson; import static org.apache.james.mailbox.model.MailboxACL.Right.CreateMailbox; import static org.apache.james.mailbox.model.MailboxACL.Right.DeleteMailbox; import static org.apache.james.mailbox.model.MailboxACL.Right.DeleteMessages; @@ -81,36 +81,36 @@ public class MailboxACLJsonConverterTest { @Test public void emptyACLShouldBeWellSerialized() throws Exception { assertThatJson(MailboxACLJsonConverter.toJson(MailboxACL.EMPTY)) - .isEqualTo("{\"entries\":{}}") - .when(Option.IGNORING_ARRAY_ORDER); + .when(Option.IGNORING_ARRAY_ORDER) + .isEqualTo("{\"entries\":{}}"); } @Test public void singleUserEntryACLShouldBeWellSerialized() throws Exception { assertThatJson(MailboxACLJsonConverter.toJson(new ACLMapBuilder().addSingleUserEntryToMap().buildAsACL())) - .isEqualTo("{\"entries\":{\"-user\":\"klprstwx\"}}") - .when(Option.IGNORING_ARRAY_ORDER); + .when(Option.IGNORING_ARRAY_ORDER) + .isEqualTo("{\"entries\":{\"-user\":\"klprstwx\"}}"); } @Test public void singleGroupEntryACLShouldBeWellSerialized() throws Exception { assertThatJson(MailboxACLJsonConverter.toJson(new ACLMapBuilder().addSingleGroupEntryToMap().buildAsACL())) - .isEqualTo("{\"entries\":{\"-$group\":\"lprstwx\"}}") - .when(Option.IGNORING_ARRAY_ORDER); + .when(Option.IGNORING_ARRAY_ORDER) + .isEqualTo("{\"entries\":{\"-$group\":\"lprstwx\"}}"); } @Test public void singleSpecialEntryACLShouldBeWellSerialized() throws Exception { assertThatJson(MailboxACLJsonConverter.toJson(new ACLMapBuilder().addSingleSpecialEntryToMap().buildAsACL())) - .isEqualTo("{\"entries\":{\"-special\":\"lpstwx\"}}") - .when(Option.IGNORING_ARRAY_ORDER); + .when(Option.IGNORING_ARRAY_ORDER) + .isEqualTo("{\"entries\":{\"-special\":\"lpstwx\"}}"); } @Test public void multipleEntriesACLShouldBeWellSerialized() throws Exception { assertThatJson(MailboxACLJsonConverter.toJson(new ACLMapBuilder().addSingleUserEntryToMap().addSingleGroupEntryToMap().buildAsACL())) - .isEqualTo("{\"entries\":{\"-user\":\"klprstwx\",\"-$group\":\"lprstwx\"}}") - .when(Option.IGNORING_ARRAY_ORDER); + .when(Option.IGNORING_ARRAY_ORDER) + .isEqualTo("{\"entries\":{\"-user\":\"klprstwx\",\"-$group\":\"lprstwx\"}}"); } @Test http://git-wip-us.apache.org/repos/asf/james-project/blob/cfd46a14/mailet/icalendar/pom.xml ---------------------------------------------------------------------- diff --git a/mailet/icalendar/pom.xml b/mailet/icalendar/pom.xml index d3a4a21..b11e5cb 100644 --- a/mailet/icalendar/pom.xml +++ b/mailet/icalendar/pom.xml @@ -83,13 +83,7 @@ </dependency> <dependency> <groupId>net.javacrumbs.json-unit</groupId> - <artifactId>json-unit</artifactId> - <version>1.5.5</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>net.javacrumbs.json-unit</groupId> - <artifactId>json-unit-fluent</artifactId> + <artifactId>json-unit-assertj</artifactId> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/cfd46a14/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/ICALToJsonAttributeTest.java ---------------------------------------------------------------------- diff --git a/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/ICALToJsonAttributeTest.java b/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/ICALToJsonAttributeTest.java index b9fc591..7eb84d2 100644 --- a/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/ICALToJsonAttributeTest.java +++ b/mailet/icalendar/src/test/java/org/apache/james/transport/mailets/ICALToJsonAttributeTest.java @@ -19,7 +19,7 @@ package org.apache.james.transport.mailets; -import static net.javacrumbs.jsonunit.fluent.JsonFluentAssert.assertThatJson; +import static net.javacrumbs.jsonunit.assertj.JsonAssertions.assertThatJson; import static org.assertj.core.api.Assertions.assertThat; import java.io.ByteArrayInputStream; http://git-wip-us.apache.org/repos/asf/james-project/blob/cfd46a14/mailet/standard/pom.xml ---------------------------------------------------------------------- diff --git a/mailet/standard/pom.xml b/mailet/standard/pom.xml index 62e4fd3..cd49a33 100644 --- a/mailet/standard/pom.xml +++ b/mailet/standard/pom.xml @@ -93,7 +93,7 @@ </dependency> <dependency> <groupId>net.javacrumbs.json-unit</groupId> - <artifactId>json-unit-fluent</artifactId> + <artifactId>json-unit-assertj</artifactId> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/cfd46a14/mailet/standard/src/test/java/org/apache/james/transport/mailets/ContactExtractorTest.java ---------------------------------------------------------------------- diff --git a/mailet/standard/src/test/java/org/apache/james/transport/mailets/ContactExtractorTest.java b/mailet/standard/src/test/java/org/apache/james/transport/mailets/ContactExtractorTest.java index b328e70..0a2319a 100644 --- a/mailet/standard/src/test/java/org/apache/james/transport/mailets/ContactExtractorTest.java +++ b/mailet/standard/src/test/java/org/apache/james/transport/mailets/ContactExtractorTest.java @@ -18,7 +18,7 @@ ****************************************************************/ package org.apache.james.transport.mailets; -import static net.javacrumbs.jsonunit.fluent.JsonFluentAssert.assertThatJson; +import static net.javacrumbs.jsonunit.assertj.JsonAssertions.assertThatJson; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.mockito.Matchers.any; http://git-wip-us.apache.org/repos/asf/james-project/blob/cfd46a14/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index f6f4594..723c7ee 100644 --- a/pom.xml +++ b/pom.xml @@ -1926,8 +1926,8 @@ </dependency> <dependency> <groupId>net.javacrumbs.json-unit</groupId> - <artifactId>json-unit-fluent</artifactId> - <version>1.5.5</version> + <artifactId>json-unit-assertj</artifactId> + <version>2.0.0.RC1</version> </dependency> <dependency> <groupId>nl.jqno.equalsverifier</groupId> http://git-wip-us.apache.org/repos/asf/james-project/blob/cfd46a14/server/data/data-cassandra/pom.xml ---------------------------------------------------------------------- diff --git a/server/data/data-cassandra/pom.xml b/server/data/data-cassandra/pom.xml index 5952582..3b4bcbb 100644 --- a/server/data/data-cassandra/pom.xml +++ b/server/data/data-cassandra/pom.xml @@ -110,7 +110,7 @@ </dependency> <dependency> <groupId>net.javacrumbs.json-unit</groupId> - <artifactId>json-unit-fluent</artifactId> + <artifactId>json-unit-assertj</artifactId> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/cfd46a14/server/data/data-cassandra/src/test/java/org/apache/james/dlp/eventsourcing/cassandra/DTOTest.java ---------------------------------------------------------------------- diff --git a/server/data/data-cassandra/src/test/java/org/apache/james/dlp/eventsourcing/cassandra/DTOTest.java b/server/data/data-cassandra/src/test/java/org/apache/james/dlp/eventsourcing/cassandra/DTOTest.java index 7828b60..ac82112 100644 --- a/server/data/data-cassandra/src/test/java/org/apache/james/dlp/eventsourcing/cassandra/DTOTest.java +++ b/server/data/data-cassandra/src/test/java/org/apache/james/dlp/eventsourcing/cassandra/DTOTest.java @@ -19,7 +19,7 @@ package org.apache.james.dlp.eventsourcing.cassandra; -import static net.javacrumbs.jsonunit.fluent.JsonFluentAssert.assertThatJson; +import static net.javacrumbs.jsonunit.assertj.JsonAssertions.assertThatJson; import static org.apache.james.util.ClassLoaderUtils.getSystemResourceAsString; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; http://git-wip-us.apache.org/repos/asf/james-project/blob/cfd46a14/server/mailet/integration-testing/pom.xml ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/pom.xml b/server/mailet/integration-testing/pom.xml index 1989ecb..3670525 100644 --- a/server/mailet/integration-testing/pom.xml +++ b/server/mailet/integration-testing/pom.xml @@ -141,7 +141,7 @@ </dependency> <dependency> <groupId>net.javacrumbs.json-unit</groupId> - <artifactId>json-unit-fluent</artifactId> + <artifactId>json-unit-assertj</artifactId> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/cfd46a14/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ContactExtractorTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ContactExtractorTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ContactExtractorTest.java index e16b948..220c4dc 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ContactExtractorTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ContactExtractorTest.java @@ -18,7 +18,7 @@ ****************************************************************/ package org.apache.james.transport.mailets; -import static net.javacrumbs.jsonunit.fluent.JsonFluentAssert.assertThatJson; +import static net.javacrumbs.jsonunit.assertj.JsonAssertions.assertThatJson; import static org.apache.james.mailets.configuration.Constants.DEFAULT_DOMAIN; import static org.apache.james.mailets.configuration.Constants.IMAP_PORT; import static org.apache.james.mailets.configuration.Constants.LOCALHOST_IP; http://git-wip-us.apache.org/repos/asf/james-project/blob/cfd46a14/server/protocols/jmap/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/pom.xml b/server/protocols/jmap/pom.xml index 03cafb4..444571e 100644 --- a/server/protocols/jmap/pom.xml +++ b/server/protocols/jmap/pom.xml @@ -236,7 +236,7 @@ </dependency> <dependency> <groupId>net.javacrumbs.json-unit</groupId> - <artifactId>json-unit-fluent</artifactId> + <artifactId>json-unit-assertj</artifactId> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/cfd46a14/server/protocols/jmap/src/test/java/org/apache/james/jmap/json/ParsingWritingObjectsTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/json/ParsingWritingObjectsTest.java b/server/protocols/jmap/src/test/java/org/apache/james/jmap/json/ParsingWritingObjectsTest.java index 48ef051..a7c451f 100644 --- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/json/ParsingWritingObjectsTest.java +++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/json/ParsingWritingObjectsTest.java @@ -19,8 +19,8 @@ package org.apache.james.jmap.json; +import static net.javacrumbs.jsonunit.assertj.JsonAssertions.assertThatJson; import static net.javacrumbs.jsonunit.core.Option.IGNORING_ARRAY_ORDER; -import static net.javacrumbs.jsonunit.fluent.JsonFluentAssert.assertThatJson; import static org.apache.james.jmap.json.ParsingWritingObjects.MESSAGE; import static org.apache.james.jmap.json.ParsingWritingObjects.SUB_MESSAGE; import static org.assertj.core.api.Assertions.assertThat; http://git-wip-us.apache.org/repos/asf/james-project/blob/cfd46a14/server/protocols/webadmin/webadmin-data/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-data/pom.xml b/server/protocols/webadmin/webadmin-data/pom.xml index 548e422..2692a2c 100644 --- a/server/protocols/webadmin/webadmin-data/pom.xml +++ b/server/protocols/webadmin/webadmin-data/pom.xml @@ -93,7 +93,7 @@ </dependency> <dependency> <groupId>net.javacrumbs.json-unit</groupId> - <artifactId>json-unit-fluent</artifactId> + <artifactId>json-unit-assertj</artifactId> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/cfd46a14/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DLPConfigurationRoutesTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DLPConfigurationRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DLPConfigurationRoutesTest.java index 62013c9..ead7860 100644 --- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DLPConfigurationRoutesTest.java +++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DLPConfigurationRoutesTest.java @@ -23,7 +23,7 @@ import static io.restassured.RestAssured.given; import static io.restassured.RestAssured.requestSpecification; import static io.restassured.RestAssured.when; import static io.restassured.RestAssured.with; -import static net.javacrumbs.jsonunit.fluent.JsonFluentAssert.assertThatJson; +import static net.javacrumbs.jsonunit.assertj.JsonAssertions.assertThatJson; import static org.apache.james.webadmin.Constants.JSON_CONTENT_TYPE; import static org.apache.james.webadmin.WebAdminServer.NO_CONFIGURATION; import static org.hamcrest.Matchers.containsString; http://git-wip-us.apache.org/repos/asf/james-project/blob/cfd46a14/server/protocols/webadmin/webadmin-mailbox/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-mailbox/pom.xml b/server/protocols/webadmin/webadmin-mailbox/pom.xml index 40828c8..d079d8d 100644 --- a/server/protocols/webadmin/webadmin-mailbox/pom.xml +++ b/server/protocols/webadmin/webadmin-mailbox/pom.xml @@ -139,7 +139,7 @@ </dependency> <dependency> <groupId>net.javacrumbs.json-unit</groupId> - <artifactId>json-unit-fluent</artifactId> + <artifactId>json-unit-assertj</artifactId> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/cfd46a14/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/DomainQuotaRoutesTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/DomainQuotaRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/DomainQuotaRoutesTest.java index 1d6f458..482d241 100644 --- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/DomainQuotaRoutesTest.java +++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/DomainQuotaRoutesTest.java @@ -21,7 +21,7 @@ package org.apache.james.webadmin.routes; import static io.restassured.RestAssured.given; import static io.restassured.RestAssured.when; -import static net.javacrumbs.jsonunit.fluent.JsonFluentAssert.assertThatJson; +import static net.javacrumbs.jsonunit.assertj.JsonAssertions.assertThatJson; import static org.assertj.core.api.Assertions.assertThat; import java.util.Map; http://git-wip-us.apache.org/repos/asf/james-project/blob/cfd46a14/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserQuotaRoutesTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserQuotaRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserQuotaRoutesTest.java index fd759bb..df649d0 100644 --- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserQuotaRoutesTest.java +++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserQuotaRoutesTest.java @@ -22,8 +22,8 @@ package org.apache.james.webadmin.routes; import static io.restassured.RestAssured.given; import static io.restassured.RestAssured.when; import static io.restassured.RestAssured.with; +import static net.javacrumbs.jsonunit.assertj.JsonAssertions.assertThatJson; import static net.javacrumbs.jsonunit.core.Option.IGNORING_ARRAY_ORDER; -import static net.javacrumbs.jsonunit.fluent.JsonFluentAssert.assertThatJson; import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.containsInAnyOrder; http://git-wip-us.apache.org/repos/asf/james-project/blob/cfd46a14/server/protocols/webadmin/webadmin-mailrepository/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-mailrepository/pom.xml b/server/protocols/webadmin/webadmin-mailrepository/pom.xml index 4cb74e1..8aeb5a7 100644 --- a/server/protocols/webadmin/webadmin-mailrepository/pom.xml +++ b/server/protocols/webadmin/webadmin-mailrepository/pom.xml @@ -105,7 +105,7 @@ </dependency> <dependency> <groupId>net.javacrumbs.json-unit</groupId> - <artifactId>json-unit-fluent</artifactId> + <artifactId>json-unit-assertj</artifactId> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/cfd46a14/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java b/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java index f930d5d..38a253e 100644 --- a/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java +++ b/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java @@ -22,9 +22,9 @@ package org.apache.james.webadmin.routes; import static io.restassured.RestAssured.given; import static io.restassured.RestAssured.when; import static io.restassured.RestAssured.with; +import static net.javacrumbs.jsonunit.assertj.JsonAssertions.assertThatJson; import static net.javacrumbs.jsonunit.core.Option.IGNORING_ARRAY_ORDER; import static net.javacrumbs.jsonunit.core.Option.IGNORING_EXTRA_FIELDS; -import static net.javacrumbs.jsonunit.fluent.JsonFluentAssert.assertThatJson; import static org.apache.james.webadmin.WebAdminServer.NO_CONFIGURATION; import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.Matchers.contains; --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org