Updated to Java 11

[holmes/rule-management.git] / rulemgt / src / test / java / org / onap / holmes / rulemgt / wrapper / RuleMgtWrapperTest.java

diff --git a/rulemgt/src/test/java/org/onap/holmes/rulemgt/wrapper/RuleMgtWrapperTest.java b/rulemgt/src/test/java/org/onap/holmes/rulemgt/wrapper/RuleMgtWrapperTest.java
index 0c81b98..90384ce 100644 (file)
--- a/rulemgt/src/test/java/org/onap/holmes/rulemgt/wrapper/RuleMgtWrapperTest.java
+++ b/rulemgt/src/test/java/org/onap/holmes/rulemgt/wrapper/RuleMgtWrapperTest.java
@@ -16,37 +16,34 @@
 \r
 package org.onap.holmes.rulemgt.wrapper;\r
 \r
-import static org.hamcrest.MatcherAssert.assertThat;\r
-import static org.hamcrest.Matchers.equalTo;\r
-import static org.hamcrest.Matchers.is;\r
 \r
-import java.util.ArrayList;\r
-import java.util.Date;\r
-import java.util.List;\r
 import org.easymock.EasyMock;\r
 import org.junit.Before;\r
 import org.junit.Rule;\r
 import org.junit.Test;\r
 import org.junit.rules.ExpectedException;\r
-import org.junit.runner.RunWith;\r
-import org.onap.holmes.rulemgt.bean.request.CorrelationCheckRule4Engine;\r
-import org.onap.holmes.rulemgt.db.CorrelationRuleDao;\r
 import org.onap.holmes.common.api.entity.CorrelationRule;\r
 import org.onap.holmes.common.exception.CorrelationException;\r
 import org.onap.holmes.common.utils.DbDaoUtil;\r
-import org.onap.holmes.rulemgt.bean.request.CorrelationDeployRule4Engine;\r
-import org.onap.holmes.rulemgt.bean.request.RuleCreateRequest;\r
-import org.onap.holmes.rulemgt.bean.request.RuleDeleteRequest;\r
-import org.onap.holmes.rulemgt.bean.request.RuleQueryCondition;\r
-import org.onap.holmes.rulemgt.bean.request.RuleUpdateRequest;\r
+import org.onap.holmes.rulemgt.bean.request.*;\r
 import org.onap.holmes.rulemgt.bean.response.RuleAddAndUpdateResponse;\r
 import org.onap.holmes.rulemgt.bean.response.RuleQueryListResponse;\r
 import org.onap.holmes.rulemgt.bolt.enginebolt.EngineWrapper;\r
+import org.onap.holmes.rulemgt.db.CorrelationRuleDao;\r
 import org.onap.holmes.rulemgt.db.CorrelationRuleQueryDao;\r
+import org.onap.holmes.rulemgt.send.Ip4AddingRule;\r
 import org.powermock.api.easymock.PowerMock;\r
 import org.powermock.modules.junit4.rule.PowerMockRule;\r
 import org.powermock.reflect.Whitebox;\r
 \r
+import java.util.ArrayList;\r
+import java.util.Date;\r
+import java.util.List;\r
+\r
+import static org.hamcrest.MatcherAssert.assertThat;\r
+import static org.hamcrest.Matchers.equalTo;\r
+import static org.hamcrest.Matchers.is;\r
+\r
 public class RuleMgtWrapperTest {\r
 \r
     @Rule\r
@@ -64,6 +61,8 @@ public class RuleMgtWrapperTest {
 \r
     private CorrelationRuleDao correlationRuleDaoMock;\r
 \r
+    private Ip4AddingRule ip4AddingRuleMock;\r
+\r
     private static final String USER_NAME = "admin";\r
 \r
     @Before\r
@@ -75,11 +74,13 @@ public class RuleMgtWrapperTest {
         correlationRuleQueryDaoMock = PowerMock.createMock(CorrelationRuleQueryDao.class);\r
         dbDaoUtilMock = PowerMock.createMock(DbDaoUtil.class);\r
         correlationRuleDaoMock = PowerMock.createMock(CorrelationRuleDao.class);\r
+        ip4AddingRuleMock = PowerMock.createMock(Ip4AddingRule.class);\r
 \r
         Whitebox.setInternalState(ruleMgtWrapper, "daoUtil", dbDaoUtilMock);\r
         Whitebox.setInternalState(ruleMgtWrapper, "correlationRuleQueryDao", correlationRuleQueryDaoMock);\r
         Whitebox.setInternalState(ruleMgtWrapper, "engineWarpper", engineWrapperMock);\r
         Whitebox.setInternalState(ruleMgtWrapper, "correlationRuleDao", correlationRuleDaoMock);\r
+        Whitebox.setInternalState(ruleMgtWrapper,"ip4AddingRule", ip4AddingRuleMock);\r
 \r
         PowerMock.resetAll();\r
     }\r
@@ -159,14 +160,18 @@ public class RuleMgtWrapperTest {
 \r
         RuleCreateRequest ruleCreateRequest = createRuleCreateRequest(ruleName, "This is a rule for testing.",\r
                 "Mocked contents.", 1);\r
+        ruleCreateRequest.setLoopControlName("loopName");\r
 \r
         CorrelationRule correlationRuleRet = new CorrelationRule();\r
         correlationRuleRet.setRid("rule_" + System.currentTimeMillis());\r
 \r
         EasyMock.expect(correlationRuleDaoMock.queryRuleByRuleName(ruleName)).andReturn(null);\r
-        EasyMock.expect(engineWrapperMock.checkRuleFromEngine(EasyMock.anyObject(CorrelationCheckRule4Engine.class)))\r
+        EasyMock.expect(ip4AddingRuleMock.getEngineIp4AddRule()).andReturn("10.96.33.34");\r
+        EasyMock.expect(engineWrapperMock.checkRuleFromEngine(EasyMock.anyObject(CorrelationCheckRule4Engine.class)\r
+                , EasyMock.anyObject(String.class)))\r
                 .andReturn(true);\r
-        EasyMock.expect(engineWrapperMock.deployEngine(EasyMock.anyObject(CorrelationDeployRule4Engine.class)))\r
+        EasyMock.expect(engineWrapperMock.deployEngine(EasyMock.anyObject(CorrelationDeployRule4Engine.class)\r
+                , EasyMock.anyObject(String.class)))\r
                 .andReturn("package-001");\r
         EasyMock.expect(correlationRuleDaoMock.saveRule(EasyMock.anyObject(CorrelationRule.class)))\r
                 .andReturn(correlationRuleRet);\r
@@ -174,9 +179,9 @@ public class RuleMgtWrapperTest {
         PowerMock.replayAll();\r
 \r
         RuleAddAndUpdateResponse response = ruleMgtWrapper.addCorrelationRule("admin", ruleCreateRequest);\r
-        assertThat(response.getRuleId(), equalTo(correlationRuleRet.getRid()));\r
-\r
         PowerMock.verifyAll();\r
+\r
+        assertThat(response.getRuleId(), equalTo(correlationRuleRet.getRid()));\r
     }\r
 \r
     @Test\r
@@ -196,15 +201,19 @@ public class RuleMgtWrapperTest {
         oldCorrelationRule.setContent("content");\r
         oldCorrelationRule.setPackageName("testName");\r
         oldCorrelationRule.setEnabled(1);\r
-        RuleUpdateRequest ruleUpdateRequest = createRuleUpdateRequest("rule_1", "des2", "contetnt2", 1);\r
+        oldCorrelationRule.setClosedControlLoopName("cl-name");\r
+        oldCorrelationRule.setEngineInstance("10.96.33.34");\r
+        RuleUpdateRequest ruleUpdateRequest = createRuleUpdateRequest("rule_1", "cl-name", "des2", "contetnt2", 1);\r
 \r
         EasyMock.expect(correlationRuleDaoMock.queryRuleByRid("rule_1")).andReturn(oldCorrelationRule);\r
-        EasyMock.expect(engineWrapperMock.deleteRuleFromEngine("testName")).andReturn(true);\r
+        EasyMock.expect(engineWrapperMock.deleteRuleFromEngine("testName", "10.96.33.34")).andReturn(true);\r
         correlationRuleDaoMock.updateRule(EasyMock.anyObject(CorrelationRule.class));\r
         EasyMock.expectLastCall();\r
-        EasyMock.expect(engineWrapperMock.checkRuleFromEngine(EasyMock.anyObject(CorrelationCheckRule4Engine.class)))\r
+        EasyMock.expect(engineWrapperMock.checkRuleFromEngine(EasyMock.anyObject(CorrelationCheckRule4Engine.class)\r
+                , EasyMock.anyObject(String.class)))\r
                 .andReturn(true);\r
-        EasyMock.expect(engineWrapperMock.deployEngine(EasyMock.anyObject(CorrelationDeployRule4Engine.class)))\r
+        EasyMock.expect(engineWrapperMock.deployEngine(EasyMock.anyObject(CorrelationDeployRule4Engine.class)\r
+                , EasyMock.anyObject(String.class)))\r
                 .andReturn("packageName1");\r
         PowerMock.replayAll();\r
 \r
@@ -224,7 +233,8 @@ public class RuleMgtWrapperTest {
         oldCorrelationRule.setContent("content");\r
         oldCorrelationRule.setPackageName("testName");\r
         oldCorrelationRule.setEnabled(1);\r
-        RuleUpdateRequest ruleUpdateRequest = createRuleUpdateRequest("rule_1", "des1", "content", 1);\r
+        oldCorrelationRule.setClosedControlLoopName("cl-name");\r
+        RuleUpdateRequest ruleUpdateRequest = createRuleUpdateRequest("rule_1", "cl-name", "des1", "content", 1);\r
 \r
         EasyMock.expect(correlationRuleDaoMock.queryRuleByRid("rule_1")).andReturn(oldCorrelationRule);\r
 \r
@@ -285,7 +295,8 @@ public class RuleMgtWrapperTest {
         correlationRule.setEnabled(1);\r
         EasyMock.expect(correlationRuleDaoMock.queryRuleByRid(ruleDeleteRequest.getRuleId()))\r
                 .andReturn(correlationRule);\r
-        EasyMock.expect(engineWrapperMock.deleteRuleFromEngine(EasyMock.anyObject(String.class))).andReturn(true);\r
+        EasyMock.expect(engineWrapperMock.deleteRuleFromEngine(EasyMock.anyObject(String.class)\r
+                , EasyMock.anyObject(String.class))).andReturn(true);\r
         correlationRuleDaoMock.deleteRule(EasyMock.anyObject(CorrelationRule.class));\r
         EasyMock.expectLastCall();\r
         PowerMock.replayAll();\r
@@ -372,12 +383,14 @@ public class RuleMgtWrapperTest {
         return rcr;\r
     }\r
 \r
-    private RuleUpdateRequest createRuleUpdateRequest(String ruleId, String description, String content, int enabled) {\r
+    private RuleUpdateRequest createRuleUpdateRequest(String ruleId, String clName, String description,\r
+            String content, int enabled) {\r
         RuleUpdateRequest ruleUpdateRequest = new RuleUpdateRequest();\r
         ruleUpdateRequest.setRuleId(ruleId);\r
         ruleUpdateRequest.setDescription(description);\r
         ruleUpdateRequest.setContent(content);\r
         ruleUpdateRequest.setEnabled(enabled);\r
+        ruleUpdateRequest.setLoopControlName(clName);\r
         return ruleUpdateRequest;\r
     }\r
 \r