From: Pamela Dragosh <pdragosh@research.att.com>
Date: Thu, 7 Sep 2017 12:29:55 +0000 (+0000)
Subject: Merge "Use Reg Ex"
X-Git-Tag: v1.1.0~89
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=461b2b7eeca1586423349bc0c4c65f80f027292d;hp=1628052b1b8a6fd4d784b82c8266367d2c203ace;p=policy%2Fengine.git

Merge "Use Reg Ex"
---

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 b02a1435d..c12797f28 100644
--- 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;
@@ -57,6 +59,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 +69,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();