root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge branch '2.7.x' into 3.0.x 

Closes gh-36049
This commit is contained in:
Scott Frederick 2023-06-23 15:19:44 -06:00
parent 2fae5de245 5ecca4be36
commit eeeb2ad72a
2 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/ssl/KeyStoreFactoryTests.java
View File

@ -17,7 +17,6 @@
package org.springframework.boot.buildpack.platform.docker.ssl; package org.springframework.boot.buildpack.platform.docker.ssl;
import java.io.IOException; import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.security.KeyStore; import java.security.KeyStore;
import java.security.KeyStoreException; import java.security.KeyStoreException;
@ -60,7 +59,6 @@ class KeyStoreFactoryTests {
assertThat(keyStore.containsAlias("test-alias-1")).isTrue(); assertThat(keyStore.containsAlias("test-alias-1")).isTrue();
assertThat(keyStore.getCertificate("test-alias-1")).isNotNull(); assertThat(keyStore.getCertificate("test-alias-1")).isNotNull();
assertThat(keyStore.getKey("test-alias-1", new char[] {})).isNull(); assertThat(keyStore.getKey("test-alias-1", new char[] {})).isNull();
Files.delete(certPath);
} }
@Test @Test
@ -72,8 +70,6 @@ class KeyStoreFactoryTests {
assertThat(keyStore.containsAlias("test-alias")).isTrue(); assertThat(keyStore.containsAlias("test-alias")).isTrue();
assertThat(keyStore.getCertificate("test-alias")).isNotNull(); assertThat(keyStore.getCertificate("test-alias")).isNotNull();
assertThat(keyStore.getKey("test-alias", new char[] {})).isNotNull(); assertThat(keyStore.getKey("test-alias", new char[] {})).isNotNull();
Files.delete(certPath);
Files.delete(keyPath);
} }
} }

5
spring-boot-project/spring-boot-tools/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/ssl/PrivateKeyParserTests.java
View File

@ -19,7 +19,6 @@ package org.springframework.boot.buildpack.platform.docker.ssl;
import java.io.IOException; import java.io.IOException;
import java.net.URI; import java.net.URI;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.security.PrivateKey; import java.security.PrivateKey;
@ -63,7 +62,6 @@ class PrivateKeyParserTests {
PrivateKey privateKey = PrivateKeyParser.parse(path); PrivateKey privateKey = PrivateKeyParser.parse(path);
assertThat(privateKey).isNotNull(); assertThat(privateKey).isNotNull();
assertThat(privateKey.getFormat()).isEqualTo("PKCS#8"); assertThat(privateKey.getFormat()).isEqualTo("PKCS#8");
Files.delete(path);
} }
@ParameterizedTest @ParameterizedTest
@ -93,7 +91,6 @@ class PrivateKeyParserTests {
assertThat(privateKey).isNotNull(); assertThat(privateKey).isNotNull();
// keys in PKCS#1 format are converted to PKCS#8 for parsing // keys in PKCS#1 format are converted to PKCS#8 for parsing
assertThat(privateKey.getFormat()).isEqualTo("PKCS#8"); assertThat(privateKey.getFormat()).isEqualTo("PKCS#8");
Files.delete(path);
} }
@Test @Test
@ -103,7 +100,6 @@ class PrivateKeyParserTests {
assertThat(privateKey).isNotNull(); assertThat(privateKey).isNotNull();
// keys in PKCS#1 format are converted to PKCS#8 for parsing // keys in PKCS#1 format are converted to PKCS#8 for parsing
assertThat(privateKey.getFormat()).isEqualTo("PKCS#8"); assertThat(privateKey.getFormat()).isEqualTo("PKCS#8");
Files.delete(path);
} }
@Test @Test
@ -120,7 +116,6 @@ class PrivateKeyParserTests {
Path path = this.fileWriter.writeFile("text.pem", "plain text"); Path path = this.fileWriter.writeFile("text.pem", "plain text");
assertThatIllegalStateException().isThrownBy(() -> PrivateKeyParser.parse(path)) assertThatIllegalStateException().isThrownBy(() -> PrivateKeyParser.parse(path))
.withMessageContaining(path.toString()); .withMessageContaining(path.toString());
Files.delete(path);
} }
@Test @Test