Updated failing tests to use a new approach

Author: vitalii-t

src/test/java/io/mailtrap/api/AttachmentsImplTest.java

@@ -22,18 +22,11 @@ class AttachmentsImplTest extends BaseTest {
     @BeforeEach
     public void init() {
         TestHttpClient httpClient = new TestHttpClient(List.of(
-                DataMock.build(
-                        Constants.GENERAL_HOST + "/api/accounts/" + accountId + "/inboxes/" + inboxId + "/messages/" + messageId + "/attachments",
-                        "GET",
-                        null,
-                        "api/attachments/getAttachmentsResponse.json"
-                ),
-                DataMock.build(
-                        Constants.GENERAL_HOST + "/api/accounts/" + accountId + "/inboxes/" + inboxId + "/messages/" + messageId + "/attachments/" + attachmentId,
-                        "GET",
-                        null,
-                        "api/attachments/getAttachmentResponse.json"
-                )
+                DataMock.build(Constants.GENERAL_HOST + "/api/accounts/" + accountId + "/inboxes/" + inboxId + "/messages/" + messageId + "/attachments",
+                        "GET", null, "api/attachments/getAttachmentsResponse.json"),
+
+                DataMock.build(Constants.GENERAL_HOST + "/api/accounts/" + accountId + "/inboxes/" + inboxId + "/messages/" + messageId + "/attachments/" + attachmentId,
+                        "GET", null, "api/attachments/getAttachmentResponse.json")
         ));
 
         MailtrapConfig testConfig = new MailtrapConfig.Builder()

src/test/java/io/mailtrap/api/BulkEmailsImplTest.java

@@ -26,12 +26,8 @@ public void init() {
                 DataMock.build(
                         Constants.BULK_SENDING_HOST + "/api/send",
                         "POST",
-                        createValidTestMail().toJson(),
-                        """
-                                {
-                                  "success": true,
-                                  "message_ids": ["11111"]
-                                }"""
+                        "api/emails/sendRequest.json",
+                        "api/emails/sendResponse.json"
                 )
         ));
 

src/test/java/io/mailtrap/api/SendingEmailsImplTest.java

@@ -27,12 +27,8 @@ public void init() {
                 DataMock.build(
                         Constants.EMAIL_SENDING_SEND_HOST + "/api/send",
                         "POST",
-                        createValidTestMail().toJson(),
-                        """
-                                {
-                                  "success": true,
-                                  "message_ids": ["11111"]
-                                }"""
+                        "api/emails/sendRequest.json",
+                        "api/emails/sendResponse.json"
                 )
         ));
 

src/test/java/io/mailtrap/api/TestingEmailsImplTest.java

@@ -27,12 +27,8 @@ public void init() {
                 DataMock.build(
                         Constants.EMAIL_TESTING_SEND_HOST + "/api/send/" + INBOX_ID,
                         "POST",
-                        createValidTestMail().toJson(),
-                        """
-                                {
-                                  "success": true,
-                                  "message_ids": ["11111"]
-                                }"""
+                        "api/emails/sendRequest.json",
+                        "api/emails/sendResponse.json"
                 )
         ));
 

src/test/java/io/mailtrap/client/MailtrapClientTest.java

@@ -24,36 +24,14 @@ class MailtrapClientTest extends BaseSendTest {
     @BeforeEach
     void setUp() {
         TestHttpClient httpClient = new TestHttpClient(List.of(
-                DataMock.build(
-                        Constants.EMAIL_TESTING_SEND_HOST + "/api/send/" + INBOX_ID,
-                        "POST",
-                        createValidTestMail().toJson(),
-                        """
-                                {
-                                  "success": true,
-                                  "message_ids": ["11111"]
-                                }"""
-                ),
-                DataMock.build(
-                        Constants.BULK_SENDING_HOST + "/api/send",
-                        "POST",
-                        createValidTestMail().toJson(),
-                        """
-                                {
-                                  "success": true,
-                                  "message_ids": ["11111"]
-                                }"""
-                ),
-                DataMock.build(
-                        Constants.EMAIL_SENDING_SEND_HOST + "/api/send",
-                        "POST",
-                        createValidTestMail().toJson(),
-                        """
-                                {
-                                  "success": true,
-                                  "message_ids": ["11111"]
-                                }"""
-                )
+                DataMock.build(Constants.EMAIL_TESTING_SEND_HOST + "/api/send/" + INBOX_ID, "POST",
+                        "api/emails/sendRequest.json", "api/emails/sendResponse.json"),
+
+                DataMock.build(Constants.BULK_SENDING_HOST + "/api/send", "POST",
+                        "api/emails/sendRequest.json", "api/emails/sendResponse.json"),
+
+                DataMock.build(Constants.EMAIL_SENDING_SEND_HOST + "/api/send", "POST",
+                        "api/emails/sendRequest.json", "api/emails/sendResponse.json")
         ));
 
         MailtrapConfig mailtrapConfig = new MailtrapConfig.Builder()

src/test/resources/api/emails/sendRequest.json

@@ -0,0 +1,22 @@
+{
+  "from": {
+    "name": "John Doe",
+    "email": "[email protected]"
+  },
+  "to": [
+    {
+      "name": "Jane Doe",
+      "email": "[email protected]"
+    }
+  ],
+  "attachments": [
+    {
+      "content": "c2FtcGxlIHRleHQgaW4gdGV4dCBmaWxl",
+      "type": "text/plain",
+      "filename": "attachment.txt"
+    }
+  ],
+  "subject": "Sample valid mail subject",
+  "text": "Sample valid mail text",
+  "html": "<html><body>Test HTML</body></html>"
+}

src/test/resources/api/emails/sendResponse.json

@@ -0,0 +1,4 @@
+{
+  "success": true,
+  "message_ids": ["11111"]
+}