Fix compilation issue due to generic Exception

[policy/engine.git] / LogParser / src / test / java / org / onap / xacml / parser / ParseLogTest.java

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 3cf3d18..62af131 100644 (file)
--- a/LogParser/src/test/java/org/onap/xacml/parser/ParseLogTest.java
+++ b/LogParser/src/test/java/org/onap/xacml/parser/ParseLogTest.java
@@ -31,6 +31,8 @@ import java.io.IOException;
 import java.io.InputStreamReader;
 import java.util.Date;
 import java.util.Properties;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import org.junit.After;
 import org.junit.Before;
@@ -38,6 +40,7 @@ import org.junit.Test;
 import org.mockito.Mockito;
 import org.onap.policy.common.im.AdministrativeStateException;
 import org.onap.policy.common.im.IntegrityMonitor;
+import org.onap.policy.common.im.IntegrityMonitorException;
 import org.onap.policy.common.im.StandbyStatusException;
 import org.onap.policy.common.logging.flexlogger.FlexLogger;
 import org.onap.policy.common.logging.flexlogger.Logger;
@@ -57,6 +60,7 @@ public class ParseLogTest {
        public void setUp() throws Exception {
                System.setProperty("com.sun.management.jmxremote.port", "9998");
                im = Mockito.mock(IntegrityMonitor.class);
+               String regex = "^\\/[a-zA-Z]\\:\\/";
                
                try {
                        Mockito.doNothing().when(im).startTransaction();
@@ -66,7 +70,10 @@ public class ParseLogTest {
                Mockito.doNothing().when(im).endTransaction();
                ClassLoader classLoader = getClass().getClassLoader();
                configFile = classLoader.getResource("test_config.properties").getFile();
-               if(configFile.startsWith("/C:/")){
+               Pattern pattern = Pattern.compile(regex);
+               Matcher matcher = pattern.matcher(configFile);
+               
+               if (matcher.find()) {
                        configFile = configFile.substring(1);
                }
                testFile1 = classLoader.getResource("LineTest.txt").getFile();
@@ -116,8 +123,8 @@ public class ParseLogTest {
                
                config = new Properties();
                config.put("RESOURCE_NAME", "logparser_pap01");
-               config.put("JDBC_DRIVER" ,"com.mysql.jdbc.Driver");
-               config.put("JDBC_URL", "jdbc:mysql://localhost:3306/");
+               config.put("JDBC_DRIVER" ,"org.mariadb.jdbc.Driver");
+               config.put("JDBC_URL", "jdbc:mariadb://localhost:3306/");
                config.put("JDBC_USER", "root");
                config.put("JDBC_PASSWORD", "password");
                config.put("JMX_URL", "service:jmx:rmi:///jndi/rmi://localhost:9998/jmxrmi");
@@ -160,19 +167,6 @@ public class ParseLogTest {
                logger.debug("testParseDate: exit");
        }
 
-       @Test
-       public  void  testParseDateFail(){
-               
-               logger.debug("testParseDateFail: enter");
-               
-               String line = "2016-02-23 08:07:30";
-               Date returnValue = ParseLog.parseDate(line, "yyyy-MM-dd HH:mm:ss", true);
-               logger.debug("testParseDateFail: returnValue: " + returnValue);
-               assertEquals(null, returnValue);
-               
-               logger.debug("testParseDateFail: exit");
-       }
-
        @Test
        public void testPullLastLineRead(){
                
@@ -180,7 +174,7 @@ public class ParseLogTest {
                File file = new File(testFile1);
                String returnValue = null;
                try {
-                       returnValue = ParseLog.PullLastLineRead(file, "pap-rest.log");
+                       returnValue = ParseLog.pullLastLineRead(file, "pap-rest.log");
                        logger.debug("testPullLastLineRead: returnValue for pap-rest.log: " + returnValue);
                } catch (IOException e) {
                        fail();
@@ -188,7 +182,7 @@ public class ParseLogTest {
                assertEquals("52", returnValue);
                
                try {
-                       returnValue = ParseLog.PullLastLineRead(file, "debug.log");
+                       returnValue = ParseLog.pullLastLineRead(file, "debug.log");
                        logger.debug("testPullLastLineRead: returnValue for debug.log: " + returnValue);
                } catch (IOException e) {
                        fail();
@@ -196,7 +190,7 @@ public class ParseLogTest {
                assertEquals("17", returnValue);
                
                try {
-                       returnValue = ParseLog.PullLastLineRead(file, "error.log");
+                       returnValue = ParseLog.pullLastLineRead(file, "error.log");
                        logger.debug("testPullLastLineRead: returnValue for error.log: " + returnValue);
                } catch (IOException e) {
                        fail();
@@ -213,7 +207,7 @@ public class ParseLogTest {
                
                File file = new File("nonExistFile.txt");
                try {
-                       assertEquals(null, ParseLog.PullLastLineRead(file, "pap-rest"));
+                       assertEquals(null, ParseLog.pullLastLineRead(file, "pap-rest"));
                } catch (IOException e) {
                        fail();
                }
@@ -228,7 +222,7 @@ public class ParseLogTest {
                
                File file = new File(testFile2);
                try {
-                       assertEquals(null, ParseLog.PullLastLineRead(file, "pap-rest"));
+                       assertEquals(null, ParseLog.pullLastLineRead(file, "pap-rest"));
                } catch (IOException e) {
                        fail();
                }
@@ -495,7 +489,7 @@ public class ParseLogTest {
                im = Mockito.mock(IntegrityMonitor.class);
                try {
                        Mockito.doNothing().when(im).startTransaction();
-               } catch (StandbyStatusException | AdministrativeStateException e) {
+               } catch (IntegrityMonitorException e) {
                        fail();
                }
                Mockito.doNothing().when(im).endTransaction();