From 585b4c8cd73cc8cda532fb760f1b29e10d4848f5 Mon Sep 17 00:00:00 2001 From: John Blum Date: Fri, 22 Mar 2019 00:33:10 -0700 Subject: [PATCH] Add test class tear down method to delete all KeyStore files in the current working directory. --- .../AutoConfiguredSslIntegrationTests.java | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/ssl/AutoConfiguredSslIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/ssl/AutoConfiguredSslIntegrationTests.java index c4cbe67e..69f3892c 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/ssl/AutoConfiguredSslIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/ssl/AutoConfiguredSslIntegrationTests.java @@ -17,10 +17,15 @@ package org.springframework.geode.boot.autoconfigure.security.ssl; import static org.assertj.core.api.Assertions.assertThat; +import static org.springframework.data.gemfire.util.ArrayUtils.nullSafeArray; +import java.io.File; import java.io.IOException; +import java.util.Arrays; import java.util.List; +import java.util.Objects; import java.util.Optional; +import java.util.function.Predicate; import java.util.stream.Collectors; import org.junit.After; @@ -105,6 +110,26 @@ public class AutoConfiguredSslIntegrationTests extends ForkingClientServerIntegr sslSystemProperties.forEach(System::clearProperty); } + @AfterClass + @SuppressWarnings("all") + public static void deleteKeyStoreFilesInCurrentWorkingDirectory() { + + Predicate keystorePredicate = file -> file.getAbsolutePath().endsWith(".jks"); + + keystorePredicate.or(file -> file.getAbsolutePath().endsWith(".keystore")); + keystorePredicate.or(file -> file.getAbsolutePath().endsWith(".truststore")); + + File currentWorkingDirectory = new File(System.getProperty("user.dir")); + + if (currentWorkingDirectory.isDirectory()) { + + Arrays.stream(nullSafeArray(currentWorkingDirectory.listFiles(keystorePredicate::test), File.class)) + .filter(Objects::nonNull) + .filter(File::isFile) + .forEach(File::delete); + } + } + @Autowired(required = false) private Environment environment;