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 3d386b72a8cb57302830227383dae2dcb495b112
Author: Rene Cordier <rcord...@linagora.com>
AuthorDate: Thu Nov 7 14:18:54 2019 +0700
[Refactoring] Move test classes in James Core to JUnit 5
---
.../org/apache/james/core/MailAddressTest.java | 43 +++++++++-------------
.../james/core/builder/MimeMessageBuilderTest.java | 15 ++++----
.../james/core/builder/MimeMessageWrapperTest.java | 10 ++---
.../james/core/healthcheck/ResultStatusTest.java | 10 ++---
.../apache/james/core/quota/QuotaCountTest.java | 2 +-
.../org/apache/james/core/quota/QuotaSizeTest.java | 2 +-
6 files changed, 36 insertions(+), 46 deletions(-)
diff --git a/core/src/test/java/org/apache/james/core/MailAddressTest.java
b/core/src/test/java/org/apache/james/core/MailAddressTest.java
index 8169978..0817587 100644
--- a/core/src/test/java/org/apache/james/core/MailAddressTest.java
+++ b/core/src/test/java/org/apache/james/core/MailAddressTest.java
@@ -26,11 +26,11 @@ import javax.mail.internet.AddressException;
import javax.mail.internet.InternetAddress;
import org.assertj.core.api.Assertions;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import nl.jqno.equalsverifier.EqualsVerifier;
-public class MailAddressTest {
+class MailAddressTest {
private static final String GOOD_LOCAL_PART = "\"quoted@local part\"";
private static final String GOOD_QUOTED_LOCAL_PART = "\"quoted@local
part\"@james.apache.org";
@@ -85,8 +85,7 @@ public class MailAddressTest {
* @throws AddressException
*/
@Test
- public void testHashCode() throws AddressException {
-
+ void testHashCode() throws AddressException {
MailAddress a = new MailAddress(GOOD_ADDRESS);
MailAddress b = new MailAddress(GOOD_ADDRESS);
assertThat(a.hashCode()).isEqualTo(b.hashCode());
@@ -98,8 +97,7 @@ public class MailAddressTest {
* @throws AddressException
*/
@Test
- public void testMailAddressString() throws AddressException {
-
+ void testMailAddressString() throws AddressException {
MailAddress a = new MailAddress(GOOD_ADDRESS);
assertThat(a.toString()).isEqualTo(GOOD_ADDRESS);
@@ -121,8 +119,7 @@ public class MailAddressTest {
* Test method for {@link MailAddress#MailAddress(java.lang.String,
java.lang.String)}.
*/
@Test
- public void testMailAddressStringString() {
-
+ void testMailAddressStringString() {
try {
new MailAddress("local-part", "domain");
} catch (AddressException e) {
@@ -140,8 +137,7 @@ public class MailAddressTest {
* Test method for {@link
MailAddress#MailAddress(javax.mail.internet.InternetAddress)}.
*/
@Test
- public void testMailAddressInternetAddress() {
-
+ void testMailAddressInternetAddress() {
try {
new MailAddress(new InternetAddress(GOOD_QUOTED_LOCAL_PART));
} catch (AddressException e) {
@@ -154,8 +150,7 @@ public class MailAddressTest {
* Test method for {@link MailAddress#getDomain()}.
*/
@Test
- public void testGetDomain() {
-
+ void testGetDomain() {
try {
MailAddress a = new MailAddress(new InternetAddress(GOOD_ADDRESS));
assertThat(a.getDomain()).isEqualTo(GOOD_DOMAIN);
@@ -169,8 +164,7 @@ public class MailAddressTest {
* Test method for {@link MailAddress#getLocalPart()}.
*/
@Test
- public void testGetLocalPart() {
-
+ void testGetLocalPart() {
try {
MailAddress a = new MailAddress(new
InternetAddress(GOOD_QUOTED_LOCAL_PART));
assertThat(a.getLocalPart()).isEqualTo(GOOD_LOCAL_PART);
@@ -184,8 +178,7 @@ public class MailAddressTest {
* Test method for {@link MailAddress#toString()}.
*/
@Test
- public void testToString() {
-
+ void testToString() {
try {
MailAddress a = new MailAddress(new InternetAddress(GOOD_ADDRESS));
assertThat(a.toString()).isEqualTo(GOOD_ADDRESS);
@@ -199,8 +192,7 @@ public class MailAddressTest {
* Test method for {@link MailAddress#toInternetAddress()}.
*/
@Test
- public void testToInternetAddress() {
-
+ void testToInternetAddress() {
try {
InternetAddress b = new InternetAddress(GOOD_ADDRESS);
MailAddress a = new MailAddress(b);
@@ -218,8 +210,7 @@ public class MailAddressTest {
* @throws AddressException
*/
@Test
- public void testEqualsObject() throws AddressException {
-
+ void testEqualsObject() throws AddressException {
MailAddress a = new MailAddress(GOOD_ADDRESS);
MailAddress b = new MailAddress(GOOD_ADDRESS);
@@ -227,41 +218,41 @@ public class MailAddressTest {
}
@Test
- public void equalsShouldReturnTrueWhenBothNullSender() {
+ void equalsShouldReturnTrueWhenBothNullSender() {
assertThat(MailAddress.nullSender())
.isEqualTo(MailAddress.nullSender());
}
@SuppressWarnings("deprecation")
@Test
- public void getMailSenderShouldReturnNullSenderWhenNullSender() {
+ void getMailSenderShouldReturnNullSenderWhenNullSender() {
assertThat(MailAddress.getMailSender(MailAddress.NULL_SENDER_AS_STRING))
.isEqualTo(MailAddress.nullSender());
}
@SuppressWarnings("deprecation")
@Test
- public void getMailSenderShouldReturnParsedAddressWhenNotNullAddress()
throws Exception {
+ void getMailSenderShouldReturnParsedAddressWhenNotNullAddress() throws
Exception {
assertThat(MailAddress.getMailSender(GOOD_ADDRESS))
.isEqualTo(new MailAddress(GOOD_ADDRESS));
}
@SuppressWarnings("deprecation")
@Test
- public void equalsShouldReturnFalseWhenOnlyFirstMemberIsANullSender() {
+ void equalsShouldReturnFalseWhenOnlyFirstMemberIsANullSender() {
assertThat(MailAddress.getMailSender(GOOD_ADDRESS))
.isNotEqualTo(MailAddress.nullSender());
}
@SuppressWarnings("deprecation")
@Test
- public void equalsShouldReturnFalseWhenOnlySecondMemberIsANullSender() {
+ void equalsShouldReturnFalseWhenOnlySecondMemberIsANullSender() {
assertThat(MailAddress.nullSender())
.isNotEqualTo(MailAddress.getMailSender(GOOD_ADDRESS));
}
@Test
- public void shouldMatchBeanContract() {
+ void shouldMatchBeanContract() {
EqualsVerifier.forClass(MailAddress.class)
.verify();
}
diff --git
a/core/src/test/java/org/apache/james/core/builder/MimeMessageBuilderTest.java
b/core/src/test/java/org/apache/james/core/builder/MimeMessageBuilderTest.java
index 62b8c56..8783b63 100644
---
a/core/src/test/java/org/apache/james/core/builder/MimeMessageBuilderTest.java
+++
b/core/src/test/java/org/apache/james/core/builder/MimeMessageBuilderTest.java
@@ -24,12 +24,12 @@ import static org.assertj.core.api.Assertions.assertThat;
import javax.mail.internet.MimeMessage;
import org.apache.james.util.MimeMessageUtil;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-public class MimeMessageBuilderTest {
+class MimeMessageBuilderTest {
@Test
- public void buildShouldPreserveMessageID() throws Exception {
+ void buildShouldPreserveMessageID() throws Exception {
String messageID = "<abc@123>";
MimeMessage mimeMessage = MimeMessageBuilder.mimeMessageBuilder()
.addHeader("Message-ID", messageID)
@@ -40,7 +40,7 @@ public class MimeMessageBuilderTest {
}
@Test
- public void buildShouldAllowMultiValuedHeader() throws Exception {
+ void buildShouldAllowMultiValuedHeader() throws Exception {
String headerName = "header";
MimeMessage mimeMessage = MimeMessageBuilder.mimeMessageBuilder()
.addHeader(headerName, "value1")
@@ -52,7 +52,7 @@ public class MimeMessageBuilderTest {
}
@Test
- public void buildShouldPreserveDate() throws Exception {
+ void buildShouldPreserveDate() throws Exception {
String value = "Wed, 28 Mar 2018 17:02:25 +0200";
MimeMessage mimeMessage = MimeMessageBuilder.mimeMessageBuilder()
.addHeader("Date", value)
@@ -63,7 +63,7 @@ public class MimeMessageBuilderTest {
}
@Test
- public void embeddedMessagesShouldBeSupported() throws Exception {
+ void embeddedMessagesShouldBeSupported() throws Exception {
MimeMessage embeddedMimeMessage =
MimeMessageBuilder.mimeMessageBuilder()
.setSubject("A unicorn eat popcorn")
.setText("As studies demonstrated unicorns eats cereals.")
@@ -81,7 +81,7 @@ public class MimeMessageBuilderTest {
}
@Test
- public void buildShouldAllowToSpecifyMultipartSubtype() throws Exception {
+ void buildShouldAllowToSpecifyMultipartSubtype() throws Exception {
MimeMessage mimeMessage = MimeMessageBuilder.mimeMessageBuilder()
.setContent(MimeMessageBuilder.multipartBuilder()
.subType("alternative")
@@ -93,5 +93,4 @@ public class MimeMessageBuilderTest {
.startsWith("multipart/alternative");
}
-
}
\ No newline at end of file
diff --git
a/core/src/test/java/org/apache/james/core/builder/MimeMessageWrapperTest.java
b/core/src/test/java/org/apache/james/core/builder/MimeMessageWrapperTest.java
index 230763c..62947c6 100644
---
a/core/src/test/java/org/apache/james/core/builder/MimeMessageWrapperTest.java
+++
b/core/src/test/java/org/apache/james/core/builder/MimeMessageWrapperTest.java
@@ -31,12 +31,12 @@ import java.util.Properties;
import javax.mail.Session;
import javax.mail.internet.MimeMessage;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-public class MimeMessageWrapperTest {
+class MimeMessageWrapperTest {
@Test
- public void saveChangesShouldPreserveMessageId() throws Exception {
+ void saveChangesShouldPreserveMessageId() throws Exception {
String messageId = "<5...@ab.com>";
String messageText = "Message-ID: " + messageId + "\r\n" +
"Subject: test\r\n" +
@@ -53,7 +53,7 @@ public class MimeMessageWrapperTest {
}
@Test
- public void wrapShouldPreserveBody() throws Exception {
+ void wrapShouldPreserveBody() throws Exception {
String messageAsText = "header1: <5...@ab.com>\r\n" +
"Subject: test\r\n" +
"\r\n" +
@@ -71,7 +71,7 @@ public class MimeMessageWrapperTest {
}
@Test
- public void wrapShouldNotThrowWhenNoBody() throws Exception {
+ void wrapShouldNotThrowWhenNoBody() throws Exception {
MimeMessage originalMessage = new
MimeMessage(Session.getDefaultInstance(new Properties()));
originalMessage.addHeader("header1", "value1");
originalMessage.addHeader("header2", "value2");
diff --git
a/core/src/test/java/org/apache/james/core/healthcheck/ResultStatusTest.java
b/core/src/test/java/org/apache/james/core/healthcheck/ResultStatusTest.java
index 1003ef5..2cd4f10 100644
--- a/core/src/test/java/org/apache/james/core/healthcheck/ResultStatusTest.java
+++ b/core/src/test/java/org/apache/james/core/healthcheck/ResultStatusTest.java
@@ -22,18 +22,18 @@ package org.apache.james.core.healthcheck;
import static org.assertj.core.api.Assertions.assertThat;
import org.assertj.core.api.SoftAssertions;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-public class ResultStatusTest {
+class ResultStatusTest {
@Test
- public void mergeReturnHealthyWhenMergeWithHealthy() {
+ void mergeReturnHealthyWhenMergeWithHealthy() {
assertThat(ResultStatus.merge(ResultStatus.HEALTHY,
ResultStatus.HEALTHY))
.isEqualTo(ResultStatus.HEALTHY);
}
@Test
- public void mergeReturnUnHealthyWhenMergeWithUnHealthy() {
+ void mergeReturnUnHealthyWhenMergeWithUnHealthy() {
SoftAssertions.assertSoftly(softly -> {
softly.assertThat(ResultStatus.merge(ResultStatus.HEALTHY,
ResultStatus.UNHEALTHY))
.isEqualTo(ResultStatus.UNHEALTHY);
@@ -49,7 +49,7 @@ public class ResultStatusTest {
}
@Test
- public void mergeReturnDegradedWhenMergeWithDegraded() {
+ void mergeReturnDegradedWhenMergeWithDegraded() {
SoftAssertions.assertSoftly(softly -> {
softly.assertThat(ResultStatus.merge(ResultStatus.HEALTHY,
ResultStatus.DEGRADED))
.isEqualTo(ResultStatus.DEGRADED);
diff --git a/core/src/test/java/org/apache/james/core/quota/QuotaCountTest.java
b/core/src/test/java/org/apache/james/core/quota/QuotaCountTest.java
index d704687..4722297 100644
--- a/core/src/test/java/org/apache/james/core/quota/QuotaCountTest.java
+++ b/core/src/test/java/org/apache/james/core/quota/QuotaCountTest.java
@@ -35,7 +35,7 @@ public class QuotaCountTest implements
QuotaValueTest<QuotaCount> {
}
@Test
- public void shouldRespectBeanContract() {
+ void shouldRespectBeanContract() {
EqualsVerifier.forClass(QuotaCount.class).verify();
}
diff --git a/core/src/test/java/org/apache/james/core/quota/QuotaSizeTest.java
b/core/src/test/java/org/apache/james/core/quota/QuotaSizeTest.java
index f89223b..7d1fa7b 100644
--- a/core/src/test/java/org/apache/james/core/quota/QuotaSizeTest.java
+++ b/core/src/test/java/org/apache/james/core/quota/QuotaSizeTest.java
@@ -35,7 +35,7 @@ public class QuotaSizeTest implements
QuotaValueTest<QuotaSize> {
}
@Test
- public void shouldRespectBeanContract() {
+ void shouldRespectBeanContract() {
EqualsVerifier.forClass(QuotaSize.class).verify();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
