Make secure testdata approach generic

Author: bbottema

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

@@ -32,29 +32,28 @@ private static Properties accessSecureTestData()
 		final Properties passwords = new Properties();
 		passwords.load(checkArgumentNotEmpty(inputStream, "InputStream was null"));
 
-		assumeThat(passwords.getProperty("legacy-signed-enveloped-email-zip"))
+		assumeThat(passwords.getProperty("secure-testdata-zip"))
 				.as("secure-testdata-passwords.properties")
 				.isNotEmpty();
 
-		final String secureDataPassword = passwords.getProperty("legacy-signed-enveloped-email-zip");
-		new ZipFile(RESOURCES + "/secure-testdata/legacy-signed-enveloped-email.zip", secureDataPassword.toCharArray())
-				.extractAll(RESOURCES + "/secure-testdata/legacy-signed-enveloped-email");
-		new ZipFile(RESOURCES + "/secure-testdata/legacy-signed-enveloped-email/file-hider.zip", secureDataPassword.toCharArray())
-				.extractAll(RESOURCES + "/secure-testdata/legacy-signed-enveloped-email");
+		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;
 	}
 
 	private static void cleanupSecureTestData() {
-		final File file = new File(RESOURCES + "/secure-testdata/legacy-signed-enveloped-email");
+		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 {
-					//noinspection BusyWait
 					Thread.sleep(100);
 				} catch (InterruptedException interruptedException) {
 					Thread.currentThread().interrupt();

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

@@ -177,12 +177,12 @@ public void testEncryptedMessageEml_LegacySignedEnvelopedAttachment()
 			@Override
 			public void accept(final Properties passwords) {
 				final Pkcs12Config pkcs12Config = Pkcs12Config.builder()
-						.pkcs12Store(RESOURCES + "/secure-testdata/legacy-signed-enveloped-email/7acc30df-26dd-40b3-9d45-e31f681e755b.p12")
+						.pkcs12Store(RESOURCES + "/secure-testdata/secure-testdata/legacy-signed-enveloped-email/7acc30df-26dd-40b3-9d45-e31f681e755b.p12")
 						.storePassword(passwords.getProperty("legacy-signed-enveloped-email-zip-keystore-password"))
 						.keyAlias("sectigo limited id von ")
 						.keyPassword(passwords.getProperty("legacy-signed-enveloped-email-zip-key-password"))
 						.build();
-				Email emailParsedFromEml = EmailConverter.emlToEmail(new File(RESOURCES + "/secure-testdata/legacy-signed-enveloped-email/email.eml"), pkcs12Config);
+				Email emailParsedFromEml = EmailConverter.emlToEmail(new File(RESOURCES + "/secure-testdata/secure-testdata/legacy-signed-enveloped-email/email.eml"), pkcs12Config);
 
 				EmailAssert.assertThat(emailParsedFromEml).hasSubject("Ausarbeitung einer Schutzrechtsanmeldung : R.389390, Hr/Pv");