Add coverage to http classes (#38)

* Add coverage to http classes

Author: Christoffer-Cortes

pom.xml

@@ -30,6 +30,12 @@
             <version>2.6</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.9</version>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
@@ -63,12 +69,33 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-module-junit4</artifactId>
+            <version>2.0.2</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-api-mockito2</artifactId>
+            <version>2.0.2</version>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-reflect</artifactId>
             <version>2.0.2</version>
             <scope>test</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.mock-server</groupId>
+            <artifactId>mockserver-netty</artifactId>
+            <version>5.6.1</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

src/main/java/com/ericsson/eiffelcommons/JenkinsManager.java

@@ -30,9 +30,9 @@
 import org.json.JSONObject;
 
 import com.ericsson.eiffelcommons.helpers.MediaType;
-import com.ericsson.eiffelcommons.utils.HttpRequest;
-import com.ericsson.eiffelcommons.utils.HttpRequest.HttpMethod;
-import com.ericsson.eiffelcommons.utils.ResponseEntity;
+import com.ericsson.eiffelcommons.http.HttpRequest;
+import com.ericsson.eiffelcommons.http.HttpRequest.HttpMethod;
+import com.ericsson.eiffelcommons.http.ResponseEntity;
 
 public class JenkinsManager {
 

src/main/java/com/ericsson/eiffelcommons/utils/HttpExecutor.java renamed to src/main/java/com/ericsson/eiffelcommons/http/HttpExecutor.java

@@ -14,7 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 */
-package com.ericsson.eiffelcommons.utils;
+package com.ericsson.eiffelcommons.http;
 
 import java.io.IOException;
 
@@ -46,20 +46,6 @@ public static HttpExecutor getInstance() {
         return instance;
     }
 
-    /**
-     * Close existing HttpClient and create a new one.
-     *
-     * @throws IOException
-     */
-    public void recreateHttpClient() throws IOException {
-        if (this.client != null) {
-            this.client.close();
-
-        }
-        this.client = HttpClientBuilder.create()
-                                       .build();
-    }
-
     /**
      * Handle the response from a HTTP request
      *

src/main/java/com/ericsson/eiffelcommons/utils/HttpRequest.java renamed to src/main/java/com/ericsson/eiffelcommons/http/HttpRequest.java

@@ -14,7 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
  */
-package com.ericsson.eiffelcommons.utils;
+package com.ericsson.eiffelcommons.http;
 
 import java.io.File;
 import java.io.IOException;
@@ -26,6 +26,7 @@
 
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.http.Header;
 import org.apache.http.HttpHeaders;
 import org.apache.http.client.ClientProtocolException;
@@ -331,10 +332,12 @@ private URIBuilder addParametersToURIBuilder(URIBuilder builder) {
      * @throws URISyntaxException
      */
     private URIBuilder createURIBuilder() throws URISyntaxException {
-        if (endpoint.startsWith("/")) {
+        if (!StringUtils.isEmpty(endpoint) && endpoint.startsWith("/")) {
             return new URIBuilder(baseUrl + endpoint);
-        } else {
+        } else if (!StringUtils.isEmpty(endpoint)) {
             return new URIBuilder(baseUrl + "/" + endpoint);
+        } else {
+            return new URIBuilder(baseUrl);
         }
     }
 

src/main/java/com/ericsson/eiffelcommons/utils/ResponseEntity.java renamed to src/main/java/com/ericsson/eiffelcommons/http/ResponseEntity.java

@@ -14,7 +14,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 */
-package com.ericsson.eiffelcommons.utils;
+package com.ericsson.eiffelcommons.http;
 
 import java.io.IOException;
 

src/test/java/com/ericsson/eiffelcommons/Utilstest/HttpRequestTest.java

@@ -0,0 +1,105 @@
+package com.ericsson.eiffelcommons.httptest;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.mockserver.integration.ClientAndServer.startClientAndServer;
+import static org.mockserver.model.HttpRequest.request;
+import static org.mockserver.model.HttpResponse.response;
+
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.UnknownHostException;
+
+import org.apache.http.client.ClientProtocolException;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.mockserver.integration.ClientAndServer;
+import org.powermock.reflect.Whitebox;
+
+import com.ericsson.eiffelcommons.http.HttpExecutor;
+import com.ericsson.eiffelcommons.http.ResponseEntity;
+
+public class HttpExecutorTest {
+
+    private static final String URL_FAKE = "http://fake.com";
+    private static final String URL_MOCK = "http://localhost:{port}";
+    private static final String ENDPOINT_MOCK = "/endpoint";
+    private static final String RESPONSE_MOCK = "{\"message\":\"dummy\"}";
+
+    private static ClientAndServer clientAndServer;
+
+    @BeforeClass
+    public static void setUpMocks() throws IOException {
+        clientAndServer = startClientAndServer();
+    }
+
+    @Test(expected = UnknownHostException.class)
+    public void testDefaultConstructor() throws IOException, URISyntaxException {
+        HttpGet request = new HttpGet();
+        request.setURI(new URI(URL_FAKE));
+
+        HttpExecutor executor = new HttpExecutor();
+        executor.executeRequest(request);
+    }
+
+    @Test(expected = IllegalStateException.class)
+    public void testHttpClientConstructor() throws IOException, URISyntaxException {
+        CloseableHttpClient client = HttpClientBuilder.create().build();
+        client.close();
+
+        HttpGet request = new HttpGet();
+        request.setURI(new URI(URL_FAKE));
+
+        HttpExecutor executor = new HttpExecutor(client);
+        executor.executeRequest(request);
+    }
+
+    @Test
+    public void testGetInstance() throws IOException, URISyntaxException {
+        HttpGet request = new HttpGet();
+        request.setURI(new URI(URL_FAKE));
+
+        HttpExecutor executor = new HttpExecutor();
+        HttpExecutor instance = Whitebox.getInternalState(executor, "instance", HttpExecutor.class);
+        assertNull(instance);
+
+        // Test if instance null branch
+        executor = HttpExecutor.getInstance();
+        instance = Whitebox.getInternalState(executor, "instance", HttpExecutor.class);
+        assertNotNull(instance);
+
+        // Test if instance not null branch
+        executor = HttpExecutor.getInstance();
+        instance = Whitebox.getInternalState(executor, "instance", HttpExecutor.class);
+        assertNotNull(instance);
+
+        // Reset static instance
+        instance = null;
+        Whitebox.setInternalState(HttpExecutor.class, "instance", instance);
+    }
+
+    @Test
+    public void testExecuteRequest()
+            throws URISyntaxException, ClientProtocolException, IOException {
+        setUpMock();
+
+        HttpGet request = new HttpGet();
+        String url = URL_MOCK.replace("{port}", String.valueOf(clientAndServer.getLocalPort()));
+        URI uri = new URI(url + ENDPOINT_MOCK);
+        request.setURI(uri);
+
+        HttpExecutor executor = new HttpExecutor();
+        ResponseEntity response = executor.executeRequest(request);
+        assertEquals(RESPONSE_MOCK, response.getBody());
+    }
+
+    private void setUpMock() {
+        clientAndServer.when(request().withMethod("GET").withPath(ENDPOINT_MOCK))
+                       .respond(response().withStatusCode(200).withBody(RESPONSE_MOCK));
+    }
+}