10000 #501: bump outlook-message-parser to 1.13.2 for improved X500 address… · bbottema/simple-java-mail@3fee7a4 · GitHub
[go: up one dir, main page]
Skip to content

Commit 3fee7a4

Browse files
bbottemabbottema
committed
#501: bump outlook-message-parser to 1.13.2 for improved X500 address support
1 parent 80aa86f commit 3fee7a4

File tree

3 files changed

+23
-20
lines changed

3 files changed

+23
-20
lines changed

‎modules/outlook-module/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<dependency>
3636
<groupId>org.simplejavamail</groupId>
3737
<artifactId>outlook-message-parser</artifactId>
38-
<version>1.13.0</version>
38+
<version>1.13.2</version>
3939
<scope>compile</scope>
4040
</dependency>
4141
</dependencies>

‎modules/outlook-module/src/main/java/org/simplejavamail/internal/outlooksupport/converter/OutlookEmailConverter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ private static EmailFromOutlookMessage buildEmailFromOutlookMessage(
123123
boolean reasonIsEmptyMessage = e.getCause() instanceof MessagingException && e.getCause().getMessage().equals("No MimeMessage content");
124124
if (!reasonIsEmptyMessage) throw e;
125125
// :sadface: nested message attachment is actually invalid (possibly empty because of #396),
126-
// so we're justgoing to ignore it
126+
// so we're just going to ignore it
127127
}
128128
}
129129
}

‎modules/simple-java-mail/src/test/java/org/simplejavamail/converter/EmailConverterTest.java

+21-18
Original file line numberDiff line numberDiff line change
@@ -354,24 +354,27 @@ public void testGithub486_InvalidSignedOutlookMessage() {
354354

355355
assertThat(emailMime.getOriginalSmimeDetails().getSmimeMode()).isEqualTo(OriginalSmimeDetails.SmimeMode.SIGNED);
356356
assertThat(emailOutlook.getOriginalSmimeDetails().getSmimeMode()).isEqualTo(OriginalSmimeDetails.SmimeMode.SIGNED);
357-
assertThat(emailMime.getFromRecipient()).isEqualTo(emailOutlook.getFromRecipient());
358-
assertThat(emailMime.getId()).isEqualTo(emailOutlook.getId());
359-
assertThat(emailMime.getSentDate()).isEqualTo(emailOutlook.getSentDate());
360-
assertThat(emailMime.getBounceToRecipient()).isEqualTo(emailOutlook.getBounceToRecipient());
361-
assertThat(normalizeNewlines(emailMime.getPlainText())).isEqualTo(normalizeNewlines(emailOutlook.getPlainText()));
362-
assertThat(emailMime.getCalendarText()).isEqualTo(emailOutlook.getCalendarText());
363-
assertThat(emailMime.getCalendarMethod()).isEqualTo(emailOutlook.getCalendarMethod());
364-
assertThat(normalizeNewlines(emailMime.getHTMLText())).isEqualTo(normalizeNewlines(emailOutlook.getHTMLText()));
365-
assertThat(emailMime.getSubject()).isEqualTo(emailOutlook.getSubject());
366-
assertThat(emailMime.getRecipients()).containsExactlyElementsOf(emailOutlook.getRecipients());
367-
assertThat(emailMime.getOverrideReceivers()).containsExactlyElementsOf(emailOutlook.getOverrideReceivers());
368-
assertThat(emailMime.getEmbeddedImages()).containsExactlyElementsOf(emailOutlook.getEmbeddedImages());
369-
assertThat(emailMime.getUseDispositionNotificationTo()).isEqualTo(emailOutlook.getUseDispositionNotificationTo());
370-
assertThat(emailMime.getUseReturnReceiptTo()).isEqualTo(emailOutlook.getUseReturnReceiptTo());
371-
assertThat(emailMime.getDispositionNotificationTo()).isEqualTo(emailOutlook.getDispositionNotificationTo());
372-
assertThat(emailMime.getSmimeSigningConfig()).isEqualTo(emailOutlook.getSmimeSigningConfig());
373-
assertThat(emailMime.getSmimeEncryptionConfig()).isEqualTo(emailOutlook.getSmimeEncryptionConfig());
374-
assertThat(emailMime.getReturnReceiptTo()).isEqualTo(emailOutlook.getReturnReceiptTo());
357+
358+
assertThat(emailOutlook.getFromRecipient()).isEqualTo(emailMime.getFromRecipient());
359+
assertThat(emailOutlook.getId()).isEqualTo(emailMime.getId());
360+
assertThat(emailOutlook.getSentDate()).isEqualTo(emailMime.getSentDate());
361+
assertThat(emailOutlook.getBounceToRecipient()).isEqualTo(emailMime.getBounceToRecipient());
362+
assertThat(normalizeNewlines(emailOutlook.getPlainText())).isEqualTo(normalizeNewlines(emailMime.getPlainText()));
363+
assertThat(emailOutlook.getCalendarText()).isEqualTo(emailMime.getCalendarText());
364+
assertThat(emailOutlook.getCalendarMethod()).isEqualTo(emailMime.getCalendarMethod());
365+
assertThat(normalizeNewlines(emailOutlook.getHTMLText())).isEqualTo(normalizeNewlines(emailMime.getHTMLText()));
366+
assertThat(emailOutlook.getSubject()).isEqualTo(emailMime.getSubject());
367+
assertThat(emailOutlook.getRecipients())
368+
.extracting(r -> new Recipient(r.getName(), r.getAddress(), TO))
369+
.containsExactlyElementsOf(emailMime.getRecipients());
370+
assertThat(emailOutlook.getOverrideReceivers()).containsExactlyElementsOf(emailMime.getOverrideReceivers());
371+
assertThat(emailOutlook.getEmbeddedImages()).containsExactlyElementsOf(emailMime.getEmbeddedImages());
372+
assertThat(emailOutlook.getUseDispositionNotificationTo()).isEqualTo(emailMime.getUseDispositionNotificationTo());
373+
assertThat(emailOutlook.getUseReturnReceiptTo()).isEqualTo(emailMime.getUseReturnReceiptTo());
374+
assertThat(emailOutlook.getDispositionNotificationTo()).isEqualTo(emailMime.getDispositionNotificationTo());
375+
assertThat(emailOutlook.getSmimeSigningConfig()).isEqualTo(emailMime.getSmimeSigningConfig());
376+
assertThat(emailOutlook.getSmimeEncryptionConfig()).isEqualTo(emailMime.getSmimeEncryptionConfig());
377+
assertThat(emailOutlook.getReturnReceiptTo()).isEqualTo(emailMime.getReturnReceiptTo());
375378
}
376379

377380
@Test

0 commit comments

Comments
 (0)
0