#108 Properly test message id's and removed old hacks

Author: bbottema

src/main/java/org/simplejavamail/converter/EmailConverter.java

@@ -245,6 +245,7 @@ private static void fillEmailFromMimeMessage(@Nonnull final Email email, @Nonnul
 				email.addHeader(header.getKey(), header.getValue());
 			}
 		}
+		email.setId(mimeMessage.getMessageID());
 		for (final InternetAddress to : parser.getTo()) {
 			email.addNamedToRecipients(to.getPersonal(), to.getAddress());
 		}

src/test/java/org/simplejavamail/mailer/MailerLiveTest.java

@@ -1,7 +1,6 @@
 package org.simplejavamail.mailer;
 
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.simplejavamail.email.AttachmentResource;
@@ -22,7 +21,6 @@
 import static javax.mail.Message.RecipientType.TO;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.simplejavamail.converter.EmailConverter.mimeMessageToEmail;
-import static org.simplejavamail.internal.util.MiscUtil.valueNullOrEmpty;
 import static testutil.EmailHelper.normalizeText;
 import static testutil.EmailHelper.readOutlookMessage;
 
@@ -67,7 +65,6 @@ public void createMailSession_StandardDummyMail_IncludingCustomHeaders()
 	}
 
 	@Test
-	@Ignore("Unfortunately, Wiser doesn't seem to get the ID back, but I confirmed with gmail that the (correct) ID should be there")
 	public void createMailSession_StandardDummyMailWithId()
 			throws IOException, MessagingException {
 		assertSendingEmail(EmailHelper.createDummyEmail("<123@456>", true, false, false));
@@ -107,14 +104,17 @@ private Email assertSendingEmail(final Email originalEmail)
 			throws MessagingException {
 		mailer.sendMail(originalEmail);
 		MimeMessage receivedMimeMessage = smtpServerRule.getOnlyMessage();
-		if (!valueNullOrEmpty(originalEmail.getId())) {
-			 assertThat(receivedMimeMessage.getMessageID()).isEqualTo(originalEmail.getId());
-		}
+		assertThat(receivedMimeMessage.getMessageID()).isEqualTo(originalEmail.getId());
+		
 		Email receivedEmail = mimeMessageToEmail(receivedMimeMessage);
 		// hack: it seems Wiser automatically defaults replyTo address to the From address if left empty
 		if (originalEmail.getReplyToRecipient() == null) {
 			originalEmail.setReplyToAddress(originalEmail.getFromRecipient());
 		}
+		// received email will always have an id, so let's make sure we're able to compare to the original email object
+		if (originalEmail.getHeaders().get("Message-ID") == null) {
+			originalEmail.addHeader("Message-ID", originalEmail.getId());
+		}
 		assertThat(receivedEmail).isEqualTo(originalEmail);
 		return receivedEmail;
 	}

src/test/java/testutil/testrules/SmtpServerRule.java

@@ -70,7 +70,6 @@ public MimeMessage getOnlyMessage()
 		List<WiserMessage> messages = getMessages();
 		assertThat(messages).hasSize(1);
 		MimeMessage mimeMessage = messages.iterator().next().getMimeMessage();
-		mimeMessage.removeHeader("Message-ID");
 		return mimeMessage;
 	}