setter to inject mock URL

Client/src/main/java/SimpleShell.java

@@ -1,6 +1,6 @@
-import idtest.IdController;
-import messagetest.MessageController;
-import messagetest.SendController;
+import id.IdController;
+import message.MessageController;
+import message.SendController;
 import shellutilities.YouAreEll;
 
 import java.io.BufferedReader;

Client/src/main/java/idtest/Id.java → Client/src/main/java/id/Id.java

@@ -1,4 +1,4 @@
-package idtest;
+package id;
 
 public class Id {
     public String userid, name, github;

Client/src/main/java/idtest/IdController.java → Client/src/main/java/id/IdController.java

@@ -1,18 +1,18 @@
-package idtest;
+package id;
 
 import shellutilities.Console;
 import shellutilities.RequestType;
 import shellutilities.YouAreEll;
 
-import java.io.IOException;
-
 public class IdController {
+
     private YouAreEll url;
     private final String MAIN_URL = "/ids";
     private Console c;
     private String[] userLine;
     private int size;
 
+
     public IdController(String [] cmds) {
         c = new Console();
         url = new YouAreEll();
@@ -20,12 +20,14 @@ public class IdController {
         size = cmds.length;
     }
 
-    public void idController() throws IOException {
+    public void setUrl(YouAreEll url) {
+        this.url = url;
+    }
+
+    public void idController() {
 
         if (size > 1) {
-            Id tempId = idCreator(getSpecificId(userLine[2]).replaceAll("^\"|\"$", ""),
-                    userLine[1],
-                    userLine[2]);
+            Id tempId = idCreator();
 
             if (!idExists(userLine[2])) {
                 c.print("Putting updated entry");
@@ -38,33 +40,33 @@ public class IdController {
         } else {
             try {
                 PrettyPrintId.prettyPrintJsonArray(get_ids());
-            } catch (IOException e) {
+            } catch (Exception e) {
                 c.print("Could not gather Id's try again?");
             }
         }
     }
 
-    public boolean idExists(String github) throws IOException {
+    public boolean idExists(String github) {
         return (getSpecificId(github).equals(""));
     }
 
-    public static Id idCreator(String id, String name, String github) {
-        return new Id(id, name, github);
+    public  Id idCreator() {
+        return new Id("", userLine[1], userLine[2]);
     }
 
-    private String get_ids() throws IOException {
+    private String get_ids() {
         return url.MakeURLCall(MAIN_URL, RequestType.GET, "");
     }
 
-    private String getSpecificId(String github) throws IOException {
+    private String getSpecificId(String github){
         return url.MakeURLCall(MAIN_URL + "/" + github, RequestType.GET, "");
     }
 
-    private String post_id(String payload) throws IOException {
+    private String post_id(String payload) {
         return url.MakeURLCall(MAIN_URL, RequestType.POST, payload);
     }
 
-    private String put_id(String payload) throws IOException {
+    private String put_id(String payload) {
         return url.MakeURLCall(MAIN_URL, RequestType.PUT, payload);
     }
 

Client/src/main/java/idtest/PrettyPrintId.java → Client/src/main/java/id/PrettyPrintId.java

@@ -1,4 +1,4 @@
-package idtest;
+package id;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;

Client/src/main/java/messagetest/Message.java → Client/src/main/java/message/Message.java

@@ -1,4 +1,4 @@
-package messagetest;
+package message;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 

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

@@ -1,4 +1,4 @@
-package messagetest;
+package message;
 
 import shellutilities.Console;
 import shellutilities.RequestType;

Client/src/main/java/messagetest/PrettyPrintMessage.java → Client/src/main/java/message/PrettyPrintMessage.java

@@ -1,4 +1,4 @@
-package messagetest;
+package message;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;

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

@@ -1,6 +1,6 @@
-package messagetest;
+package message;
 
-import idtest.IdController;
+import id.IdController;
 import shellutilities.Console;
 import shellutilities.RequestType;
 import shellutilities.YouAreEll;
@@ -50,7 +50,7 @@ public class SendController  {
     private boolean toIdValid() {
         try {
             return idCheck.idExists(userLine[userLine.length-1]);
-        } catch (IOException e) {
+        } catch (Exception e) {
             return false;
         }
     }

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

@@ -1,4 +1,4 @@
-package idtest;
+package id;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.*;
 import static org.testng.Assert.*;
@@ -6,7 +6,6 @@ import static org.testng.Assert.*;
 import com.github.tomakehurst.wiremock.WireMockServer;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.methods.HttpGet;
-import org.testng.Assert;
 import org.testng.annotations.*;
 import shellutilities.YouAreEll;
 
@@ -21,10 +20,14 @@ public class IdControllerTest {
 
     @BeforeSuite
     public void beforeAll() {
+
         wireMockServer = new WireMockServer(wireMockConfig().dynamicPort());
         wireMockServer.start();
         urlClient = new YouAreEll("http://localhost:" + wireMockServer.port());
 
+        ic = new IdController(new String[] {"ids", "dodoname", "dodogit"});
+        ic.setUrl(urlClient);
+
     }
 
     @AfterSuite
@@ -66,15 +69,18 @@ public class IdControllerTest {
 
     @Test
     public void testIdCreator() {
-        String[] commands = new String[] {"ids", "dodoname", "dodogit"};
 
         Id testId = new Id("", "dodoname", "dodogit");
-        IdController ic = new IdController(commands);
 
-        Id newId = IdController.idCreator("", "dodoname", "dodogit");
+        Id newId = ic.idCreator();
 
         assertEquals(testId.github, newId.github);
         assertEquals(testId.name, newId.name);
+    }
+
+    @Test
+    public void testGetSpecificIds() {
+
 
     }
 }

Client/src/test/java/messagetest/MessageControllerTest.java → Client/src/test/java/message/MessageControllerTest.java

@@ -1,4 +1,4 @@
-package messagetest;
+package message;
 
 public class MessageControllerTest {
 }

Client/src/test/java/message/SendControllerTest.java

@@ -0,0 +1,4 @@
+package message;
+
+public class SendControllerTest {
+}