Improve test coverage

Author: rubengees

library/src/test/java/me/proxer/library/api/HttpUrlAdapterTest.java

@@ -0,0 +1,35 @@
+package me.proxer.library.api;
+
+import okhttp3.HttpUrl;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author Ruben Gees
+ */
+public class HttpUrlAdapterTest {
+
+    private HttpUrlAdapter adapter;
+
+    @Before
+    public void setUp() throws Exception {
+        adapter = new HttpUrlAdapter();
+    }
+
+    @Test
+    public void testNormal() throws Exception {
+        assertThat(adapter.fromJson("https://www.example.com")).isEqualTo(HttpUrl.parse("https://www.example.com"));
+    }
+
+    @Test
+    public void testSchemaLess() throws Exception {
+        assertThat(adapter.fromJson("//www.example.com")).isEqualTo(HttpUrl.parse("http://www.example.com"));
+    }
+
+    @Test
+    public void testInvalid() throws Exception {
+        assertThat(adapter.fromJson("example.com")).isNull();
+    }
+}

library/src/test/java/me/proxer/library/api/ProxerCallTest.java

@@ -1,6 +1,8 @@
 package me.proxer.library.api;
 
 import me.proxer.library.ProxerTest;
+import me.proxer.library.api.ProxerException.ErrorType;
+import me.proxer.library.api.ProxerException.ServerErrorType;
 import me.proxer.library.entitiy.notifications.NewsArticle;
 import okhttp3.mockwebserver.MockResponse;
 import okhttp3.mockwebserver.SocketPolicy;
@@ -25,7 +27,7 @@ public void testTimeoutError() throws IOException {
                 .setSocketPolicy(SocketPolicy.NO_RESPONSE));
 
         assertThatExceptionOfType(ProxerException.class).isThrownBy(() -> api.notifications().news().build().execute())
-                .has(new Condition<Throwable>(e -> ((ProxerException) e).getErrorType() == ProxerException.ErrorType.TIMEOUT,
+                .has(new Condition<Throwable>(e -> ((ProxerException) e).getErrorType() == ErrorType.TIMEOUT,
                         "TIMEOUT ErrorType"));
     }
 
@@ -34,7 +36,7 @@ public void testIOError() throws IOException {
         server.enqueue(new MockResponse().setBody(fromResource("news.json")).setResponseCode(404));
 
         assertThatExceptionOfType(ProxerException.class).isThrownBy(() -> api.notifications().news().build().execute())
-                .has(new Condition<Throwable>(e -> ((ProxerException) e).getErrorType() == ProxerException.ErrorType.IO,
+                .has(new Condition<Throwable>(e -> ((ProxerException) e).getErrorType() == ErrorType.IO,
                         "IO ErrorType"));
     }
 
@@ -43,7 +45,7 @@ public void testInvalidEncodingError() throws IOException {
         server.enqueue(new MockResponse().setBody(fromResource("news.json").replace(":", "invalid")));
 
         assertThatExceptionOfType(ProxerException.class).isThrownBy(() -> api.notifications().news().build().execute())
-                .has(new Condition<Throwable>(e -> ((ProxerException) e).getErrorType() == ProxerException.ErrorType.IO,
+                .has(new Condition<Throwable>(e -> ((ProxerException) e).getErrorType() == ErrorType.IO,
                         "IO ErrorType"));
     }
 
@@ -52,10 +54,23 @@ public void testInvalidDataError() throws IOException {
         server.enqueue(new MockResponse().setBody(fromResource("news.json").replace("256", "invalid")));
 
         assertThatExceptionOfType(ProxerException.class).isThrownBy(() -> api.notifications().news().build().execute())
-                .has(new Condition<Throwable>(e -> ((ProxerException) e).getErrorType() == ProxerException.ErrorType.PARSING,
+                .has(new Condition<Throwable>(e -> ((ProxerException) e).getErrorType() == ErrorType.PARSING,
                         "PARSING ErrorType"));
     }
 
+    @Test
+    public void testServerError() throws Exception {
+        server.enqueue(new MockResponse().setBody(fromResource("conferences_error.json")));
+
+        assertThatExceptionOfType(ProxerException.class).isThrownBy(() -> api.messenger().conferences().build().execute())
+                .has(new Condition<Throwable>(e -> ((ProxerException) e).getErrorType() == ErrorType.SERVER,
+                        "SERVER ErrorType"))
+                .has(new Condition<Throwable>(e -> ((ProxerException) e).getServerErrorType() == ServerErrorType.MESSAGES_LOGIN_REQUIRED,
+                        "MESSAGES_LOGIN_REQUIRED ServerErrorType"))
+                .has(new Condition<Throwable>(e -> e.getMessage().equals("Du bist nicht eingeloggt."),
+                        "Message is equal"));
+    }
+
     @Test(timeout = 1000L)
     public void testEnqueue() throws IOException, InterruptedException {
         final CountDownLatch lock = new CountDownLatch(1);
@@ -80,7 +95,7 @@ public void testEnqueueError() throws IOException, InterruptedException {
                     // Failed. The lock will never be counted down and timeout.
                 },
                 exception -> {
-                    if (exception.getErrorType() == ProxerException.ErrorType.IO) {
+                    if (exception.getErrorType() == ErrorType.IO) {
                         lock.countDown();
                     }
 
@@ -112,7 +127,7 @@ public void testCancel() throws IOException, InterruptedException {
         call.enqueue(result -> {
             // Failed. The lock will never be counted down and timeout.
         }, exception -> {
-            if (exception.getErrorType() == ProxerException.ErrorType.IO) {
+            if (exception.getErrorType() == ErrorType.IO) {
                 lock.countDown();
             }
 

library/src/test/java/me/proxer/library/util/ProxerUrlsTest.java

@@ -119,8 +119,8 @@ public void testNewsWeb() {
 
     @Test
     public void testNewsWebWithDevice() {
-        assertThat(ProxerUrls.newsWeb("4", "5", Device.MOBILE).toString())
-                .isEqualTo("https://proxer.me/forum/4/5?device=mobile");
+        assertThat(ProxerUrls.newsWeb("4", "5", Device.UNSPECIFIED).toString())
+                .isEqualTo("https://proxer.me/forum/4/5?device=");
     }
 
     @Test