Added junit test for emailBuilder.copying(email) (thereby resolving related FIXME) and fixed a bug where ContentTransferEncoding was not copied

Author: bbottema

modules/simple-java-mail/src/main/java/org/simplejavamail/email/internal/EmailStartingBuilderImpl.java

@@ -196,7 +196,6 @@ public EmailPopulatingBuilder copying(@NotNull final EmailPopulatingBuilder emai
 	 */
 	@SuppressWarnings({"deprecation" })
 	@Override
-	// FIXME junit test this copying method
 	public EmailPopulatingBuilder copying(@NotNull final Email email) {
 		EmailPopulatingBuilder builder = new EmailPopulatingBuilderImpl()
 				.ignoringOverrides(ignoreDefaults)
@@ -226,6 +225,9 @@ public EmailPopulatingBuilder copying(@NotNull final Email email) {
 		builder.withRecipients(email.getRecipients());
 		builder.withEmbeddedImages(email.getEmbeddedImages());
 		builder.withAttachments(email.getAttachments());
+		if (email.getContentTransferEncoding() != null) {
+			builder.withContentTransferEncoding(email.getContentTransferEncoding());
+		}
 		((InternalEmailPopulatingBuilder) builder).withHeaders(email.getHeaders(), true);
 		if (email.getSentDate() != null) {
 			builder.fixingSentDate(email.getSentDate());

modules/simple-java-mail/src/main/java/org/simplejavamail/email/internal/InternalEmail.java

@@ -28,7 +28,7 @@ public InternalEmail(@NotNull EmailPopulatingBuilder builder) {
      * are applied. When sending the email, however, we still need a reference to the original email to be able to update the message id. userProvidedEmail can be set to
      * null in some junit tests.
      */
-    public void setUserProvidedEmail(@NotNull final Email userProvidedEmail) {
+    public void setUserProvidedEmail(@Nullable final Email userProvidedEmail) {
         this.userProvidedEmail = (InternalEmail) userProvidedEmail;
     }
 

modules/simple-java-mail/src/test/java/org/simplejavamail/email/internal/EmailStartingBuilderImplTest.java

@@ -1,14 +1,17 @@
 package org.simplejavamail.email.internal;
 
+import lombok.val;
 import org.junit.Test;
 import org.simplejavamail.api.email.CalendarMethod;
 import org.simplejavamail.api.email.Email;
 import org.simplejavamail.api.email.EmailAssert;
 import org.simplejavamail.api.email.EmailPopulatingBuilder;
+import org.simplejavamail.api.email.EmailWithDefaultsAndOverridesApplied;
 import org.simplejavamail.api.email.config.DkimConfig;
 import org.simplejavamail.converter.EmailConverter;
 import org.simplejavamail.email.EmailBuilder;
 import testutil.ConfigLoaderTestHelper;
+import testutil.EmailHelper;
 
 import java.io.File;
 import java.util.Date;
@@ -22,6 +25,28 @@ public class EmailStartingBuilderImplTest {
 	private static final String RESOURCES_PATH = determineResourceFolder("simple-java-mail") + "/test/resources";
 	private static final String RESOURCES_TEST_MESSAGES = RESOURCES_PATH + "/test-messages";
 
+	@Test
+	public void testCopying() {
+		val email1 = EmailHelper.createDummyEmailBuilder("moo", true, false, true, true, true, false, true)
+				.signWithDomainKey(DkimConfig.builder()
+						.dkimPrivateKeyData("dummykey")
+						.dkimSigningDomain("moo.com")
+						.dkimSelector("selector")
+						.build())
+				.buildEmailCompletedWithDefaultsAndOverrides()
+				.getDelegate();
+
+		//noinspection deprecation
+		((InternalEmail) email1).setUserProvidedEmail(null);
+
+		val email2 = EmailBuilder
+				.ignoringDefaults()
+				.ignoringOverrides()
+				.copying(email1).buildEmail();
+
+		assertThat(email2).isEqualTo(email1);
+	}
+
 	@Test
 	public void testCopyingSmimeSignedOutlookMessage() {
 		final Email emailParsedFromMsg = EmailConverter.outlookMsgToEmail(new File(RESOURCES_TEST_MESSAGES + "/SMIME (signed and clear text).msg"));