AtHeartEngineer/linea-besu
1
0
Fork 0
mirror of https://github.com/vacp2p/linea-besu.git synced 2026-01-09 15:37:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

[#5561]migrate tests to junit5 (#6122)

Browse Source 
* migrate teste from Junit4 to Junit5

Signed-off-by: Fabio Pirola <fspirola@gmail.com>

* migrate test from Junit4 to Junit5

Signed-off-by: Fabio Pirola <fspirola@gmail.com>

* #5571 besu - migrate tests from Junit4 to Junit5

Signed-off-by: Fabio Pirola <fspirola@gmail.com>

* #5571migrate-tests-to-Junit5

Signed-off-by: Fabio Pirola <fspirola@gmail.com>

* #5561migrate-tests-to-Junit5

Signed-off-by: Fabio Pirola <fspirola@gmail.com>

* [#5561] remove ide files

Signed-off-by: Fabio Pirola <fspirola@gmail.com>

* [#5561] remove ide files

Signed-off-by: Fabio Pirola <fspirola@gmail.com>

---------

Signed-off-by: Fabio Pirola <fspirola@gmail.com>
Co-authored-by: Sally MacFarlane <macfarla.github@gmail.com>
This commit is contained in:
Fabio Pirola
2023-11-21 06:16:48 -03:00
committed by GitHub
parent ea376ba5a1
commit d94ea7758e
11 changed files with 44 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -9,6 +9,7 @@
.DS_Store .DS_Store
.externalToolBuilders/ .externalToolBuilders/
.gradle/ .gradle/
.vscode/
.idea/ .idea/
.loadpath .loadpath
.metadata .metadata

2
besu/build.gradle
View File

@@ -90,7 +90,7 @@ dependencies {
testImplementation 'com.squareup.okhttp3:okhttp' testImplementation 'com.squareup.okhttp3:okhttp'
testImplementation 'commons-io:commons-io' testImplementation 'commons-io:commons-io'
testImplementation 'io.opentelemetry:opentelemetry-api' testImplementation 'io.opentelemetry:opentelemetry-api'
testImplementation 'junit:junit' testImplementation 'org.mockito:mockito-junit-jupiter'
testImplementation 'org.apache.commons:commons-text' testImplementation 'org.apache.commons:commons-text'
testImplementation 'io.tmio:tuweni-bytes' testImplementation 'io.tmio:tuweni-bytes'
testImplementation 'io.tmio:tuweni-units' testImplementation 'io.tmio:tuweni-units'

16
besu/src/test/java/org/hyperledger/besu/chainimport/RlpBlockImporterTest.java
View File

@@ -41,23 +41,21 @@ import java.nio.file.Path;
import java.util.concurrent.CompletionException; import java.util.concurrent.CompletionException;
import org.apache.tuweni.units.bigints.UInt256; import org.apache.tuweni.units.bigints.UInt256;
import org.junit.Rule; import org.junit.jupiter.api.Test;
import org.junit.Test; import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.rules.TemporaryFolder; import org.junit.jupiter.api.io.TempDir;
import org.junit.runner.RunWith; import org.mockito.junit.jupiter.MockitoExtension;
import org.mockito.junit.MockitoJUnitRunner;
/** Tests for {@link RlpBlockImporter}. */ /** Tests for {@link RlpBlockImporter}. */
@RunWith(MockitoJUnitRunner.class) @ExtendWith(MockitoExtension.class)
public final class RlpBlockImporterTest { public final class RlpBlockImporterTest {
@Rule public final TemporaryFolder folder = new TemporaryFolder(); @TempDir Path dataDir;
private final RlpBlockImporter rlpBlockImporter = new RlpBlockImporter(); private final RlpBlockImporter rlpBlockImporter = new RlpBlockImporter();
@Test @Test
public void blockImport() throws IOException { public void blockImport() throws IOException {
final Path dataDir = folder.newFolder().toPath();
final Path source = dataDir.resolve("1000.blocks"); final Path source = dataDir.resolve("1000.blocks");
BlockTestUtil.write1000Blocks(source); BlockTestUtil.write1000Blocks(source);
final BesuController targetController = final BesuController targetController =
@@ -90,7 +88,6 @@ public final class RlpBlockImporterTest {
// set merge flag to false, otherwise this test can fail if a merge test runs first // set merge flag to false, otherwise this test can fail if a merge test runs first
MergeConfigOptions.setMergeEnabled(false); MergeConfigOptions.setMergeEnabled(false);
final Path dataDir = folder.newFolder().toPath();
final Path source = dataDir.resolve("badpow.blocks"); final Path source = dataDir.resolve("badpow.blocks");
BlockTestUtil.writeBadPowBlocks(source); BlockTestUtil.writeBadPowBlocks(source);
final BesuController targetController = final BesuController targetController =
@@ -120,7 +117,6 @@ public final class RlpBlockImporterTest {
@Test @Test
public void blockImportCanSkipPow() throws IOException { public void blockImportCanSkipPow() throws IOException {
final Path dataDir = folder.newFolder().toPath();
final Path source = dataDir.resolve("badpow.blocks"); final Path source = dataDir.resolve("badpow.blocks");
BlockTestUtil.writeBadPowBlocks(source); BlockTestUtil.writeBadPowBlocks(source);
final BesuController targetController = final BesuController targetController =

2
nat/build.gradle
View File

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

8
nat/src/test/java/org/hyperledger/besu/nat/NatServiceTest.java
View File

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

8
nat/src/test/java/org/hyperledger/besu/nat/core/AbstractNatManagerTest.java
View File

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

12
nat/src/test/java/org/hyperledger/besu/nat/docker/DockerNatManagerTest.java
View File

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

12
nat/src/test/java/org/hyperledger/besu/nat/kubernetes/KubernetesClusterIpNatManagerTest.java
View File

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

12
nat/src/test/java/org/hyperledger/besu/nat/kubernetes/KubernetesLoadManagerNatManagerTest.java
View File

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

12
nat/src/test/java/org/hyperledger/besu/nat/kubernetes/KubernetesUnknownNatManagerTest.java
View File

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

6
nat/src/test/java/org/hyperledger/besu/nat/upnp/UpnpNatManagerTest.java
View File

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