Improve code coverage for aaf cadi modules

[aaf/cadi.git] / core / src / test / java / org / onap / aaf / cadi / JU_PropAccessTest.java

diff --git a/core/src/test/java/org/onap/aaf/cadi/JU_PropAccessTest.java b/core/src/test/java/org/onap/aaf/cadi/JU_PropAccessTest.java
index 0dcb3a9..1a5a1ce 100644 (file)
--- a/core/src/test/java/org/onap/aaf/cadi/JU_PropAccessTest.java
+++ b/core/src/test/java/org/onap/aaf/cadi/JU_PropAccessTest.java
@@ -37,73 +37,44 @@ import org.junit.Test;
 import org.onap.aaf.cadi.Access.Level;\r
 import org.onap.aaf.cadi.config.Config;\r
 \r
-public class JU_PropAccessTest {\r
+import java.util.Properties;\r
 \r
-       @Before\r
-       public void setUp() throws Exception {\r
-       }\r
+import org.junit.Test;\r
+import org.onap.aaf.cadi.Access.Level;\r
+\r
+public class JU_PropAccessTest {\r
 \r
        @Test\r
-       public void testPropAccess() throws IOException {\r
-               PropAccess p = new PropAccess(new Object());\r
-               \r
-               assertNotNull(p);\r
-               assertNotNull(p.getProperties());\r
-               assertNull(p.getProperty("anything"));\r
-               \r
-               p.setProperty("prop", "value");\r
-               assertEquals(p.getProperty("prop"), "value");\r
-               \r
-               p.setProperty(Config.CADI_KEYFILE, "value");\r
-               assertEquals(p.getProperty("prop"), "value");\r
-               \r
-               p.setLogLevel(Level.INFO);\r
-               assertTrue(p.willLog(Level.INFO));\r
-               p.log(Level.DEBUG, new Object());\r
-               String[] args = {"key=value","wow=wow"};\r
-               p = new PropAccess(args);\r
-       }\r
-       \r
-       @Test\r
-       public void testPropAccessone() throws IOException {\r
-               PropAccess p = new PropAccess(new Object());\r
-               \r
-               assertNotNull(p);\r
-               assertNotNull(p.getProperties());\r
-               assertNull(p.getProperty("everything"));\r
+       public void test() {\r
+               PropAccess prop = new PropAccess(new Object());\r
                \r
-               p.setProperty("prop1", "value1");\r
-               assertEquals(p.getProperty("prop1"), "value1");\r
+               prop = new PropAccess("cadi_name=user","cadi_loglevel=DEBUG","cadi_prop_files=test/cadi.properties");\r
                \r
-               p.setProperty(Config.CADI_KEYFILE, "value1");\r
-               assertEquals(p.getProperty("prop1"), "value1");\r
+               assertTrue(prop.getProperties().keySet().contains("cadi_name"));\r
+               assertTrue(prop.getProperty("cadi_name").equals("user"));\r
                \r
-               p.setLogLevel(Level.INFO);\r
-               assertTrue(p.willLog(Level.INFO));\r
-               p.log(Level.DEBUG, new Object());\r
-               String[] args = {"key=value1","wow=wow1"};\r
-               p = new PropAccess(args);\r
+               prop.setProperty("cadi_keyfile", "file");\r
+               prop.setLogLevel(Level.DEBUG);\r
+               assertEquals(prop.getProperty("cadi_keyfile"),"file");\r
+//             assertEquals(prop.getDME2Properties().size(),3);\r
+               prop.log(Level.DEBUG);\r
        }\r
        \r
        @Test\r
-       public void testPropAccesstwo() throws IOException {\r
-               PropAccess p = new PropAccess(new Object());\r
+       public void testWithProperties() {\r
+               Properties p = new Properties();\r
+               p.put("cadi_name", "user");\r
+               p.put("cadi_loglevel", "DEBUG");\r
                \r
-               assertNotNull(p);\r
-               assertNotNull(p.getProperties());\r
-               assertNull(p.getProperty("everythingone"));\r
+               PropAccess prop = new PropAccess(p);\r
                \r
-               p.setProperty("prop12", "value12");\r
-               assertEquals(p.getProperty("prop12"), "value12");\r
+               assertTrue(prop.getProperties().keySet().contains("cadi_name"));\r
+               assertTrue(prop.getProperty("cadi_name").equals("user"));\r
                \r
-               p.setProperty(Config.CADI_KEYFILE, "value12");\r
-               assertEquals(p.getProperty("prop12"), "value12");\r
-               \r
-               p.setLogLevel(Level.INFO);\r
-               assertTrue(p.willLog(Level.INFO));\r
-               p.log(Level.DEBUG, new Object());\r
-               String[] args = {"key=value12","wow=wow12"};\r
-               p = new PropAccess(args);\r
+               prop.setProperty("cadi_keyfile", "file");\r
+               prop.setLogLevel(Level.DEBUG);\r
+               assertEquals(prop.getProperty("cadi_keyfile"),"file");\r
+//             assertEquals(prop.getDME2Properties().size(),3);\r
+               prop.log(Level.DEBUG);\r
        }\r
-\r
-}
\ No newline at end of file
+}\r