Finally fixed the zip unpacking and folder cleanup issue properly (I think)

Author: bbottema

modules/core-test-module/src/main/java/testutil/SecureTestDataHelper.java

@@ -29,6 +29,7 @@ public static void runTestWithSecureTestData(PasswordsConsumer consumer)
 
 	private static Properties accessSecureTestData()
 			throws IOException {
+		final File file = new File(RESOURCES + "/secure-testdata/secure-testdata");
 		final InputStream inputStream = ConfigLoader.class.getClassLoader().getResourceAsStream("secure-testdata-passwords.properties");
 		final Properties passwords = new Properties();
 		passwords.load(checkArgumentNotEmpty(inputStream, "InputStream was null"));
@@ -37,31 +38,21 @@ private static Properties accessSecureTestData()
 				.as("secure-testdata-passwords.properties")
 				.isNotEmpty();
 
-		final String secureDataPassword = passwords.getProperty("secure-testdata-zip");
-		new ZipFile(RESOURCES + "/secure-testdata/secure-testdata.zip", secureDataPassword.toCharArray())
-				.extractAll(RESOURCES + "/secure-testdata/secure-testdata");
-		new ZipFile(RESOURCES + "/secure-testdata/secure-testdata/file-hider.zip", secureDataPassword.toCharArray())
-				.extractAll(RESOURCES + "/secure-testdata/secure-testdata");
+		synchronized (SecureTestDataHelper.class) {
+			if (!file.exists()) {
+				final String secureDataPassword = passwords.getProperty("secure-testdata-zip");
+				new ZipFile(RESOURCES + "/secure-testdata/secure-testdata.zip", secureDataPassword.toCharArray())
+						.extractAll(RESOURCES + "/secure-testdata/secure-testdata");
+				new ZipFile(RESOURCES + "/secure-testdata/secure-testdata/file-hider.zip", secureDataPassword.toCharArray())
+						.extractAll(RESOURCES + "/secure-testdata/secure-testdata");
+			}
+		}
 
 		return passwords;
 	}
 
-	public static void cleanupSecureTestData() {
-		final File file = new File(RESOURCES + "/secure-testdata/secure-testdata");
-
-		int tries = 0;
-		while (file.exists() && tries++ <= 10) {
-			try {
-				FileUtils.deleteDirectory(file);
-			} catch (IOException e) {
-				try {
-					Thread.sleep(100);
-				} catch (InterruptedException interruptedException) {
-					Thread.currentThread().interrupt();
-					return;
-				}
-			}
-		}
+	private static void cleanupSecureTestData() throws IOException {
+		FileUtils.forceDeleteOnExit(new File(RESOURCES + "/secure-testdata/secure-testdata"));
 	}
 
 	public interface PasswordsConsumer {

modules/simple-java-mail/src/test/java/org/simplejavamail/internal/smimesupport/ReadSmimeSelfSignedTest.java

@@ -213,7 +213,6 @@ public void testNPE_InSmimeUtilFixed()
 			throws Exception {
 		// for some reason running this test from CLI fails without this line
 		// I think a previous cleanup failed or couldn't be executed successfully
-		SecureTestDataHelper.cleanupSecureTestData();
 		SecureTestDataHelper.runTestWithSecureTestData(passwords -> {
 			String fileNameMsg = RESOURCES + "/secure-testdata/secure-testdata/npe-SmimeUtilFixed-test-email/NPE_SmimeUtilFixed Test Mail.msg";
 			FileInputStream fileInputStream = new FileInputStream(fileNameMsg);