From 89ee664e04a147474b973f0ff3be0f148ef83320 Mon Sep 17 00:00:00 2001 From: Fabio Pirola Date: Sat, 4 Nov 2023 23:31:54 -0300 Subject: [PATCH] #5561migrate-tests-to-Junit5 Signed-off-by: Fabio Pirola --- nat/build.gradle | 2 +- .../org/hyperledger/besu/nat/NatServiceTest.java | 8 ++++---- .../besu/nat/core/AbstractNatManagerTest.java | 8 ++++---- .../besu/nat/docker/DockerNatManagerTest.java | 12 ++++++------ .../KubernetesClusterIpNatManagerTest.java | 12 ++++++------ .../KubernetesLoadManagerNatManagerTest.java | 12 ++++++------ .../kubernetes/KubernetesUnknownNatManagerTest.java | 12 ++++++------ .../besu/nat/upnp/UpnpNatManagerTest.java | 6 +++--- 8 files changed, 36 insertions(+), 36 deletions(-) diff --git a/nat/build.gradle b/nat/build.gradle index 311183b0015..f6c814ad113 100644 --- a/nat/build.gradle +++ b/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' diff --git a/nat/src/test/java/org/hyperledger/besu/nat/NatServiceTest.java b/nat/src/test/java/org/hyperledger/besu/nat/NatServiceTest.java index 2209c25e3f5..ae51ab6a352 100644 --- a/nat/src/test/java/org/hyperledger/besu/nat/NatServiceTest.java +++ b/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 diff --git a/nat/src/test/java/org/hyperledger/besu/nat/core/AbstractNatManagerTest.java b/nat/src/test/java/org/hyperledger/besu/nat/core/AbstractNatManagerTest.java index 974f8d5df18..768d2a2bd01 100644 --- a/nat/src/test/java/org/hyperledger/besu/nat/core/AbstractNatManagerTest.java +++ b/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 diff --git a/nat/src/test/java/org/hyperledger/besu/nat/docker/DockerNatManagerTest.java b/nat/src/test/java/org/hyperledger/besu/nat/docker/DockerNatManagerTest.java index 84c8548c7f6..a035882ef06 100644 --- a/nat/src/test/java/org/hyperledger/besu/nat/docker/DockerNatManagerTest.java +++ b/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)); diff --git a/nat/src/test/java/org/hyperledger/besu/nat/kubernetes/KubernetesClusterIpNatManagerTest.java b/nat/src/test/java/org/hyperledger/besu/nat/kubernetes/KubernetesClusterIpNatManagerTest.java index 2164c172d14..da218eb95cf 100644 --- a/nat/src/test/java/org/hyperledger/besu/nat/kubernetes/KubernetesClusterIpNatManagerTest.java +++ b/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()) diff --git a/nat/src/test/java/org/hyperledger/besu/nat/kubernetes/KubernetesLoadManagerNatManagerTest.java b/nat/src/test/java/org/hyperledger/besu/nat/kubernetes/KubernetesLoadManagerNatManagerTest.java index 931d13ffbc5..b38314e6eca 100644 --- a/nat/src/test/java/org/hyperledger/besu/nat/kubernetes/KubernetesLoadManagerNatManagerTest.java +++ b/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() diff --git a/nat/src/test/java/org/hyperledger/besu/nat/kubernetes/KubernetesUnknownNatManagerTest.java b/nat/src/test/java/org/hyperledger/besu/nat/kubernetes/KubernetesUnknownNatManagerTest.java index fb180fde815..d3d53f75dda 100644 --- a/nat/src/test/java/org/hyperledger/besu/nat/kubernetes/KubernetesUnknownNatManagerTest.java +++ b/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")); diff --git a/nat/src/test/java/org/hyperledger/besu/nat/upnp/UpnpNatManagerTest.java b/nat/src/test/java/org/hyperledger/besu/nat/upnp/UpnpNatManagerTest.java index 4c8aa93f020..1090f2d0269 100644 --- a/nat/src/test/java/org/hyperledger/besu/nat/upnp/UpnpNatManagerTest.java +++ b/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);