Add more code coverage for Misc env

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

diff --git a/misc/env/src/test/java/org/onap/aaf/misc/env/impl/JU_BasicEnvTest.java b/misc/env/src/test/java/org/onap/aaf/misc/env/impl/JU_BasicEnvTest.java
index 5eab5dd..65dc7c5 100644 (file)
--- a/misc/env/src/test/java/org/onap/aaf/misc/env/impl/JU_BasicEnvTest.java
+++ b/misc/env/src/test/java/org/onap/aaf/misc/env/impl/JU_BasicEnvTest.java
@@ -22,11 +22,14 @@ package org.onap.aaf.misc.env.impl;
 \r
 import static org.junit.Assert.assertEquals;\r
 import static org.junit.Assert.assertNull;\r
+import static org.junit.Assert.assertTrue;\r
 import static org.mockito.Mockito.mock;\r
 \r
 import java.applet.Applet;\r
+import java.io.IOException;\r
 import java.util.Properties;\r
 \r
+import org.junit.After;\r
 import org.junit.Before;\r
 import org.junit.Test;\r
 import org.mockito.Mock;\r
@@ -129,12 +132,49 @@ public class JU_BasicEnvTest {
                assertEquals(tt.toString(), "New Name " + (end - tt.start) / 1000000f + "ms 10");\r
                assertEquals(sb.toString(), "JSON New Name " + (end - tt.start) / 1000000f + "ms size: 10");\r
 \r
+               env.staticSlot("tag", "prop");\r
+\r
                if (System.getProperties().keySet().iterator().hasNext()) {\r
                        String key = (String) System.getProperties().keySet().iterator().next();\r
 \r
                        env.loadFromSystemPropsStartsWith(key);\r
                        assertEquals(env.getProperty(key), System.getProperties().get(key));\r
                }\r
+\r
+               BasicTrans trans = env.newTrans();\r
+               assertEquals(trans.delegate, env);\r
+\r
+       }\r
+\r
+       @Test\r
+       public void testLoadProperties() throws IOException {\r
+               Properties prop = new Properties();\r
+\r
+               BasicEnv env = new BasicEnv("tag1", prop);\r
+\r
+               env.loadPropFiles("tag1", null);\r
+               env.setProperty("tag1", "propfile.properties");\r
+               env.loadPropFiles("tag1", null);\r
+\r
+               assertEquals(env.getProperty("prop1"), "New Property");\r
+\r
+               env.loadToSystemPropsStartsWith("prop1");\r
+\r
+               assertTrue(System.getProperties().keySet().contains("prop1"));\r
+               assertEquals(System.getProperties().get("prop1"), "New Property");\r
        }\r
 \r
+       @After\r
+       public void tearDown() throws IOException {\r
+               /*\r
+                * File file = new File("./log-Append" + ending + "_0.log"); if (file.exists())\r
+                * { Files.delete(Paths.get(file.getAbsolutePath())); } file = new\r
+                * File("./log-Append" + ending + "_1.log"); if (file.exists()) {\r
+                * Files.delete(Paths.get(file.getAbsolutePath())); } file = new File("./Append"\r
+                * + ending + "_0.log"); if (file.exists()) {\r
+                * Files.delete(Paths.get(file.getAbsolutePath())); } file = new File("./Append"\r
+                * + ending + "_1.log"); if (file.exists()) {\r
+                * Files.delete(Paths.get(file.getAbsolutePath())); }\r
+                */\r
+       }\r
 }\r