Merge from ECOMP's repository

Main Features
--------------

-  Async-Instantiation jobs mechanism major update; still WIP (package
   `org.onap.vid.job`)

-  New features in View/Edit: Activate fabric configuration; show
   related networks; soft delete

-  Support AAI service-tree traversal (`AAIServiceTree`)

-  In-memory cache for SDC models and certain A&AI queries
   (`CacheProviderWithLoadingCache`)

-  Upgrade TOSCA Parser and add parsing options; fix malformed TOSCA
   models

-  Resolve Cloud-Owner values for MSO

-  Pass X-ONAP headers to MSO

Infrastructure
--------------
-  Remove codehaus' jackson mapper; use soley fasterxml 2.9.7
-  Surefire invokes both TestNG and JUnit tests
-  Support Kotlin source files
-  AaiController2 which handles errors in a "Spring manner"
-  Inline generated-sources and remove jsonschema2pojo

Quality
--------
-  Cumulative bug fixes (A&AI API, UI timeouts, and many more)
-  Many Sonar issues cleaned-up
-  Some unused classes removed
-  Minor changes in vid-automation project, allowing some API
   verification to run

Hard Merges
------------
-  HTTP Clients (MSO, A&AI, WebConfig, OutgoingRequestHeadersTest)
-  Moved `package org.onap.vid.controllers` to `controller`, without
   plural -- just to keep semantic sync with ECOMP.

Reference commit in ECOMP: 3d1141625

Issue-ID: VID-378
Change-Id: I9c8d1e74caa41815891d441fc0760bb5f29c5788
Signed-off-by: Ittay Stern <ittay.stern@att.com>

1 files changed, 23 insertions, 18 deletions

diff --git a/vid-app-common/src/test/java/org/onap/vid/aai/util/HttpsAuthClientTest.java b/vid-app-common/src/test/java/org/onap/vid/aai/util/HttpsAuthClientTest.java
index ce957ab67..44678ec24 100644
--- a/vid-app-common/src/test/java/org/onap/vid/aai/util/HttpsAuthClientTest.java
+++ b/vid-app-common/src/test/java/org/onap/vid/aai/util/HttpsAuthClientTest.java
@@ -21,11 +21,20 @@
 
 package org.onap.vid.aai.util;
 
+import org.junit.Before;
+import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
+import org.onap.vid.aai.exceptions.HttpClientBuilderException;
+import org.onap.vid.exceptions.GenericUncheckedException;
+import org.togglz.core.manager.FeatureManager;
 
 import javax.net.ssl.SSLContext;
+import java.util.Optional;
+
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.*;
 
 @RunWith(MockitoJUnitRunner.class)
 public class HttpsAuthClientTest {
@@ -38,47 +47,43 @@ public class HttpsAuthClientTest {
 
     public static final String CERT_FILE_PATH = "any_path";
 
-    /*
-    TO BE IMPLEMENTED
-    
     private HttpsAuthClient createTestSubject() {
-        return new HttpsAuthClient(systemPropertyHelper, sslContextProvider);
+        return new HttpsAuthClient(CERT_FILE_PATH, systemPropertyHelper, sslContextProvider, mock(FeatureManager.class));
     }
 
     @Before
     public void setUp() throws Exception {
         when(systemPropertyHelper.getAAITruststoreFilename()).thenReturn(Optional.of("filename"));
-        when(systemPropertyHelper.getEncodedTruststorePassword()).thenReturn("password");
+        when(systemPropertyHelper.getDecryptedKeystorePassword()).thenReturn("password");
+        when(systemPropertyHelper.getDecryptedTruststorePassword()).thenReturn("password");
     }
 
     @Test(expected = HttpClientBuilderException.class)
-    public void testHttpClientBuilderExceptionOnGetClient() throws HttpClientBuilderException {
+    public void testHttpClientBuilderExceptionOnGetClient() throws Exception {
         //when
-        when(systemPropertyHelper.getAAIUseClientCert()).thenReturn(Optional.of("true"));
-        when(sslContextProvider.getSslContext(anyString(), anyString())).thenThrow(new HttpClientBuilderException());
-        createTestSubject().getClient("nonExistingFile");
+        when(systemPropertyHelper.isClientCertEnabled()).thenReturn(true);
+        when(sslContextProvider.getSslContext(anyString(), anyString(), any())).thenThrow(new HttpClientBuilderException(new GenericUncheckedException("msg")));
+        createTestSubject().getClient(HttpClientMode.WITH_KEYSTORE);
     }
 
     @Test
     public void testGetSecuredClient() throws Exception {
         // when
-        when(systemPropertyHelper.getAAIUseClientCert()).thenReturn(Optional.of("true"));
-        when(sslContextProvider.getSslContext(anyString(), anyString())).thenReturn(sslContext);
-        createTestSubject().getClient(CERT_FILE_PATH);
+        when(systemPropertyHelper.isClientCertEnabled()).thenReturn(true);
+        when(sslContextProvider.getSslContext(anyString(), anyString(), any())).thenReturn(sslContext);
+        createTestSubject().getClient(HttpClientMode.WITH_KEYSTORE);
 
         //then
-        verify(sslContextProvider).getSslContext(anyString(), anyString());
+        verify(sslContextProvider).getSslContext(anyString(), anyString(), any());
     }
 
     @Test
     public void testGetUnsecuredClient() throws Exception {
         // when
-        when(systemPropertyHelper.getAAIUseClientCert()).thenReturn(Optional.of("false"));
-        when(sslContextProvider.getSslContext(anyString(), anyString())).thenReturn(sslContext);
-        createTestSubject().getClient(CERT_FILE_PATH);
+        when(systemPropertyHelper.isClientCertEnabled()).thenReturn(false);
+        createTestSubject().getClient(HttpClientMode.WITH_KEYSTORE);
 
         //then
-        verify(sslContextProvider, never()).getSslContext(anyString(), anyString());
+        verify(sslContextProvider, never()).getSslContext(anyString(), anyString(), any());
     }
-    */
 }
\ No newline at end of file