From d4d97233bf8aae575241080909370f81f68b6e82 Mon Sep 17 00:00:00 2001 From: ramverma Date: Tue, 27 Feb 2018 09:55:18 +0000 Subject: [PATCH] Add Junit to policy/engine LogParser package Test cases to improve the coverage of LogParser to 72% Change-Id: Idbf9dbbc7254d2ba4d6953852d7847b5070dd4d4 Issue-ID: POLICY-599 Signed-off-by: ramverma --- LogParser/pom.xml | 14 ++++++++- .../java/org/onap/xacml/parser/ParseLogTest.java | 33 +++++++++++++++++++++- .../test/resources/test_config_debug.properties | 2 ++ .../test/resources/test_config_error.properties | 2 ++ 4 files changed, 49 insertions(+), 2 deletions(-) diff --git a/LogParser/pom.xml b/LogParser/pom.xml index 8bf50b083..0bd21a8de 100644 --- a/LogParser/pom.xml +++ b/LogParser/pom.xml @@ -130,7 +130,19 @@ cadi-aaf - + + + org.powermock + powermock-module-junit4 + 1.7.3 + test + + + org.powermock + powermock-api-mockito2 + 1.7.3 + test + diff --git a/LogParser/src/test/java/org/onap/xacml/parser/ParseLogTest.java b/LogParser/src/test/java/org/onap/xacml/parser/ParseLogTest.java index 09ffa4254..91de46440 100644 --- a/LogParser/src/test/java/org/onap/xacml/parser/ParseLogTest.java +++ b/LogParser/src/test/java/org/onap/xacml/parser/ParseLogTest.java @@ -37,6 +37,7 @@ import java.util.regex.Pattern; import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.junit.runner.RunWith; import org.mockito.Mockito; import org.onap.policy.common.im.AdministrativeStateException; import org.onap.policy.common.im.IntegrityMonitor; @@ -45,8 +46,12 @@ import org.onap.policy.common.im.StandbyStatusException; import org.onap.policy.common.logging.flexlogger.FlexLogger; import org.onap.policy.common.logging.flexlogger.Logger; import org.onap.xacml.parser.LogEntryObject.LOGTYPE; +import org.powermock.api.mockito.PowerMockito; +import org.powermock.core.classloader.annotations.PrepareForTest; +import org.powermock.modules.junit4.PowerMockRunner; - +@PrepareForTest({ParseLogTest.class, IntegrityMonitor.class}) +@RunWith(PowerMockRunner.class) public class ParseLogTest { private static Logger logger = FlexLogger.getLogger(ParseLogTest.class); @@ -568,4 +573,30 @@ public class ParseLogTest { logger.debug("exception occured while executing the test: exit"); } } + + @Test + public void testMainDebug() { + try { + final Properties returnConfig = ParseLog.getPropertiesValue(configFileDebug); + PowerMockito.mockStatic(IntegrityMonitor.class); + Mockito.when(IntegrityMonitor.getInstance("test", returnConfig)).thenReturn(im); + ParseLog.main(new String[] {}); + Thread.sleep(30000); + } catch (final Exception e) { + logger.debug("exception occured while executing the test: exit"); + } + } + + @Test + public void testMainError() { + try { + final Properties returnConfig = ParseLog.getPropertiesValue(configFileError); + PowerMockito.mockStatic(IntegrityMonitor.class); + Mockito.when(IntegrityMonitor.getInstance("test", returnConfig)).thenReturn(im); + ParseLog.main(new String[] {}); + Thread.sleep(30000); + } catch (final Exception e) { + logger.debug("exception occured while executing the test: exit"); + } + } } \ No newline at end of file diff --git a/LogParser/src/test/resources/test_config_debug.properties b/LogParser/src/test/resources/test_config_debug.properties index 66b417339..3e9d614fe 100644 --- a/LogParser/src/test/resources/test_config_debug.properties +++ b/LogParser/src/test/resources/test_config_debug.properties @@ -29,3 +29,5 @@ SERVER=https://localhost:9091/pap/ LOGTYPE=PAP LOGPATH=/Workspaces/HealthCheck/debug/pap-rest.log PARSERLOGPATH=IntegrityMonitor.log +CHECK_INTERVAL=600000 +TIME_FRAME=5 \ No newline at end of file diff --git a/LogParser/src/test/resources/test_config_error.properties b/LogParser/src/test/resources/test_config_error.properties index 3c5c07019..2348493b5 100644 --- a/LogParser/src/test/resources/test_config_error.properties +++ b/LogParser/src/test/resources/test_config_error.properties @@ -29,3 +29,5 @@ SERVER=https://localhost:9091/pap/ LOGTYPE=PAP LOGPATH=/Workspaces/HealthCheck/error/pap-rest.log PARSERLOGPATH=IntegrityMonitor.log +CHECK_INTERVAL=600000 +TIME_FRAME=five \ No newline at end of file -- 2.16.6