added more message creation tests and helper for setting up from address with full name

Author: ibalosh

src/main/java/com/wildbit/java/postmark/client/data/model/message/BaseMessage.java

@@ -74,6 +74,10 @@ public void setFrom(String from) {
         this.from = from;
     }
 
+    public void setFrom(String name, String address) {
+        this.from = convertRecipient(name, address);
+    }
+
     public String getTo() {
         return to;
     }
@@ -336,28 +340,31 @@ private String readFileContentType(String path) {
     }
 
     /**
-     * This helper method allows setting list of recipients which will contain full name next to email address.
+     * Converts list of recipients which contains full name next to email address to a string.
      * By passing something like Map of: key -> John Smith, value -> john@example.com
      * you would be able to send email to recipient John Smith ("John Smith" <john@example.com>)
      *
      * @param recipients recipient Map, with Full Name, Email address pairs.
      */
     private String convertRecipients(Map<String,String> recipients) {
-
         StringBuilder recipientsString = new StringBuilder();
 
         Iterator<Map.Entry<String, String>> entries = recipients.entrySet().iterator();
         while (entries.hasNext()) {
             Map.Entry<String, String> entry = entries.next();
-            recipientsString.append("\"").append(entry.getKey()).append("\"").append("<").append(entry.getValue()).append(">");
+            recipientsString.append(convertRecipient(entry.getKey(), entry.getValue()));
             if (entries.hasNext()) { recipientsString.append(","); }
         }
 
         return recipientsString.toString();
     }
 
+    /**
+     * Converts list of recipients to string list like "john@example.com,smith@example.com".
+     *
+     * @param recipients recipient List.
+     */
     private String convertRecipients(List<String> recipients) {
-
         StringBuilder recipientsString = new StringBuilder();
 
         Iterator<String> entries = recipients.iterator();
@@ -370,4 +377,9 @@ private String convertRecipients(List<String> recipients) {
         return recipientsString.toString();
     }
 
+    private String convertRecipient(String name, String address) {
+        StringBuilder recipientsString = new StringBuilder();
+        return recipientsString.append("\"").append(name).append("\"")
+                .append("<").append(address).append(">").toString();
+    }
 }

src/test/java/unit/data/MessageTest.java

@@ -65,6 +65,33 @@ void simpleMessageWithHeaders() throws IOException{
 
     }
 
+    @Test
+    void singleMessageFromRecipient() {
+        Message message = new Message();
+
+        message.setFrom("igor@example.com");
+        assertEquals(message.getFrom(), "igor@example.com");
+    }
+
+    @Test
+    void singleMessageFromRecipientFullName() {
+        Message message = new Message();
+
+        message.setFrom("John Smith","igor@example.com");
+        assertEquals(message.getFrom(), "\"John Smith\"<igor@example.com>");
+    }
+
+    @Test
+    void singleMessageToRecipient() {
+        Message message = new Message();
+
+        ArrayList<String> recipients = new ArrayList<>();
+        recipients.add("igor@example.com");
+
+        message.setTo(recipients);
+        assertEquals(message.getTo(), "\"igor@example.com\"");
+    }
+
     @Test
     void simpleMessageToRecipients() throws IOException {
 
@@ -167,14 +194,31 @@ void addAttachment() throws IOException {
         assertEquals(attachment.get("ContentType"), "application/pdf");
         assertEquals(attachment.get("Name"), new File(getDefaultFilePath()).getName());
         assertNotNull(attachment.get("Content"));
+        assertEquals(attachment.get("ContentId"), null);
+    }
+
+    @Test
+    void addAttachmentWithContentId() throws IOException {
+        String contentId = "test-id";
+        Message message = new Message("from@example.com","to@example.com","Hello world", "Hello world");
+        message.addAttachment(getDefaultFilePath(), contentId);
+
+        HashMap<String,String> attachment = (HashMap<String, String>) message.getAttachments().get(0);
+        assertEquals(attachment.get("ContentType"), "application/pdf");
+        assertEquals(attachment.get("Name"), new File(getDefaultFilePath()).getName());
+        assertNotNull(attachment.get("Content"));
+        assertEquals(attachment.get("ContentId"), contentId);
     }
 
     @Test
     void addMultipleAttachments() throws IOException {
+        String contentId = "test-id";
         Message message = new Message("from@example.com","to@example.com","Hello world", "Hello world");
-        message.addAttachment(getDefaultFilePath());
+        message.addAttachment(getDefaultFilePath(), contentId);
         message.addAttachment(getDefaultFilePath());
         assertEquals(message.getAttachments().size(), 2);
+        assertEquals(message.getAttachments().get(0).get("ContentId"), contentId);
+        assertEquals(message.getAttachments().get(1).get("ContentId"), null);
     }
 
 }