chore: migrate to Junit 5

pom.xml

@@ -93,15 +93,15 @@
         <guava.version>32.1.3-jre</guava.version>
         <jsr305.version>3.0.2</jsr305.version>
         <jsr311-api.version>1.1.1</jsr311-api.version>
-        <junit.version>4.13.1</junit.version>
+        <junit.version>5.10.0</junit.version>
         <slf4j-api.version>1.7.36</slf4j-api.version>
-        <mockito-core.version>3.2.4</mockito-core.version>
+        <mockito-core.version>5.6.0</mockito-core.version>
         <commons-io.version>2.6</commons-io.version>
         <jackson.version>2.15.3</jackson.version>
         <immutables.version>2.9.3</immutables.version>
-        <powermock.version>2.0.2</powermock.version>
-        <objenesis.version>3.0.1</objenesis.version>
+        <objenesis.version>3.3</objenesis.version>
         <opencensus.version>0.31.1</opencensus.version>
+        <okhttp.version>4.11.0</okhttp.version>
 
         <shade.id>${project.groupId}.githubclient.shade</shade.id>
     </properties>
@@ -137,7 +137,7 @@
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
-            <version>3.14.7</version>
+            <version>${okhttp.version}</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -210,17 +210,18 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
             <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.5.0</version>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
+
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
@@ -242,32 +243,8 @@
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>mockwebserver</artifactId>
-            <version>3.14.7</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-module-junit4</artifactId>
-            <version>${powermock.version}</version>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.mockito</groupId>
-                    <artifactId>mockito-core</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-api-mockito2</artifactId>
-            <version>${powermock.version}</version>
+            <version>${okhttp.version}</version>
             <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.mockito</groupId>
-                    <artifactId>mockito-core</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>
@@ -409,7 +386,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.19.1</version>
+                <version>3.2.1</version>
             </plugin>
             <plugin>
                 <artifactId>maven-jar-plugin</artifactId>

src/test/java/com/spotify/github/GitHubInstantTest.java

@@ -25,7 +25,7 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.time.Instant;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class GitHubInstantTest {
 

src/test/java/com/spotify/github/hooks/PullRequestEventTest.java

@@ -27,7 +27,7 @@
 import com.spotify.github.jackson.Json;
 import com.spotify.github.v3.activity.events.PullRequestEvent;
 import java.io.IOException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class PullRequestEventTest {
 

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

@@ -26,7 +26,7 @@
 
 import java.util.Arrays;
 import java.util.List;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class LinkTest {
 

src/test/java/com/spotify/github/jackson/GitHubInstantModuleTest.java

@@ -26,14 +26,14 @@
 import com.spotify.github.GitHubInstant;
 import java.io.IOException;
 import java.time.Instant;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class GitHubInstantModuleTest {
 
   private Json mapper;
 
-  @Before
+  @BeforeEach
   public void setUp() throws Exception {
     mapper = Json.create();
   }

src/test/java/com/spotify/github/opencensus/OpenCensusSpanTest.java

@@ -26,7 +26,6 @@
 import io.opencensus.trace.Status;
 import org.junit.jupiter.api.Test;
 
-import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 

src/test/java/com/spotify/github/opencensus/OpenCensusTracerTest.java

@@ -28,11 +28,9 @@
 import io.opencensus.trace.export.SpanData;
 import io.opencensus.trace.samplers.Samplers;
 import io.opencensus.trace.unsafe.ContextUtils;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.Map;
@@ -115,13 +113,13 @@ private SpanData findSpan(final List<SpanData> spans, final String name) {
         return spans.stream().filter(s -> s.getName().equals(name)).findFirst().get();
     }
 
-    @Before
+    @BeforeEach
     public void setUpExporter() {
         spanExporterHandler = new TestExportHandler();
         Tracing.getExportComponent().getSpanExporter().registerHandler("test", spanExporterHandler);
     }
 
-    @BeforeClass
+    @BeforeAll
     public static void setupTracing() {
         final TraceConfig traceConfig = Tracing.getTraceConfig();
         final Sampler sampler = Samplers.alwaysSample();

src/test/java/com/spotify/github/v3/TeamTest.java

@@ -29,9 +29,8 @@
 import com.spotify.github.jackson.Json;
 import java.io.IOException;
 import java.net.URI;
-import java.util.Optional;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class TeamTest {
 
@@ -50,7 +49,7 @@ public static final void assertTeam(final Team team) {
     assertThat(team.repositoriesUrl(), is(URI.create(team.url() + "/repos")));
   }
 
-  @Before
+  @BeforeEach
   public void setUp() throws Exception {
     fixture = Resources.toString(getResource(this.getClass(), "team.json"), defaultCharset());
   }

src/test/java/com/spotify/github/v3/TreeItemTest.java

@@ -29,8 +29,8 @@
 import com.spotify.github.jackson.Json;
 import com.spotify.github.v3.git.TreeItem;
 import java.io.IOException;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class TreeItemTest {
 
@@ -42,7 +42,7 @@ public static final void assertTreeItem(final TreeItem treeItem) {
     assertThat(treeItem.size(), is(12L));
   }
 
-  @Before
+  @BeforeEach
   public void setUp() throws Exception {
     fixture = Resources.toString(getResource(this.getClass(), "treeItem.json"), defaultCharset());
   }

src/test/java/com/spotify/github/v3/UserTest.java

@@ -30,8 +30,8 @@
 import java.io.IOException;
 import java.net.URI;
 import java.util.Optional;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class UserTest {
 
@@ -50,7 +50,7 @@ public static final void assertUser(final User user) {
     assertThat(user.siteAdmin().get(), is(false));
   }
 
-  @Before
+  @BeforeEach
   public void setUp() throws Exception {
     fixture = Resources.toString(getResource(this.getClass(), "user.json"), defaultCharset());
   }

src/test/java/com/spotify/github/v3/activity/events/CheckRunEventTest.java

@@ -29,8 +29,7 @@
 import com.spotify.github.jackson.Json;
 
 import java.io.IOException;
-
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class CheckRunEventTest {
 

src/test/java/com/spotify/github/v3/activity/events/PullRequestEventTest.java

@@ -29,7 +29,7 @@
 import com.spotify.github.jackson.Json;
 import com.spotify.github.v3.prs.PullRequestActionState;
 import java.io.IOException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class PullRequestEventTest {
 

src/test/java/com/spotify/github/v3/activity/events/PullRequestReviewEventTest.java

@@ -28,7 +28,7 @@
 import com.google.common.io.Resources;
 import com.spotify.github.jackson.Json;
 import java.io.IOException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class PullRequestReviewEventTest {
   @Test

src/test/java/com/spotify/github/v3/activity/events/StatusEventTest.java

@@ -28,7 +28,7 @@
 import com.google.common.io.Resources;
 import com.spotify.github.jackson.Json;
 import java.io.IOException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class StatusEventTest {
   @Test

src/test/java/com/spotify/github/v3/checks/AccessTokenTest.java

@@ -27,7 +27,7 @@
 import com.spotify.github.jackson.Json;
 import java.io.IOException;
 import java.time.ZonedDateTime;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class AccessTokenTest {
   private final Json json = Json.create();

src/test/java/com/spotify/github/v3/checks/AnnotationTest.java

@@ -22,14 +22,14 @@
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertTrue;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import com.spotify.github.jackson.Json;
 import com.spotify.github.v3.checks.ImmutableAnnotation.Builder;
 import java.util.Optional;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 public class AnnotationTest {
    private Builder builder() {
@@ -88,16 +88,16 @@ public void serializesWithEmptyFields() {
   @Test
   public void clearsColumnFieldsForMultiLineAnnotation() {
     Annotation multiLineAnnotation = builder().startLine(1).endLine(2).build();
-    assertTrue(multiLineAnnotation.startColumn().isEmpty());
-    assertTrue(multiLineAnnotation.endColumn().isEmpty());
+    Assertions.assertTrue(multiLineAnnotation.startColumn().isEmpty());
+    Assertions.assertTrue(multiLineAnnotation.endColumn().isEmpty());
 
     Annotation anotherMultiLineAnnotation = builder().startLine(1).endLine(2).startColumn(Optional.empty()).endColumn(1).build();
-    assertTrue(anotherMultiLineAnnotation.startColumn().isEmpty());
-    assertTrue(anotherMultiLineAnnotation.endColumn().isEmpty());
+    Assertions.assertTrue(anotherMultiLineAnnotation.startColumn().isEmpty());
+    Assertions.assertTrue(anotherMultiLineAnnotation.endColumn().isEmpty());
 
     Annotation yetAnotherMultiLineAnnotation = builder().startLine(1).endLine(2).startColumn(1).endColumn(Optional.empty()).build();
-    assertTrue(yetAnotherMultiLineAnnotation.startColumn().isEmpty());
-    assertTrue(yetAnotherMultiLineAnnotation.endColumn().isEmpty());
+    Assertions.assertTrue(yetAnotherMultiLineAnnotation.startColumn().isEmpty());
+    Assertions.assertTrue(yetAnotherMultiLineAnnotation.endColumn().isEmpty());
 
     Annotation singleLineAnnotation = builder().startLine(1).endLine(1).build();
     assertEquals(1, singleLineAnnotation.startColumn().orElse(0));

src/test/java/com/spotify/github/v3/checks/CheckRunActionTest.java

@@ -23,7 +23,7 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import com.spotify.github.v3.checks.ImmutableCheckRunAction.Builder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class CheckRunActionTest {
   private Builder builder() {

src/test/java/com/spotify/github/v3/checks/CheckRunOutputTest.java

@@ -23,7 +23,7 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import com.spotify.github.v3.checks.ImmutableCheckRunOutput.Builder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class CheckRunOutputTest {
 

src/test/java/com/spotify/github/v3/checks/CheckSuiteTest.java

@@ -39,7 +39,7 @@ public void testDeserialization() throws IOException {
         Resources.toString(
             getResource(this.getClass(), "check-suites-response.json"), defaultCharset());
     final CheckSuiteResponseList checkSuiteResponseList = Json.create().fromJson(fixture, CheckSuiteResponseList.class);
-    assertThat(checkSuiteResponseList.checkSuites().get(0).id(), is(5));
+    assertThat(checkSuiteResponseList.checkSuites().get(0).id(), is(5L));
     assertThat(checkSuiteResponseList.checkSuites().get(0).app().get().slug().get(), is("octoapp"));
   }
 

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

@@ -43,8 +43,8 @@
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.util.concurrent.CompletableFuture;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class ChecksClientTest {
 
@@ -61,7 +61,7 @@ public static String loadResource(final String path) {
     }
   }
 
-  @Before
+  @BeforeEach
   public void setUp() {
     github = mock(GitHubClient.class);
     checksClient = new ChecksClient(github, "someowner", "somerepo");

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

@@ -50,8 +50,8 @@
 import java.time.Instant;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class GitDataClientTest {
 
@@ -63,7 +63,7 @@ private static String getFixture(String resource) throws IOException {
     return Resources.toString(getResource(GitDataClientTest.class, resource), defaultCharset());
   }
 
-  @Before
+  @BeforeEach
   public void setUp() {
     github = mock(GitHubClient.class);
     gitDataClient = new GitDataClient(github, "someowner", "somerepo");