From f85b48b0514d672ee3b4709baf588b90daa05c05 Mon Sep 17 00:00:00 2001
From: Lukasz Gasior <lukasz.gasior@rdx.works>
Date: Tue, 3 Oct 2023 12:22:01 +0200
Subject: [PATCH 1/3] Use TemporaryFolder in RadixKeyStoreTest

---
 .../test/java/com/radixdlt/crypto/RadixKeyStoreTest.java  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/common/src/test/java/com/radixdlt/crypto/RadixKeyStoreTest.java b/common/src/test/java/com/radixdlt/crypto/RadixKeyStoreTest.java
index 055484230a..1910679cc1 100644
--- a/common/src/test/java/com/radixdlt/crypto/RadixKeyStoreTest.java
+++ b/common/src/test/java/com/radixdlt/crypto/RadixKeyStoreTest.java
@@ -91,13 +91,17 @@
 import java.util.stream.IntStream;
 import javax.crypto.SecretKey;
 import org.bouncycastle.jcajce.PKCS12Key;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
 
 public class RadixKeyStoreTest {
   private static final String TEST_SECRET = "secret";
   private static final String TEST_KS_FILENAME = "testfile.ks";
   private static final char[] DEFAULT_TEST_PASSWORD = "radix".toCharArray();
 
+  @Rule public TemporaryFolder folder = new TemporaryFolder();
+
   /** Test method for {@link RadixKeyStore#fromFile(java.io.File, char[], boolean)}. */
   @Test
   public void testFromFileCreate() throws IOException, KeyStoreException {
@@ -327,8 +331,8 @@ public void test_read_various_key_stores() throws Exception {
     }
   }
 
-  private static File newFile(String filename) throws IOException {
-    File file = new File(filename);
+  private File newFile(String filename) throws IOException {
+    File file = folder.newFile(filename);
     if (!Files.deleteIfExists(file.toPath())) {
       // In this case we are fine if "file" does not exist and wasn't deleted.
     }

From 3c36ee622887ca6a41947e7b245672ce6004cac9 Mon Sep 17 00:00:00 2001
From: Lukasz Gasior <lukasz.gasior@rdx.works>
Date: Tue, 3 Oct 2023 13:02:35 +0200
Subject: [PATCH 2/3] Don't rename the file in RadixKeyStoreTest

---
 .../test/java/com/radixdlt/crypto/RadixKeyStoreTest.java   | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/common/src/test/java/com/radixdlt/crypto/RadixKeyStoreTest.java b/common/src/test/java/com/radixdlt/crypto/RadixKeyStoreTest.java
index 1910679cc1..14a8759c13 100644
--- a/common/src/test/java/com/radixdlt/crypto/RadixKeyStoreTest.java
+++ b/common/src/test/java/com/radixdlt/crypto/RadixKeyStoreTest.java
@@ -192,14 +192,9 @@ public void testReadKeyPairSuccess()
 
     try (RadixKeyStore ks = RadixKeyStore.fromFile(file, storePassword, true)) {
       assertTrue(file.exists());
-
       ks.writeKeyPair(keyPairName, originalKeypair);
     }
-
-    final File renamedFile = new File(TEST_KS_FILENAME);
-    file.renameTo(renamedFile);
-
-    try (RadixKeyStore ks = RadixKeyStore.fromFile(renamedFile, storePassword, false)) {
+    try (RadixKeyStore ks = RadixKeyStore.fromFile(file, storePassword, false)) {
       var loadedKeypair = ks.readKeyPair(keyPairName, false);
       assertThat(loadedKeypair).isEqualTo(originalKeypair);
     }

From 4823a66962ae11b790d9c66ea2e6a9e23d2ae032 Mon Sep 17 00:00:00 2001
From: Lukasz Gasior <lukasz.gasior@rdx.works>
Date: Tue, 3 Oct 2023 14:57:00 +0200
Subject: [PATCH 3/3] Fix RadixNodeModuleTest

---
 .../com/radixdlt/RadixNodeModuleTest.java     | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/core/src/test/java/com/radixdlt/RadixNodeModuleTest.java b/core/src/test/java/com/radixdlt/RadixNodeModuleTest.java
index e13eac4194..fe2398d52f 100644
--- a/core/src/test/java/com/radixdlt/RadixNodeModuleTest.java
+++ b/core/src/test/java/com/radixdlt/RadixNodeModuleTest.java
@@ -77,8 +77,8 @@
 import com.radixdlt.networks.Network;
 import com.radixdlt.utils.properties.RuntimeProperties;
 import java.io.File;
+import java.io.IOException;
 import org.apache.commons.cli.ParseException;
-import org.assertj.core.util.Files;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
@@ -152,12 +152,16 @@ private RuntimeProperties createDefaultProperties() {
       throw new RuntimeException(e);
     }
     doReturn("127.0.0.1").when(properties).get(eq("host.ip"), anyString());
-    var keyStore = new File("nonesuch.ks");
-    Files.delete(keyStore);
-    generateKeystore(keyStore);
-
-    doReturn("nonesuch.ks").when(properties).get(eq("node.key.path"), anyString());
-    return properties;
+    try {
+      final var keyStoreFile = new File(folder.newFolder(), "test-keystore.ks");
+      generateKeystore(keyStoreFile);
+      doReturn(keyStoreFile.getAbsolutePath())
+          .when(properties)
+          .get(eq("node.key.path"), anyString());
+      return properties;
+    } catch (IOException e) {
+      throw new RuntimeException(e);
+    }
   }
 
   private void generateKeystore(File keyStore) {
@@ -165,7 +169,7 @@ private void generateKeystore(File keyStore) {
       RadixKeyStore.fromFile(keyStore, "".toCharArray(), true)
           .writeKeyPair("node", ECKeyPair.generateNew());
     } catch (Exception e) {
-      throw new IllegalStateException("Unable to create keystore");
+      throw new IllegalStateException("Unable to create keystore", e);
     }
   }
 }