X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=holmes-actions%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fholmes%2Fcommon%2Fdmaap%2FPublisherTest.java;h=164c1762d5881a783650ae7d8bddbad0fcf59576;hb=bf20ddf00200c5468da7a0090caf28beebb93e9c;hp=991455d5c1658d920f6272b953d200d6d3653920;hpb=fca9385739569e4bcf27903ebde80e078b3530b9;p=holmes%2Fcommon.git

diff --git a/holmes-actions/src/test/java/org/onap/holmes/common/dmaap/PublisherTest.java b/holmes-actions/src/test/java/org/onap/holmes/common/dmaap/PublisherTest.java
index 991455d..164c176 100644
--- a/holmes-actions/src/test/java/org/onap/holmes/common/dmaap/PublisherTest.java
+++ b/holmes-actions/src/test/java/org/onap/holmes/common/dmaap/PublisherTest.java
@@ -15,31 +15,36 @@
  */
 package org.onap.holmes.common.dmaap;
 
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+import java.util.HashMap;
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.Entity;
+import javax.ws.rs.client.Invocation.Builder;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import org.apache.http.HttpResponse;
 import org.apache.http.HttpStatus;
+import org.apache.http.StatusLine;
+import org.apache.http.entity.StringEntity;
 import org.easymock.EasyMock;
-import org.glassfish.jersey.client.ClientConfig;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
+import org.mockito.Matchers;
 import org.onap.holmes.common.dmaap.entity.PolicyMsg;
 import org.onap.holmes.common.exception.CorrelationException;
+import org.onap.holmes.common.utils.HttpsUtils;
 import org.powermock.api.easymock.PowerMock;
+import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.Invocation.Builder;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.client.Entity;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
-@PrepareForTest({Client.class, WebTarget.class, ClientBuilder.class, Response.class, Builder.class})
+@PrepareForTest({HttpsUtils.class, HttpResponse.class})
 @RunWith(PowerMockRunner.class)
 public class PublisherTest {
 
@@ -66,17 +71,13 @@ public class PublisherTest {
         Publisher publisher = new Publisher();
         publisher.setUrl(URL);
 
-        WebTarget target = PowerMock.createMock(WebTarget.class);
-        Client client = PowerMock.createMock(Client.class);
-        Builder builder = PowerMock.createMock(Builder.class);
-        Response response = PowerMock.createMock(Response.class);
-        PowerMock.mockStatic(ClientBuilder.class);
-
-        EasyMock.expect(ClientBuilder.newClient(EasyMock.anyObject(ClientConfig.class))).andReturn(client);
-        EasyMock.expect(client.target(publisher.getUrl())).andReturn(target);
-        EasyMock.expect(target.request(MediaType.APPLICATION_JSON)).andReturn(builder);
-        EasyMock.expect(builder.post(EasyMock.anyObject(Entity.class))).andReturn(response);
-        EasyMock.expect(response.getStatus()).andReturn(HttpStatus.SC_OK);
+        PowerMockito.mockStatic(HttpsUtils.class);
+        HttpResponse httpResponse = PowerMockito.mock(HttpResponse.class);
+        PowerMockito.when(HttpsUtils.post(Matchers.eq("http://localhost/dmaapTopic"),
+                Matchers.any(HashMap.class), Matchers.any(HashMap.class), Matchers.any(StringEntity.class))).thenReturn(httpResponse);
+        StatusLine statusLine = PowerMockito.mock(StatusLine.class);
+        PowerMockito.when(httpResponse.getStatusLine()).thenReturn(statusLine);
+        PowerMockito.when(statusLine.getStatusCode()).thenReturn(HttpStatus.SC_OK);
 
         PowerMock.replayAll();