1 files changed, 16 insertions, 16 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 7d6088eb..a74dd94d 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,13 +3,14 @@
  * ONAP-Logging
  * ================================================================================
  * Copyright (C) 2018 Ericsson. All rights reserved.
+ * Modifications Copyright (C) 2019 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.
@@ -22,20 +23,19 @@ package org.onap.policy.common.logging.flexlogger;
 
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertSame;
-import static org.onap.policy.common.logging.util.TestUtils.overrideStaticField;
 
 import java.io.IOException;
 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;
 
 public class FlexLoggerTest {
 
     @Test
     public void testGetLoggerClassOfQEelf() {
-        overrideStaticField(FlexLogger.class, "loggerType", LoggerType.EELF);
+        Whitebox.setInternalState(FlexLogger.class, "loggerType", LoggerType.EELF);
         Logger logger = FlexLogger.getLogger((Class<?>) null);
         assertSame(logger, FlexLogger.getLogger((Class<?>) null));
         assertNotEquals(logger, FlexLogger.getLogger(String.class));
@@ -43,77 +43,77 @@ public class FlexLoggerTest {
 
     @Test
     public void testGetLoggerClassOfQLog4j() {
-        overrideStaticField(FlexLogger.class, "loggerType", LoggerType.LOG4J);
+        Whitebox.setInternalState(FlexLogger.class, "loggerType", LoggerType.LOG4J);
         Logger logger = FlexLogger.getLogger(this.getClass());
         assertSame(logger, FlexLogger.getLogger(this.getClass()));
     }
 
     @Test
     public void testGetLoggerClassOfQSystemOut() {
-        overrideStaticField(FlexLogger.class, "loggerType", LoggerType.SYSTEMOUT);
+        Whitebox.setInternalState(FlexLogger.class, "loggerType", LoggerType.SYSTEMOUT);
         Logger logger = FlexLogger.getLogger(this.getClass());
         assertSame(logger, FlexLogger.getLogger(this.getClass()));
     }
 
     @Test
     public void testGetLoggerStringEelf() {
-        overrideStaticField(FlexLogger.class, "loggerType", LoggerType.EELF);
+        Whitebox.setInternalState(FlexLogger.class, "loggerType", LoggerType.EELF);
         Logger logger = FlexLogger.getLogger("str1");
         assertSame(logger, FlexLogger.getLogger("str1"));
     }
 
     @Test
     public void testGetLoggerStringLog4j() {
-        overrideStaticField(FlexLogger.class, "loggerType", LoggerType.LOG4J);
+        Whitebox.setInternalState(FlexLogger.class, "loggerType", LoggerType.LOG4J);
         Logger logger = FlexLogger.getLogger("str1");
         assertSame(logger, FlexLogger.getLogger("str1"));
     }
 
     @Test
     public void testGetLoggerStringSystemOut() {
-        overrideStaticField(FlexLogger.class, "loggerType", LoggerType.SYSTEMOUT);
+        Whitebox.setInternalState(FlexLogger.class, "loggerType", LoggerType.SYSTEMOUT);
         Logger logger = FlexLogger.getLogger("str1");
         assertSame(logger, FlexLogger.getLogger("str1"));
     }
 
     @Test
     public void testGetLoggerClassOfQBooleanEelf() {
-        overrideStaticField(FlexLogger.class, "loggerType", LoggerType.EELF);
+        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() {
-        overrideStaticField(FlexLogger.class, "loggerType", LoggerType.LOG4J);
+        Whitebox.setInternalState(FlexLogger.class, "loggerType", LoggerType.LOG4J);
         Logger logger = FlexLogger.getLogger(this.getClass(), true);
         assertSame(logger, FlexLogger.getLogger(this.getClass(), true));
     }
 
     @Test
     public void testGetLoggerClassOfQBooleanSystemOut() {
-        overrideStaticField(FlexLogger.class, "loggerType", LoggerType.SYSTEMOUT);
+        Whitebox.setInternalState(FlexLogger.class, "loggerType", LoggerType.SYSTEMOUT);
         Logger logger = FlexLogger.getLogger(this.getClass(), true);
         assertSame(logger, FlexLogger.getLogger(this.getClass(), true));
     }
 
     @Test
     public void testGetLoggerStringBooleanEelf() {
-        overrideStaticField(FlexLogger.class, "loggerType", LoggerType.EELF);
+        Whitebox.setInternalState(FlexLogger.class, "loggerType", LoggerType.EELF);
         Logger logger = FlexLogger.getLogger("str1", true);
         assertSame(logger, FlexLogger.getLogger("str1", true));
     }
 
     @Test
     public void testGetLoggerStringBooleanLog4j() {
-        overrideStaticField(FlexLogger.class, "loggerType", LoggerType.LOG4J);
+        Whitebox.setInternalState(FlexLogger.class, "loggerType", LoggerType.LOG4J);
         Logger logger = FlexLogger.getLogger("str1", true);
         assertSame(logger, FlexLogger.getLogger("str1", true));
     }
 
     @Test
     public void testGetLoggerStringBooleanSystemOut() {
-        overrideStaticField(FlexLogger.class, "loggerType", LoggerType.SYSTEMOUT);
+        Whitebox.setInternalState(FlexLogger.class, "loggerType", LoggerType.SYSTEMOUT);
         Logger logger = FlexLogger.getLogger("str1", true);
         assertSame(logger, FlexLogger.getLogger("str1", true));
     }