1 files changed, 54 insertions, 28 deletions
diff --git a/rulemgt/src/test/java/org/onap/holmes/rulemgt/bolt/enginebolt/EngineWrapperTest.java b/rulemgt/src/test/java/org/onap/holmes/rulemgt/bolt/enginebolt/EngineWrapperTest.java
index b63b106..cc8c047 100644
--- a/rulemgt/src/test/java/org/onap/holmes/rulemgt/bolt/enginebolt/EngineWrapperTest.java
+++ b/rulemgt/src/test/java/org/onap/holmes/rulemgt/bolt/enginebolt/EngineWrapperTest.java
@@ -20,32 +20,40 @@ package org.onap.holmes.rulemgt.bolt.enginebolt;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 
-import javax.ws.rs.core.Response;
+import org.apache.http.HttpResponse;
 import org.apache.http.StatusLine;
 import org.easymock.EasyMock;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
+import org.junit.runner.RunWith;
+import org.onap.holmes.common.utils.HttpsUtils;
 import org.onap.holmes.rulemgt.bean.request.CorrelationCheckRule4Engine;
 import org.onap.holmes.rulemgt.bean.request.CorrelationDeployRule4Engine;
 import org.onap.holmes.common.exception.CorrelationException;
 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 org.powermock.reflect.Whitebox;
 
+@PrepareForTest({EngineWrapper.class, EngineService.class, HttpsUtils.class, HttpResponse.class,
+        StatusLine.class})
+@RunWith(PowerMockRunner.class)
 public class EngineWrapperTest {
 
     @Rule
     public ExpectedException thrown = ExpectedException.none();
     private EngineWrapper engineWrapper = new EngineWrapper();
     private EngineService engineServiceMock;
-    private Response response;
+    private HttpResponse httpResponse;
     private StatusLine statusLineMock;
 
     @Before
     public void setUp() throws Exception {
         engineServiceMock = PowerMock.createMock(EngineService.class);
-        response = PowerMock.createMock(Response.class);
+        httpResponse = PowerMock.createMock(HttpResponse.class);
         statusLineMock = PowerMock.createMock(StatusLine.class);
         Whitebox.setInternalState(engineWrapper, "engineService", engineServiceMock);
     }
@@ -55,8 +63,10 @@ public class EngineWrapperTest {
         thrown.expect(CorrelationException.class);
         thrown.expectMessage("Failed to call the rule deployment RESTful API.");
 
-        EasyMock.expect(engineServiceMock.deploy(EasyMock.anyObject(CorrelationDeployRule4Engine.class))).andThrow(
-                new RuntimeException(""));
+        EasyMock.expect(
+                engineServiceMock.deploy(EasyMock.anyObject(CorrelationDeployRule4Engine.class)))
+                .andThrow(
+                        new RuntimeException(""));
         PowerMock.replayAll();
 
         engineWrapper.deployEngine(new CorrelationDeployRule4Engine());
@@ -69,9 +79,11 @@ public class EngineWrapperTest {
         thrown.expect(CorrelationException.class);
         thrown.expectMessage("Failed to deploy the rule!");
 
-        EasyMock.expect(engineServiceMock.deploy(EasyMock.anyObject(CorrelationDeployRule4Engine.class)))
-                .andReturn(response);
-        EasyMock.expect(response.getStatus()).andReturn(400);
+        EasyMock.expect(
+                engineServiceMock.deploy(EasyMock.anyObject(CorrelationDeployRule4Engine.class)))
+                .andReturn(httpResponse);
+        EasyMock.expect(httpResponse.getStatusLine()).andReturn(statusLineMock);
+        EasyMock.expect(statusLineMock.getStatusCode()).andReturn(400);
         PowerMock.replayAll();
 
         engineWrapper.deployEngine(new CorrelationDeployRule4Engine());
@@ -81,14 +93,18 @@ public class EngineWrapperTest {
 
     @Test
     public void deployEngine_parse_content_exception() throws Exception {
+        PowerMock.resetAll();
         String content = "";
-
+        PowerMockito.mockStatic(HttpsUtils.class);
         thrown.expect(CorrelationException.class);
-        thrown.expectMessage("Failed to parse the value returned by the engine management service.");
-        EasyMock.expect(engineServiceMock.deploy(EasyMock.anyObject(CorrelationDeployRule4Engine.class)))
-                .andReturn(response);
-        EasyMock.expect(response.getStatus()).andReturn(200);
-        EasyMock.expect(response.readEntity(String.class)).andReturn(content);
+        thrown.expectMessage(
+                "Failed to parse the value returned by the engine management service.");
+        EasyMock.expect(
+                engineServiceMock.deploy(EasyMock.anyObject(CorrelationDeployRule4Engine.class)))
+                .andReturn(httpResponse);
+        EasyMock.expect(httpResponse.getStatusLine()).andReturn(statusLineMock);
+        EasyMock.expect(statusLineMock.getStatusCode()).andReturn(200);
+        PowerMockito.when(HttpsUtils.extractResponseEntity(httpResponse)).thenReturn(content);
         PowerMock.replayAll();
 
         engineWrapper.deployEngine(new CorrelationDeployRule4Engine());
@@ -98,11 +114,15 @@ public class EngineWrapperTest {
 
     @Test
     public void deployEngine_success() throws Exception {
-        String content = "{\"package\":\"test\"}";
-        EasyMock.expect(engineServiceMock.deploy(EasyMock.anyObject(CorrelationDeployRule4Engine.class)))
-                .andReturn(response);
-        EasyMock.expect(response.getStatus()).andReturn(200);
-        EasyMock.expect(response.readEntity(String.class)).andReturn(content);
+        PowerMock.resetAll();
+        String content = "{\"packageName\":\"test\"}";
+        PowerMockito.mockStatic(HttpsUtils.class);
+        EasyMock.expect(
+                engineServiceMock.deploy(EasyMock.anyObject(CorrelationDeployRule4Engine.class)))
+                .andReturn(httpResponse);
+        EasyMock.expect(httpResponse.getStatusLine()).andReturn(statusLineMock);
+        EasyMock.expect(statusLineMock.getStatusCode()).andReturn(200);
+        PowerMockito.when(HttpsUtils.extractResponseEntity(httpResponse)).thenReturn(content);
         PowerMock.replayAll();
 
         String result = engineWrapper.deployEngine(new CorrelationDeployRule4Engine());
@@ -131,8 +151,9 @@ public class EngineWrapperTest {
         thrown.expectMessage("Failed to delete the rule!");
 
         EasyMock.expect(engineServiceMock.delete(EasyMock.anyObject(String.class)))
-                .andReturn(response);
-        EasyMock.expect(response.getStatus()).andReturn(400);
+                .andReturn(httpResponse);
+        EasyMock.expect(httpResponse.getStatusLine()).andReturn(statusLineMock);
+        EasyMock.expect(statusLineMock.getStatusCode()).andReturn(400);
 
         PowerMock.replayAll();
 
@@ -144,8 +165,9 @@ public class EngineWrapperTest {
     @Test
     public void deleteRuleFromEngine_success() throws Exception {
         EasyMock.expect(engineServiceMock.delete(EasyMock.anyObject(String.class)))
-                .andReturn(response);
-        EasyMock.expect(response.getStatus()).andReturn(200);
+                .andReturn(httpResponse);
+        EasyMock.expect(httpResponse.getStatusLine()).andReturn(statusLineMock);
+        EasyMock.expect(statusLineMock.getStatusCode()).andReturn(200);
 
         PowerMock.replayAll();
 
@@ -159,8 +181,10 @@ public class EngineWrapperTest {
         thrown.expect(CorrelationException.class);
         thrown.expectMessage("Failed to call the rule verification RESTful API.");
 
-        EasyMock.expect(engineServiceMock.check(EasyMock.anyObject(CorrelationCheckRule4Engine.class))).andThrow(
-                new RuntimeException(""));
+        EasyMock.expect(
+                engineServiceMock.check(EasyMock.anyObject(CorrelationCheckRule4Engine.class)))
+                .andThrow(
+                        new RuntimeException(""));
         PowerMock.replayAll();
 
         engineWrapper.checkRuleFromEngine(new CorrelationCheckRule4Engine());
@@ -170,9 +194,11 @@ public class EngineWrapperTest {
 
     @Test
     public void checkRuleFromEngine_success() throws Exception {
-        EasyMock.expect(engineServiceMock.check(EasyMock.anyObject(CorrelationCheckRule4Engine.class)))
-                .andReturn(response);
-        EasyMock.expect(response.getStatus()).andReturn(200);
+        EasyMock.expect(
+                engineServiceMock.check(EasyMock.anyObject(CorrelationCheckRule4Engine.class)))
+                .andReturn(httpResponse);
+        EasyMock.expect(httpResponse.getStatusLine()).andReturn(statusLineMock);
+        EasyMock.expect(statusLineMock.getStatusCode()).andReturn(200);
 
         PowerMock.replayAll();