Finished switch to Junit5!

Author: bbottema

modules/simple-java-mail/pom.xml

@@ -117,8 +117,9 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.19.1</version>
+                <version>3.2.5</version>
                 <configuration>
+                    <useSystemClassLoader>false</useSystemClassLoader>
                     <forkCount>8</forkCount><!-- for quad cores with multi-threading -->
                     <reuseForks>false</reuseForks>
                 </configuration>

modules/simple-java-mail/src/test/java/org/simplejavamail/converter/internal/mimemessage/MimeMessageHelper2Test.java

@@ -3,6 +3,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.MockedStatic;
+import org.mockito.Mockito;
 import org.simplejavamail.api.email.Email;
 import org.simplejavamail.api.email.config.DkimConfig;
 import org.simplejavamail.converter.EmailConverter;
@@ -33,7 +34,7 @@ public void testSignMessageWithDKIM_ShouldFailSpecificallyBecauseDKIMLibraryIsMi
 						.build())
 				.buildEmail();
 
-		try (MockedStatic<MiscUtil> miscUtilMockedStatic = mockStatic(MiscUtil.class)) {
+		try (MockedStatic<MiscUtil> miscUtilMockedStatic = mockStatic(MiscUtil.class, Mockito.CALLS_REAL_METHODS)) {
 			miscUtilMockedStatic.when(() -> MiscUtil.classAvailable("org.simplejavamail.internal.dkimsupport.DKIMSigner")).thenReturn(false);
 
 			assertThatThrownBy(() -> EmailConverter.emailToMimeMessage(email))

modules/simple-java-mail/src/test/java/org/simplejavamail/mailer/MailerSOCKSLiveTest.java

@@ -1,6 +1,7 @@
 package org.simplejavamail.mailer;
 
 import org.bbottema.javasocksproxyserver.junit.SockServerExtension;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -20,7 +21,7 @@ public class MailerSOCKSLiveTest {
 	private static final Integer PROXY_SERVER_PORT = 253;
 
 	@RegisterExtension
-	static SmtpServerExtension smtpServerRule = new SmtpServerExtension(SMTP_SERVER_PORT, "usey", "passy");
+	static SmtpServerExtension smtpServerRule = new SmtpServerExtension(SMTP_SERVER_PORT, null, null);
 	@RegisterExtension
 	static SockServerExtension sockServerRule = new SockServerExtension(PROXY_SERVER_PORT);
 
@@ -29,6 +30,11 @@ public void setup() {
 		ConfigLoaderTestHelper.clearConfigProperties();
 	}
 
+	@AfterEach
+	public void tearDown() {
+		smtpServerRule.getWiser().stop();
+	}
+
 	@Test
 	public void testSOCKSPassthrough_Anonymous() throws Exception {
 		Mailer mailer = MailerBuilder

modules/simple-java-mail/src/test/java/testutil/testrules/SmtpServerExtension.java

@@ -26,7 +26,10 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class SmtpServerExtension implements BeforeEachCallback, AfterEachCallback {
-	private final Wiser wiser;
+	@NotNull final Integer port;
+	@Nullable final String username;
+	@Nullable final String password;
+	private Wiser wiser;
 
 	@RequiredArgsConstructor
 	static class RequiredUsernamePasswordValidator implements UsernamePasswordValidator {
@@ -42,13 +45,17 @@ public void login(String username, String password, MessageContext context) thro
 	}
 
 	public SmtpServerExtension(@NotNull Integer port, @Nullable String username, @Nullable String password) {
-		this.wiser = Wiser.create(SMTPServer.port(port)
-				.authenticationHandlerFactory(new EasyAuthenticationHandlerFactory(new RequiredUsernamePasswordValidator(username, password)))
-				.requireAuth(password != null));
+		this.port = port;
+		this.username = username;
+		this.password = password;
 	}
 
 	@Override
 	public void beforeEach(ExtensionContext context) {
+		this.wiser = Wiser.create(SMTPServer.port(port)
+				.authenticationHandlerFactory(new EasyAuthenticationHandlerFactory(new RequiredUsernamePasswordValidator(username, password)))
+				.requireAuth(password != null));
+
 		this.wiser.start();
 	}