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

Merge pull request #1943 from isopov/ssl-keystore-classpath-test 

* ssl-keystore-classpath-test:
  Add Jetty SSL keystore in classpath test
This commit is contained in:
Phillip Webb 2014-11-18 12:21:36 -08:00
parent 6efa2d5315 72dd75b66e
commit 7e81f164f2
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot/src/test/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java
View File

@ -312,6 +312,10 @@ public abstract class AbstractEmbeddedServletContainerFactoryTests {
@Test @Test
public void basicSsl() throws Exception { public void basicSsl() throws Exception {
testBasicSllWithKeystore("src/test/resources/test.jks");
}
protected final void testBasicSllWithKeystore(String keyStore) throws Exception {
FileCopyUtils.copy("test", FileCopyUtils.copy("test",
new FileWriter(this.temporaryFolder.newFile("test.txt"))); new FileWriter(this.temporaryFolder.newFile("test.txt")));
@ -319,7 +323,7 @@ public abstract class AbstractEmbeddedServletContainerFactoryTests {
factory.setDocumentRoot(this.temporaryFolder.getRoot()); factory.setDocumentRoot(this.temporaryFolder.getRoot());
Ssl ssl = new Ssl(); Ssl ssl = new Ssl();
ssl.setKeyStore("src/test/resources/test.jks"); ssl.setKeyStore(keyStore);
ssl.setKeyStorePassword("secret"); ssl.setKeyStorePassword("secret");
ssl.setKeyPassword("password"); ssl.setKeyPassword("password");
factory.setSsl(ssl); factory.setSsl(ssl);

5
spring-boot/src/test/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java
View File

@ -154,4 +154,9 @@ public class JettyEmbeddedServletContainerFactoryTests extends
assertThat(getResponse(getLocalUrl("/hello")), equalTo("Hello World")); assertThat(getResponse(getLocalUrl("/hello")), equalTo("Hello World"));
} }
@Test
public void basicSslClasspathKeyStore() throws Exception {
testBasicSllWithKeystore("classpath:test.jks");
}
} }