Add DMaaP Configuration APIs for Testing

[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..d448e40 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
@@ -159,6 +159,7 @@ 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
@@ -174,9 +175,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,7 +197,8 @@ 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
+        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
@@ -224,7 +226,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
@@ -372,12 +375,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