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=6309ef454e6960d95d13534645e1f15904de6862;hp=e3f5492997478ae1bdea1486664a15c642012817;hpb=41904d6bcb906a34971fada665accdd2e5d38a53;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 e3f54929..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
-	Logger log;
+    @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);
-	}
+    @Before
+    public void setup() {
+        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 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",""});
 
-	@Test
-	public void test() throws APIException {
-		Log4JLogTarget target = new Log4JLogTarget(null, Level.INFO);
-		Log4JLogTarget target1 = new Log4JLogTarget("Info", Level.DEBUG);
+    }
+    
+    @Test
+    public void testSetEnv() {
+        try {
+            Log4JLogTarget.setLog4JEnv("test", Mockito.mock(BasicEnv.class));
+        } catch (APIException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
 
-		assertFalse(target1.isLoggable());
-
-	}
+    }
 }
\ No newline at end of file