Merge pull request #35986 from izeye

* gh-35986: Remove redundant Files.delete() calls in tests Closes gh-35986
spring-projects · Jun 23, 2023 · 5ecca4b · 5ecca4b
2 parents 7b0aa7d + 4a2c9d9
commit 5ecca4b
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 9 deletions.
diff --git a/...est/java/org/springframework/boot/buildpack/platform/docker/ssl/KeyStoreFactoryTests.java b/...est/java/org/springframework/boot/buildpack/platform/docker/ssl/KeyStoreFactoryTests.java
@@ -17,7 +17,6 @@
 package org.springframework.boot.buildpack.platform.docker.ssl;
 
 import java.io.IOException;
-import java.nio.file.Files;
 import java.nio.file.Path;
 import java.security.KeyStore;
 import java.security.KeyStoreException;
@@ -60,7 +59,6 @@ void createKeyStoreWithCertChain()
 		assertThat(keyStore.containsAlias("test-alias-1")).isTrue();
 		assertThat(keyStore.getCertificate("test-alias-1")).isNotNull();
 		assertThat(keyStore.getKey("test-alias-1", new char[] {})).isNull();
-		Files.delete(certPath);
 	}
 
 	@Test
@@ -72,8 +70,6 @@ void createKeyStoreWithCertChainAndRsaPrivateKey()
 		assertThat(keyStore.containsAlias("test-alias")).isTrue();
 		assertThat(keyStore.getCertificate("test-alias")).isNotNull();
 		assertThat(keyStore.getKey("test-alias", new char[] {})).isNotNull();
-		Files.delete(certPath);
-		Files.delete(keyPath);
 	}
 
 }
diff --git a/...st/java/org/springframework/boot/buildpack/platform/docker/ssl/PrivateKeyParserTests.java b/...st/java/org/springframework/boot/buildpack/platform/docker/ssl/PrivateKeyParserTests.java
@@ -19,7 +19,6 @@
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.security.PrivateKey;
@@ -63,7 +62,6 @@ void parsePkcs8RsaKeyFile() throws IOException {
 		PrivateKey privateKey = PrivateKeyParser.parse(path);
 		assertThat(privateKey).isNotNull();
 		assertThat(privateKey.getFormat()).isEqualTo("PKCS#8");
-		Files.delete(path);
 	}
 
 	@ParameterizedTest
@@ -93,7 +91,6 @@ void parsePkcs1RsaKeyFile() throws IOException {
 		assertThat(privateKey).isNotNull();
 		// keys in PKCS#1 format are converted to PKCS#8 for parsing
 		assertThat(privateKey.getFormat()).isEqualTo("PKCS#8");
-		Files.delete(path);
 	}
 
 	@Test
@@ -103,15 +100,13 @@ void parsePkcs1EcKeyFile() throws IOException {
 		assertThat(privateKey).isNotNull();
 		// keys in PKCS#1 format are converted to PKCS#8 for parsing
 		assertThat(privateKey.getFormat()).isEqualTo("PKCS#8");
-		Files.delete(path);
 	}
 
 	@Test
 	void parseWithNonKeyFileWillThrowException() throws IOException {
 		Path path = this.fileWriter.writeFile("text.pem", "plain text");
 		assertThatIllegalStateException().isThrownBy(() -> PrivateKeyParser.parse(path))
 			.withMessageContaining(path.toString());
-		Files.delete(path);
 	}
 
 	@Test