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 e215a4d7870a4ae5cafebe07e8fe6a4c0457d233 Author: Matthieu Baechler <matth...@apache.org> AuthorDate: Fri Nov 29 15:09:27 2019 +0100 JAMES-2979 enhance assertions for IMAPMessageReader --- .../main/java/org/apache/james/utils/IMAPMessageReader.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/server/testing/src/main/java/org/apache/james/utils/IMAPMessageReader.java b/server/testing/src/main/java/org/apache/james/utils/IMAPMessageReader.java index 311c873..c9f841e 100644 --- a/server/testing/src/main/java/org/apache/james/utils/IMAPMessageReader.java +++ b/server/testing/src/main/java/org/apache/james/utils/IMAPMessageReader.java @@ -28,6 +28,7 @@ import java.util.stream.Stream; import org.apache.commons.net.imap.IMAPClient; import org.apache.james.core.Username; +import org.assertj.core.api.Assertions; import org.awaitility.core.ConditionFactory; import org.junit.jupiter.api.extension.AfterEachCallback; import org.junit.jupiter.api.extension.ExtensionContext; @@ -83,7 +84,7 @@ public class IMAPMessageReader extends ExternalResource implements Closeable, Af } public boolean hasAMessage() throws IOException { - imapClient.fetch("1:1", "ALL"); + imapClient.fetch("1", "UID"); return imapClient.getReplyString() .contains("OK FETCH completed"); } @@ -94,13 +95,9 @@ public class IMAPMessageReader extends ExternalResource implements Closeable, Af } public IMAPMessageReader awaitMessageCount(ConditionFactory conditionFactory, int messageCount) { - conditionFactory.until(() -> { - try { - imapClient.fetch("1:*", "ALL"); - return countFetchedEntries() == messageCount; - } catch (Exception e) { - throw new RuntimeException(e); - } + conditionFactory.untilAsserted(() -> { + imapClient.fetch("1:*", "UID"); + Assertions.assertThat(countFetchedEntries()).isEqualTo(messageCount); }); return this; } --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org