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 57d561075cc18fcaf66c8a4bdaa3f12dfe893b55 Author: Rene Cordier <[email protected]> AuthorDate: Tue Dec 10 16:06:27 2019 +0700 [Refactoring] Move JPAMailboxIdDeserializerTest to JUnit 5 --- .../mailbox/jpa/JPAMailboxIdDeserializerTest.java | 28 ++++++++++++---------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JPAMailboxIdDeserializerTest.java b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JPAMailboxIdDeserializerTest.java index 3a60788..1ad1d88 100644 --- a/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JPAMailboxIdDeserializerTest.java +++ b/mailbox/jpa/src/test/java/org/apache/james/mailbox/jpa/JPAMailboxIdDeserializerTest.java @@ -20,32 +20,34 @@ package org.apache.james.mailbox.jpa; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; import org.apache.james.mailbox.store.mail.model.MailboxIdDeserialisationException; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; -public class JPAMailboxIdDeserializerTest { +class JPAMailboxIdDeserializerTest { - private static final String SERIALIZED_ID = "123456789012"; - private static final String MALFORMED_SERIALIZED_ID = "abcz"; - private static final JPAId JPA_ID = JPAId.of(Long.parseLong(SERIALIZED_ID)); + static final String SERIALIZED_ID = "123456789012"; + static final String MALFORMED_SERIALIZED_ID = "abcz"; + static final JPAId JPA_ID = JPAId.of(Long.parseLong(SERIALIZED_ID)); - private JPAMailboxIdDeserializer mailboxIdDeserializer; + JPAMailboxIdDeserializer mailboxIdDeserializer; - @Before - public void setUp() { + @BeforeEach + void setUp() { mailboxIdDeserializer = new JPAMailboxIdDeserializer(); } @Test - public void deserializeShouldWork() throws Exception { + void deserializeShouldWork() throws Exception { assertThat(mailboxIdDeserializer.deserialize(SERIALIZED_ID)).isEqualTo(JPA_ID); } - @Test(expected = MailboxIdDeserialisationException.class) - public void deserializeShouldThrowOnMalformedData() throws Exception { - mailboxIdDeserializer.deserialize(MALFORMED_SERIALIZED_ID); + @Test + void deserializeShouldThrowOnMalformedData() { + assertThatThrownBy(() -> mailboxIdDeserializer.deserialize(MALFORMED_SERIALIZED_ID)) + .isInstanceOf(MailboxIdDeserialisationException.class); } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
