HTTP/S Modifications

Change-Id: I731a37f868a8145f3018314db7c0248a75c8d62d
Issue-ID: HOLMES-203
Signed-off-by: tangpeng <tang.peng5@zte.com.cn>

1 files changed, 6 insertions, 6 deletions

diff --git a/rulemgt/src/test/java/org/onap/holmes/rulemgt/dcae/DcaeConfigurationPollingTest.java b/rulemgt/src/test/java/org/onap/holmes/rulemgt/dcae/DcaeConfigurationPollingTest.java
index 4ad213c..53e60c8 100644
--- a/rulemgt/src/test/java/org/onap/holmes/rulemgt/dcae/DcaeConfigurationPollingTest.java
+++ b/rulemgt/src/test/java/org/onap/holmes/rulemgt/dcae/DcaeConfigurationPollingTest.java
@@ -79,20 +79,20 @@ public class DcaeConfigurationPollingTest {
 
         CloseableHttpClient clientMock = createMock(CloseableHttpClient.class);
         HttpResponse httpResponseMock = createMock(HttpResponse.class);
-        expect(HttpsUtils.getHttpClient(30000)).andReturn(clientMock);
+        expect(HttpsUtils.getConditionalHttpsClient(30000)).andReturn(clientMock);
         expect(HttpsUtils.get(anyObject(HttpGet.class), anyObject(HashMap.class), anyObject(CloseableHttpClient.class)))
                 .andReturn(httpResponseMock);
         expect(HttpsUtils.extractResponseEntity(httpResponseMock)).andReturn(JSONObject.toJSONString(ruleQueryListResponse));
         clientMock.close();
         expectLastCall();
 
-        expect(HttpsUtils.getHttpClient(30000)).andReturn(clientMock);
+        expect(HttpsUtils.getConditionalHttpsClient(30000)).andReturn(clientMock);
         expect(HttpsUtils.delete(anyObject(HttpDelete.class), anyObject(HashMap.class), anyObject(CloseableHttpClient.class)))
                 .andReturn(httpResponseMock);
         clientMock.close();
         expectLastCall();
 
-        expect(HttpsUtils.getHttpClient(30000)).andReturn(clientMock);
+        expect(HttpsUtils.getConditionalHttpsClient(30000)).andReturn(clientMock);
         expect(HttpsUtils.put(anyObject(HttpPut.class), anyObject(HashMap.class), anyObject(HashMap.class),
                 anyObject(StringEntity.class), anyObject(CloseableHttpClient.class)))
                 .andReturn(httpResponseMock);
@@ -132,13 +132,13 @@ public class DcaeConfigurationPollingTest {
 
         CloseableHttpClient clientMock = createMock(CloseableHttpClient.class);
         HttpResponse httpResponseMock = createMock(HttpResponse.class);
-        expect(HttpsUtils.getHttpClient(30000)).andReturn(clientMock);
+        expect(HttpsUtils.getConditionalHttpsClient(30000)).andReturn(clientMock);
         expect(HttpsUtils.delete(anyObject(HttpDelete.class), anyObject(HashMap.class), anyObject(CloseableHttpClient.class)))
                 .andReturn(httpResponseMock);
         clientMock.close();
         expectLastCall();
 
-        expect(HttpsUtils.getHttpClient(30000)).andReturn(clientMock);
+        expect(HttpsUtils.getConditionalHttpsClient(30000)).andReturn(clientMock);
         expect(HttpsUtils.put(anyObject(HttpPut.class), anyObject(HashMap.class), anyObject(HashMap.class),
                 anyObject(StringEntity.class), anyObject(CloseableHttpClient.class)))
                 .andReturn(httpResponseMock);
@@ -164,7 +164,7 @@ public class DcaeConfigurationPollingTest {
 
         CloseableHttpClient clientMock = createMock(CloseableHttpClient.class);
         HttpResponse httpResponseMock = createMock(HttpResponse.class);
-        expect(HttpsUtils.getHttpClient(30000)).andReturn(clientMock);
+        expect(HttpsUtils.getConditionalHttpsClient(30000)).andReturn(clientMock);
         expect(HttpsUtils.get(anyObject(HttpGet.class), anyObject(HashMap.class), anyObject(CloseableHttpClient.class)))
                 .andReturn(httpResponseMock);
         expect(HttpsUtils.extractResponseEntity(httpResponseMock)).andReturn("{\"correlationRules\": [], \"totalCount\": 0}");