This is an automated email from the ASF dual-hosted git repository. rcordier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 9e5dc61c01421e96f2c4a8bee82472ebbe365d2d Author: Rene Cordier <rcord...@linagora.com> AuthorDate: Thu Dec 5 17:20:07 2019 +0700 [Refactoring] Move StoreMailboxMessageResultIteratorTest to JUnit 5 --- .../StoreMailboxMessageResultIteratorTest.java | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxMessageResultIteratorTest.java b/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxMessageResultIteratorTest.java index cadaf56..f5b1635 100644 --- a/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxMessageResultIteratorTest.java +++ b/mailbox/store/src/test/java/org/apache/james/mailbox/store/StoreMailboxMessageResultIteratorTest.java @@ -20,6 +20,7 @@ package org.apache.james.mailbox.store; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; import java.util.ArrayList; import java.util.Collection; @@ -47,11 +48,11 @@ import org.apache.james.mailbox.store.mail.model.DefaultMessageId; import org.apache.james.mailbox.store.mail.model.MailboxMessage; import org.apache.james.mailbox.store.mail.model.impl.PropertyBuilder; import org.apache.james.mailbox.store.mail.model.impl.SimpleMailboxMessage; -import org.junit.Test; +import org.junit.jupiter.api.Test; import com.google.common.collect.Iterables; -public class StoreMailboxMessageResultIteratorTest { +class StoreMailboxMessageResultIteratorTest { private final class TestMessageMapper implements MessageMapper { private final MessageRange messageRange; @@ -186,7 +187,7 @@ public class StoreMailboxMessageResultIteratorTest { } @Test - public void testBatching() { + void testBatching() { MessageRange range = MessageRange.range(MessageUid.of(1), MessageUid.of(10)); BatchSizes batchSize = BatchSizes.uniqueBatchSize(3); StoreMessageResultIterator it = new StoreMessageResultIterator(new TestMessageMapper(MessageRange.all()), null, range, batchSize, FetchGroup.MINIMAL); @@ -197,28 +198,32 @@ public class StoreMailboxMessageResultIteratorTest { } @Test - public void nextShouldReturnFirstElement() { + void nextShouldReturnFirstElement() { MessageRange range = MessageUid.of(1).toRange(); BatchSizes batchSize = BatchSizes.uniqueBatchSize(42); StoreMessageResultIterator iterator = new StoreMessageResultIterator(new TestMessageMapper(range), null, range, batchSize, FetchGroup.MINIMAL); + assertThat(iterator.next()).isNotNull(); } - @Test(expected = NoSuchElementException.class) - public void nextShouldThrowWhenNoElement() { + @Test + void nextShouldThrowWhenNoElement() { MessageRange messages = MessageUid.of(1).toRange(); MessageRange findRange = MessageUid.of(2).toRange(); BatchSizes batchSize = BatchSizes.uniqueBatchSize(42); StoreMessageResultIterator iterator = new StoreMessageResultIterator(new TestMessageMapper(messages), null, findRange, batchSize, FetchGroup.MINIMAL); - iterator.next(); + + assertThatThrownBy(() -> iterator.next()) + .isInstanceOf(NoSuchElementException.class); } @Test - public void hasNextShouldReturnFalseWhenNoElement() { + void hasNextShouldReturnFalseWhenNoElement() { MessageRange messages = MessageUid.of(1).toRange(); MessageRange findRange = MessageUid.of(2).toRange(); BatchSizes batchSize = BatchSizes.uniqueBatchSize(42); StoreMessageResultIterator iterator = new StoreMessageResultIterator(new TestMessageMapper(messages), null, findRange, batchSize, FetchGroup.MINIMAL); + assertThat(iterator.hasNext()).isFalse(); } } --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org