organized tests by type

src/main/java/com/wildbit/java/postmark/client/BaseApiClient.java

@@ -9,8 +9,8 @@
  */
 public class BaseApiClient extends HttpClientHandler {
 
-    private final String baseUrl;
-    protected String getEndpointUrl(String endpoint) {
+    public final String baseUrl;
+    public String getEndpointUrl(String endpoint) {
         return baseUrl + endpoint;
     }
 
@@ -24,4 +24,7 @@ public BaseApiClient(String baseUrl, MultivaluedHashMap<String,Object> headers,
         setSecureConnection(secureConnection);
     }
 
+    public String getBaseUrl() {
+        return baseUrl;
+    }
 }

src/test/java/BaseTest.java → src/test/java/base/BaseTest.java

@@ -1,3 +1,5 @@
+package base;
+
 import com.wildbit.java.postmark.Postmark;
 import com.wildbit.java.postmark.client.AccountApiClient;
 import com.wildbit.java.postmark.client.ApiClient;

src/test/java/BounceTest.java → src/test/java/integration/BounceTest.java

@@ -1,3 +1,6 @@
+package integration;
+
+import base.BaseTest;
 import com.wildbit.java.postmark.client.ApiClient;
 import com.wildbit.java.postmark.client.Parameters;
 import com.wildbit.java.postmark.client.data.model.bounces.Bounce;

src/test/java/MessageTest.java → src/test/java/integration/MessageTest.java

@@ -1,3 +1,6 @@
+package integration;
+
+import base.BaseTest;
 import com.wildbit.java.postmark.Postmark;
 import com.wildbit.java.postmark.client.ApiClient;
 import com.wildbit.java.postmark.client.data.model.message.Message;

src/test/java/MessagesTest.java → src/test/java/integration/MessagesTest.java

@@ -1,13 +1,16 @@
+package integration;
+
+import base.BaseTest;
 import com.wildbit.java.postmark.client.ApiClient;
 import com.wildbit.java.postmark.client.Parameters;
 import com.wildbit.java.postmark.client.data.model.messages.*;
+import com.wildbit.java.postmark.client.exception.InvalidMessageException;
 import com.wildbit.java.postmark.client.exception.PostmarkException;
 import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * Created by bash on 11/14/17.
@@ -57,4 +60,9 @@ void inboundMessageById() throws PostmarkException, IOException {
         InboundMessageDetails inboundMessageDetails = client.getInboundMessageDetails(messageId);
         assertNotNull(inboundMessageDetails.getFrom());
     }
+
+    @Test
+    void exception() throws PostmarkException, IOException {
+        assertThrows(InvalidMessageException.class, () -> client.getMessages(Parameters.init().build("count", -4).build("offset", 0)));
+    }
 }

src/test/java/ServerTest.java → src/test/java/integration/ServerTest.java

@@ -1,3 +1,6 @@
+package integration;
+
+import base.BaseTest;
 import com.wildbit.java.postmark.client.ApiClient;
 import com.wildbit.java.postmark.client.data.model.server.Server;
 import com.wildbit.java.postmark.client.exception.PostmarkException;

src/test/java/ServersTest.java → src/test/java/integration/ServersTest.java

@@ -1,6 +1,8 @@
+package integration;
+
+import base.BaseTest;
 import com.wildbit.java.postmark.client.AccountApiClient;
 import com.wildbit.java.postmark.client.Parameters;
-import com.wildbit.java.postmark.client.data.model.server.Server;
 import com.wildbit.java.postmark.client.data.model.servers.Servers;
 import com.wildbit.java.postmark.client.exception.PostmarkException;
 import org.junit.jupiter.api.Test;

src/test/java/PostmarkTest.java → src/test/java/unit/PostmarkTest.java

@@ -1,3 +1,6 @@
+package unit;
+
+import base.BaseTest;
 import com.wildbit.java.postmark.Postmark;
 import org.junit.jupiter.api.Test;
 

src/test/java/client/ApiClientTest.java → src/test/java/unit/client/ApiClientTest.java

@@ -1,4 +1,4 @@
-package client;
+package unit.client;
 
 import com.wildbit.java.postmark.Postmark;
 import com.wildbit.java.postmark.client.ApiClient;

src/test/java/unit/client/HttpClientTest.java

@@ -0,0 +1,27 @@
+package unit.client;
+
+import com.wildbit.java.postmark.Postmark;
+import com.wildbit.java.postmark.client.HttpClient;
+import com.wildbit.java.postmark.client.exception.PostmarkException;
+import org.junit.jupiter.api.Test;
+
+import javax.ws.rs.core.MultivaluedHashMap;
+import java.io.IOException;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+
+public class HttpClientTest {
+
+    @Test
+    void execute() throws IOException, PostmarkException {
+        HttpClient client = new HttpClient(new MultivaluedHashMap<>());
+        HttpClient.ClientResponse response = client.execute(HttpClient.REQUEST_TYPES.GET, "https://" + Postmark.DEFAULTS.API_URL.value);
+
+        assertEquals(response.getCode(),302);
+        assertNotNull(response.getMessage());
+
+    }
+}

src/test/java/client/ParametersTest.java → src/test/java/unit/client/ParametersTest.java

@@ -1,4 +1,4 @@
-package client;
+package unit.client;
 
 import com.wildbit.java.postmark.client.Parameters;
 import org.junit.jupiter.api.Test;

src/test/java/client/data/DataHandlerTest.java → src/test/java/unit/client/data/DataHandlerTest.java

@@ -1,4 +1,4 @@
-package client.data;
+package unit.client.data;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException;

src/test/java/data/MessageTest.java → src/test/java/unit/data/MessageTest.java

@@ -1,4 +1,4 @@
-package data;
+package unit.data;
 
 
 import com.wildbit.java.postmark.client.data.DataHandler;