SpringCloud/spring-cloud-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.0.x'

Browse Source
This commit is contained in:
Ryan Baxter
2023-09-15 12:41:31 -04:00
parent 7b6da4497c 5565acf9a9
commit 46e529d181
38 changed files with 156 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-cloud-config-client-tls-tests/src/test/java/org/springframework/cloud/config/client/tls/ConfigClientTlsTests.java
View File

@@ -21,7 +21,6 @@ import java.io.File;
import org.apache.commons.logging.LogFactory;
import org.apache.hc.core5.http.io.SocketConfig;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
@@ -32,6 +31,7 @@ import org.springframework.cloud.config.client.ConfigClientRequestTemplateFactor
import org.springframework.cloud.config.server.EnableConfigServer;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.AssertionsForClassTypes.assertThatExceptionOfType;
public class ConfigClientTlsTests extends AbstractTlsSetup {
@@ -120,7 +120,7 @@ public class ConfigClientTlsTests extends AbstractTlsSetup {
@Test
public void wrongPasswordCauseFailure() {
Assertions.assertThrows(IllegalStateException.class, () -> {
assertThatExceptionOfType(IllegalStateException.class).isThrownBy(() -> {
TlsConfigClientRunner client = createConfigClient(false);
enableTlsClient(client);
client.setKeyStore(clientCert, WRONG_PASSWORD, WRONG_PASSWORD);
@@ -130,7 +130,7 @@ public class ConfigClientTlsTests extends AbstractTlsSetup {
@Test
public void nonExistKeyStoreCauseFailure() {
Assertions.assertThrows(IllegalStateException.class, () -> {
assertThatExceptionOfType(IllegalStateException.class).isThrownBy(() -> {
TlsConfigClientRunner client = createConfigClient(false);
enableTlsClient(client);
client.setKeyStore(new File("nonExistFile"));