Merge pull request #167 from rostilos/1.5.5-rc

feat: Update GreenMail version to 2.1.8 and refactor EmailDeliveryIT …

Author: rostilos

java-ecosystem/libs/email/src/it/java/org/rostilos/codecrow/email/EmailDeliveryIT.java

@@ -1,9 +1,12 @@
 package org.rostilos.codecrow.email;
 
-import com.icegreen.greenmail.util.GreenMail;
-import com.icegreen.greenmail.util.ServerSetupTest;
+import com.icegreen.greenmail.configuration.GreenMailConfiguration;
+import com.icegreen.greenmail.junit5.GreenMailExtension;
+import com.icegreen.greenmail.util.ServerSetup;
+import jakarta.mail.Multipart;
 import jakarta.mail.internet.MimeMessage;
 import org.junit.jupiter.api.*;
+import org.junit.jupiter.api.extension.RegisterExtension;
 import org.springframework.mail.SimpleMailMessage;
 import org.springframework.mail.javamail.JavaMailSenderImpl;
 import org.springframework.mail.javamail.MimeMessageHelper;
@@ -15,17 +18,23 @@
 /**
  * Integration test for email delivery using GreenMail embedded SMTP server.
  * Verifies actual SMTP delivery, HTML rendering, multi-part messages.
+ *
+ * Uses {@link GreenMailExtension} with a dynamic port to avoid port conflicts
+ * in CI environments and ensure proper server lifecycle management.
  */
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 class EmailDeliveryIT {
 
-    private GreenMail greenMail;
+    @RegisterExtension
+    static GreenMailExtension greenMail = new GreenMailExtension(
+            new ServerSetup(0, null, ServerSetup.PROTOCOL_SMTP))
+            .withConfiguration(GreenMailConfiguration.aConfig().withDisabledAuthentication());
+
     private JavaMailSenderImpl mailSender;
 
     @BeforeEach
     void setup() {
-        greenMail = new GreenMail(ServerSetupTest.SMTP);
-        greenMail.start();
+        greenMail.reset();
 
         mailSender = new JavaMailSenderImpl();
         mailSender.setHost("localhost");
@@ -37,9 +46,32 @@ void setup() {
         props.put("mail.smtp.starttls.enable", "false");
     }
 
-    @AfterEach
-    void teardown() {
-        greenMail.stop();
+    /**
+     * Extracts text content from a MimeMessage, handling both plain text
+     * and nested multipart (HTML) messages.
+     */
+    private String extractTextContent(MimeMessage msg) throws Exception {
+        Object content = msg.getContent();
+        if (content instanceof String s) {
+            return s;
+        }
+        if (content instanceof Multipart multipart) {
+            return extractFromMultipart(multipart);
+        }
+        return content.toString();
+    }
+
+    private String extractFromMultipart(Multipart multipart) throws Exception {
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < multipart.getCount(); i++) {
+            Object partContent = multipart.getBodyPart(i).getContent();
+            if (partContent instanceof String s) {
+                sb.append(s);
+            } else if (partContent instanceof Multipart nested) {
+                sb.append(extractFromMultipart(nested));
+            }
+        }
+        return sb.toString();
     }
 
     @Test
@@ -75,7 +107,7 @@ void shouldSendHtmlEmail() throws Exception {
 
         MimeMessage[] received = greenMail.getReceivedMessages();
         assertThat(received).hasSize(1);
-        String content = received[0].getContent().toString();
+        String content = extractTextContent(received[0]);
         assertThat(content).contains("CodeCrow Report");
         assertThat(content).contains("5 issues found");
     }
@@ -150,7 +182,7 @@ void shouldSendBackupCodesEmail() throws Exception {
 
         MimeMessage[] received = greenMail.getReceivedMessages();
         assertThat(received).hasSize(1);
-        String content = received[0].getContent().toString();
+        String content = extractTextContent(received[0]);
         assertThat(content).contains("CODE-0001", "CODE-0005");
     }
 }

java-ecosystem/libs/test-support/pom.xml

@@ -20,7 +20,7 @@
         <wiremock.version>3.4.2</wiremock.version>
         <rest-assured.version>5.4.0</rest-assured.version>
         <awaitility.version>4.2.0</awaitility.version>
-        <greenmail.version>2.0.1</greenmail.version>
+        <greenmail.version>2.1.8</greenmail.version>
     </properties>
 
     <dependencies>

java-ecosystem/pom.xml

@@ -338,7 +338,7 @@
             <dependency>
                 <groupId>com.icegreen</groupId>
                 <artifactId>greenmail-junit5</artifactId>
-                <version>2.0.1</version>
+                <version>2.1.8</version>
                 <scope>test</scope>
             </dependency>