testing

Client/Client.iml

@@ -5,6 +5,7 @@
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />
@@ -20,5 +21,37 @@
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.7" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-json-org:2.9.7" level="project" />
     <orderEntry type="library" name="Maven: org.json:json:20171018" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.github.tomakehurst:wiremock:2.19.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.eclipse.jetty:jetty-server:9.2.24.v20180105" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.eclipse.jetty:jetty-http:9.2.24.v20180105" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.eclipse.jetty:jetty-io:9.2.24.v20180105" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.eclipse.jetty:jetty-servlet:9.2.24.v20180105" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.eclipse.jetty:jetty-security:9.2.24.v20180105" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.eclipse.jetty:jetty-servlets:9.2.24.v20180105" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.eclipse.jetty:jetty-continuation:9.2.24.v20180105" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.eclipse.jetty:jetty-util:9.2.24.v20180105" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.eclipse.jetty:jetty-webapp:9.2.24.v20180105" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.eclipse.jetty:jetty-xml:9.2.24.v20180105" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.google.guava:guava:20.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.5.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-legacy:2.5.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.4.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:1.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.slf4j:slf4j-api:1.7.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: net.sf.jopt-simple:jopt-simple:5.0.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.apache.commons:commons-lang3:3.7" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.flipkart.zjsonpatch:zjsonpatch:0.4.4" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.github.jknack:handlebars:4.0.7" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.antlr:antlr4-runtime:4.7.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.github.jknack:handlebars-helpers:4.0.7" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-api:5.2.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.apiguardian:apiguardian-api:1.0.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.opentest4j:opentest4j:1.1.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-commons:1.2.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:7.0.0-beta1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.beust:jcommander:1.72" level="project" />
   </component>
 </module>

Client/pom.xml

@@ -46,6 +46,24 @@
             <version>2.9.7</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.github.tomakehurst</groupId>
+            <artifactId>wiremock</artifactId>
+            <version>2.19.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>5.2.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <version>7.0.0-beta1</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
 

Client/src/main/java/SimpleShell.java

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

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

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

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

@@ -1,4 +1,4 @@
-package ids;
+package idtest;
 
 import shellutilities.Console;
 import shellutilities.RequestType;

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

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

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

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

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

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

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

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

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

@@ -1,6 +1,6 @@
-package message;
+package messagetest;
 
-import ids.IdController;
+import idtest.IdController;
 import shellutilities.Console;
 import shellutilities.RequestType;
 import shellutilities.YouAreEll;

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

@@ -14,30 +14,37 @@ import java.io.IOException;
 import java.io.InputStreamReader;
 
 public class YouAreEll {
-    private HttpClient client;
-    private final String baseUrl = "http://zipcode.rocks:8085";
+    public HttpClient client;
+    public final String baseUrl;
 
     public YouAreEll() {
+        this.baseUrl = "http://zipcode.rocks:8085"; // Default URL
         this.client = HttpClientBuilder.create().build();
     }
 
-    public static void main(String[] args) throws IOException {
+    public YouAreEll(String baseUrl) {
+        this.baseUrl = baseUrl;
+        this.client = HttpClientBuilder.create().build();
+    }
+
+    public static void main(String[] args) {
         YouAreEll urlhandler = new YouAreEll();
         // response.getStatusLine().getStatusCode(); // 200 OK, 404 Not Found, etc.
     }
 
-    public String MakeURLCall(String mainurl, RequestType req, String jpayload) throws IOException {
+    public String MakeURLCall(String mainUrl, RequestType req, String jsonPayload) {
         switch (req) {
             case GET:
-                return getCall(baseUrl + mainurl);
+                System.out.println("Entering get...");
+                return getCall(baseUrl + mainUrl);
 
             case POST:
-                HttpPost postReq = new HttpPost(baseUrl + mainurl);
-                return makeCall(postReq, jpayload);
+                HttpPost postReq = new HttpPost(baseUrl + mainUrl);
+                return makeCall(postReq, jsonPayload);
 
             case PUT:
-                HttpPut putReq = new HttpPut(baseUrl + mainurl);
-                return makeCall(putReq, jpayload);
+                HttpPut putReq = new HttpPut(baseUrl + mainUrl);
+                return makeCall(putReq, jsonPayload);
             default:
                 return "Could not make connection.";
         }
@@ -54,7 +61,7 @@ public class YouAreEll {
         }
     }
 
-    public String getCall(String url) {
+    private String getCall(String url) {
 
         HttpGet request = new HttpGet(url);
         try {
@@ -65,7 +72,7 @@ public class YouAreEll {
         }
     }
 
-    public String readCalls(HttpResponse response) throws IOException {
+    public String readCalls(HttpResponse response) {
         try {
             BufferedReader rd = new BufferedReader(
                     new InputStreamReader(response.getEntity().getContent()));
@@ -83,9 +90,4 @@ public class YouAreEll {
             return ("An unexpected IO error occurred: " + e.getMessage());
         }
     }
-
-
 }
-
-
-

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

@@ -0,0 +1,51 @@
+package idtest;
+
+import static com.github.tomakehurst.wiremock.client.WireMock.*;
+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.annotations.*;
+import shellutilities.YouAreEll;
+
+import java.io.IOException;
+
+import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;
+
+public class IdControllerTest {
+    private WireMockServer wireMockServer;
+    private YouAreEll urlClient;
+
+    @BeforeSuite
+    public void beforeAll() {
+        wireMockServer = new WireMockServer(wireMockConfig().dynamicPort());
+        wireMockServer.start();
+        urlClient = new YouAreEll("http://localhost:" + wireMockServer.port());
+    }
+
+    @AfterSuite
+    public void afterAll() {
+        wireMockServer.shutdown();
+    }
+
+    @AfterTest
+    public void beforeEach() {
+        wireMockServer.resetAll();
+    }
+
+    @Test
+    public void getIdsSuccess() throws IOException {
+        String response = new Id("userId", "name", "githubId").toString().replace("\n", "");
+
+        wireMockServer.stubFor(
+            get(urlEqualTo("/ids"))
+                .willReturn(aResponse().withStatus(200).withBody(response))
+        );
+
+        HttpResponse result = urlClient.client.execute(new HttpGet(urlClient.baseUrl + "/ids"));
+
+        assertEquals(result.getStatusLine().getStatusCode(), 200);
+        assertEquals(urlClient.readCalls(result), response);
+    }
+}

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

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