Update Fixes from testing

[aaf/authz.git] / misc / env / src / test / java / org / onap / aaf / misc / env / impl / JU_Log4JLogTargetTest.java

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