This is an automated email from the ASF dual-hosted git repository. btellier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 12071e9eeea0e54947813178870189d8628ad989 Author: Tung Tran <[email protected]> AuthorDate: Sat Jun 24 05:55:15 2023 +0700 [CLEAN CODE] Update Deprecated method: AssertJ containsOnlyElementsOf -> containOnly --- .../backends/rabbitmq/RabbitMQClusterTest.java | 21 +++++----- .../james/backends/rabbitmq/RabbitMQTest.java | 15 ++++--- .../store/mail/model/ListMailboxAssert.java | 3 +- .../store/mail/model/ListMessageAssert.java | 2 +- .../mail/model/ListMessagePropertiesAssert.java | 2 +- .../james/rrt/lib/RewriteTablesStepdefs.java | 4 +- .../james/transport/util/RecipientsUtilsTest.java | 5 +-- .../apache/james/transport/util/TosUtilsTest.java | 6 +-- .../mailrepository/MailRepositoryContract.java | 3 +- .../cucumber/GetMessagesMethodStepdefs.java | 4 +- .../jmap/draft/methods/GetMessagesMethodTest.java | 48 ++++++++++------------ .../jmap/http/DefaultMailboxesProvisionerTest.java | 9 ++-- .../james/jmap/http/MailboxesProvisionerTest.scala | 13 +++--- .../org/apache/james/linshare/LinshareTest.java | 2 +- 14 files changed, 64 insertions(+), 73 deletions(-) diff --git a/backends-common/rabbitmq/src/test/java/org/apache/james/backends/rabbitmq/RabbitMQClusterTest.java b/backends-common/rabbitmq/src/test/java/org/apache/james/backends/rabbitmq/RabbitMQClusterTest.java index afac128618..1f0da7300e 100644 --- a/backends-common/rabbitmq/src/test/java/org/apache/james/backends/rabbitmq/RabbitMQClusterTest.java +++ b/backends-common/rabbitmq/src/test/java/org/apache/james/backends/rabbitmq/RabbitMQClusterTest.java @@ -33,7 +33,6 @@ import static org.awaitility.Durations.ONE_SECOND; import java.io.IOException; import java.nio.charset.StandardCharsets; import java.util.Arrays; -import java.util.List; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.IntStream; @@ -136,8 +135,8 @@ class RabbitMQClusterTest { awaitAtMostOneMinute.until(() -> consumer2.getConsumedMessages().size() == nbMessages); - List<Integer> expectedResult = IntStream.range(0, nbMessages).boxed().collect(ImmutableList.toImmutableList()); - assertThat(consumer2.getConsumedMessages()).containsOnlyElementsOf(expectedResult); + Integer[] expectedResult = IntStream.range(0, nbMessages).boxed().toArray(Integer[]::new); + assertThat(consumer2.getConsumedMessages()).containsOnly(expectedResult); } @Test @@ -157,8 +156,8 @@ class RabbitMQClusterTest { awaitAtMostOneMinute.until(() -> consumer2.getConsumedMessages().size() == nbMessages); - List<Integer> expectedResult = IntStream.range(0, nbMessages).boxed().collect(ImmutableList.toImmutableList()); - assertThat(consumer2.getConsumedMessages()).containsOnlyElementsOf(expectedResult); + Integer[] expectedResult = IntStream.range(0, nbMessages).boxed().toArray(Integer[]::new); + assertThat(consumer2.getConsumedMessages()).containsOnly(expectedResult); } } @@ -214,8 +213,8 @@ class RabbitMQClusterTest { awaitAtMostOneMinute.until(() -> consumer.getConsumedMessages().size() == nbMessages); - List<Integer> expectedResult = IntStream.range(0, nbMessages).boxed().collect(ImmutableList.toImmutableList()); - assertThat(consumer.getConsumedMessages()).containsOnlyElementsOf(expectedResult); + Integer[] expectedResult = IntStream.range(0, nbMessages).boxed().toArray(Integer[]::new); + assertThat(consumer.getConsumedMessages()).containsOnly(expectedResult); } private void tryPublishWithRetry(byte[] bytes) { @@ -256,8 +255,8 @@ class RabbitMQClusterTest { awaitAtMostOneMinute.until(() -> consumer.getConsumedMessages().size() == nbMessages); - List<Integer> expectedResult = IntStream.range(0, nbMessages).boxed().collect(ImmutableList.toImmutableList()); - assertThat(consumer.getConsumedMessages()).containsOnlyElementsOf(expectedResult); + Integer[] expectedResult = IntStream.range(0, nbMessages).boxed().toArray(Integer[]::new); + assertThat(consumer.getConsumedMessages()).containsOnly(expectedResult); } } @@ -283,8 +282,8 @@ class RabbitMQClusterTest { awaitAtMostOneMinute.until(() -> consumer.getConsumedMessages().size() == nbMessages); - List<Integer> expectedResult = IntStream.range(0, nbMessages).boxed().collect(ImmutableList.toImmutableList()); - assertThat(consumer.getConsumedMessages()).containsOnlyElementsOf(expectedResult); + Integer[] expectedResult = IntStream.range(0, nbMessages).boxed().toArray(Integer[]::new); + assertThat(consumer.getConsumedMessages()).containsOnly(expectedResult); } private void stopWhenHalfProcessed(DockerRabbitMQCluster cluster, int nbMessages, AtomicInteger counter) { diff --git a/backends-common/rabbitmq/src/test/java/org/apache/james/backends/rabbitmq/RabbitMQTest.java b/backends-common/rabbitmq/src/test/java/org/apache/james/backends/rabbitmq/RabbitMQTest.java index 0f22ff36a3..8feeaa11fa 100644 --- a/backends-common/rabbitmq/src/test/java/org/apache/james/backends/rabbitmq/RabbitMQTest.java +++ b/backends-common/rabbitmq/src/test/java/org/apache/james/backends/rabbitmq/RabbitMQTest.java @@ -61,7 +61,6 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; import com.github.fge.lambdas.Throwing; -import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; import com.rabbitmq.client.AMQP; @@ -264,11 +263,11 @@ class RabbitMQTest { awaitAtMostOneMinute.until( () -> countReceivedMessages(consumer2, consumer3, consumer4) == 30); - ImmutableList<Integer> expectedResult = IntStream.range(0, 10).boxed().collect(ImmutableList.toImmutableList()); - // Check every subscriber have receive all the messages. - assertThat(consumer2.getConsumedMessages()).containsOnlyElementsOf(expectedResult); - assertThat(consumer3.getConsumedMessages()).containsOnlyElementsOf(expectedResult); - assertThat(consumer4.getConsumedMessages()).containsOnlyElementsOf(expectedResult); + Integer[] expectedResult = IntStream.range(0, 10).boxed().toArray(Integer[]::new); + // Check every subscriber have received all the messages. + assertThat(consumer2.getConsumedMessages()).containsOnly(expectedResult); + assertThat(consumer3.getConsumedMessages()).containsOnly(expectedResult); + assertThat(consumer4.getConsumedMessages()).containsOnly(expectedResult); } } @@ -304,14 +303,14 @@ class RabbitMQTest { awaitAtMostOneMinute.until( () -> countReceivedMessages(consumer2, consumer3, consumer4) == nbMessages); - ImmutableList<Integer> expectedResult = IntStream.range(0, nbMessages).boxed().collect(ImmutableList.toImmutableList()); + Integer[] expectedResult = IntStream.range(0, nbMessages).boxed().toArray(Integer[]::new); assertThat( Iterables.concat( consumer2.getConsumedMessages(), consumer3.getConsumedMessages(), consumer4.getConsumedMessages())) - .containsOnlyElementsOf(expectedResult); + .containsOnly(expectedResult); } @Test diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMailboxAssert.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMailboxAssert.java index 3a128f5fa7..be2ca14aa6 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMailboxAssert.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMailboxAssert.java @@ -51,7 +51,8 @@ public class ListMailboxAssert { } public void containOnly(Mailbox... expecteds) { - assertThat(mailboxtoInnerMailbox(actual)).containsOnlyElementsOf(mailboxtoInnerMailbox(Lists.newArrayList(expecteds))); + InnerMailbox[] innerMailboxes = mailboxtoInnerMailbox(Lists.newArrayList(expecteds)).toArray(new InnerMailbox[0]); + assertThat(mailboxtoInnerMailbox(actual)).containsOnly(innerMailboxes); } private final class InnerMailbox { diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMessageAssert.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMessageAssert.java index f36b2bfba9..253cbd3154 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMessageAssert.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMessageAssert.java @@ -62,7 +62,7 @@ public class ListMessageAssert { } public void containOnly(MailboxMessage... expecteds) { - assertThat(messageToInnerMessage(actual)).containsOnlyElementsOf(messageToInnerMessage(Lists.newArrayList(expecteds))); + assertThat(messageToInnerMessage(actual)).containsOnly(messageToInnerMessage(Lists.newArrayList(expecteds)).toArray(new InnerMessage[0])); } private final class InnerMessage { diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMessagePropertiesAssert.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMessagePropertiesAssert.java index 297b7bb230..342e6497e7 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMessagePropertiesAssert.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/mail/model/ListMessagePropertiesAssert.java @@ -50,7 +50,7 @@ public class ListMessagePropertiesAssert { } public void containsOnly(List<Property> expected) { - assertThat(propertiesToInnerProperties(actual)).containsOnlyElementsOf(propertiesToInnerProperties(expected)); + assertThat(propertiesToInnerProperties(actual)).containsOnly(propertiesToInnerProperties(expected).toArray(new InnerProperty[0])); } private final class InnerProperty { diff --git a/server/data/data-library/src/test/java/org/apache/james/rrt/lib/RewriteTablesStepdefs.java b/server/data/data-library/src/test/java/org/apache/james/rrt/lib/RewriteTablesStepdefs.java index ade2238da0..f4de1a6023 100644 --- a/server/data/data-library/src/test/java/org/apache/james/rrt/lib/RewriteTablesStepdefs.java +++ b/server/data/data-library/src/test/java/org/apache/james/rrt/lib/RewriteTablesStepdefs.java @@ -188,12 +188,12 @@ public class RewriteTablesStepdefs { @Then("mappings for user \"([^\"]*)\" at domain \"([^\"]*)\" should contain only \"([^\"]*)\"") public void assertMappingsForUser(String user, String domain, List<String> mappings) throws Throwable { - assertThat(rewriteTable.getResolvedMappings(user, Domain.of(domain)).asStrings()).containsOnlyElementsOf(mappings); + assertThat(rewriteTable.getResolvedMappings(user, Domain.of(domain)).asStrings()).containsOnly(mappings.toArray(new String[0])); } @Then("mappings for alias \"([^\"]*)\" at domain \"([^\"]*)\" should contain only \"([^\"]*)\"") public void assertMappingsForAlias(String alias, String domain, List<String> mappings) throws Throwable { - assertThat(rewriteTable.getResolvedMappings(alias, Domain.of(domain)).asStrings()).containsOnlyElementsOf(mappings); + assertThat(rewriteTable.getResolvedMappings(alias, Domain.of(domain)).asStrings()).containsOnly(mappings.toArray(new String[0])); } @Then("a \"([^\"]*)\" exception should have been thrown") diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/util/RecipientsUtilsTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/util/RecipientsUtilsTest.java index 384547cd21..2e050b8ee8 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/util/RecipientsUtilsTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/util/RecipientsUtilsTest.java @@ -90,7 +90,7 @@ class RecipientsUtilsTest { List<MailAddress> recipients = testee.getRecipients(fakeMail); - assertThat(recipients).containsOnlyElementsOf(expectedRecipients); + assertThat(recipients).containsOnly(expectedRecipients.toArray(new MailAddress[0])); } @Test @@ -113,7 +113,6 @@ class RecipientsUtilsTest { List<MailAddress> recipients = testee.getRecipients(fakeMail); - ImmutableList<MailAddress> expectedRecipients = ImmutableList.of(from, to, to2); - assertThat(recipients).containsOnlyElementsOf(expectedRecipients); + assertThat(recipients).containsOnly(from, to, to2); } } diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/util/TosUtilsTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/util/TosUtilsTest.java index 52bf6925fe..02d2b77572 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/util/TosUtilsTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/util/TosUtilsTest.java @@ -93,8 +93,7 @@ class TosUtilsTest { List<MailAddress> to = testee.getTo(fakeMail); - ImmutableList<MailAddress> expectedTo = ImmutableList.of(mailAddress, mailAddress2); - assertThat(to).containsOnlyElementsOf(expectedTo); + assertThat(to).containsOnly(mailAddress, mailAddress2); } @Test @@ -115,7 +114,6 @@ class TosUtilsTest { List<MailAddress> to = testee.getTo(fakeMail); - ImmutableList<MailAddress> expectedTo = ImmutableList.of(from, toMailAddress, toMailAddress2); - assertThat(to).containsOnlyElementsOf(expectedTo); + assertThat(to).containsOnly(from, toMailAddress, toMailAddress2); } } diff --git a/server/mailrepository/mailrepository-api/src/test/java/org/apache/james/mailrepository/MailRepositoryContract.java b/server/mailrepository/mailrepository-api/src/test/java/org/apache/james/mailrepository/MailRepositoryContract.java index 3eb4f4ba94..bf9d452afe 100644 --- a/server/mailrepository/mailrepository-api/src/test/java/org/apache/james/mailrepository/MailRepositoryContract.java +++ b/server/mailrepository/mailrepository-api/src/test/java/org/apache/james/mailrepository/MailRepositoryContract.java @@ -51,6 +51,7 @@ import org.apache.mailet.PerRecipientHeaders; import org.apache.mailet.base.MailAddressFixture; import org.apache.mailet.base.test.FakeMail; import org.assertj.core.api.SoftAssertions; +import org.assertj.core.util.IterableUtil; import org.junit.jupiter.api.RepeatedTest; import org.junit.jupiter.api.Test; @@ -533,7 +534,7 @@ public interface MailRepositoryContract { assertThat(testee.list()) .toIterable() - .containsOnlyElementsOf(expectedResult); + .containsOnly(expectedResult.toArray(new MailKey[0])); } default MailKey computeKey(int keyIndex) { diff --git a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/GetMessagesMethodStepdefs.java b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/GetMessagesMethodStepdefs.java index 2bb69a2f1d..262d6a7879 100644 --- a/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/GetMessagesMethodStepdefs.java +++ b/server/protocols/jmap-draft-integration-testing/jmap-draft-integration-testing-common/src/test/java/org/apache/james/jmap/draft/methods/integration/cucumber/GetMessagesMethodStepdefs.java @@ -712,7 +712,7 @@ public class GetMessagesMethodStepdefs { @Then("^the keywords of the message is (.*)$") public void assertKeywordsOfMessageShouldDisplay(List<String> keywords) { assertThat(httpClient.jsonPath.<Map<String, Boolean>>read(FIRST_MESSAGE + ".keywords").keySet()) - .containsOnlyElementsOf(keywords); + .containsOnly(keywords.toArray(new String[0])); } @Then("^the message has no keyword$") @@ -726,7 +726,7 @@ public class GetMessagesMethodStepdefs { userStepdefs.execWithUser(user, () -> postWithAListOfIds(ImmutableList.of(messageId))); assertThat(httpClient.jsonPath.<Map<String, Boolean>>read(FIRST_MESSAGE + ".keywords").keySet()) - .containsOnlyElementsOf(keywords); + .containsOnly(keywords.toArray(new String[0])); } @Then("^\"([^\"]*)\" should see message \"([^\"]*)\" without keywords$") diff --git a/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/methods/GetMessagesMethodTest.java b/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/methods/GetMessagesMethodTest.java index 9a3c73a210..5155d8d69e 100644 --- a/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/methods/GetMessagesMethodTest.java +++ b/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/methods/GetMessagesMethodTest.java @@ -669,17 +669,15 @@ public class GetMessagesMethodTest { .hasOnlyElementsOfType(MessageFullView.class) .extracting(MessageFullView.class::cast) .extracting(MessageFullView::getKeywords) - .containsOnlyElementsOf( - ImmutableList.of( - ImmutableMap.of( - "$Answered", true, - "$Draft", true), - ImmutableMap.of( - "$Answered", true, - "$Draft", true), - ImmutableMap.of( - "$Answered", true, - "$Draft", true))); + .containsOnly( ImmutableMap.of( + "$Answered", true, + "$Draft", true), + ImmutableMap.of( + "$Answered", true, + "$Draft", true), + ImmutableMap.of( + "$Answered", true, + "$Draft", true)); } @@ -728,17 +726,15 @@ public class GetMessagesMethodTest { .hasOnlyElementsOfType(MessageFullView.class) .extracting(MessageFullView.class::cast) .extracting(MessageFullView::getKeywords) - .containsOnlyElementsOf( - ImmutableList.of( - ImmutableMap.of( - "$Answered", true, - "$Draft", true), - ImmutableMap.of( - "$Answered", true, - "$Draft", true), - ImmutableMap.of( - "$Answered", true, - "$Draft", true))); + .containsOnly(ImmutableMap.of( + "$Answered", true, + "$Draft", true), + ImmutableMap.of( + "$Answered", true, + "$Draft", true), + ImmutableMap.of( + "$Answered", true, + "$Draft", true)); } @@ -770,11 +766,9 @@ public class GetMessagesMethodTest { .hasOnlyElementsOfType(MessageFullView.class) .extracting(MessageFullView.class::cast) .extracting(MessageFullView::getKeywords) - .containsOnlyElementsOf( - ImmutableList.of( - ImmutableMap.of( - "$Answered", true, - FORWARDED, true))); + .containsOnly(ImmutableMap.of( + "$Answered", true, + FORWARDED, true)); } } diff --git a/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/http/DefaultMailboxesProvisionerTest.java b/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/http/DefaultMailboxesProvisionerTest.java index cb18446210..e444f18c25 100644 --- a/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/http/DefaultMailboxesProvisionerTest.java +++ b/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/http/DefaultMailboxesProvisionerTest.java @@ -37,7 +37,6 @@ import org.junit.Before; import org.junit.Test; import com.github.fge.lambdas.Throwing; -import com.google.common.collect.ImmutableList; public class DefaultMailboxesProvisionerTest { @@ -61,10 +60,10 @@ public class DefaultMailboxesProvisionerTest { testee.createMailboxesIfNeeded(session).block(); assertThat(mailboxManager.list(session)) - .containsOnlyElementsOf(DefaultMailboxes.DEFAULT_MAILBOXES + .containsOnly(DefaultMailboxes.DEFAULT_MAILBOXES .stream() .map(mailboxName -> MailboxPath.forUser(USERNAME, mailboxName)) - .collect(ImmutableList.toImmutableList())); + .toArray(MailboxPath[]::new)); } @Test @@ -84,7 +83,7 @@ public class DefaultMailboxesProvisionerTest { testee.createMailboxesIfNeeded(session).block(); assertThat(subscriptionManager.subscriptions(session)) - .containsOnlyElementsOf(DefaultMailboxes.defaultMailboxesAsPath(USERNAME)); + .containsOnly(DefaultMailboxes.defaultMailboxesAsPath(USERNAME).toArray(MailboxPath[]::new)); } @Test @@ -95,7 +94,7 @@ public class DefaultMailboxesProvisionerTest { .runSuccessfullyWithin(Duration.ofSeconds(10)); assertThat(mailboxManager.list(session)) - .containsOnlyElementsOf(DefaultMailboxes.defaultMailboxesAsPath(USERNAME)); + .containsOnly(DefaultMailboxes.defaultMailboxesAsPath(USERNAME).toArray(MailboxPath[]::new)); } } diff --git a/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/http/MailboxesProvisionerTest.scala b/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/http/MailboxesProvisionerTest.scala index cf0454574e..50c0b66e69 100644 --- a/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/http/MailboxesProvisionerTest.scala +++ b/server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/http/MailboxesProvisionerTest.scala @@ -23,7 +23,6 @@ import java.time.Duration import java.util.function.Predicate import com.github.fge.lambdas.Throwing -import com.google.common.collect.ImmutableList import org.apache.james.core.Username import org.apache.james.mailbox.inmemory.InMemoryMailboxManager import org.apache.james.mailbox.inmemory.manager.InMemoryIntegrationResources @@ -35,6 +34,8 @@ import org.apache.james.util.concurrency.ConcurrentTestRunner import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.{BeforeEach, Test} +import scala.jdk.CollectionConverters._ + object MailboxesProvisionerTest { private val USERNAME: Username = Username.of("username") } @@ -60,10 +61,10 @@ class MailboxesProvisionerTest { testee.createMailboxesIfNeeded(session).block() assertThat(mailboxManager.list(session)) - .containsOnlyElementsOf(DefaultMailboxes.DEFAULT_MAILBOXES - .stream + .containsOnly(DefaultMailboxes.DEFAULT_MAILBOXES + .asScala .map((mailboxName: String) => MailboxPath.forUser(USERNAME, mailboxName)) - .collect(ImmutableList.toImmutableList())) + .toArray: _*) } @Test @@ -84,7 +85,7 @@ class MailboxesProvisionerTest { testee.createMailboxesIfNeeded(session).block() assertThat(subscriptionManager.subscriptions(session)) - .containsOnlyElementsOf(DefaultMailboxes.defaultMailboxesAsPath(USERNAME)) + .containsOnly(DefaultMailboxes.defaultMailboxesAsPath(USERNAME).asScala.toArray: _*) } @Test @@ -95,6 +96,6 @@ class MailboxesProvisionerTest { .runSuccessfullyWithin(Duration.ofSeconds(10)) assertThat(mailboxManager.list(session)) - .containsOnlyElementsOf(DefaultMailboxes.defaultMailboxesAsPath(USERNAME)) + .containsOnly(DefaultMailboxes.defaultMailboxesAsPath(USERNAME).asScala.toArray: _*) } } diff --git a/third-party/linshare/src/test/java/org/apache/james/linshare/LinshareTest.java b/third-party/linshare/src/test/java/org/apache/james/linshare/LinshareTest.java index c3f805556a..be6c70d57a 100644 --- a/third-party/linshare/src/test/java/org/apache/james/linshare/LinshareTest.java +++ b/third-party/linshare/src/test/java/org/apache/james/linshare/LinshareTest.java @@ -78,7 +78,7 @@ class LinshareTest { assertThat(technicalAccounts).anySatisfy(account -> SoftAssertions.assertSoftly(softly -> { softly.assertThat(account.getName()).isEqualTo(TECHNICAL_ACCOUNT.getUsername()); - softly.assertThat(account.getPermissions()).containsOnlyElementsOf(TECHNICAL_PERMISSIONS); + softly.assertThat(account.getPermissions()).containsOnly(TECHNICAL_PERMISSIONS.toArray(new String[0])); softly.assertThat(account.isEnabled()).isEqualTo(ACCOUNT_ENABLED); })); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
