Fix testdata and equals checking with different line-endings

bbottema · bbottema · commit f137f5e2f5b7 · 2019-04-05T21:57:19.000+02:00
diff --git a/src/main/java/org/simplejavamail/email/EqualsHelper.java b/src/main/java/org/simplejavamail/email/EqualsHelper.java
@@ -3,6 +3,8 @@
 import javax.activation.DataSource;
 import java.util.List;
 
+import static org.simplejavamail.internal.util.MiscUtil.normalizeNewlines;
+
 /**
  * Util class to get rid of some boilerplate code in the core classes. The equals code was needed to analyze junit test errors.
  * <p>
@@ -30,7 +32,7 @@ public static boolean equalsEmail(final Email email1, final Email email2) {
 		if (email1.getEmailToForward() != null ? email2.getEmailToForward() == null : email2.getEmailToForward() != null) {
 			return false;
 		}
-		if (email1.getHTMLText() != null ? !email1.getHTMLText().equals(email2.getHTMLText()) : email2.getHTMLText() != null) {
+		if (email1.getHTMLText() != null ? !normalizeNewlines(email1.getHTMLText()).equals(normalizeNewlines(email2.getHTMLText())) : email2.getHTMLText() != null) {
 			return false;
 		}
 		if (email1.getSubject() != null ? !email1.getSubject().equals(email2.getSubject()) : email2.getSubject() != null) {
diff --git a/src/main/java/org/simplejavamail/internal/util/MiscUtil.java b/src/main/java/org/simplejavamail/internal/util/MiscUtil.java
@@ -149,4 +149,9 @@ public static boolean classAvailable(@Nonnull String className) {
 			return false;
 		}
 	}
+	
+	@Nullable
+	public static String normalizeNewlines(final @Nullable String text) {
+		return text == null ? null : text.replaceAll("\\r\\n", "\n").replaceAll("\\r", "\n");
+	}
 }
diff --git a/src/test/java/org/simplejavamail/mailer/MailerLiveTest.java b/src/test/java/org/simplejavamail/mailer/MailerLiveTest.java
@@ -25,7 +25,7 @@
 import static org.assertj.core.data.MapEntry.entry;
 import static org.simplejavamail.converter.EmailConverter.mimeMessageToEmail;
 import static org.simplejavamail.converter.EmailConverter.mimeMessageToEmailBuilder;
-import static testutil.EmailHelper.normalizeText;
+import static org.simplejavamail.internal.util.MiscUtil.normalizeNewlines;
 import static testutil.EmailHelper.readOutlookMessage;
 
 @SuppressWarnings("unused")
@@ -86,10 +86,12 @@ public void createMailSession_OutlookMessageTest()
 		// Outlook overrode this when saving the .email to match the mail account
 		EmailAssert.assertThat(email).hasRecipients(new Recipient("Bottema, Benny", "benny.bottema@aegon.nl", TO));
 		EmailAssert.assertThat(email).hasReplyToRecipient(new Recipient("lollypop-replyto", "lo.pop.replyto@somemail.com", null));
-		assertThat(normalizeText(email.getPlainText())).isEqualTo("We should meet up!\n");
+		assertThat(normalizeNewlines(email.getPlainText())).isEqualTo("We should meet up!\n");
 		// Outlook overrode this value too OR converted the original HTML to RTF, from which OutlookMessageParser derived this HTML
-		assertThat(normalizeText(email.getHTMLText())).contains(
-				"<html><body style=\"font-family:'Courier',monospace;font-size:10pt;\">   <br/>      <br/> <b>   We should meet up! <br/>  </b>   <br/>  <img src=\"cid:thumbsup\"> <br/> ");
+		assertThat(normalizeNewlines(email.getHTMLText())).contains(
+				"<html><body style=\"font-family:'Courier',monospace;font-size:10pt;\">   <br/> \n" +
+						"     <br/> <b>   We should meet up! <br/>  </b>   <br/>  <img src=\"cid:thumbsup\">\n" +
+						" <br/> </body></html>");
 		// the RTF was probably created by Outlook based on the HTML when the message was saved
 		assertThat(email.getAttachments()).hasSize(2);
 		assertThat(email.getEmbeddedImages()).hasSize(1);
@@ -100,9 +102,9 @@ public void createMailSession_OutlookMessageTest()
 		assertAttachmentMetadata(attachment1, "text/plain", "dresscode.txt");
 		assertAttachmentMetadata(attachment2, "text/plain", "location.txt");
 		assertAttachmentMetadata(embeddedImg, "image/png", "thumbsup");
-
-		assertThat(normalizeText(attachment1.readAllData())).isEqualTo("Black Tie Optional");
-		assertThat(normalizeText(attachment2.readAllData())).isEqualTo("On the moon!");
+		
+		assertThat(normalizeNewlines(attachment1.readAllData())).isEqualTo("Black Tie Optional");
+		assertThat(normalizeNewlines(attachment2.readAllData())).isEqualTo("On the moon!");
 	}
 
 	private Email assertSendingEmail(final EmailPopulatingBuilder originalEmailPopulatingBuilder, boolean compensateForDresscodeAttachmentNameOverrideErasure)
diff --git a/src/test/java/testutil/EmailHelper.java b/src/test/java/testutil/EmailHelper.java
@@ -63,7 +63,4 @@ public static EmailPopulatingBuilder readOutlookMessage(final String filePath) {
 		return outlookMsgToEmailBuilder(resourceAsStream);
 	}
 	
-	public static String normalizeText(String text) {
-		return text.replaceAll("\\r\\n", "\n").replaceAll("\\r", "\n");
-	}
 }

Original file line number	Diff line number	Diff line change
`@@ -149,4 +149,9 @@ public static boolean classAvailable(@Nonnull String className) {`
`149`	`149`	`return false;`
`150`	`150`	`}`
`151`	`151`	`}`
	`152`	`+`
	`153`	`+ @Nullable`
	`154`	`+ public static String normalizeNewlines(final @Nullable String text) {`
	`155`	`+ return text == null ? null : text.replaceAll("\\r\\n", "\n").replaceAll("\\r", "\n");`
	`156`	`+ }`
`152`	`157`	`}`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,4 @@ public static EmailPopulatingBuilder readOutlookMessage(final String filePath) {`
`63`	`63`	`return outlookMsgToEmailBuilder(resourceAsStream);`
`64`	`64`	`}`
`65`	`65`
`66`		`- public static String normalizeText(String text) {`
`67`		`- return text.replaceAll("\\r\\n", "\n").replaceAll("\\r", "\n");`
`68`		`- }`
`69`	`66`	`}`