From 12c56819dae5e28396ad192e07c87029bd9977f4 Mon Sep 17 00:00:00 2001 From: Edyta Krukowska Date: Thu, 3 Dec 2020 13:34:09 +0100 Subject: [PATCH] Increase code coverage Issue-ID: SDC-3388 Signed-off-by: Edyta Krukowska Change-Id: I4cf8c47bc05e550edb29399b25aa87d8f1d93ecf --- .../org/onap/sdc/http/HttpClientFactoryTest.java | 86 +++++++++++++++++++++ .../src/test/resources/asdc-client.jks | Bin 0 -> 1177 bytes 2 files changed, 86 insertions(+) create mode 100644 sdc-distribution-client/src/test/java/org/onap/sdc/http/HttpClientFactoryTest.java create mode 100644 sdc-distribution-client/src/test/resources/asdc-client.jks diff --git a/sdc-distribution-client/src/test/java/org/onap/sdc/http/HttpClientFactoryTest.java b/sdc-distribution-client/src/test/java/org/onap/sdc/http/HttpClientFactoryTest.java new file mode 100644 index 0000000..4594fb9 --- /dev/null +++ b/sdc-distribution-client/src/test/java/org/onap/sdc/http/HttpClientFactoryTest.java @@ -0,0 +1,86 @@ +/*- + * ============LICENSE_START======================================================= + * sdc-distribution-client + * ================================================================================ + * Copyright (C) 2020 Nokia. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ +package org.onap.sdc.http; + +import org.apache.http.client.CredentialsProvider; +import org.apache.http.conn.ssl.SSLConnectionSocketFactory; +import org.apache.http.impl.client.BasicCredentialsProvider; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClientBuilder; +import org.junit.Test; +import org.onap.sdc.utils.Pair; +import org.onap.sdc.utils.TestConfiguration; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.when; + + +public class HttpClientFactoryTest { + + @Test + public void shouldReturnSSLConnection(){ + TestConfiguration config = spy(new TestConfiguration()); + HttpClientFactory httpClientFactory = new HttpClientFactory(config); + when(config.activateServerTLSAuth()).thenReturn(true); + when(config.getKeyStorePath()).thenReturn("src/test/resources/asdc-client.jks"); + when(config.getKeyStorePassword()).thenReturn("Aa123456"); + Pair client = httpClientFactory.createInstance(); + SSLConnectionSocketFactory sslsf = spy(SSLConnectionSocketFactory.getSocketFactory()); + CredentialsProvider credsProvider = new BasicCredentialsProvider(); + CloseableHttpClient expectedHttpClient = HttpClientBuilder.create(). + setDefaultCredentialsProvider(credsProvider). + setSSLSocketFactory(sslsf). + build(); + Pair expectedClient = new Pair<>("https://", expectedHttpClient); + assertNotNull(client); + assertEquals(expectedClient.getFirst(), client.getFirst()); + } + + @Test + public void shouldReturnSSLConnectionWithHttp(){ + TestConfiguration config = spy(new TestConfiguration()); + HttpClientFactory httpClientFactory = new HttpClientFactory(config); + when(config.activateServerTLSAuth()).thenReturn(false); + when(config.isUseHttpsWithSDC()).thenReturn(false); + Pair client = httpClientFactory.createInstance(); + SSLConnectionSocketFactory sslsf = spy(SSLConnectionSocketFactory.getSocketFactory()); + CredentialsProvider credsProvider = new BasicCredentialsProvider(); + CloseableHttpClient expectedHttpClient = HttpClientBuilder.create(). + setDefaultCredentialsProvider(credsProvider). + setSSLSocketFactory(sslsf). + build(); + Pair expectedClient = new Pair<>("http://", expectedHttpClient); + assertNotNull(client); + assertEquals(expectedClient.getFirst(), client.getFirst()); + } + + @Test (expected = HttpAsdcClientException.class) + public void shouldReturnSSLConnectionError() throws HttpAsdcClientException{ + TestConfiguration config = spy(new TestConfiguration()); + HttpClientFactory httpClientFactory = new HttpClientFactory(config); + when(config.activateServerTLSAuth()).thenReturn(true); + when(config.getKeyStorePath()).thenReturn("src/test/resources/dummy.jks"); + when(config.getKeyStorePassword()).thenReturn("Aa123456"); + httpClientFactory.createInstance(); + } + +} \ No newline at end of file diff --git a/sdc-distribution-client/src/test/resources/asdc-client.jks b/sdc-distribution-client/src/test/resources/asdc-client.jks new file mode 100644 index 0000000000000000000000000000000000000000..eb0a0d35af2f112648d9e2d2cfc5e10f38498830 GIT binary patch literal 1177 zcmezO_TO6u1_mY|W(3o$xs~zBi9lY^L790z46G4)rUsS_3@p(GO)TLCP0aQSn3))v zm^c}(>h1WUQW4y3z{|#|)#lOmotKf3o0Y+!%8=K9n~gb?g-e9RF+?rIkjH=v#N`%d z_Vf)llr@lstLJ1C*PU+beK zx+*zkd9xlHU#y%qRj=*s1rBk!AaQOZle>$vk1BgSwqs?MYd-Am(G-8LwrY80*AJ%D zygh|&zFU-c2!{SXu6$#i%mTkjUZ1|i)X(&cZVr`Q((+&m&xf@Cv)5{Kn{IN=d?Nqe zUc}7D`LAoWmS3*UvxtDF6Q{GRH+CyGx!cyWD0cEhc_xh`0?uBc=GZhxPco@!hUaugwcr&MyLE{>byfRDU5`)Ht4OrDItXonukdfbnGrIuO z03*ZFZ}Rgkp8a!4u6W1v{OHEpTn|{eSLa{YJAFCJ@89<-KA%Y1b;`?!<4*dyu8+By z92~i`+@gav{npZYHGi#}b=bZiH@~jE#Qq~yZdR9-NT>bFg@r4*c893Hl$yt5pp)gk z>|C|?wau z%N~1Ut@3pJw!1;+*IIsAYqVW_wblQ4m3~XF>>X?EuU_1I=QuB~`=j1ZUV@%1$-MI} n1*=r=+fh`#!mqVi-`#D_W2-{XkVSk3iIc9XmF*5&