bugfix - mis-removal of rules

[holmes/rule-management.git] / rulemgt / src / test / java / org / onap / holmes / rulemgt / resources / RuleMgtResourcesTest.java

diff --git a/rulemgt/src/test/java/org/onap/holmes/rulemgt/resources/RuleMgtResourcesTest.java b/rulemgt/src/test/java/org/onap/holmes/rulemgt/resources/RuleMgtResourcesTest.java
index a515196..7cc0def 100644 (file)
--- a/rulemgt/src/test/java/org/onap/holmes/rulemgt/resources/RuleMgtResourcesTest.java
+++ b/rulemgt/src/test/java/org/onap/holmes/rulemgt/resources/RuleMgtResourcesTest.java
@@ -51,7 +51,7 @@ public class RuleMgtResourcesTest {
     private RuleMgtResources ruleMgtResources = new RuleMgtResources();\r
 \r
     @Before\r
-    public void setUp() throws Exception {\r
+    public void setUp() {\r
         Whitebox.setInternalState(ruleMgtResources, "ruleMgtWrapper", ruleMgtWrapper);\r
         PowerMock.resetAll();\r
     }\r
@@ -64,7 +64,7 @@ public class RuleMgtResourcesTest {
         final RuleCreateRequest ruleCreateRequest = new RuleCreateRequest();\r
         EasyMock.expect(ruleMgtWrapper.addCorrelationRule("admin", ruleCreateRequest))\r
                 .andThrow(new CorrelationException(EasyMock.anyObject(String.class)));\r
-        EasyMock.expect(request.getHeader("username")).andReturn("admin");\r
+        EasyMock.expect(request.getHeader("username")).andReturn("admin").times(2);\r
         PowerMock.replayAll();\r
         ruleMgtResources.addCorrelationRule(request, ruleCreateRequest);\r
         PowerMock.verifyAll();\r
@@ -76,7 +76,7 @@ public class RuleMgtResourcesTest {
         final RuleCreateRequest ruleCreateRequest = new RuleCreateRequest();\r
         EasyMock.expect(ruleMgtWrapper.addCorrelationRule("admin",\r
                 ruleCreateRequest)).andReturn(new RuleAddAndUpdateResponse());\r
-        EasyMock.expect(request.getHeader("username")).andReturn("admin");\r
+        EasyMock.expect(request.getHeader("username")).andReturn("admin").times(2);\r
         PowerMock.replayAll();\r
         ruleMgtResources.addCorrelationRule(request, ruleCreateRequest);\r
         PowerMock.verifyAll();\r
@@ -89,7 +89,7 @@ public class RuleMgtResourcesTest {
         final RuleUpdateRequest ruleUpdateRequest = new RuleUpdateRequest();\r
         EasyMock.expect(ruleMgtWrapper.updateCorrelationRule("admin", ruleUpdateRequest))\r
                 .andThrow(new CorrelationException(EasyMock.anyObject(String.class)));\r
-        EasyMock.expect(request.getHeader("username")).andReturn("admin");\r
+        EasyMock.expect(request.getHeader("username")).andReturn("admin").times(2);\r
         PowerMock.replayAll();\r
         ruleMgtResources.updateCorrelationRule(request, ruleUpdateRequest);\r
         PowerMock.verifyAll();\r
@@ -100,7 +100,7 @@ public class RuleMgtResourcesTest {
         final RuleUpdateRequest ruleUpdateRequest = new RuleUpdateRequest();\r
         EasyMock.expect(ruleMgtWrapper.updateCorrelationRule("admin",\r
                 ruleUpdateRequest)).andReturn(new RuleAddAndUpdateResponse());\r
-        EasyMock.expect(request.getHeader("username")).andReturn("admin");\r
+        EasyMock.expect(request.getHeader("username")).andReturn("admin").times(2);\r
         PowerMock.replayAll();\r
         ruleMgtResources.updateCorrelationRule(request, ruleUpdateRequest);\r
         PowerMock.verifyAll();\r