diff --git a/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/smartdocuments/SmartDocumentsConfigurationTest.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/smartdocuments/SmartDocumentsConfigurationTest.java index 3d1829645fa269383ab59b983e004f0233094be1..c5d27ade9b9f2dd7b2060eb78c98ce1396d10428 100644 --- a/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/smartdocuments/SmartDocumentsConfigurationTest.java +++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/smartdocuments/SmartDocumentsConfigurationTest.java @@ -41,33 +41,32 @@ class SmartDocumentsConfigurationTest { private SslBundles sslBundles; @Nested - class TestCreateProxyCredentialsProvider { - - private final String user = "max"; - private final String password = "max2"; - private final String host = "test-proxy.local"; - private final int port = 8080; - private final ProxyConfiguration proxyConfiguration = new ProxyConfiguration(); + class TestBuildHttpClient { + private final CloseableHttpClient proxyHttpClient = HttpClients.createDefault(); + private final CloseableHttpClient nonProxyHttpClient = HttpClients.createDefault(); @BeforeEach void setUp() { - proxyConfiguration.setHost(host); - proxyConfiguration.setPort(port); - proxyConfiguration.setUsername(user); - proxyConfiguration.setPassword(password); - when(properties.getProxy()).thenReturn(proxyConfiguration); } @Test - void shouldCreateWithUserAndPassword() { - var credentialsProvider = smartDocumentsConfiguration.createProxyCredentialsProvider(); + void shouldReturnProxyHttpClient() { + doReturn(proxyHttpClient).when(smartDocumentsConfiguration).createHttpClientUsingProxy(); + when(properties.getProxy()).thenReturn(new ProxyConfiguration()); - var credentialsForProxy = (UsernamePasswordCredentials) credentialsProvider.getCredentials(new AuthScope(host, port), null); + var httpClient = smartDocumentsConfiguration.buildHttpClient(); - assertThat(credentialsForProxy).extracting( - UsernamePasswordCredentials::getUserName, - UsernamePasswordCredentials::getUserPassword) - .containsExactly(user, password.toCharArray()); + assertThat(httpClient).isSameAs(proxyHttpClient); + } + + @Test + void shouldReturnNonProxyHttpClient() { + doReturn(nonProxyHttpClient).when(smartDocumentsConfiguration).createNoProxyHttpClient(); + when(properties.getProxy()).thenReturn(null); + + var httpClient = smartDocumentsConfiguration.buildHttpClient(); + + assertThat(httpClient).isSameAs(nonProxyHttpClient); } } @@ -99,32 +98,33 @@ class SmartDocumentsConfigurationTest { } @Nested - class TestBuildHttpClient { - private final CloseableHttpClient proxyHttpClient = HttpClients.createDefault(); - private final CloseableHttpClient nonProxyHttpClient = HttpClients.createDefault(); + class TestCreateProxyCredentialsProvider { + + private final String user = "max"; + private final String password = "max2"; + private final String host = "test-proxy.local"; + private final int port = 8080; + private final ProxyConfiguration proxyConfiguration = new ProxyConfiguration(); @BeforeEach void setUp() { + proxyConfiguration.setHost(host); + proxyConfiguration.setPort(port); + proxyConfiguration.setUsername(user); + proxyConfiguration.setPassword(password); + when(properties.getProxy()).thenReturn(proxyConfiguration); } @Test - void shouldReturnProxyHttpClient() { - doReturn(proxyHttpClient).when(smartDocumentsConfiguration).createHttpClientUsingProxy(); - when(properties.getProxy()).thenReturn(new ProxyConfiguration()); - - var httpClient = smartDocumentsConfiguration.buildHttpClient(); - - assertThat(httpClient).isSameAs(proxyHttpClient); - } - - @Test - void shouldReturnNonProxyHttpClient() { - doReturn(nonProxyHttpClient).when(smartDocumentsConfiguration).createNoProxyHttpClient(); - when(properties.getProxy()).thenReturn(null); + void shouldCreateWithUserAndPassword() { + var credentialsProvider = smartDocumentsConfiguration.createProxyCredentialsProvider(); - var httpClient = smartDocumentsConfiguration.buildHttpClient(); + var credentialsForProxy = (UsernamePasswordCredentials) credentialsProvider.getCredentials(new AuthScope(host, port), null); - assertThat(httpClient).isSameAs(nonProxyHttpClient); + assertThat(credentialsForProxy).extracting( + UsernamePasswordCredentials::getUserName, + UsernamePasswordCredentials::getUserPassword) + .containsExactly(user, password.toCharArray()); } }