1 files changed, 23 insertions, 47 deletions

diff --git a/common-logging/src/test/java/org/onap/policy/common/logging/flexlogger/FlexLoggerTest.java b/common-logging/src/test/java/org/onap/policy/common/logging/flexlogger/FlexLoggerTest.java
index a74dd94d..c0194f2b 100644
--- a/common-logging/src/test/java/org/onap/policy/common/logging/flexlogger/FlexLoggerTest.java
+++ b/common-logging/src/test/java/org/onap/policy/common/logging/flexlogger/FlexLoggerTest.java
@@ -3,7 +3,8 @@
  * ONAP-Logging
  * ================================================================================
  * Copyright (C) 2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2023 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +22,7 @@
 
 package org.onap.policy.common.logging.flexlogger;
 
+import static org.assertj.core.api.Assertions.assertThatCode;
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertSame;
 
@@ -29,93 +31,65 @@ import java.util.HashSet;
 import java.util.Set;
 import org.junit.Test;
 import org.onap.policy.common.logging.flexlogger.FlexLogger.PropertiesCallBack;
-import org.powermock.reflect.Whitebox;
+import org.springframework.test.util.ReflectionTestUtils;
 
 public class FlexLoggerTest {
 
     @Test
     public void testGetLoggerClassOfQEelf() {
-        Whitebox.setInternalState(FlexLogger.class, "loggerType", LoggerType.EELF);
+        ReflectionTestUtils.setField(FlexLogger.class, "loggerType", LoggerType.EELF);
         Logger logger = FlexLogger.getLogger((Class<?>) null);
         assertSame(logger, FlexLogger.getLogger((Class<?>) null));
         assertNotEquals(logger, FlexLogger.getLogger(String.class));
     }
 
     @Test
-    public void testGetLoggerClassOfQLog4j() {
-        Whitebox.setInternalState(FlexLogger.class, "loggerType", LoggerType.LOG4J);
-        Logger logger = FlexLogger.getLogger(this.getClass());
-        assertSame(logger, FlexLogger.getLogger(this.getClass()));
-    }
-
-    @Test
     public void testGetLoggerClassOfQSystemOut() {
-        Whitebox.setInternalState(FlexLogger.class, "loggerType", LoggerType.SYSTEMOUT);
+        ReflectionTestUtils.setField(FlexLogger.class, "loggerType", LoggerType.SYSTEMOUT);
         Logger logger = FlexLogger.getLogger(this.getClass());
         assertSame(logger, FlexLogger.getLogger(this.getClass()));
     }
 
     @Test
     public void testGetLoggerStringEelf() {
-        Whitebox.setInternalState(FlexLogger.class, "loggerType", LoggerType.EELF);
-        Logger logger = FlexLogger.getLogger("str1");
-        assertSame(logger, FlexLogger.getLogger("str1"));
-    }
-
-    @Test
-    public void testGetLoggerStringLog4j() {
-        Whitebox.setInternalState(FlexLogger.class, "loggerType", LoggerType.LOG4J);
-        Logger logger = FlexLogger.getLogger("str1");
-        assertSame(logger, FlexLogger.getLogger("str1"));
+        ReflectionTestUtils.setField(FlexLogger.class, "loggerType", LoggerType.EELF);
+        Logger logger = FlexLogger.getLogger();
+        assertSame(logger, FlexLogger.getLogger());
     }
 
     @Test
     public void testGetLoggerStringSystemOut() {
-        Whitebox.setInternalState(FlexLogger.class, "loggerType", LoggerType.SYSTEMOUT);
-        Logger logger = FlexLogger.getLogger("str1");
-        assertSame(logger, FlexLogger.getLogger("str1"));
+        ReflectionTestUtils.setField(FlexLogger.class, "loggerType", LoggerType.SYSTEMOUT);
+        Logger logger = FlexLogger.getLogger();
+        assertSame(logger, FlexLogger.getLogger());
     }
 
     @Test
     public void testGetLoggerClassOfQBooleanEelf() {
-        Whitebox.setInternalState(FlexLogger.class, "loggerType", LoggerType.EELF);
-        Logger logger = FlexLogger.getLogger(this.getClass(), true);
-        assertSame(logger, FlexLogger.getLogger(this.getClass(), true));
-    }
-
-    @Test
-    public void testGetLoggerClassOfQBooleanLog4j() {
-        Whitebox.setInternalState(FlexLogger.class, "loggerType", LoggerType.LOG4J);
+        ReflectionTestUtils.setField(FlexLogger.class, "loggerType", LoggerType.EELF);
         Logger logger = FlexLogger.getLogger(this.getClass(), true);
         assertSame(logger, FlexLogger.getLogger(this.getClass(), true));
     }
 
     @Test
     public void testGetLoggerClassOfQBooleanSystemOut() {
-        Whitebox.setInternalState(FlexLogger.class, "loggerType", LoggerType.SYSTEMOUT);
+        ReflectionTestUtils.setField(FlexLogger.class, "loggerType", LoggerType.SYSTEMOUT);
         Logger logger = FlexLogger.getLogger(this.getClass(), true);
         assertSame(logger, FlexLogger.getLogger(this.getClass(), true));
     }
 
     @Test
     public void testGetLoggerStringBooleanEelf() {
-        Whitebox.setInternalState(FlexLogger.class, "loggerType", LoggerType.EELF);
-        Logger logger = FlexLogger.getLogger("str1", true);
-        assertSame(logger, FlexLogger.getLogger("str1", true));
-    }
-
-    @Test
-    public void testGetLoggerStringBooleanLog4j() {
-        Whitebox.setInternalState(FlexLogger.class, "loggerType", LoggerType.LOG4J);
-        Logger logger = FlexLogger.getLogger("str1", true);
-        assertSame(logger, FlexLogger.getLogger("str1", true));
+        ReflectionTestUtils.setField(FlexLogger.class, "loggerType", LoggerType.EELF);
+        Logger logger = FlexLogger.getLogger(true);
+        assertSame(logger, FlexLogger.getLogger(true));
     }
 
     @Test
     public void testGetLoggerStringBooleanSystemOut() {
-        Whitebox.setInternalState(FlexLogger.class, "loggerType", LoggerType.SYSTEMOUT);
-        Logger logger = FlexLogger.getLogger("str1", true);
-        assertSame(logger, FlexLogger.getLogger("str1", true));
+        ReflectionTestUtils.setField(FlexLogger.class, "loggerType", LoggerType.SYSTEMOUT);
+        Logger logger = FlexLogger.getLogger(true);
+        assertSame(logger, FlexLogger.getLogger(true));
     }
 
     @Test
@@ -131,7 +105,9 @@ public class FlexLoggerTest {
         changedKeys.add("error.level");
         changedKeys.add("audit.level");
         PropertiesCallBack propertiesCallBack = new PropertiesCallBack("name");
-        propertiesCallBack.propertiesChanged(PropertyUtil.getProperties("config/policyLogger.properties"), changedKeys);
+        assertThatCode(() -> propertiesCallBack
+                        .propertiesChanged(PropertyUtil.getProperties("config/policyLogger.properties"), changedKeys))
+                                        .doesNotThrowAnyException();
     }
 
 }