junit 5 for util tests (#5226)

Use Junit 5 for besu/util tests Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com>
hyperledger · Mar 16, 2023 · 5aa78ae · 5aa78ae
1 parent b46d903
commit 5aa78ae
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 13 deletions.
diff --git a/besu/build.gradle b/besu/build.gradle
@@ -99,6 +99,7 @@ dependencies {
   testImplementation 'org.awaitility:awaitility'
   testImplementation 'org.junit.jupiter:junit-jupiter'
   testImplementation 'org.mockito:mockito-core'
+  testImplementation 'org.mockito:mockito-junit-jupiter'
   testImplementation 'org.testcontainers:testcontainers'
   testImplementation 'tech.pegasys.discovery:discovery'
 

diff --git a/...src/test/java/org/hyperledger/besu/util/LocalPermissioningConfigurationValidatorTest.java b/...src/test/java/org/hyperledger/besu/util/LocalPermissioningConfigurationValidatorTest.java
@@ -34,11 +34,11 @@
 
 import com.google.common.collect.Lists;
 import com.google.common.io.Resources;
-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 LocalPermissioningConfigurationValidatorTest {
 
   static final String PERMISSIONING_CONFIG_SEPOLIA_BOOTNODES =
@@ -50,7 +50,7 @@ public class LocalPermissioningConfigurationValidatorTest {
       "/permissioning_config_unknown_hostname.toml";
 
   @Test
-  public void spoliaWithNodesAllowlistOptionWhichDoesIncludeRopstenBootnodesMustNotError()
+  public void sepoliaWithNodesAllowlistOptionWhichDoesIncludeRopstenBootnodesMustNotError()
       throws Exception {
 
     EthNetworkConfig ethNetworkConfig = EthNetworkConfig.getNetworkConfig(NetworkName.SEPOLIA);

diff --git a/besu/src/test/java/org/hyperledger/besu/util/PrivateStorageMigrationServiceTest.java b/besu/src/test/java/org/hyperledger/besu/util/PrivateStorageMigrationServiceTest.java
@@ -31,12 +31,12 @@
 import org.hyperledger.besu.ethereum.privacy.storage.migration.PrivateStorageMigrationException;
 import org.hyperledger.besu.ethereum.privacy.storage.migration.PrivateStorageMigrationService;
 
-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.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class PrivateStorageMigrationServiceTest {
 
   @Mock private PrivateStateStorage privateStateStorage;

diff --git a/besu/src/test/java/org/hyperledger/besu/util/StringUtilsTest.java b/besu/src/test/java/org/hyperledger/besu/util/StringUtilsTest.java
@@ -22,11 +22,11 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
-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 StringUtilsTest {
 
   @Test