From 059d701cc5741938793fbdd3fb4d29f9d0d26df1 Mon Sep 17 00:00:00 2001 From: Guangrong Fu Date: Wed, 17 Aug 2022 16:17:04 +0800 Subject: bugfix - mis-removal of rules Issue-ID: HOLMES-564 Signed-off-by: Guangrong Fu Change-Id: I2dcf9f1a3f2bec54a6018afa203adff369c64554 --- .../onap/holmes/rulemgt/dcae/ConfigFileScanningTaskTest.java | 6 ++++-- .../onap/holmes/rulemgt/resources/RuleMgtResourcesTest.java | 10 +++++----- 2 files changed, 9 insertions(+), 7 deletions(-) (limited to 'rulemgt/src/test/java') diff --git a/rulemgt/src/test/java/org/onap/holmes/rulemgt/dcae/ConfigFileScanningTaskTest.java b/rulemgt/src/test/java/org/onap/holmes/rulemgt/dcae/ConfigFileScanningTaskTest.java index a4ab15b..cc29103 100644 --- a/rulemgt/src/test/java/org/onap/holmes/rulemgt/dcae/ConfigFileScanningTaskTest.java +++ b/rulemgt/src/test/java/org/onap/holmes/rulemgt/dcae/ConfigFileScanningTaskTest.java @@ -28,6 +28,7 @@ import org.onap.holmes.rulemgt.bean.response.RuleQueryListResponse; import org.onap.holmes.rulemgt.bean.response.RuleResult4API; import org.powermock.api.easymock.PowerMock; import org.powermock.core.classloader.annotations.PrepareForTest; +import org.powermock.core.classloader.annotations.SuppressStaticInitializationFor; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.reflect.Whitebox; @@ -37,6 +38,7 @@ import static org.junit.Assert.assertThat; @RunWith(PowerMockRunner.class) @PrepareForTest({JerseyClient.class}) +@SuppressStaticInitializationFor({"org.onap.holmes.common.utils.JerseyClient"}) public class ConfigFileScanningTaskTest { @Rule @@ -81,7 +83,7 @@ public class ConfigFileScanningTaskTest { EasyMock.expect(jcMock.get(EasyMock.anyString(), EasyMock.anyObject())).andReturn(rqlr); // mock for deployRule - EasyMock.expect(jcMock.header(EasyMock.anyString(), EasyMock.anyObject())).andReturn(jcMock); + EasyMock.expect(jcMock.header(EasyMock.anyString(), EasyMock.anyObject())).andReturn(jcMock).times(2); EasyMock.expect(jcMock.put(EasyMock.anyString(), EasyMock.anyObject())).andReturn(""); PowerMock.replayAll(); @@ -169,7 +171,7 @@ public class ConfigFileScanningTaskTest { EasyMock.expect(jcMock.delete(EasyMock.anyString())).andReturn(""); // mock for deployRule - EasyMock.expect(jcMock.header(EasyMock.anyString(), EasyMock.anyObject())).andReturn(jcMock); + EasyMock.expect(jcMock.header(EasyMock.anyString(), EasyMock.anyObject())).andReturn(jcMock).times(2); EasyMock.expect(jcMock.put(EasyMock.anyString(), EasyMock.anyObject())).andReturn(""); PowerMock.replayAll(); 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 --- 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(); @Before - public void setUp() throws Exception { + public void setUp() { Whitebox.setInternalState(ruleMgtResources, "ruleMgtWrapper", ruleMgtWrapper); PowerMock.resetAll(); } @@ -64,7 +64,7 @@ public class RuleMgtResourcesTest { final RuleCreateRequest ruleCreateRequest = new RuleCreateRequest(); EasyMock.expect(ruleMgtWrapper.addCorrelationRule("admin", ruleCreateRequest)) .andThrow(new CorrelationException(EasyMock.anyObject(String.class))); - EasyMock.expect(request.getHeader("username")).andReturn("admin"); + EasyMock.expect(request.getHeader("username")).andReturn("admin").times(2); PowerMock.replayAll(); ruleMgtResources.addCorrelationRule(request, ruleCreateRequest); PowerMock.verifyAll(); @@ -76,7 +76,7 @@ public class RuleMgtResourcesTest { final RuleCreateRequest ruleCreateRequest = new RuleCreateRequest(); EasyMock.expect(ruleMgtWrapper.addCorrelationRule("admin", ruleCreateRequest)).andReturn(new RuleAddAndUpdateResponse()); - EasyMock.expect(request.getHeader("username")).andReturn("admin"); + EasyMock.expect(request.getHeader("username")).andReturn("admin").times(2); PowerMock.replayAll(); ruleMgtResources.addCorrelationRule(request, ruleCreateRequest); PowerMock.verifyAll(); @@ -89,7 +89,7 @@ public class RuleMgtResourcesTest { final RuleUpdateRequest ruleUpdateRequest = new RuleUpdateRequest(); EasyMock.expect(ruleMgtWrapper.updateCorrelationRule("admin", ruleUpdateRequest)) .andThrow(new CorrelationException(EasyMock.anyObject(String.class))); - EasyMock.expect(request.getHeader("username")).andReturn("admin"); + EasyMock.expect(request.getHeader("username")).andReturn("admin").times(2); PowerMock.replayAll(); ruleMgtResources.updateCorrelationRule(request, ruleUpdateRequest); PowerMock.verifyAll(); @@ -100,7 +100,7 @@ public class RuleMgtResourcesTest { final RuleUpdateRequest ruleUpdateRequest = new RuleUpdateRequest(); EasyMock.expect(ruleMgtWrapper.updateCorrelationRule("admin", ruleUpdateRequest)).andReturn(new RuleAddAndUpdateResponse()); - EasyMock.expect(request.getHeader("username")).andReturn("admin"); + EasyMock.expect(request.getHeader("username")).andReturn("admin").times(2); PowerMock.replayAll(); ruleMgtResources.updateCorrelationRule(request, ruleUpdateRequest); PowerMock.verifyAll(); -- cgit 1.2.3-korg