junit4 to junit5 (#5598)

Signed-off-by: Nischal Sharma <nischal@web3labs.com>
hyperledger · Jun 14, 2023 · 5450074 · 5450074
1 parent 2d63987
commit 5450074
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/enclave/build.gradle b/enclave/build.gradle
@@ -14,7 +14,6 @@ dependencies {
   // test dependencies.
   testImplementation project(':testutil')
 
-  testImplementation 'junit:junit'
   testImplementation 'org.assertj:assertj-core'
   testImplementation 'org.junit.jupiter:junit-jupiter'
 

diff --git a/enclave/src/test/java/org/hyperledger/besu/enclave/EnclaveFactoryTest.java b/enclave/src/test/java/org/hyperledger/besu/enclave/EnclaveFactoryTest.java
@@ -23,32 +23,32 @@
 import java.io.IOException;
 import java.nio.file.Files;
 
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
 
 public class EnclaveFactoryTest {
-  @ClassRule public static final TemporaryFolder temporaryFolder = new TemporaryFolder();
+  @TempDir File tempDir;
   private static final String EMPTY_FILE_ERROR_MSG = "Keystore password file is empty: %s";
 
   @Test
   public void passwordCanBeReadFromFile() throws IOException {
-    final File passwordFile = temporaryFolder.newFile();
+    File passwordFile = new File(tempDir, "password.txt");
     Files.writeString(passwordFile.toPath(), "test" + System.lineSeparator() + "test2");
     assertThat(EnclaveFactory.readSecretFromFile(passwordFile.toPath())).isEqualTo("test");
   }
 
   @Test
   public void emptyFileThrowsException() throws IOException {
-    final File passwordFile = temporaryFolder.newFile();
+    File passwordFile = new File(tempDir, "password.txt");
+    Files.createFile(passwordFile.toPath()); // Create an empty file
     assertThatExceptionOfType(InvalidConfigurationException.class)
         .isThrownBy(() -> EnclaveFactory.readSecretFromFile(passwordFile.toPath()))
         .withMessage(EMPTY_FILE_ERROR_MSG, passwordFile);
   }
 
   @Test
   public void fileWithOnlyEoLThrowsException() throws IOException {
-    final File passwordFile = temporaryFolder.newFile();
+    File passwordFile = new File(tempDir, "password.txt");
     Files.writeString(passwordFile.toPath(), System.lineSeparator());
     assertThatExceptionOfType(InvalidConfigurationException.class)
         .isThrownBy(() -> EnclaveFactory.readSecretFromFile(passwordFile.toPath()))