test: Add more tests

Author: Abhi347

src/main/java/com/spotify/github/http/HttpRequest.java

@@ -34,15 +34,18 @@
 @JsonSerialize(as = ImmutableHttpRequest.class)
 @JsonDeserialize(as = ImmutableHttpRequest.class)
 public interface HttpRequest {
-  String method();
+  @Value.Default
+  default String method() {
+    return "GET";
+  }
 
   String url();
 
   @Nullable
   String body();
 
   @Value.Default
-  default Map<String, List<String>> headers(){
+  default Map<String, List<String>> headers() {
     return Map.of();
   }
 

src/test/java/com/spotify/github/v3/clients/MockHelper.java renamed to src/test/java/com/spotify/github/MockHelper.java

@@ -18,7 +18,7 @@
  * -/-/-
  */
 
-package com.spotify.github.v3.clients;
+package com.spotify.github;
 
 import com.spotify.github.http.BaseHttpResponse;
 import com.spotify.github.http.HttpRequest;
@@ -48,11 +48,7 @@ public static HttpResponse createMockHttpResponse(
       final int statusCode,
       final String body,
       final Map<String, List<String>> headers) {
-    HttpRequest httpRequest = ImmutableHttpRequest.builder()
-            .method("GET")
-            .body(null)
-            .headers(Map.of())
-            .url(url).build();
+    HttpRequest httpRequest = ImmutableHttpRequest.builder().url(url).build();
     return new BaseHttpResponse(httpRequest, statusCode, "", headers) {
       @Override
       public InputStream body() {

src/test/java/com/spotify/github/http/HttpRequestTest.java

@@ -0,0 +1,75 @@
+/*-
+ * -\-\-
+ * github-api
+ * --
+ * Copyright (C) 2021 Spotify AB
+ * --
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * -/-/-
+ */
+
+package com.spotify.github.http;
+
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+import java.util.Map;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.junit.jupiter.api.Assertions.*;
+
+public class HttpRequestTest {
+  @Test
+  void createBareRequest() {
+    // When
+    HttpRequest httpRequest = ImmutableHttpRequest.builder().url("https://example.com").build();
+    // Then
+    assertNotNull(httpRequest);
+    assertEquals("GET", httpRequest.method());
+    assertEquals("https://example.com", httpRequest.url());
+    assertNull(httpRequest.body());
+    assertEquals(0, httpRequest.headers().size());
+    assertNull(httpRequest.headers("Accept-Encoding"));
+    assertNull(httpRequest.header("Accept-Encoding"));
+  }
+
+  @Test
+  void createRequest() {
+    // When
+    HttpRequest httpRequest =
+        ImmutableHttpRequest.builder()
+            .url("https://example.com")
+            .method("POST")
+            .body("{\"foo\":\"bar\"}")
+            .headers(
+                Map.of(
+                    "Content-Type",
+                    List.of("application/json", "charset=utf-8"),
+                    "Accept",
+                    List.of("application/json")))
+            .build();
+    // Then
+    assertNotNull(httpRequest);
+    assertEquals("POST", httpRequest.method());
+    assertEquals("https://example.com", httpRequest.url());
+    assertEquals("{\"foo\":\"bar\"}", httpRequest.body());
+    assertEquals(2, httpRequest.headers().size());
+    assertThat(
+        httpRequest.headers("Content-Type"),
+        containsInAnyOrder("application/json", "charset=utf-8"));
+    assertEquals("application/json,charset=utf-8", httpRequest.header("Content-Type"));
+    assertThat(httpRequest.headers("Accept"), containsInAnyOrder("application/json"));
+    assertEquals("application/json", httpRequest.header("Accept"));
+  }
+}

src/test/java/com/spotify/github/http/HttpResponseTest.java

@@ -0,0 +1,88 @@
+/*-
+ * -\-\-
+ * github-api
+ * --
+ * Copyright (C) 2021 Spotify AB
+ * --
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * -/-/-
+ */
+
+package com.spotify.github.http;
+
+import static com.spotify.github.MockHelper.createMockHttpResponse;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.junit.jupiter.api.Assertions.*;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.List;
+import java.util.Map;
+import org.junit.jupiter.api.Test;
+
+public class HttpResponseTest {
+  @Test
+  void createBareResponse() {
+    // When
+    HttpResponse httpResponse = createMockHttpResponse("https://example.com", 200, "{}", Map.of());
+    // Then
+    assertNotNull(httpResponse);
+    assertEquals("GET", httpResponse.request().method());
+    assertEquals("https://example.com", httpResponse.request().url());
+    assertTrue(httpResponse.isSuccessful());
+    assertEquals(0, httpResponse.headers().size());
+    assertNull(httpResponse.headers("Accept-Encoding"));
+    assertNull(httpResponse.header("Accept-Encoding"));
+  }
+
+  @Test
+  void createResponse() throws IOException {
+    // When
+    HttpResponse httpResponse =
+        createMockHttpResponse(
+            "https://example.com",
+            200,
+            "{\"foo\":\"bar\"}",
+            Map.of(
+                "Content-Type",
+                List.of("application/json", "charset=utf-8"),
+                "Accept",
+                List.of("application/json"),
+                "Cache-Control",
+                List.of("no-cache"),
+                "Set-Cookie",
+                List.of("sessionId=abc123", "userId=xyz789")));
+    String responseBody = null;
+    try (InputStream is = httpResponse.body()) {
+      responseBody = new String(is.readAllBytes());
+    }
+    // Then
+    assertNotNull(httpResponse);
+    assertEquals("{\"foo\":\"bar\"}", httpResponse.bodyString());
+    assertEquals("{\"foo\":\"bar\"}", responseBody);
+    assertEquals(4, httpResponse.headers().size());
+    assertThat(
+        httpResponse.headers("Content-Type"),
+        containsInAnyOrder("application/json", "charset=utf-8"));
+    assertEquals("application/json,charset=utf-8", httpResponse.header("Content-Type"));
+    assertThat(httpResponse.headers("Accept"), containsInAnyOrder("application/json"));
+    assertEquals("application/json", httpResponse.header("Accept"));
+    assertThat(httpResponse.headers("Cache-Control"), containsInAnyOrder("no-cache"));
+    assertEquals("no-cache", httpResponse.header("Cache-Control"));
+    assertThat(
+        httpResponse.headers("Set-Cookie"),
+        containsInAnyOrder("sessionId=abc123", "userId=xyz789"));
+    assertEquals("sessionId=abc123,userId=xyz789", httpResponse.header("Set-Cookie"));
+  }
+}

src/test/java/com/spotify/github/v3/clients/IssueClientTest.java

@@ -23,7 +23,7 @@
 import static com.google.common.io.Resources.getResource;
 import static com.spotify.github.FixtureHelper.loadFixture;
 import static com.spotify.github.v3.clients.IssueClient.*;
-import static com.spotify.github.v3.clients.MockHelper.createMockResponse;
+import static com.spotify.github.MockHelper.createMockResponse;
 import static java.lang.String.format;
 import static java.nio.charset.Charset.defaultCharset;
 import static java.util.concurrent.CompletableFuture.completedFuture;
@@ -57,7 +57,7 @@
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionException;
-import okhttp3.Response;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;

src/test/java/com/spotify/github/v3/clients/RepositoryClientTest.java

@@ -29,8 +29,8 @@
 import static com.spotify.github.v3.clients.GitHubClient.LIST_PR_TYPE_REFERENCE;
 import static com.spotify.github.v3.clients.GitHubClient.LIST_REPOSITORY;
 import static com.spotify.github.v3.clients.GitHubClient.LIST_REPOSITORY_INVITATION;
-import static com.spotify.github.v3.clients.MockHelper.createMockHttpResponse;
-import static com.spotify.github.v3.clients.MockHelper.createMockResponse;
+import static com.spotify.github.MockHelper.createMockHttpResponse;
+import static com.spotify.github.MockHelper.createMockResponse;
 import static com.spotify.github.v3.clients.RepositoryClient.STATUS_URI_TEMPLATE;
 import static java.lang.String.format;
 import static java.nio.charset.Charset.defaultCharset;
@@ -50,7 +50,6 @@
 import com.google.common.io.Resources;
 import com.spotify.github.async.Async;
 import com.spotify.github.async.AsyncPage;
-import com.spotify.github.http.HttpRequest;
 import com.spotify.github.http.HttpResponse;
 import com.spotify.github.jackson.Json;
 import com.spotify.github.v3.comment.Comment;
@@ -77,13 +76,8 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
 import java.util.stream.Collectors;
-import okhttp3.MediaType;
-import okhttp3.Protocol;
-import okhttp3.Request;
-import okhttp3.Response;
-import okhttp3.ResponseBody;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;

src/test/java/com/spotify/github/v3/clients/TeamClientTest.java

@@ -24,7 +24,7 @@
 import static com.spotify.github.v3.clients.GitHubClient.LIST_PENDING_TEAM_INVITATIONS;
 import static com.spotify.github.v3.clients.GitHubClient.LIST_TEAMS;
 import static com.spotify.github.v3.clients.GitHubClient.LIST_TEAM_MEMBERS;
-import static com.spotify.github.v3.clients.MockHelper.createMockResponse;
+import static com.spotify.github.MockHelper.createMockResponse;
 import static java.nio.charset.Charset.defaultCharset;
 import static java.util.concurrent.CompletableFuture.completedFuture;
 import static java.util.stream.Collectors.toList;
@@ -49,7 +49,7 @@
 import java.io.IOException;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
-import okhttp3.Response;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;