Browse Source

Merge branch '2.0.x'

pull/12922/merge
Madhura Bhave 8 years ago
parent
commit
d7abbe37cd
  1. 5
      spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactoryTests.java

5
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactoryTests.java

@ -118,6 +118,7 @@ import static org.hamcrest.CoreMatchers.notNullValue; @@ -118,6 +118,7 @@ import static org.hamcrest.CoreMatchers.notNullValue;
import static org.junit.Assert.fail;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.inOrder;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
@ -619,8 +620,8 @@ public abstract class AbstractServletWebServerFactoryTests { @@ -619,8 +620,8 @@ public abstract class AbstractServletWebServerFactoryTests {
httpClient);
assertThat(getResponse(getLocalUrl("https", "/test.txt"), requestFactory))
.isEqualTo("test");
verify(sslStoreProvider).getKeyStore();
verify(sslStoreProvider).getTrustStore();
verify(sslStoreProvider, atLeastOnce()).getKeyStore();
verify(sslStoreProvider, atLeastOnce()).getTrustStore();
}
@Test

Loading…
Cancel
Save