X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=dmaap-dsa%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fholmes%2Fdsa%2Fdmaappolling%2FSubscriberTest.java;h=97932f067e2e2a50b84b8e06418e69aabb5cc2a6;hb=60604fc38e3e1547c8fbec3378a9f38eb9f2896f;hp=e9e08493a3c5180806b8fb1b3fd07ca624eb31cc;hpb=f831daf1d824b91697819a5d680fba87dcf91337;p=holmes%2Fdsa.git

diff --git a/dmaap-dsa/src/test/java/org/onap/holmes/dsa/dmaappolling/SubscriberTest.java b/dmaap-dsa/src/test/java/org/onap/holmes/dsa/dmaappolling/SubscriberTest.java
index e9e0849..97932f0 100644
--- a/dmaap-dsa/src/test/java/org/onap/holmes/dsa/dmaappolling/SubscriberTest.java
+++ b/dmaap-dsa/src/test/java/org/onap/holmes/dsa/dmaappolling/SubscriberTest.java
@@ -17,6 +17,8 @@ package org.onap.holmes.dsa.dmaappolling;
 
 import java.util.HashMap;
 import org.apache.http.HttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.CloseableHttpClient;
 import org.glassfish.hk2.api.ServiceLocator;
 import org.junit.Before;
 import org.junit.Test;
@@ -35,6 +37,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import java.util.ArrayList;
 import java.util.List;
 
+import static org.easymock.EasyMock.anyObject;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.nullValue;
@@ -116,23 +119,22 @@ public class SubscriberTest {
                 "\"specificProblem\": \"specificProblem\"," +
                 "\"vfStatus\": \"vfStatus\"" +
                 "}}}";
-
+        Subscriber subscriber = new Subscriber();
+        subscriber.setUrl("https://www.onap.org");
+        subscriber.setConsumerGroup("group");
+        subscriber.setConsumer("consumer");
         List<String> responseList = new ArrayList<>();
         responseList.add(eventString);
         String responseJson = GsonUtil.beanToJson(responseList);
 
         PowerMockito.mockStatic(HttpsUtils.class);
         HttpResponse httpResponse = PowerMockito.mock(HttpResponse.class);
-        PowerMockito.when(HttpsUtils.get(Matchers.eq("https://www.onap.org/group/consumer"),
-                Matchers.any(HashMap.class), Matchers.eq(15000))).thenReturn(httpResponse);
+        PowerMockito.when(HttpsUtils.get(Matchers.any(HttpGet.class),
+                Matchers.any(HashMap.class), Matchers.any(CloseableHttpClient.class))).thenReturn(httpResponse);
         PowerMockito.when(HttpsUtils.extractResponseEntity(httpResponse)).thenReturn(responseJson);
 
         PowerMock.replayAll();
 
-        Subscriber subscriber = new Subscriber();
-        subscriber.setUrl("https://www.onap.org");
-        subscriber.setConsumerGroup("group");
-        subscriber.setConsumer("consumer");
         List<VesAlarm> vesAlarms = subscriber.subscribe();
         PowerMock.verifyAll();