From 483e17a5348d689ab34215ea9d0a9a1e8556a6c6 Mon Sep 17 00:00:00 2001 From: Fabio Pirola Date: Fri, 27 Oct 2023 23:48:06 -0300 Subject: [PATCH 1/7] migrate teste from Junit4 to Junit5 Signed-off-by: Fabio Pirola --- .../besu/chainimport/RlpBlockImporterTest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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..ebf414c64b3 100644 --- a/besu/src/test/java/org/hyperledger/besu/chainimport/RlpBlockImporterTest.java +++ b/besu/src/test/java/org/hyperledger/besu/chainimport/RlpBlockImporterTest.java @@ -42,13 +42,13 @@ import org.apache.tuweni.units.bigints.UInt256; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.junit.rules.TemporaryFolder; -import org.junit.runner.RunWith; -import org.mockito.junit.MockitoJUnitRunner; +import org.junit.jupiter.api.extension.ExtendWith; +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(); From 8acfad9f20b3c0513af3f182ced3222a8e0f8323 Mon Sep 17 00:00:00 2001 From: Fabio Pirola Date: Sat, 28 Oct 2023 00:18:46 -0300 Subject: [PATCH 2/7] migrate test from Junit4 to Junit5 Signed-off-by: Fabio Pirola --- .../org/hyperledger/besu/chainimport/RlpBlockImporterTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ebf414c64b3..636b0d5f12a 100644 --- a/besu/src/test/java/org/hyperledger/besu/chainimport/RlpBlockImporterTest.java +++ b/besu/src/test/java/org/hyperledger/besu/chainimport/RlpBlockImporterTest.java @@ -43,8 +43,8 @@ import org.apache.tuweni.units.bigints.UInt256; import org.junit.Rule; import org.junit.jupiter.api.Test; -import org.junit.rules.TemporaryFolder; import org.junit.jupiter.api.extension.ExtendWith; +import org.junit.rules.TemporaryFolder; import org.mockito.junit.jupiter.MockitoExtension; /** Tests for {@link RlpBlockImporter}. */ From 61c04210d5f2a83bb3d33ea69ae30b1b0dad7bb9 Mon Sep 17 00:00:00 2001 From: Fabio Pirola Date: Thu, 2 Nov 2023 13:49:53 -0300 Subject: [PATCH 3/7] #5571 besu - migrate tests from Junit4 to Junit5 Signed-off-by: Fabio Pirola --- .vscode/settings.json | 3 +++ besu/build.gradle | 2 +- .../org/hyperledger/besu/chainimport/RlpBlockImporterTest.java | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 00000000000..c5f3f6b9c75 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "java.configuration.updateBuildConfiguration": "interactive" +} \ No newline at end of file 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 636b0d5f12a..ebf414c64b3 100644 --- a/besu/src/test/java/org/hyperledger/besu/chainimport/RlpBlockImporterTest.java +++ b/besu/src/test/java/org/hyperledger/besu/chainimport/RlpBlockImporterTest.java @@ -43,8 +43,8 @@ import org.apache.tuweni.units.bigints.UInt256; import org.junit.Rule; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; import org.junit.rules.TemporaryFolder; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.junit.jupiter.MockitoExtension; /** Tests for {@link RlpBlockImporter}. */ From fb889d1b1873039fcd03d7e2136e6e89c1513b8f Mon Sep 17 00:00:00 2001 From: Fabio Pirola Date: Sat, 4 Nov 2023 19:55:34 -0300 Subject: [PATCH 4/7] #5571migrate-tests-to-Junit5 Signed-off-by: Fabio Pirola --- .../besu/chainimport/RlpBlockImporterTest.java | 8 ++------ .../besu/ethereum/p2p/peers/EnodeURLImplTest.java | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) 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 ebf414c64b3..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.jupiter.api.Test; -import org.junit.rules.TemporaryFolder; import org.junit.jupiter.api.extension.ExtendWith; +import org.junit.jupiter.api.io.TempDir; import org.mockito.junit.jupiter.MockitoExtension; /** Tests for {@link RlpBlockImporter}. */ @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/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/peers/EnodeURLImplTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/peers/EnodeURLImplTest.java index b7cc2a06327..88e623f0ecd 100644 --- a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/peers/EnodeURLImplTest.java +++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/peers/EnodeURLImplTest.java @@ -500,7 +500,7 @@ public void toURI_WithHostnameShouldWorkWhenDnsEnabledAndUpdateEnabled() "enode://" + VALID_NODE_ID + "@" - + InetAddress.getLocalHost().getCanonicalHostName() + + InetAddress.getLocalHost().getHostName() + ":" + P2P_PORT; final URI expectedURI = URI.create(enodeURLString); From 89ee664e04a147474b973f0ff3be0f148ef83320 Mon Sep 17 00:00:00 2001 From: Fabio Pirola Date: Sat, 4 Nov 2023 23:31:54 -0300 Subject: [PATCH 5/7] #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); From 92f5adde54761606cdb1d2f10b0cc75396c530a8 Mon Sep 17 00:00:00 2001 From: Fabio Pirola Date: Tue, 7 Nov 2023 22:20:03 -0300 Subject: [PATCH 6/7] [#5561] remove ide files Signed-off-by: Fabio Pirola --- .gitignore | 1 + .vscode/settings.json | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) delete mode 100644 .vscode/settings.json 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/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index c5f3f6b9c75..00000000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "java.configuration.updateBuildConfiguration": "interactive" -} \ No newline at end of file From 1f1c4d18f5bacb6c12716b6e342cfaf52c2b8bcf Mon Sep 17 00:00:00 2001 From: Fabio Pirola Date: Wed, 8 Nov 2023 00:33:28 -0300 Subject: [PATCH 7/7] [#5561] remove ide files Signed-off-by: Fabio Pirola --- .../hyperledger/besu/ethereum/p2p/peers/EnodeURLImplTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/peers/EnodeURLImplTest.java b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/peers/EnodeURLImplTest.java index 88e623f0ecd..b7cc2a06327 100644 --- a/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/peers/EnodeURLImplTest.java +++ b/ethereum/p2p/src/test/java/org/hyperledger/besu/ethereum/p2p/peers/EnodeURLImplTest.java @@ -500,7 +500,7 @@ public void toURI_WithHostnameShouldWorkWhenDnsEnabledAndUpdateEnabled() "enode://" + VALID_NODE_ID + "@" - + InetAddress.getLocalHost().getHostName() + + InetAddress.getLocalHost().getCanonicalHostName() + ":" + P2P_PORT; final URI expectedURI = URI.create(enodeURLString);