Merge branch 'main' into t8n_server

diega · Jun 22, 2023 · 58d356b · 58d356b
2 parents af75728 + 5ee0836
commit 58d356b
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 11 deletions.
diff --git a/config/build.gradle b/config/build.gradle
@@ -41,12 +41,9 @@ dependencies {
 
   testImplementation project(':testutil')
 
-  testImplementation 'junit:junit'
   testImplementation 'org.assertj:assertj-core'
   testImplementation 'org.junit.jupiter:junit-jupiter'
   testImplementation 'org.mockito:mockito-core'
-
-  testRuntimeOnly 'org.junit.vintage:junit-vintage-engine'
 }
 
 configurations { testArtifacts }
diff --git a/config/src/test/java/org/hyperledger/besu/config/BFTForkTest.java b/config/src/test/java/org/hyperledger/besu/config/BFTForkTest.java
@@ -23,7 +23,7 @@
 import java.util.Map;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class BFTForkTest {
   private final String BENEFICIARY = "0x1111111111111111111111111111111111111111";

diff --git a/config/src/test/java/org/hyperledger/besu/config/CliqueConfigOptionsTest.java b/config/src/test/java/org/hyperledger/besu/config/CliqueConfigOptionsTest.java
@@ -22,7 +22,7 @@
 import java.util.Map;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class CliqueConfigOptionsTest {
 

diff --git a/config/src/test/java/org/hyperledger/besu/config/GenesisConfigFileTest.java b/config/src/test/java/org/hyperledger/besu/config/GenesisConfigFileTest.java
@@ -36,7 +36,7 @@
 import com.google.common.io.Resources;
 import org.apache.tuweni.units.bigints.UInt256;
 import org.assertj.core.api.ThrowableAssert.ThrowingCallable;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class GenesisConfigFileTest {
 

diff --git a/config/src/test/java/org/hyperledger/besu/config/GenesisConfigOptionsTest.java b/config/src/test/java/org/hyperledger/besu/config/GenesisConfigOptionsTest.java
@@ -27,7 +27,7 @@
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import org.apache.tuweni.units.bigints.UInt256;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class GenesisConfigOptionsTest {
 

diff --git a/config/src/test/java/org/hyperledger/besu/config/JsonBftConfigOptionsTest.java b/config/src/test/java/org/hyperledger/besu/config/JsonBftConfigOptionsTest.java
@@ -24,7 +24,7 @@
 import java.util.Map;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class JsonBftConfigOptionsTest {
 

diff --git a/config/src/test/java/org/hyperledger/besu/config/JsonGenesisConfigOptionsTest.java b/config/src/test/java/org/hyperledger/besu/config/JsonGenesisConfigOptionsTest.java
@@ -25,7 +25,7 @@
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.common.io.Resources;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class JsonGenesisConfigOptionsTest {
 

diff --git a/config/src/test/java/org/hyperledger/besu/config/JsonQbftConfigOptionsTest.java b/config/src/test/java/org/hyperledger/besu/config/JsonQbftConfigOptionsTest.java
@@ -23,7 +23,7 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class JsonQbftConfigOptionsTest {
 

diff --git a/config/src/test/java/org/hyperledger/besu/config/JsonUtilTest.java b/config/src/test/java/org/hyperledger/besu/config/JsonUtilTest.java
@@ -30,7 +30,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class JsonUtilTest {
   private final ObjectMapper mapper = new ObjectMapper();