Refactor testConversationMessage to use mocking.

Author: Daniel Morales

api/src/main/java/com/messagebird/MessageBirdClient.java

@@ -72,7 +72,7 @@ public class MessageBirdClient {
      * can, however, override this behaviour by providing absolute URLs
      * ourselves.
      */
-    private static final String CONVERSATIONS_BASE_URL = "https://conversations.messagebird.com/v1";
+    static final String CONVERSATIONS_BASE_URL = "https://conversations.messagebird.com/v1";
     static final String VOICE_CALLS_BASE_URL = "https://voice.messagebird.com";
     static final String NUMBERS_CALLS_BASE_URL = "https://numbers.messagebird.com/v1";
     static final String MESSAGING_BASE_URL = "https://messaging.messagebird.com/v1";
@@ -91,10 +91,10 @@ public class MessageBirdClient {
     private static final String VERIFYPATH = "/verify";
     private static final String VERIFYEMAILPATH = "/verify/messages/email";
     private static final String VOICEMESSAGESPATH = "/voicemessages";
-    private static final String CONVERSATION_PATH = "/conversations";
-    private static final String CONVERSATION_SEND_PATH = "/send";
-    private static final String CONVERSATION_MESSAGE_PATH = "/messages";
-    private static final String CONVERSATION_WEBHOOK_PATH = "/webhooks";
+    static final String CONVERSATION_PATH = "/conversations";
+    static final String CONVERSATION_SEND_PATH = "/send";
+    static final String CONVERSATION_MESSAGE_PATH = "/messages";
+    static final String CONVERSATION_WEBHOOK_PATH = "/webhooks";
     static final String INTEGRATIONS_WHATSAPP_PATH = "/platforms/whatsapp";
     static final String VOICECALLSPATH = "/calls";
     static final String LEGSPATH = "/legs";

api/src/test/java/com/messagebird/MessageBirdClientTest.java

@@ -10,6 +10,8 @@
 import com.messagebird.objects.integrations.TemplateResponse;
 import com.messagebird.objects.voicecalls.*;
 import java.util.ArrayList;
+
+import org.jetbrains.annotations.NotNull;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -1289,6 +1291,25 @@ public void testDeleteChildAccount() throws GeneralException, UnauthorizedExcept
 
     @Test
     public void testConversationMessage() throws Exception {
+        ConversationSendRequest request = createDummyConversationRequest();
+        ConversationSendResponse conversationSendResponse = new ConversationSendResponse();
+        conversationSendResponse.setStatus("ACCEPTED");
+        conversationSendResponse.setId("1234");
+
+        MessageBirdService messageBirdServiceMock = mock(MessageBirdService.class);
+        MessageBirdClient messageBirdClientInjectMock = new MessageBirdClient(messageBirdServiceMock);
+
+        when(messageBirdServiceMock.sendPayLoad( CONVERSATIONS_BASE_URL + CONVERSATION_SEND_PATH, request, ConversationSendResponse.class))
+                .thenReturn(conversationSendResponse);
+        ConversationSendResponse response = messageBirdClientInjectMock.sendMessage(request);
+
+        verify(messageBirdServiceMock, times(1))
+                .sendPayLoad(CONVERSATIONS_BASE_URL + CONVERSATION_SEND_PATH, request, ConversationSendResponse.class);
+        assertNotNull(response.getId());
+        assertNotNull(response.getStatus());
+    }
+
+    private ConversationSendRequest createDummyConversationRequest() {
         ConversationContent conversationContent = new ConversationContent();
         conversationContent.setText("test");
         ConversationSendRequest request = new ConversationSendRequest();
@@ -1298,11 +1319,8 @@ public void testConversationMessage() throws Exception {
         request.setType(ConversationContentType.TEXT);
         request.setContent(conversationContent);
         request.setTrackId("mycampaign");
-        ConversationSendResponse conversationSendResponse = messageBirdClient.sendMessage(request);
-        ConversationMessage conversationMessageResponse = messageBirdClient.viewConversationMessage(conversationSendResponse.getId());
-        assertEquals(request.getFrom(),conversationMessageResponse.getChannelId());
-        assertEquals(ConversationContentType.TEXT,conversationMessageResponse.getType());
-        assertEquals(request.getTrackId(),conversationMessageResponse.getTrackId());
-        assertNotNull(conversationMessageResponse.getStatus());
+        return request;
     }
+
+
 }