Refactor temp directory setup for JmxTest.

Author: fniephaus

substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/jmx/JmxTest.java

@@ -81,10 +81,14 @@ public class JmxTest {
     static final String ACCESS_PROPERTY = "com.sun.management.jmxremote.access.file";
     static final String PASSWORD_PROPERTY = "com.sun.management.jmxremote.password.file";
     static final String SSL_PROPERTY = "com.sun.management.jmxremote.ssl";
-    static final String KEYSTORE_PROPERTY = "javax.net.ssl.keyStore";
+    static final String KEYSTORE_FILENAME = "clientkeystore";
+    static final String KEYSTORE_PASSWORD = "clientpass";
     static final String KEYSTORE_PASSWORD_PROPERTY = "javax.net.ssl.keyStorePassword";
-    static final String TRUSTSTORE_PROPERTY = "javax.net.ssl.trustStore";
+    static final String KEYSTORE_PROPERTY = "javax.net.ssl.keyStore";
+    static final String TRUSTSTORE_FILENAME = "servertruststore";
+    static final String TRUSTSTORE_PASSWORD = "servertrustpass";
     static final String TRUSTSTORE_PASSWORD_PROPERTY = "javax.net.ssl.trustStorePassword";
+    static final String TRUSTSTORE_PROPERTY = "javax.net.ssl.trustStore";
     static final String REGISTRY_SSL_PROPERTY = "com.sun.management.jmxremote.registry.ssl";
     static final String SOCKET_FACTORY_PROPERTY = "com.sun.jndi.rmi.factory.socket";
     static final String TEST_PORT = "12345";
@@ -104,34 +108,30 @@ public static void setup() throws IOException {
         System.setProperty(SSL_PROPERTY, TRUE);
         System.setProperty(REGISTRY_SSL_PROPERTY, TRUE);
 
+        // Prepare temp directory with files required for testing authentification.
         Path tempDirectory = Files.createTempDirectory("jmxtest");
+        Path jmxRemoteAccess = tempDirectory.resolve("jmxremote.access");
+        Path jmxRemotePassword = tempDirectory.resolve("jmxremote.password");
+        Path clientKeyStore = tempDirectory.resolve(KEYSTORE_FILENAME);
+        Path serverTrustStore = tempDirectory.resolve(TRUSTSTORE_FILENAME);
 
-        // Generate SSL keystore, client cert, and truststore
+        // Generate SSL keystore, client cert, and truststore for testing SSL connection.
         createClientKey(tempDirectory);
         createClientCert(tempDirectory);
+        assertTrue("Failed to create " + KEYSTORE_FILENAME, Files.exists(clientKeyStore));
+        System.setProperty(KEYSTORE_PROPERTY, clientKeyStore.toString());
+        System.setProperty(KEYSTORE_PASSWORD_PROPERTY, KEYSTORE_PASSWORD);
         createServerTrustStore(tempDirectory);
-        // Copy resources into tempDirectory
-        Path jmxRemoteAccess = tempDirectory.resolve("jmxremote.access");
-        Path jmxRemotePassword = tempDirectory.resolve("jmxremote.password");
-        Path clientkeystore = tempDirectory.resolve("clientkeystore");
-        Path servertruststore = tempDirectory.resolve("servertruststore");
-        // Note: full paths are used to ensure analysis includes the resources automatically
-        Files.writeString(jmxRemoteAccess, TEST_ROLE + " readwrite");
-        Files.writeString(jmxRemotePassword, TEST_ROLE + " " + TEST_ROLE_PASSWORD);
+        assertTrue("Failed to create " + TRUSTSTORE_FILENAME, Files.exists(serverTrustStore));
+        System.setProperty(TRUSTSTORE_PROPERTY, serverTrustStore.toString());
+        System.setProperty(TRUSTSTORE_PASSWORD_PROPERTY, TRUSTSTORE_PASSWORD);
 
-        // The following are dummy password and access files required for testing authentication.
+        // The following are dummy access and password files required for testing authentication.
+        Files.writeString(jmxRemoteAccess, TEST_ROLE + " readwrite");
         System.setProperty(ACCESS_PROPERTY, jmxRemoteAccess.toString());
+        Files.writeString(jmxRemotePassword, TEST_ROLE + " " + TEST_ROLE_PASSWORD);
         System.setProperty(PASSWORD_PROPERTY, jmxRemotePassword.toString());
 
-        /*
-         * The following are dummy SSL keystore and truststore files required for testing connection
-         * using SSL. See resources/jmxremote/README.md for more information.
-         */
-        System.setProperty(KEYSTORE_PROPERTY, clientkeystore.toString());
-        System.setProperty(KEYSTORE_PASSWORD_PROPERTY, "clientpass");
-        System.setProperty(TRUSTSTORE_PROPERTY, servertruststore.toString());
-        System.setProperty(TRUSTSTORE_PASSWORD_PROPERTY, "servertrustpass");
-
         // Password file must have restricted access.
         Files.setPosixFilePermissions(jmxRemotePassword, Set.of(PosixFilePermission.OWNER_READ, PosixFilePermission.OWNER_WRITE));
 
@@ -140,35 +140,35 @@ public static void setup() throws IOException {
             ManagementAgentStartupHook startupHook = new ManagementAgentStartupHook();
             startupHook.execute(false);
         } catch (Exception e) {
-            Assert.fail("Failed to start server Cause: " + e.getMessage());
+            Assert.fail("Failed to start server. Cause: " + e.getMessage());
         }
     }
 
     private static void createClientKey(Path tempDirectory) throws IOException {
         runCommand(tempDirectory, List.of("keytool", "-genkey",
-                        "-keystore", "clientkeystore",
+                        "-keystore", KEYSTORE_FILENAME,
                         "-alias", "clientkey",
-                        "-storepass", "clientpass",
-                        "-keypass", "clientpass",
+                        "-storepass", KEYSTORE_PASSWORD,
+                        "-keypass", KEYSTORE_PASSWORD,
                         "-dname", "CN=test, OU=test, O=test, L=test, ST=test, C=test, EMAILADDRESS=test",
                         "-validity", "99999",
                         "-keyalg", "rsa"));
     }
 
     private static void createClientCert(Path tempDirectory) throws IOException {
         runCommand(tempDirectory, List.of("keytool", "-exportcert",
-                        "-keystore", "clientkeystore",
+                        "-keystore", KEYSTORE_FILENAME,
                         "-alias", "clientkey",
-                        "-storepass", "clientpass",
+                        "-storepass", KEYSTORE_PASSWORD,
                         "-file", "client.cer"));
     }
 
     private static void createServerTrustStore(Path tempDirectory) throws IOException {
         runCommand(tempDirectory, List.of("keytool", "-importcert",
                         "-noprompt",
                         "-file", "client.cer",
-                        "-keystore", "servertruststore",
-                        "-storepass", "servertrustpass"));
+                        "-keystore", TRUSTSTORE_FILENAME,
+                        "-storepass", TRUSTSTORE_PASSWORD));
     }
 
     private static void runCommand(Path tempDirectory, List<String> command) throws IOException {