[MINOR] migrate remaining Crypto tests to junit 5 (hyperledger#6280)

* update crypto tests to junit5 * fixed temp file * removed vintage junit dep Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> --------- Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> Signed-off-by: jflo <justin+github@florentine.us>
jflo · Dec 12, 2023 · e39a9a4 · e39a9a4
1 parent 639236a
commit e39a9a4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 15 deletions.
diff --git a/crypto/services/build.gradle b/crypto/services/build.gradle
@@ -32,11 +32,8 @@ dependencies {
   api project(':crypto:algorithms')
   api project(':plugin-api')
 
-  testImplementation 'junit:junit'
   testImplementation 'org.assertj:assertj-core'
   testImplementation 'org.junit.jupiter:junit-jupiter'
-
-  testRuntimeOnly 'org.junit.vintage:junit-vintage-engine'
 }
 
 artifacts { testSupportArtifacts testSupportJar }
diff --git a/...services/src/test/java/org/hyperledger/besu/cryptoservices/KeyPairSecurityModuleTest.java b/...services/src/test/java/org/hyperledger/besu/cryptoservices/KeyPairSecurityModuleTest.java
@@ -20,26 +20,22 @@
 import org.hyperledger.besu.crypto.SECPPublicKey;
 import org.hyperledger.besu.crypto.SignatureAlgorithmFactory;
 
-import java.io.File;
 import java.io.IOException;
+import java.nio.file.Path;
 import java.security.spec.ECPoint;
 
 import org.apache.tuweni.bytes.Bytes;
 import org.assertj.core.api.Assertions;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
 
 public class KeyPairSecurityModuleTest {
 
-  @Rule public final TemporaryFolder temp = new TemporaryFolder();
+  @TempDir public Path keyFile;
 
   @Test
   public void validatePublicKeyFromECPointCanBeConstructed() throws IOException {
-    final File keyDirectory = temp.newFolder();
-    final File keyFile = new File(keyDirectory, "key");
-
-    final KeyPair keyPair = KeyPairUtil.loadKeyPair(keyFile);
+    final KeyPair keyPair = KeyPairUtil.loadKeyPair(keyFile.resolve("key"));
 
     final KeyPairSecurityModule keyPairSecurityModule = new KeyPairSecurityModule(keyPair);
     final ECPoint ecPoint = keyPairSecurityModule.getPublicKey().getW();

diff --git a/crypto/services/src/test/java/org/hyperledger/besu/cryptoservices/NodeKeyTest.java b/crypto/services/src/test/java/org/hyperledger/besu/cryptoservices/NodeKeyTest.java
@@ -21,12 +21,12 @@
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.bytes.Bytes32;
 import org.assertj.core.api.Assertions;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class NodeKeyTest {
 
-  @Before
+  @BeforeEach
   public void resetInstance() {
     SignatureAlgorithmFactory.resetInstance();
   }