From 8743148ccd9865b73b5ee143c278a21474e76572 Mon Sep 17 00:00:00 2001 From: Madhura Bhave Date: Mon, 13 Mar 2017 13:58:17 -0700 Subject: [PATCH] Fix tests --- .../server/AbstractServletWebServerFactoryTests.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-boot/src/test/java/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactoryTests.java b/spring-boot/src/test/java/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactoryTests.java index a358255acf1..2a3af46077a 100644 --- a/spring-boot/src/test/java/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactoryTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactoryTests.java @@ -449,11 +449,11 @@ public abstract class AbstractServletWebServerFactoryTests { @Test public void sslKeyAlias() throws Exception { - AbstractEmbeddedServletContainerFactory factory = getFactory(); + AbstractServletWebServerFactory factory = getFactory(); factory.setSsl(getSsl(null, "password", "test-alias", "src/test/resources/test.jks")); - this.container = factory.getEmbeddedServletContainer( - new ServletRegistrationBean(new ExampleServlet(true, false), "/hello")); - this.container.start(); + this.webServer = factory.getWebServer( + new ServletRegistrationBean<>(new ExampleServlet(true, false), "/hello")); + this.webServer.start(); SSLConnectionSocketFactory socketFactory = new SSLConnectionSocketFactory( new SSLContextBuilder() .loadTrustMaterial(null, new SerialNumberValidatingTrustSelfSignedStrategy("77e7c302")).build());