Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[#5561]migrate tests to junit5 #6122

Merged
merged 11 commits into from
Nov 21, 2023
Merged

[#5561]migrate tests to junit5 #6122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
483e17a
migrate teste from Junit4 to Junit5
fspirola Oct 28, 2023
8acfad9
migrate test from Junit4 to Junit5
fspirola Oct 28, 2023
61c0421
#5571 besu - migrate tests from Junit4 to Junit5
fspirola Nov 2, 2023
fb889d1
#5571migrate-tests-to-Junit5
fspirola Nov 4, 2023
89ee664
#5561migrate-tests-to-Junit5
fspirola Nov 5, 2023
f8bdf22
Merge branch 'main' into 5561migrate-tests-to-Junit5
macfarla Nov 7, 2023
92f5add
[#5561] remove ide files
fspirola Nov 8, 2023
00fe1ce
Merge branch '5561migrate-tests-to-Junit5' of https://github.com/fspi…
fspirola Nov 8, 2023
1f1c4d1
[#5561] remove ide files
fspirola Nov 8, 2023
9f3fe28
Merge branch 'main' into 5561migrate-tests-to-Junit5
macfarla Nov 8, 2023
2d350cf
Merge branch 'main' of github.com:hyperledger/besu into 5561migrate-t…
macfarla Nov 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
.DS_Store
.externalToolBuilders/
.gradle/
.vscode/
.idea/
.loadpath
.metadata
Expand Down
2 changes: 1 addition & 1 deletion besu/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
16 changes: 6 additions & 10 deletions besu/src/test/java/org/hyperledger/besu/chainimport/RlpBlockImporterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down Expand Up @@ -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 =
Expand Down Expand Up @@ -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 =
Expand Down
2 changes: 1 addition & 1 deletion nat/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
8 changes: 4 additions & 4 deletions nat/src/test/java/org/hyperledger/besu/nat/NatServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions nat/src/test/java/org/hyperledger/besu/nat/core/AbstractNatManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions nat/src/test/java/org/hyperledger/besu/nat/docker/DockerNatManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand All @@ -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));
Expand Down
12 changes: 6 additions & 6 deletions nat/src/test/java/org/hyperledger/besu/nat/kubernetes/KubernetesClusterIpNatManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand All @@ -51,7 +51,7 @@ public final class KubernetesClusterIpNatManagerTest {

private KubernetesNatManager natManager;

@Before
@BeforeEach
public void initialize() throws IOException {

when(v1Service.getSpec())
Expand Down
12 changes: 6 additions & 6 deletions ...rc/test/java/org/hyperledger/besu/nat/kubernetes/KubernetesLoadManagerNatManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand All @@ -54,7 +54,7 @@ public final class KubernetesLoadManagerNatManagerTest {

private KubernetesNatManager natManager;

@Before
@BeforeEach
public void initialize() throws IOException {
final V1ServiceStatus v1ServiceStatus =
new V1ServiceStatus()
Expand Down
12 changes: 6 additions & 6 deletions nat/src/test/java/org/hyperledger/besu/nat/kubernetes/KubernetesUnknownNatManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"));
Expand Down
6 changes: 3 additions & 3 deletions nat/src/test/java/org/hyperledger/besu/nat/upnp/UpnpNatManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -54,7 +54,7 @@ public final class UpnpNatManagerTest {

private UpnpNatManager upnpManager;

@Before
@BeforeEach
public void initialize() {

mockedRegistry = mock(Registry.class);
Expand Down