X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=misc%2Fenv%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Faaf%2Fmisc%2Fenv%2Fimpl%2FJU_Log4JLogTargetTest.java;h=b51011582188f4a1f61434f39b20d3ba6e49cf54;hb=1aba148a7ff88c8f43762da19fa4c757c62732c5;hp=914a01b0523bc0c191eed09f12f9ab43bb2f3f45;hpb=4b5a7d721d994a49057e9bfb403c7bff1b376660;p=aaf%2Fauthz.git

diff --git a/misc/env/src/test/java/org/onap/aaf/misc/env/impl/JU_Log4JLogTargetTest.java b/misc/env/src/test/java/org/onap/aaf/misc/env/impl/JU_Log4JLogTargetTest.java
index 914a01b0..b5101158 100644
--- a/misc/env/src/test/java/org/onap/aaf/misc/env/impl/JU_Log4JLogTargetTest.java
+++ b/misc/env/src/test/java/org/onap/aaf/misc/env/impl/JU_Log4JLogTargetTest.java
@@ -21,42 +21,90 @@
 
 package org.onap.aaf.misc.env.impl;
 
-import static org.junit.Assert.assertFalse;
-import static org.powermock.api.mockito.PowerMockito.when;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.MockitoAnnotations.initMocks;
 
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.Mockito;
 import org.onap.aaf.misc.env.APIException;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
 
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({ Log4JLogTarget.class, Logger.class })
 public class JU_Log4JLogTargetTest {
 
+    @Mock
+    Level level;
+     
     @Mock
     Logger log;
 
     @Before
     public void setup() {
-        MockitoAnnotations.initMocks(this);
-        PowerMockito.mockStatic(Logger.class);
-        when(Logger.getLogger("Info")).thenReturn(log);
-        when(log.isEnabledFor(Level.DEBUG)).thenReturn(false);
+        initMocks(this);
     }
-
+    
+    @Test
+    public void testLoggable() {
+    	Logger l4jLogger = Logger.getLogger("testLogger");
+    	l4jLogger.setLevel(Level.DEBUG);
+        Log4JLogTarget logObj = null;
+        try {
+            logObj = new Log4JLogTarget( "testLogger", Level.DEBUG);
+        } catch (APIException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        boolean retVal = logObj.isLoggable();
+        assertTrue(retVal);
+    }
+    
+    @Test
+    public void testLog() {
+        Log4JLogTarget logObj = null;
+        try {
+            logObj = new Log4JLogTarget( null, Level.DEBUG);
+        } catch (APIException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        logObj.log(new Object[] {"test"});
+    }
+    
+    @Test
+    public void testLogThrowable() {
+        Log4JLogTarget logObj = null;
+        try {
+            logObj = new Log4JLogTarget( null, Level.DEBUG);
+        } catch (APIException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        logObj.log(new Throwable("test exception"), new Object[] {"test","test2","",null});
+    }
+    
     @Test
-    public void test() throws APIException {
-        Log4JLogTarget target = new Log4JLogTarget(null, Level.INFO);
-        Log4JLogTarget target1 = new Log4JLogTarget("Info", Level.DEBUG);
+    public void testPrintf() {
+        Log4JLogTarget logObj = null;
+        try {
+            logObj = new Log4JLogTarget( "", level);
+        } catch (APIException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        logObj.printf("test", new Object[] {"test","test2",""});
 
-        assertFalse(target1.isLoggable());
+    }
+    
+    @Test
+    public void testSetEnv() {
+        try {
+            Log4JLogTarget.setLog4JEnv("test", Mockito.mock(BasicEnv.class));
+        } catch (APIException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
 
     }
 }
\ No newline at end of file