root
/
spring-boot
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch '2.0.x'

Browse Source
pull/12922/merge
Madhura Bhave 7 years ago
parent ca41a3c1cc 5792042d5d
commit d7abbe37cd
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File

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

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

Write Preview
Loading…
Cancel
Save