You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by rc...@apache.org on 2020/08/10 02:47:44 UTC
[james-project] 14/23: [Refactoring] Migrate OriginalMessageIdTest
to JUnit5
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 b63194f457e5c3073f4f1a4783c22c366ab0f9ce
Author: Rene Cordier <rc...@linagora.com>
AuthorDate: Fri Jul 31 14:20:39 2020 +0700
[Refactoring] Migrate OriginalMessageIdTest to JUnit5
---
.../james/mdn/fields/OriginalMessageIdTest.java | 66 +++++++++-------------
1 file changed, 28 insertions(+), 38 deletions(-)
diff --git a/mdn/src/test/java/org/apache/james/mdn/fields/OriginalMessageIdTest.java b/mdn/src/test/java/org/apache/james/mdn/fields/OriginalMessageIdTest.java
index 2c6b1b2..3f348f1 100644
--- a/mdn/src/test/java/org/apache/james/mdn/fields/OriginalMessageIdTest.java
+++ b/mdn/src/test/java/org/apache/james/mdn/fields/OriginalMessageIdTest.java
@@ -20,79 +20,69 @@
package org.apache.james.mdn.fields;
import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
+import org.junit.jupiter.api.Test;
import nl.jqno.equalsverifier.EqualsVerifier;
-public class OriginalMessageIdTest {
-
- @Rule
- public ExpectedException expectedException = ExpectedException.none();
+class OriginalMessageIdTest {
@Test
- public void shouldMatchBeanContract() throws Exception {
+ void shouldMatchBeanContract() {
EqualsVerifier.forClass(OriginalMessageId.class)
.verify();
}
@Test
- public void shouldThrowOnNullMessageId() {
- expectedException.expect(NullPointerException.class);
-
- new OriginalMessageId(null);
+ void shouldThrowOnNullMessageId() {
+ assertThatThrownBy(() -> new OriginalMessageId(null))
+ .isInstanceOf(NullPointerException.class);
}
@Test
- public void shouldThrowOnMultiLineMessageId() {
- expectedException.expect(IllegalArgumentException.class);
-
- new OriginalMessageId("message\nid");
+ void shouldThrowOnMultiLineMessageId() {
+ assertThatThrownBy(() -> new OriginalMessageId("message\nid"))
+ .isInstanceOf(IllegalArgumentException.class);
}
@Test
- public void constructorShouldThrowOnEmpty() {
- expectedException.expect(IllegalArgumentException.class);
-
- new OriginalMessageId("");
+ void constructorShouldThrowOnEmpty() {
+ assertThatThrownBy(() -> new OriginalMessageId(""))
+ .isInstanceOf(IllegalArgumentException.class);
}
@Test
- public void constructorShouldThrowOnFoldingWhiteSpaces() {
- expectedException.expect(IllegalArgumentException.class);
-
- new OriginalMessageId(" ");
+ void constructorShouldThrowOnFoldingWhiteSpaces() {
+ assertThatThrownBy(() -> new OriginalMessageId(" "))
+ .isInstanceOf(IllegalArgumentException.class);
}
@Test
- public void shouldThrowOnNameWithLineBreakAtTheEnd() {
- expectedException.expect(IllegalArgumentException.class);
-
+ void shouldThrowOnNameWithLineBreakAtTheEnd() {
String userAgentName = "a\n";
- new OriginalMessageId(userAgentName);
+
+ assertThatThrownBy(() -> new OriginalMessageId(userAgentName))
+ .isInstanceOf(IllegalArgumentException.class);
}
@Test
- public void shouldThrowOnNameWithLineBreakAtTheBeginning() {
- expectedException.expect(IllegalArgumentException.class);
-
+ void shouldThrowOnNameWithLineBreakAtTheBeginning() {
String userAgentName = "\nb";
- new OriginalMessageId(userAgentName);
+
+ assertThatThrownBy(() -> new OriginalMessageId(userAgentName))
+ .isInstanceOf(IllegalArgumentException.class);
}
@Test
- public void formattedValueShouldDisplayMessageId() {
- assertThat(new OriginalMessageId("msgId")
- .formattedValue())
+ void formattedValueShouldDisplayMessageId() {
+ assertThat(new OriginalMessageId("msgId").formattedValue())
.isEqualTo("Original-Message-ID: msgId");
}
@Test
- public void messageIdShouldBeTrimmed() {
- assertThat(new OriginalMessageId(" msgId ")
- .getOriginalMessageId())
+ void messageIdShouldBeTrimmed() {
+ assertThat(new OriginalMessageId(" msgId ").getOriginalMessageId())
.isEqualTo("msgId");
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org