Merge "Tried to Fix Some Vulnerability Issues"

[holmes/rule-management.git] / rulemgt / src / test / java / org / onap / holmes / rulemgt / bolt / enginebolt / EngineWrapperTest.java

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 cc8c047..0dd2fbd 100644 (file)
--- 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
@@ -17,9 +17,6 @@
 package org.onap.holmes.rulemgt.bolt.enginebolt;\r
 \r
 \r
-import static org.hamcrest.MatcherAssert.assertThat;\r
-import static org.hamcrest.Matchers.equalTo;\r
-\r
 import org.apache.http.HttpResponse;\r
 import org.apache.http.StatusLine;\r
 import org.easymock.EasyMock;\r
@@ -28,16 +25,18 @@ import org.junit.Rule;
 import org.junit.Test;\r
 import org.junit.rules.ExpectedException;\r
 import org.junit.runner.RunWith;\r
+import org.onap.holmes.common.exception.CorrelationException;\r
 import org.onap.holmes.common.utils.HttpsUtils;\r
 import org.onap.holmes.rulemgt.bean.request.CorrelationCheckRule4Engine;\r
 import org.onap.holmes.rulemgt.bean.request.CorrelationDeployRule4Engine;\r
-import org.onap.holmes.common.exception.CorrelationException;\r
 import org.powermock.api.easymock.PowerMock;\r
-import org.powermock.api.mockito.PowerMockito;\r
 import org.powermock.core.classloader.annotations.PrepareForTest;\r
 import org.powermock.modules.junit4.PowerMockRunner;\r
 import org.powermock.reflect.Whitebox;\r
 \r
+import static org.hamcrest.MatcherAssert.assertThat;\r
+import static org.hamcrest.Matchers.equalTo;\r
+\r
 @PrepareForTest({EngineWrapper.class, EngineService.class, HttpsUtils.class, HttpResponse.class,\r
         StatusLine.class})\r
 @RunWith(PowerMockRunner.class)\r
@@ -64,12 +63,13 @@ public class EngineWrapperTest {
         thrown.expectMessage("Failed to call the rule deployment RESTful API.");\r
 \r
         EasyMock.expect(\r
-                engineServiceMock.deploy(EasyMock.anyObject(CorrelationDeployRule4Engine.class)))\r
+                engineServiceMock.deploy(EasyMock.anyObject(CorrelationDeployRule4Engine.class),\r
+                        EasyMock.anyObject(String.class)))\r
                 .andThrow(\r
                         new RuntimeException(""));\r
         PowerMock.replayAll();\r
 \r
-        engineWrapper.deployEngine(new CorrelationDeployRule4Engine());\r
+        engineWrapper.deployEngine(new CorrelationDeployRule4Engine(),"10.96.33.34");\r
 \r
         PowerMock.verifyAll();\r
     }\r
@@ -80,13 +80,14 @@ public class EngineWrapperTest {
         thrown.expectMessage("Failed to deploy the rule!");\r
 \r
         EasyMock.expect(\r
-                engineServiceMock.deploy(EasyMock.anyObject(CorrelationDeployRule4Engine.class)))\r
+                engineServiceMock.deploy(EasyMock.anyObject(CorrelationDeployRule4Engine.class),\r
+                        EasyMock.anyObject(String.class)))\r
                 .andReturn(httpResponse);\r
         EasyMock.expect(httpResponse.getStatusLine()).andReturn(statusLineMock);\r
         EasyMock.expect(statusLineMock.getStatusCode()).andReturn(400);\r
         PowerMock.replayAll();\r
 \r
-        engineWrapper.deployEngine(new CorrelationDeployRule4Engine());\r
+        engineWrapper.deployEngine(new CorrelationDeployRule4Engine(),"10.96.33.34");\r
 \r
         PowerMock.verifyAll();\r
     }\r
@@ -95,19 +96,20 @@ public class EngineWrapperTest {
     public void deployEngine_parse_content_exception() throws Exception {\r
         PowerMock.resetAll();\r
         String content = "";\r
-        PowerMockito.mockStatic(HttpsUtils.class);\r
+        PowerMock.mockStatic(HttpsUtils.class);\r
         thrown.expect(CorrelationException.class);\r
         thrown.expectMessage(\r
                 "Failed to parse the value returned by the engine management service.");\r
         EasyMock.expect(\r
-                engineServiceMock.deploy(EasyMock.anyObject(CorrelationDeployRule4Engine.class)))\r
+                engineServiceMock.deploy(EasyMock.anyObject(CorrelationDeployRule4Engine.class),\r
+                        EasyMock.anyObject(String.class)))\r
                 .andReturn(httpResponse);\r
         EasyMock.expect(httpResponse.getStatusLine()).andReturn(statusLineMock);\r
         EasyMock.expect(statusLineMock.getStatusCode()).andReturn(200);\r
-        PowerMockito.when(HttpsUtils.extractResponseEntity(httpResponse)).thenReturn(content);\r
+        EasyMock.expect(HttpsUtils.extractResponseEntity(httpResponse)).andReturn(content);\r
         PowerMock.replayAll();\r
 \r
-        engineWrapper.deployEngine(new CorrelationDeployRule4Engine());\r
+        engineWrapper.deployEngine(new CorrelationDeployRule4Engine(),"10.96.33.34");\r
 \r
         PowerMock.verifyAll();\r
     }\r
@@ -116,16 +118,17 @@ public class EngineWrapperTest {
     public void deployEngine_success() throws Exception {\r
         PowerMock.resetAll();\r
         String content = "{\"packageName\":\"test\"}";\r
-        PowerMockito.mockStatic(HttpsUtils.class);\r
+        PowerMock.mockStatic(HttpsUtils.class);\r
         EasyMock.expect(\r
-                engineServiceMock.deploy(EasyMock.anyObject(CorrelationDeployRule4Engine.class)))\r
+                engineServiceMock.deploy(EasyMock.anyObject(CorrelationDeployRule4Engine.class),\r
+                        EasyMock.anyObject(String.class)))\r
                 .andReturn(httpResponse);\r
         EasyMock.expect(httpResponse.getStatusLine()).andReturn(statusLineMock);\r
         EasyMock.expect(statusLineMock.getStatusCode()).andReturn(200);\r
-        PowerMockito.when(HttpsUtils.extractResponseEntity(httpResponse)).thenReturn(content);\r
+        EasyMock.expect(HttpsUtils.extractResponseEntity(httpResponse)).andReturn(content);\r
         PowerMock.replayAll();\r
 \r
-        String result = engineWrapper.deployEngine(new CorrelationDeployRule4Engine());\r
+        String result = engineWrapper.deployEngine(new CorrelationDeployRule4Engine(),"10.96.33.34");\r
 \r
         assertThat(result, equalTo("test"));\r
 \r
@@ -136,11 +139,12 @@ public class EngineWrapperTest {
         thrown.expect(CorrelationException.class);\r
         thrown.expectMessage("Failed to call the rule deleting RESTful API.");\r
 \r
-        EasyMock.expect(engineServiceMock.delete(EasyMock.anyObject(String.class))).andThrow(\r
+        EasyMock.expect(engineServiceMock.delete(EasyMock.anyObject(String.class),\r
+                EasyMock.anyObject(String.class))).andThrow(\r
                 new RuntimeException(""));\r
         PowerMock.replayAll();\r
 \r
-        engineWrapper.deleteRuleFromEngine("");\r
+        engineWrapper.deleteRuleFromEngine("","10.96.33.34");\r
 \r
         PowerMock.verifyAll();\r
     }\r
@@ -150,28 +154,30 @@ public class EngineWrapperTest {
         thrown.expect(CorrelationException.class);\r
         thrown.expectMessage("Failed to delete the rule!");\r
 \r
-        EasyMock.expect(engineServiceMock.delete(EasyMock.anyObject(String.class)))\r
+        EasyMock.expect(engineServiceMock.delete(EasyMock.anyObject(String.class),\r
+                EasyMock.anyObject(String.class)))\r
                 .andReturn(httpResponse);\r
         EasyMock.expect(httpResponse.getStatusLine()).andReturn(statusLineMock);\r
         EasyMock.expect(statusLineMock.getStatusCode()).andReturn(400);\r
 \r
         PowerMock.replayAll();\r
 \r
-        engineWrapper.deleteRuleFromEngine("");\r
+        engineWrapper.deleteRuleFromEngine("","10.96.33.34");\r
 \r
         PowerMock.verifyAll();\r
     }\r
 \r
     @Test\r
     public void deleteRuleFromEngine_success() throws Exception {\r
-        EasyMock.expect(engineServiceMock.delete(EasyMock.anyObject(String.class)))\r
+        EasyMock.expect(engineServiceMock.delete(EasyMock.anyObject(String.class),\r
+                EasyMock.anyObject(String.class)))\r
                 .andReturn(httpResponse);\r
         EasyMock.expect(httpResponse.getStatusLine()).andReturn(statusLineMock);\r
         EasyMock.expect(statusLineMock.getStatusCode()).andReturn(200);\r
 \r
         PowerMock.replayAll();\r
 \r
-        boolean result = engineWrapper.deleteRuleFromEngine("");\r
+        boolean result = engineWrapper.deleteRuleFromEngine("","10.96.33.34");\r
 \r
         assertThat(result, equalTo(true));\r
     }\r
@@ -182,12 +188,13 @@ public class EngineWrapperTest {
         thrown.expectMessage("Failed to call the rule verification RESTful API.");\r
 \r
         EasyMock.expect(\r
-                engineServiceMock.check(EasyMock.anyObject(CorrelationCheckRule4Engine.class)))\r
+                engineServiceMock.check(EasyMock.anyObject(CorrelationCheckRule4Engine.class),\r
+                        EasyMock.anyObject(String.class)))\r
                 .andThrow(\r
                         new RuntimeException(""));\r
         PowerMock.replayAll();\r
 \r
-        engineWrapper.checkRuleFromEngine(new CorrelationCheckRule4Engine());\r
+        engineWrapper.checkRuleFromEngine(new CorrelationCheckRule4Engine(),"10.96.33.34");\r
 \r
         PowerMock.verifyAll();\r
     }\r
@@ -195,14 +202,15 @@ public class EngineWrapperTest {
     @Test\r
     public void checkRuleFromEngine_success() throws Exception {\r
         EasyMock.expect(\r
-                engineServiceMock.check(EasyMock.anyObject(CorrelationCheckRule4Engine.class)))\r
+                engineServiceMock.check(EasyMock.anyObject(CorrelationCheckRule4Engine.class),\r
+                        EasyMock.anyObject(String.class)))\r
                 .andReturn(httpResponse);\r
         EasyMock.expect(httpResponse.getStatusLine()).andReturn(statusLineMock);\r
         EasyMock.expect(statusLineMock.getStatusCode()).andReturn(200);\r
 \r
         PowerMock.replayAll();\r
 \r
-        boolean result = engineWrapper.checkRuleFromEngine(new CorrelationCheckRule4Engine());\r
+        boolean result = engineWrapper.checkRuleFromEngine(new CorrelationCheckRule4Engine(),"10.96.33.34");\r
 \r
         assertThat(result, equalTo(true));\r
     }\r