testing idcontroller

Client/src/main/java/message/MessageController.java

@@ -1,5 +1,6 @@
 package message;
 
+import org.apache.http.HttpResponse;
 import shellutilities.Console;
 import shellutilities.RequestType;
 import shellutilities.YouAreEll;
@@ -20,25 +21,29 @@ public class MessageController {
         size = userLine.length;
     }
 
+    public void setUrl(YouAreEll url) {
+        this.url = url;
+    }
+
     public void messageController() throws IOException {
         if (size > 1) {
             try {
-                PrettyPrintMessage.prettyPrintMessageArray(getMessageToId(userLine[1]));
+                PrettyPrintMessage.prettyPrintMessageArray(url.readCalls(getMessageToId(userLine[1])));
             } catch (NullPointerException nullEx) {
                 c.print("Not a valid github name.");
             }
             // Get messages for me from friend #### URL: /ids/:mygithubid/from/:friendgithubid
             // get messages from sequence #### URL: /ids/:mygithubid/messages/:sequence
         } else {
-            PrettyPrintMessage.prettyPrintMessageArray(get_messages());
+            PrettyPrintMessage.prettyPrintMessageArray(url.readCalls(get_messages()));
         }
     }
 
-    public String get_messages() throws IOException {
+    public HttpResponse get_messages() throws IOException {
         return url.MakeURLCall(MAIN_URL, RequestType.GET, "");
     }
 
-    public String getMessageToId(String github) throws IOException {
+    public HttpResponse getMessageToId(String github) throws IOException {
 //        http://zipcode.rocks:8085/ids/jard/messages
         return url.MakeURLCall("/ids/" + github + MAIN_URL, RequestType.GET, "");
     }

Client/src/main/java/message/SendController.java

@@ -1,6 +1,7 @@
 package message;
 
 import id.IdController;
+import org.apache.http.HttpResponse;
 import shellutilities.Console;
 import shellutilities.RequestType;
 import shellutilities.YouAreEll;
@@ -23,12 +24,16 @@ public class SendController  {
 
     }
 
+    public void setUrl(YouAreEll url) {
+        this.url = url;
+    }
+
     public void sendController() {
         try {
             if (size > 3) {
                 if (!toIdValid()) {
-                    PrettyPrintMessage.prettyPrintSingleMessage(postMessage(userLine[1],
-                            messageCreator(userLine[1], "", getRawMsg()).toString()));
+                    PrettyPrintMessage.prettyPrintSingleMessage(url.readCalls(postMessage(userLine[1],
+                            messageCreator().toString())));
                 } else if (toIdValid()) {
                     //#### URL: /ids/:mygithubid/from/:friendgithubid
                 }
@@ -55,11 +60,11 @@ public class SendController  {
         }
     }
 
-    private Message messageCreator(String fromId, String toId, String message) {
-        return new Message("", "", fromId, toId, message);
+    private Message messageCreator() {
+        return new Message("", "", userLine[1], userLine[userLine.length - 1], getRawMsg());
     }
 
-    private String postMessage(String fromId, String payload) throws IOException {
+    private HttpResponse postMessage(String fromId, String payload) throws IOException {
         return url.MakeURLCall("/ids/" + fromId + "/messages", RequestType.POST, payload);
     }
 }

Client/src/main/java/shellutilities/YouAreEll.java

@@ -39,7 +39,6 @@ public class YouAreEll {
         try {
             switch (req) {
                 case GET:
-                    System.out.println("Entering get...");
                     return getCall(baseUrl + mainUrl);
 
                 case POST:

Client/src/test/java/id/IdControllerTest.java

@@ -44,26 +44,29 @@ public class IdControllerTest {
     public void getIdsSuccess() throws IOException {
         String response = new Id("userId", "name", "githubId").toString().replace("\n", "");
 
-        wireMockServer.stubFor(
+            wireMockServer.stubFor(
             get(urlEqualTo("/ids"))
                 .willReturn(aResponse().withStatus(200).withBody(response))
         );
 
-        HttpResponse result = urlClient.client.execute(new HttpGet(urlClient.baseUrl + "/ids"));
+//        HttpResponse result = urlClient.client.execute(new HttpGet(urlClient.baseUrl + "/ids"));
 
-        assertEquals(result.getStatusLine().getStatusCode(), 200);
-        assertEquals(urlClient.readCalls(result), response);
+        HttpResponse output = ic.get_ids();
+
+        assertEquals(output.getStatusLine().getStatusCode(), 200);
+        assertEquals(urlClient.readCalls(output), response);
     }
 
     @Test
     public void testGetIdFail() throws IOException {
-        // No body sent
+
         wireMockServer.stubFor(
                 get(urlEqualTo("/ids"))
                         .willReturn(aResponse().withStatus(404))
         );
 
-        HttpResponse result = urlClient.client.execute(new HttpGet(urlClient.baseUrl + "/ids"));
+        HttpResponse result = ic.get_ids();
+//        HttpResponse result = ic.get_ids();
         assertEquals(result.getStatusLine().getStatusCode(), 404);
     }
 
@@ -80,7 +83,17 @@ public class IdControllerTest {
 
     @Test
     public void testGetSpecificIds() {
+        String response = "nullId";
 
+        wireMockServer.stubFor(
+                get(urlEqualTo("/ids/githubId"))
+                        .willReturn(aResponse().withStatus(200).withBody(response))
+        );
+
+        HttpResponse result =  ic.getSpecificId("githubId");
+
+        assertEquals(result.getStatusLine().getStatusCode(), 200);
+        assertEquals(urlClient.readCalls(result), response);
 
     }
 }