#5561migrate-tests-to-Junit5

Author: fspirola

nat/build.gradle

@@ -41,7 +41,7 @@ dependencies {
   testImplementation project(path: ':ethereum:core', configuration: 'testSupportArtifacts')
   testImplementation project(':testutil')
 
-  testImplementation 'junit:junit'
+  testImplementation 'org.mockito:mockito-junit-jupiter'
   testImplementation 'org.assertj:assertj-core'
   testImplementation 'org.junit.jupiter:junit-jupiter'
   testImplementation 'org.mockito:mockito-core'

nat/src/test/java/org/hyperledger/besu/nat/NatServiceTest.java

@@ -33,11 +33,11 @@
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class NatServiceTest {
 
   @Test

nat/src/test/java/org/hyperledger/besu/nat/core/AbstractNatManagerTest.java

@@ -29,12 +29,12 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mockito;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class AbstractNatManagerTest {
 
   @Test

nat/src/test/java/org/hyperledger/besu/nat/docker/DockerNatManagerTest.java

@@ -30,13 +30,13 @@
 import java.util.concurrent.ExecutionException;
 
 import org.assertj.core.api.Assertions;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public final class DockerNatManagerTest {
 
   private final String advertisedHost = "99.45.69.12";
@@ -49,7 +49,7 @@ public final class DockerNatManagerTest {
 
   private DockerNatManager natManager;
 
-  @Before
+  @BeforeEach
   public void initialize() throws NatInitializationException {
     hostBasedIpDetector = mock(HostBasedIpDetector.class);
     when(hostBasedIpDetector.detectAdvertisedIp()).thenReturn(Optional.of(detectedAdvertisedHost));

nat/src/test/java/org/hyperledger/besu/nat/kubernetes/KubernetesClusterIpNatManagerTest.java

@@ -33,13 +33,13 @@
 import io.kubernetes.client.openapi.models.V1Service;
 import io.kubernetes.client.openapi.models.V1ServicePort;
 import io.kubernetes.client.openapi.models.V1ServiceSpec;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public final class KubernetesClusterIpNatManagerTest {
 
   private final String detectedAdvertisedHost = "199.45.69.12";
@@ -51,7 +51,7 @@ public final class KubernetesClusterIpNatManagerTest {
 
   private KubernetesNatManager natManager;
 
-  @Before
+  @BeforeEach
   public void initialize() throws IOException {
 
     when(v1Service.getSpec())

nat/src/test/java/org/hyperledger/besu/nat/kubernetes/KubernetesLoadManagerNatManagerTest.java

@@ -36,13 +36,13 @@
 import io.kubernetes.client.openapi.models.V1ServicePort;
 import io.kubernetes.client.openapi.models.V1ServiceSpec;
 import io.kubernetes.client.openapi.models.V1ServiceStatus;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public final class KubernetesLoadManagerNatManagerTest {
 
   private final String detectedAdvertisedHost = "199.45.69.12";
@@ -54,7 +54,7 @@ public final class KubernetesLoadManagerNatManagerTest {
 
   private KubernetesNatManager natManager;
 
-  @Before
+  @BeforeEach
   public void initialize() throws IOException {
     final V1ServiceStatus v1ServiceStatus =
         new V1ServiceStatus()

nat/src/test/java/org/hyperledger/besu/nat/kubernetes/KubernetesUnknownNatManagerTest.java

@@ -21,20 +21,20 @@
 import io.kubernetes.client.openapi.models.V1ObjectMeta;
 import io.kubernetes.client.openapi.models.V1Service;
 import io.kubernetes.client.openapi.models.V1ServiceSpec;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public final class KubernetesUnknownNatManagerTest {
 
   @Mock private V1Service v1Service;
 
   private KubernetesNatManager natManager;
 
-  @Before
+  @BeforeEach
   public void initialize() {
 
     when(v1Service.getSpec()).thenReturn(new V1ServiceSpec().type("Unknown"));

nat/src/test/java/org/hyperledger/besu/nat/upnp/UpnpNatManagerTest.java

@@ -30,8 +30,8 @@
 import java.net.URI;
 import java.net.URL;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.jupnp.UpnpService;
 import org.jupnp.controlpoint.ControlPoint;
 import org.jupnp.model.meta.DeviceDetails;
@@ -54,7 +54,7 @@ public final class UpnpNatManagerTest {
 
   private UpnpNatManager upnpManager;
 
-  @Before
+  @BeforeEach
   public void initialize() {
 
     mockedRegistry = mock(Registry.class);