test: Fix tests

Author: Abhi347

src/main/java/com/spotify/github/http/okhttp/OkHttpHttpResponse.java

@@ -39,7 +39,7 @@ public class OkHttpHttpResponse implements HttpResponse {
   private final String body;
   private final Map<String, List<String>> headers;
 
-  public OkHttpHttpResponse(final HttpRequest request, final Response response) throws IOException {
+  public OkHttpHttpResponse(final HttpRequest request, final Response response) {
     this.request = request;
     this.statusCode = response.code();
     this.statusMessage = response.message();
@@ -90,6 +90,9 @@ public boolean isSuccessful() {
   }
 
   private static String responseBodyUnchecked(final Response response) {
+    if (response.body() == null) {
+      return null;
+    }
     try (ResponseBody body = response.body()) {
       return body.string();
     } catch (IOException e) {

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

@@ -33,6 +33,7 @@
 import static org.mockito.Mockito.*;
 
 import com.google.common.io.Resources;
+import com.spotify.github.http.HttpRequest;
 import com.spotify.github.tracing.Span;
 import com.spotify.github.tracing.Tracer;
 import com.spotify.github.v3.checks.CheckSuiteResponseList;
@@ -129,21 +130,12 @@ public void testSearchIssue() throws Throwable {
             .build();
 
     when(client.newCall(any())).thenReturn(call);
-    when(tracer.createTracedClient(client))
-        .thenReturn(
-            new Call.Factory() {
-              @NotNull
-              @Override
-              public Call newCall(@NotNull final Request request) {
-                return call;
-              }
-            });
     IssueClient issueClient =
         github.withTracer(tracer).createRepositoryClient("testorg", "testrepo").createIssueClient();
 
     CompletableFuture<Void> maybeSucceeded = issueClient.editComment(1, "some comment");
     capture.getValue().onResponse(call, response);
-    verify(tracer, times(1)).span(any(Request.class));
+    verify(tracer, times(1)).span(any(HttpRequest.class));
 
     Exception exception = assertThrows(ExecutionException.class, maybeSucceeded::get);
     Assertions.assertEquals(ReadOnlyRepositoryException.class, exception.getCause().getClass());
@@ -267,16 +259,6 @@ public void testGetWorkflow() throws Throwable {
             .request(new Request.Builder().url("http://localhost/").build())
             .build();
 
-    when(tracer.createTracedClient(any(OkHttpClient.class)))
-        .thenReturn(
-            new Call.Factory() {
-              @NotNull
-              @Override
-              public Call newCall(@NotNull final Request request) {
-                return call;
-              }
-            });
-
     when(client.newCall(any())).thenReturn(call);
     WorkflowsClient client =
         github

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

@@ -43,6 +43,7 @@
 import com.google.common.io.Resources;
 import com.spotify.github.async.Async;
 import com.spotify.github.async.AsyncPage;
+import com.spotify.github.http.HttpResponse;
 import com.spotify.github.jackson.Json;
 import com.spotify.github.v3.ImmutableUser;
 import com.spotify.github.v3.comment.Comment;
@@ -83,13 +84,13 @@ public void testCommentPaginationSpliterator() throws IOException {
         "<https://github.com/api/v3/repos/someowner/somerepo/issues/123/comments?page=2>; rel=\"next\", <https://github.com/api/v3/repos/someowner/somerepo/issues/123/comments?page=2>; rel=\"last\"";
     final String firstPageBody =
         Resources.toString(getResource(this.getClass(), "comments_page1.json"), defaultCharset());
-    final Response firstPageResponse = createMockResponse(firstPageLink, firstPageBody);
+    final HttpResponse firstPageResponse = createMockResponse(firstPageLink, firstPageBody);
 
     final String lastPageLink =
         "<https://github.com/api/v3/repos/someowner/somerepo/issues/123/comments>; rel=\"first\", <https://github.com/api/v3/repos/someowner/somerepo/issues/123/comments>; rel=\"prev\"";
     final String lastPageBody =
         Resources.toString(getResource(this.getClass(), "comments_page2.json"), defaultCharset());
-    final Response lastPageResponse = createMockResponse(lastPageLink, lastPageBody);
+    final HttpResponse lastPageResponse = createMockResponse(lastPageLink, lastPageBody);
 
     when(github.request(format(COMMENTS_URI_NUMBER_TEMPLATE, "someowner", "somerepo", "123")))
         .thenReturn(completedFuture(firstPageResponse));
@@ -112,13 +113,13 @@ public void testCommentPaginationForeach() throws IOException {
         "<https://github.com/api/v3/repos/someowner/somerepo/issues/123/comments?page=2>; rel=\"next\", <https://github.com/api/v3/repos/someowner/somerepo/issues/123/comments?page=2>; rel=\"last\"";
     final String firstPageBody =
         Resources.toString(getResource(this.getClass(), "comments_page1.json"), defaultCharset());
-    final Response firstPageResponse = createMockResponse(firstPageLink, firstPageBody);
+    final HttpResponse firstPageResponse = createMockResponse(firstPageLink, firstPageBody);
 
     final String lastPageLink =
         "<https://github.com/api/v3/repos/someowner/somerepo/issues/123/comments>; rel=\"first\", <https://github.com/api/v3/repos/someowner/somerepo/issues/123/comments>; rel=\"prev\"";
     final String lastPageBody =
         Resources.toString(getResource(this.getClass(), "comments_page2.json"), defaultCharset());
-    final Response lastPageResponse = createMockResponse(lastPageLink, lastPageBody);
+    final HttpResponse lastPageResponse = createMockResponse(lastPageLink, lastPageBody);
 
     when(github.request(format(COMMENTS_URI_NUMBER_TEMPLATE, "someowner", "somerepo", "123")))
         .thenReturn(completedFuture(firstPageResponse));
@@ -142,7 +143,7 @@ public void testCommentPaginationForeach() throws IOException {
   @Test
   public void testCommentCreated() throws IOException {
     final String fixture = loadFixture("clients/comment_created.json");
-    final Response response = createMockResponse("", fixture);
+    final HttpResponse response = createMockResponse("", fixture);
     final String path = format(COMMENTS_URI_NUMBER_TEMPLATE, "someowner", "somerepo", 10);
     when(github.post(anyString(), anyString(), eq(Comment.class))).thenCallRealMethod();
     when(github.post(eq(path), anyString())).thenReturn(completedFuture(response));
@@ -154,7 +155,7 @@ public void testCommentCreated() throws IOException {
   @Test
   public void testCommentCreatedWithLargeId() throws IOException {
     final String fixture = loadFixture("clients/comment_created_long_id.json");
-    final Response response = createMockResponse("", fixture);
+    final HttpResponse response = createMockResponse("", fixture);
     final String path = format(COMMENTS_URI_NUMBER_TEMPLATE, "someowner", "somerepo", 10);
     when(github.post(anyString(), anyString(), eq(Comment.class))).thenCallRealMethod();
     when(github.post(eq(path), anyString())).thenReturn(completedFuture(response));
@@ -210,8 +211,8 @@ public void testDeleteIssueCommentReaction() {
     long reactionId = 385825;
     final String path =
         format(COMMENTS_REACTION_ID_TEMPLATE, "someowner", "somerepo", issueNumber, reactionId);
-    Response mockResponse = mock(Response.class);
-    when(mockResponse.code()).thenReturn(204);
+    HttpResponse mockResponse = mock(HttpResponse.class);
+    when(mockResponse.statusCode()).thenReturn(204);
     when(github.delete(eq(path))).thenReturn(completedFuture(mockResponse));
 
     final var response = issueClient.deleteCommentReaction(issueNumber, reactionId).join();
@@ -239,7 +240,7 @@ public void testListIssueCommentReaction() throws IOException {
             "<https://github.com/api/v3/repos/someowner/somerepo/comments/%s/reactions?page=1>; rel=\"last\"",
             commentId);
     final String firstPageBody = github.json().toJsonUnchecked(listResponse.join().toArray());
-    final Response firstPageResponse = createMockResponse(firstPageLink, firstPageBody);
+    final HttpResponse firstPageResponse = createMockResponse(firstPageLink, firstPageBody);
 
     when(github.request(eq(path))).thenReturn(completedFuture(firstPageResponse));
     final List<CommentReaction> listCommentReactions = Lists.newArrayList();

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

@@ -7,9 +7,9 @@
  * 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.
@@ -20,26 +20,78 @@
 
 package com.spotify.github.v3.clients;
 
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
+import com.spotify.github.http.HttpRequest;
+import com.spotify.github.http.HttpResponse;
 import java.io.IOException;
-import okhttp3.Headers;
-import okhttp3.Response;
-import okhttp3.ResponseBody;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 
 public class MockHelper {
-  public static Response createMockResponse(final String headerLinksFixture, final String bodyFixture)
-      throws IOException {
-    final ResponseBody body = mock(ResponseBody.class);
-    when(body.string()).thenReturn(bodyFixture);
-
-    final Headers headers = mock(Headers.class);
-    when(headers.get("Link")).thenReturn(headerLinksFixture);
-
-    final Response response = mock(Response.class);
-    when(response.headers()).thenReturn(headers);
-    when(response.body()).thenReturn(body);
-    return response;
+  private static final int HTTP_OK = 200;
+  private static final int HTTP_BAD_REQUEST = 400;
+
+  //  public static Response createMockResponse(final String headerLinksFixture, final String
+  // bodyFixture)
+  //      throws IOException {
+  //    final ResponseBody body = mock(ResponseBody.class);
+  //    when(body.string()).thenReturn(bodyFixture);
+  //
+  //    final Headers headers = mock(Headers.class);
+  //    when(headers.get("Link")).thenReturn(headerLinksFixture);
+  //
+  //    final Response response = mock(Response.class);
+  //    when(response.headers()).thenReturn(headers);
+  //    when(response.body()).thenReturn(body);
+  //    return response;
+  //  }
+
+  public static HttpResponse createMockResponse(
+      final String headerLinksFixture, final String bodyFixture) throws IOException {
+    int statusCode = 200;
+    return createMockHttpResponse(
+        "", statusCode, bodyFixture, Map.of("Link", List.of(headerLinksFixture)));
+  }
+
+  public static HttpResponse createMockHttpResponse(
+      final String url,
+      final int statusCode,
+      final String body,
+      final Map<String, List<String>> headers) {
+    return new HttpResponse() {
+      @Override
+      public HttpRequest request() {
+        return ImmutableHttpRequest.builder.url(url).build();
+      }
+
+      @Override
+      public int statusCode() {
+        return statusCode;
+      }
+
+      @Override
+      public String statusMessage() {
+        return "";
+      }
+
+      @Override
+      public String body() {
+        return body;
+      }
+
+      @Override
+      public Map<String, List<String>> headers() {
+        return Optional.ofNullable(headers).orElse(Map.of());
+      }
+
+      @Override
+      public boolean isSuccessful() {
+        return MockHelper.isSuccessful(statusCode);
+      }
+    };
+  }
+
+  private static boolean isSuccessful(final int statusCode) {
+    return statusCode >= HTTP_OK && statusCode < HTTP_BAD_REQUEST;
   }
-}
+}