Added junit tests in ONAP-Logging

Added junit tests to org.onap.policy.common.logging.flexlogger package in ONAP-Logging

Issue-ID: POLICY-582
Change-Id: I024f990960fa71bff7655da9c2cd5dd0db8ee33c
Signed-off-by: mmis <michael.morris@ericsson.com>

5 files changed, 19 insertions, 112 deletions

diff --git a/common-logging/src/main/java/org/onap/policy/common/logging/flexlogger/EelfLogger.java b/common-logging/src/main/java/org/onap/policy/common/logging/flexlogger/EelfLogger.java
index ff097edf..07ef5626 100644
--- a/common-logging/src/main/java/org/onap/policy/common/logging/flexlogger/EelfLogger.java
+++ b/common-logging/src/main/java/org/onap/policy/common/logging/flexlogger/EelfLogger.java
@@ -107,6 +107,7 @@ public class EelfLogger implements Logger, Serializable {
 		   className = clazz.getName();
 		}
 		PolicyLogger.postMDCInfoForEvent(transId);
+		this.transId = transId;
 	}
 	
 	/**
@@ -119,6 +120,7 @@ public class EelfLogger implements Logger, Serializable {
 		   className = s;
 		}
 		PolicyLogger.postMDCInfoForEvent(transId);
+		this.transId = transId;
 	}
 	
 	/**
diff --git a/common-logging/src/main/java/org/onap/policy/common/logging/flexlogger/FlexLoggerTester.java b/common-logging/src/main/java/org/onap/policy/common/logging/flexlogger/FlexLoggerTester.java
deleted file mode 100644
index 0fa65c0c..00000000
--- a/common-logging/src/main/java/org/onap/policy/common/logging/flexlogger/FlexLoggerTester.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP-Logging
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * 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.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.common.logging.flexlogger;
-
-import java.util.UUID;
-
-public class FlexLoggerTester {
-
-	
-	public void testLogging(){
-		
-		// get an instance of logger 
-		Logger  logger = FlexLogger.getLogger(FlexLoggerTester.class);
-		
-		logger.info("logger.isAuditEnabled():" + logger.isAuditEnabled());
-		logger.info("logger.isDebugEnabled():" + logger.isDebugEnabled());
-		logger.info("logger.isErrorEnabled():" + logger.isErrorEnabled());
-		logger.info("logger.isInfoEnabled():" + logger.isInfoEnabled());
-		logger.info("logger.isMetricsEnabled():" + logger.isMetricsEnabled());
-		logger.info("logger.isWarnEnabled():" + logger.isWarnEnabled());
-		
-		if(logger.isDebugEnabled())
-		    logger.debug("this is from logger.debug call");
-		else
-			logger.info("this is from logger.info call");
-
-		if(logger.isMetricsEnabled()) 
-			logger.metrics("this is from logger.metrics call");
-		
-		logger.error("this is from logger.error call");
-		if(logger.isAuditEnabled()) 
-			logger.audit("this is from logger.audit call");
-		else{
-			logger.audit("shouldn't see this line in audit log");
-			logger.info("shouldn't see this line in audit log");
-		}
-		
-		if(logger.isMetricsEnabled()) 
-			logger.metrics("this is from logger.metrics call");
-		else{
-			logger.metrics("shouldn't see this line in metrics log");
-			logger.info("shouldn't see this line in metrics log");
-		}
-		
-		if(logger.isErrorEnabled()) {
-			logger.error("this is from logger.error call");
-		}else{
-			logger.error("shouldn't see this logger.error call in error.log");
-			logger.info("error is not enabled");
-		}
-		
-		logger.info("logger.isDebugEnabled() returned value:" + logger.isDebugEnabled());
-		logger.recordAuditEventEnd("123345456464998", "from recordAuditEventEnd call", "12345");
-		logger.recordAuditEventEnd(UUID.randomUUID(), "from recordAuditEventEnd call", "abcdf");
-		logger.recordAuditEventStart("from recordAuditEventStart call");
-		logger.recordAuditEventStart(UUID.randomUUID().toString());
-		logger.recordMetricEvent("123345456464998", "from recordMetricEvent call");
-		logger.recordMetricEvent(UUID.randomUUID(), "from recordMetricEvent call");
-		logger.trace("from trace call");
-
-	}
-}
diff --git a/common-logging/src/main/java/org/onap/policy/common/logging/flexlogger/Logger4J.java b/common-logging/src/main/java/org/onap/policy/common/logging/flexlogger/Logger4J.java
index 30349d5c..555620f2 100644
--- a/common-logging/src/main/java/org/onap/policy/common/logging/flexlogger/Logger4J.java
+++ b/common-logging/src/main/java/org/onap/policy/common/logging/flexlogger/Logger4J.java
@@ -24,6 +24,7 @@ import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
+import java.util.Arrays;
 import java.util.UUID;
 
 import org.apache.log4j.Logger;
@@ -316,7 +317,7 @@ public class Logger4J implements org.onap.policy.common.logging.flexlogger.Logge
 	 */		
 	@Override
 	public void error(MessageCodes msg, Throwable arg0, String... arguments){
-		log.error(transId + "|" + className +"|" + "MessageCodes :" + msg + arguments);
+		log.error(transId + "|" + className +"|" + "MessageCodes :" + msg + Arrays.asList(arguments));
 
 	}
 	
@@ -327,7 +328,7 @@ public class Logger4J implements org.onap.policy.common.logging.flexlogger.Logge
 	 */		
 	@Override
 	public void error(MessageCodes msg, String... arguments){		
-		log.error(transId + "|" + className +"|" + "MessageCode:" + msg + arguments);
+		log.error(transId + "|" + className +"|" + "MessageCode:" + msg + Arrays.asList(arguments));
 	}
 	
 	/**
@@ -351,7 +352,7 @@ public class Logger4J implements org.onap.policy.common.logging.flexlogger.Logge
 	 */
     @Override
 	public void warn(MessageCodes msg, String... arguments){    	
-    	log.warn(className +"|" +"MessageCodes:" + msg + arguments);
+    	log.warn(className +"|" +"MessageCodes:" + msg + Arrays.asList(arguments));
     }
 
 	/**
@@ -362,7 +363,7 @@ public class Logger4J implements org.onap.policy.common.logging.flexlogger.Logge
 	 */
     @Override
 	public void warn(MessageCodes msg, Throwable arg0, String... arguments){
-    	log.warn(className +"|" +"MessageCodes:" + msg + arguments);    	
+    	log.warn(className +"|" +"MessageCodes:" + msg + Arrays.asList(arguments));    	
     }
 
 	/**
diff --git a/common-logging/src/main/java/org/onap/policy/common/logging/flexlogger/PropertyUtil.java b/common-logging/src/main/java/org/onap/policy/common/logging/flexlogger/PropertyUtil.java
index 1bc57f01..86d119ea 100644
--- a/common-logging/src/main/java/org/onap/policy/common/logging/flexlogger/PropertyUtil.java
+++ b/common-logging/src/main/java/org/onap/policy/common/logging/flexlogger/PropertyUtil.java
@@ -362,12 +362,13 @@ public class PropertyUtil
    * @param file the properties file
    * @param notify if not null, this is a callback interface that was used for
    *	notifications of changes
+ * @throws IOException 
    */
-  public static void stopListening(File file, Listener listener)
+  public static void stopListening(File file, Listener listener) throws IOException
   {
 	if (listener != null)
 	  {
-		ListenerRegistration reg = registrations.get(file);
+		ListenerRegistration reg = registrations.get(file.getCanonicalFile());
 		if (reg != null)
 		  {
 			reg.removeListener(listener);
@@ -380,29 +381,11 @@ public class PropertyUtil
    * @param fileName the properties file
    * @param notify if not null, this is a callback interface that was used for
    *	notifications of changes
+ * @throws IOException 
    */
-  public static void stopListening(String fileName, Listener listener)
+  public static void stopListening(String fileName, Listener listener) throws IOException
   {
 	stopListening(new File(fileName), listener);
   }
-
-  /* ============================================================ */
-
-  // TEMPORARY - used to test callback interface
-  public static class Test implements Listener
-  {
-	String name;
-
-	public Test(String name)
-	  {
-		this.name = name;
-	  }
-
-	@Override
-	public void propertiesChanged(Properties properties, Set<String> changedKeys)
-	  {
-		System.out.println("Test(" + name + ")\nproperties = " + properties
-						   + "\nchangedKeys = " + changedKeys);
-	  }
-  }
+  
 } 
diff --git a/common-logging/src/main/java/org/onap/policy/common/logging/flexlogger/SystemOutLogger.java b/common-logging/src/main/java/org/onap/policy/common/logging/flexlogger/SystemOutLogger.java
index cb005c13..825799b9 100644
--- a/common-logging/src/main/java/org/onap/policy/common/logging/flexlogger/SystemOutLogger.java
+++ b/common-logging/src/main/java/org/onap/policy/common/logging/flexlogger/SystemOutLogger.java
@@ -21,6 +21,7 @@
 package org.onap.policy.common.logging.flexlogger;
 
 import java.io.Serializable;
+import java.util.Arrays;
 import java.util.UUID;
 
 import org.onap.policy.common.logging.eelf.MessageCodes;
@@ -324,7 +325,7 @@ public class SystemOutLogger implements Logger, Serializable {
 	@Override
 	public void recordMetricEvent(String eventId, String arg1) {
 		
-		System.out.println(className+" : "+"eventId:" + ":" + eventId + "message:" + arg1);	
+		System.out.println(className+" : "+"eventId:" + eventId + "message:" + arg1);	
 		
 	}
 
@@ -358,7 +359,7 @@ public class SystemOutLogger implements Logger, Serializable {
 	@Override
 	public void error(MessageCodes msg, Throwable arg0, String... arguments){
 
-		System.out.println(className+" : "+"MessageCodes :" + msg + arguments);
+		System.out.println(className+" : "+"MessageCodes :" + msg + Arrays.asList(arguments));
 
 	}
 	
@@ -370,7 +371,7 @@ public class SystemOutLogger implements Logger, Serializable {
 	@Override
 	public void error(MessageCodes msg, String... arguments){
 		
-		System.out.println(transId + "|" + className+" : "+"MessageCode:" + msg + arguments);
+		System.out.println(transId + "|" + className+" : "+"MessageCode:" + msg + Arrays.asList(arguments));
 	}
 	
 	/**
@@ -396,7 +397,7 @@ public class SystemOutLogger implements Logger, Serializable {
     @Override
 	public void warn(MessageCodes msg, String... arguments){
     	
-    	System.out.println(transId + "|" + className+" : "+"MessageCodes:" + msg + arguments);
+    	System.out.println(transId + "|" + className+" : "+"MessageCodes:" + msg + Arrays.asList(arguments));
     }
 
 	/**
@@ -408,7 +409,7 @@ public class SystemOutLogger implements Logger, Serializable {
     @Override
 	public void warn(MessageCodes msg, Throwable arg0, String... arguments){
 	
-    	System.out.println(transId + "|" + className+" : "+"MessageCodes:" + msg + arguments);
+    	System.out.println(transId + "|" + className+" : "+"MessageCodes:" + msg + Arrays.asList(arguments));
     	
     }