From a85d4feb890a8c34ba9b72ed9c5f203905b835db Mon Sep 17 00:00:00 2001 From: Fabio Pirola <38575166+fspirola@users.noreply.github.com> Date: Tue, 21 Nov 2023 06:16:48 -0300 Subject: [PATCH] [#5561]migrate tests to junit5 (#6122) * migrate teste from Junit4 to Junit5 Signed-off-by: Fabio Pirola * migrate test from Junit4 to Junit5 Signed-off-by: Fabio Pirola * #5571 besu - migrate tests from Junit4 to Junit5 Signed-off-by: Fabio Pirola * #5571migrate-tests-to-Junit5 Signed-off-by: Fabio Pirola * #5561migrate-tests-to-Junit5 Signed-off-by: Fabio Pirola * [#5561] remove ide files Signed-off-by: Fabio Pirola * [#5561] remove ide files Signed-off-by: Fabio Pirola --------- Signed-off-by: Fabio Pirola Co-authored-by: Sally MacFarlane Signed-off-by: Justin Florentine --- .gitignore | 1 + besu/build.gradle | 2 +- .../besu/chainimport/RlpBlockImporterTest.java | 16 ++++++---------- 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 ++++++------ .../KubernetesUnknownNatManagerTest.java | 12 ++++++------ .../besu/nat/upnp/UpnpNatManagerTest.java | 6 +++--- 11 files changed, 44 insertions(+), 47 deletions(-) diff --git a/.gitignore b/.gitignore index 0465ea5e30f..074d25e5c77 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ .DS_Store .externalToolBuilders/ .gradle/ +.vscode/ .idea/ .loadpath .metadata diff --git a/besu/build.gradle b/besu/build.gradle index 73977d81ba7..9d72f50b021 100644 --- a/besu/build.gradle +++ b/besu/build.gradle @@ -90,7 +90,7 @@ dependencies { testImplementation 'com.squareup.okhttp3:okhttp' testImplementation 'commons-io:commons-io' testImplementation 'io.opentelemetry:opentelemetry-api' - testImplementation 'junit:junit' + testImplementation 'org.mockito:mockito-junit-jupiter' testImplementation 'org.apache.commons:commons-text' testImplementation 'io.tmio:tuweni-bytes' testImplementation 'io.tmio:tuweni-units' diff --git a/besu/src/test/java/org/hyperledger/besu/chainimport/RlpBlockImporterTest.java b/besu/src/test/java/org/hyperledger/besu/chainimport/RlpBlockImporterTest.java index f9d543aca9f..d65569535aa 100644 --- a/besu/src/test/java/org/hyperledger/besu/chainimport/RlpBlockImporterTest.java +++ b/besu/src/test/java/org/hyperledger/besu/chainimport/RlpBlockImporterTest.java @@ -41,23 +41,21 @@ import java.util.concurrent.CompletionException; import org.apache.tuweni.units.bigints.UInt256; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; -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.junit.jupiter.api.io.TempDir; +import org.mockito.junit.jupiter.MockitoExtension; /** Tests for {@link RlpBlockImporter}. */ -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public final class RlpBlockImporterTest { - @Rule public final TemporaryFolder folder = new TemporaryFolder(); + @TempDir Path dataDir; private final RlpBlockImporter rlpBlockImporter = new RlpBlockImporter(); @Test public void blockImport() throws IOException { - final Path dataDir = folder.newFolder().toPath(); final Path source = dataDir.resolve("1000.blocks"); BlockTestUtil.write1000Blocks(source); final BesuController targetController = @@ -90,7 +88,6 @@ public void blockImportRejectsBadPow() throws IOException { // set merge flag to false, otherwise this test can fail if a merge test runs first MergeConfigOptions.setMergeEnabled(false); - final Path dataDir = folder.newFolder().toPath(); final Path source = dataDir.resolve("badpow.blocks"); BlockTestUtil.writeBadPowBlocks(source); final BesuController targetController = @@ -120,7 +117,6 @@ public void blockImportRejectsBadPow() throws IOException { @Test public void blockImportCanSkipPow() throws IOException { - final Path dataDir = folder.newFolder().toPath(); final Path source = dataDir.resolve("badpow.blocks"); BlockTestUtil.writeBadPowBlocks(source); final BesuController targetController = 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);