From e5e0b7b09226751d4986b1080c2bdb76cde5df4d Mon Sep 17 00:00:00 2001 From: Shiwei Tian Date: Mon, 9 Oct 2017 16:28:07 +0800 Subject: modify dace polling and loopControlName Issue-ID: HOLMES-67 Change-Id: If538c63d4ab173bd4ea0aa0bb3af8afcce24a177 Signed-off-by: Shiwei Tian --- .../rulemgt/dcae/DaceConfigurationPollingTest.java | 138 --------------------- .../rulemgt/dcae/DcaeConfigurationPollingTest.java | 122 ++++++++++++++++++ .../holmes/rulemgt/wrapper/RuleMgtWrapperTest.java | 1 + 3 files changed, 123 insertions(+), 138 deletions(-) delete mode 100644 rulemgt/src/test/java/org/onap/holmes/rulemgt/dcae/DaceConfigurationPollingTest.java create mode 100644 rulemgt/src/test/java/org/onap/holmes/rulemgt/dcae/DcaeConfigurationPollingTest.java (limited to 'rulemgt/src/test/java') diff --git a/rulemgt/src/test/java/org/onap/holmes/rulemgt/dcae/DaceConfigurationPollingTest.java b/rulemgt/src/test/java/org/onap/holmes/rulemgt/dcae/DaceConfigurationPollingTest.java deleted file mode 100644 index b9d9abb..0000000 --- a/rulemgt/src/test/java/org/onap/holmes/rulemgt/dcae/DaceConfigurationPollingTest.java +++ /dev/null @@ -1,138 +0,0 @@ -/** - * Copyright 2017 ZTE Corporation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.onap.holmes.rulemgt.dcae; - -import static org.easymock.EasyMock.anyObject; -import static org.hamcrest.CoreMatchers.anyOf; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.junit.Assert.assertThat; -import static org.powermock.api.mockito.PowerMockito.when; - -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; -import java.util.ArrayList; -import java.util.List; -import javax.ws.rs.ProcessingException; -import org.junit.Before; -import org.junit.Test; -import org.junit.rules.ExpectedException; -import org.junit.runner.RunWith; -import org.onap.holmes.common.config.MicroServiceConfig; -import org.onap.holmes.common.dcae.entity.DcaeConfigurations; -import org.onap.holmes.common.dcae.entity.Rule; -import org.onap.holmes.common.dcae.utils.DcaeConfigurationParser; -import org.onap.holmes.common.exception.CorrelationException; -import org.onap.holmes.rulemgt.bean.request.RuleCreateRequest; -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.api.mockito.PowerMockito; -import org.powermock.core.classloader.annotations.PrepareForTest; -import org.powermock.modules.junit4.PowerMockRunner; -import org.powermock.reflect.Whitebox; - -@PrepareForTest({DaceConfigurationPolling.class, MicroServiceConfig.class, ObjectMapper.class}) -@RunWith(PowerMockRunner.class) -public class DaceConfigurationPollingTest { - - @org.junit.Rule - public ExpectedException thrown = ExpectedException.none(); - - private DaceConfigurationPolling daceConfigurationPolling; - - @Before - public void setUp() { - daceConfigurationPolling = new DaceConfigurationPolling("holmes-rule-mgmt"); - } - - @Test - public void testDaceConfigurationPolling_getDcaeConfigurations_exception() throws Exception { - PowerMock.resetAll(); - thrown.expect(CorrelationException.class); - thrown.expectMessage("host"); - PowerMockito.mockStatic(MicroServiceConfig.class); - when(MicroServiceConfig.getServiceAddrInfoFromCBS("holmes-rule-mgmt")) - .thenReturn("host"); - PowerMock.createMock(DcaeConfigurationParser.class); - PowerMock.expectPrivate(DcaeConfigurationParser.class, "parse", "host") - .andThrow(new CorrelationException("tests")).anyTimes(); - - PowerMock.replayAll(); - Whitebox.invokeMethod(daceConfigurationPolling, "getDcaeConfigurations"); - PowerMock.verifyAll(); - } - - @Test - public void testDaceConfigurationPolling_getDcaeConfigurations_null() throws Exception { - PowerMock.resetAll(); - thrown.expect(CorrelationException.class); - PowerMockito.mockStatic(MicroServiceConfig.class); - when(MicroServiceConfig.getServiceAddrInfoFromCBS("holmes-rule-mgmt")) - .thenReturn("host"); - PowerMock.createMock(DcaeConfigurationParser.class); - PowerMock.expectPrivate(DcaeConfigurationParser.class, "parse", "host") - .andReturn(null).anyTimes(); - - PowerMock.replayAll(); - DcaeConfigurations dcaeConfigurations = Whitebox - .invokeMethod(daceConfigurationPolling, "getDcaeConfigurations"); - PowerMock.verifyAll(); - - assertThat(dcaeConfigurations == null, equalTo(true)); - } - - @Test - public void testDaceConfigurationPolling_addAllCorrelationRules_connection_exception() - throws Exception { - PowerMock.resetAll(); - thrown.expect(ProcessingException.class); - DcaeConfigurations dcaeConfigurations = new DcaeConfigurations(); - Rule rule = new Rule("test", "test", 1); - dcaeConfigurations.getDefaultRules().add(rule); - - PowerMock.replayAll(); - Whitebox.invokeMethod(daceConfigurationPolling, "addAllCorrelationRules", - dcaeConfigurations); - PowerMock.verifyAll(); - } - - @Test - public void testDaceConfigurationPolling_getRuleCreateRequest() throws Exception { - PowerMock.resetAll(); - Rule rule = new Rule("test", "test1", 1); - PowerMock.replayAll(); - RuleCreateRequest actual = Whitebox - .invokeMethod(daceConfigurationPolling, "getRuleCreateRequest", rule); - PowerMock.verifyAll(); - - assertThat(actual.getRuleName(), equalTo("test")); - assertThat(actual.getContent(), equalTo("test1")); - assertThat(actual.getDescription(), equalTo("")); - assertThat(actual.getEnabled(), equalTo(1)); - } - - @Test - public void testDaceConfigurationPolling_run_null_exception() throws Exception { - PowerMock.replayAll(); - PowerMockito.mockStatic(MicroServiceConfig.class); - when(MicroServiceConfig.getServiceAddrInfoFromCBS("holmes-rule-mgmt")) - .thenReturn("host"); - PowerMock.replayAll(); - Whitebox.invokeMethod(daceConfigurationPolling, "run"); - PowerMock.verifyAll(); - } - -} \ No newline at end of file diff --git a/rulemgt/src/test/java/org/onap/holmes/rulemgt/dcae/DcaeConfigurationPollingTest.java b/rulemgt/src/test/java/org/onap/holmes/rulemgt/dcae/DcaeConfigurationPollingTest.java new file mode 100644 index 0000000..25e211a --- /dev/null +++ b/rulemgt/src/test/java/org/onap/holmes/rulemgt/dcae/DcaeConfigurationPollingTest.java @@ -0,0 +1,122 @@ +/** + * Copyright 2017 ZTE Corporation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.onap.holmes.rulemgt.dcae; + +import static org.easymock.EasyMock.anyObject; +import static org.hamcrest.CoreMatchers.anyOf; +import static org.hamcrest.CoreMatchers.equalTo; +import static org.junit.Assert.assertThat; +import static org.powermock.api.mockito.PowerMockito.when; + +import com.fasterxml.jackson.databind.ObjectMapper; +import javax.ws.rs.ProcessingException; +import org.junit.Before; +import org.junit.Test; +import org.junit.rules.ExpectedException; +import org.junit.runner.RunWith; +import org.onap.holmes.common.config.MicroServiceConfig; +import org.onap.holmes.common.dcae.entity.DcaeConfigurations; +import org.onap.holmes.common.dcae.entity.Rule; +import org.onap.holmes.common.dcae.utils.DcaeConfigurationParser; +import org.onap.holmes.common.exception.CorrelationException; +import org.onap.holmes.rulemgt.bean.request.RuleCreateRequest; +import org.powermock.api.easymock.PowerMock; +import org.powermock.api.mockito.PowerMockito; +import org.powermock.core.classloader.annotations.PrepareForTest; +import org.powermock.modules.junit4.PowerMockRunner; +import org.powermock.reflect.Whitebox; + +@PrepareForTest({DcaeConfigurationPolling.class, MicroServiceConfig.class, ObjectMapper.class}) +@RunWith(PowerMockRunner.class) +public class DcaeConfigurationPollingTest { + + @org.junit.Rule + public ExpectedException thrown = ExpectedException.none(); + + private DcaeConfigurationPolling daceConfigurationPolling; + + @Before + public void setUp() { + daceConfigurationPolling = new DcaeConfigurationPolling("holmes-rule-mgmt"); + } + + @Test + public void testDaceConfigurationPolling_getDcaeConfigurations_exception() throws Exception { + PowerMock.resetAll(); + thrown.expect(CorrelationException.class); + thrown.expectMessage("host"); + PowerMockito.mockStatic(MicroServiceConfig.class); + when(MicroServiceConfig.getServiceAddrInfoFromCBS("holmes-rule-mgmt")) + .thenReturn("host"); + PowerMock.createMock(DcaeConfigurationParser.class); + PowerMock.expectPrivate(DcaeConfigurationParser.class, "parse", "host") + .andThrow(new CorrelationException("tests")).anyTimes(); + + PowerMock.replayAll(); + Whitebox.invokeMethod(daceConfigurationPolling, "getDcaeConfigurations"); + PowerMock.verifyAll(); + } + + @Test + public void testDaceConfigurationPolling_getDcaeConfigurations_null() throws Exception { + PowerMock.resetAll(); + thrown.expect(CorrelationException.class); + PowerMockito.mockStatic(MicroServiceConfig.class); + when(MicroServiceConfig.getServiceAddrInfoFromCBS("holmes-rule-mgmt")) + .thenReturn("host"); + PowerMock.createMock(DcaeConfigurationParser.class); + PowerMock.expectPrivate(DcaeConfigurationParser.class, "parse", "host") + .andReturn(null).anyTimes(); + + PowerMock.replayAll(); + DcaeConfigurations dcaeConfigurations = Whitebox + .invokeMethod(daceConfigurationPolling, "getDcaeConfigurations"); + PowerMock.verifyAll(); + + assertThat(dcaeConfigurations == null, equalTo(true)); + } + + @Test + public void testDaceConfigurationPolling_addAllCorrelationRules_connection_exception() + throws Exception { + PowerMock.resetAll(); + thrown.expect(ProcessingException.class); + DcaeConfigurations dcaeConfigurations = new DcaeConfigurations(); + Rule rule = new Rule("test", "test", "tset",1); + dcaeConfigurations.getDefaultRules().add(rule); + + PowerMock.replayAll(); + Whitebox.invokeMethod(daceConfigurationPolling, "addAllCorrelationRules", + dcaeConfigurations); + PowerMock.verifyAll(); + } + + @Test + public void testDaceConfigurationPolling_getRuleCreateRequest() throws Exception { + PowerMock.resetAll(); + Rule rule = new Rule("test", "test1", "stest",1); + PowerMock.replayAll(); + RuleCreateRequest actual = Whitebox + .invokeMethod(daceConfigurationPolling, "getRuleCreateRequest", rule); + PowerMock.verifyAll(); + + assertThat(actual.getRuleName(), equalTo("test")); + assertThat(actual.getLoopControlName(), equalTo("test1")); + assertThat(actual.getContent(), equalTo("stest")); + assertThat(actual.getDescription(), equalTo("")); + assertThat(actual.getEnabled(), equalTo(1)); + } +} \ No newline at end of file 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 1697bf4..9837fc5 100644 --- 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 { RuleCreateRequest ruleCreateRequest = createRuleCreateRequest(ruleName, "This is a rule for testing.", "Mocked contents.", 1); + ruleCreateRequest.setLoopControlName("loopName"); CorrelationRule correlationRuleRet = new CorrelationRule(); correlationRuleRet.setRid("rule_" + System.currentTimeMillis()); -- cgit 1.2.3-korg