Merge "Sonar fixes related to exceptions"

[aaf/authz.git] / auth / auth-core / src / test / java / org / onap / aaf / auth / common / test / JU_Define.java

diff --git a/auth/auth-core/src/test/java/org/onap/aaf/auth/common/test/JU_Define.java b/auth/auth-core/src/test/java/org/onap/aaf/auth/common/test/JU_Define.java
index 9de907d..0f986f2 100644 (file)
--- a/auth/auth-core/src/test/java/org/onap/aaf/auth/common/test/JU_Define.java
+++ b/auth/auth-core/src/test/java/org/onap/aaf/auth/common/test/JU_Define.java
@@ -21,25 +21,23 @@
  ******************************************************************************/
 package org.onap.aaf.auth.common.test;
 
+import static org.mockito.Mockito.mock;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.junit.Before;
-import static org.mockito.Mockito.*;
 import org.onap.aaf.auth.common.Define;
 import org.onap.aaf.cadi.Access;
 import org.onap.aaf.cadi.CadiException;
+import org.onap.aaf.cadi.PropAccess;
 import org.onap.aaf.cadi.config.Config;
 import org.onap.aaf.misc.env.Env;
-import static org.junit.Assert.*;
-
-//import com.att.authz.common.Define;
-import org.powermock.api.mockito.PowerMockito;
 import org.powermock.modules.junit4.PowerMockRunner;
 
 @RunWith(PowerMockRunner.class)
 public class JU_Define {
+       private static final String AAF_NS_DOT = "AAF_NS.";
        public static String ROOT_NS="NS.Not.Set";
        public static String ROOT_COMPANY=ROOT_NS;
        Access acc;
@@ -48,30 +46,39 @@ public class JU_Define {
 
 
        @Before
-       public void setUp(){
+       public void setUp() throws CadiException{
                acc = mock(Access.class);
        }
-
-       @Test
-       public void testRootNS() {
-               //Define.ROOT_NS();
-       }
-
-       @Test
-       public void testRootCompany() {
-               //Define.ROOT_COMPANY();
-       }
-
+       
        @Test
        public void testSet() throws CadiException {
-               when(acc.getProperty(Config.AAF_ROOT_NS,"org.onap.aaf")).thenReturn(".ns_Test");
-               //when(acc.getProperty(Config.AAF_ROOT_COMPANY,null)).thenReturn("company_Test");
-               //Define.set(acc);
+               PropAccess prop = new PropAccess();
+               prop.setProperty(AAF_NS_DOT, AAF_NS_DOT);
+               prop.setProperty(Config.AAF_ROOT_NS, ".ns_Test");
+               prop.setProperty(Config.AAF_ROOT_COMPANY, "company_Test");
+               Define.set(prop);
+               Define.ROOT_NS();
+               Define.ROOT_COMPANY();
+               
+               PropAccess prop1 = new PropAccess();
+               prop1.setProperty(AAF_NS_DOT, AAF_NS_DOT);
+               prop1.setProperty(Config.AAF_ROOT_NS, ".ns_Test");
+               Define.set(prop1);
        }
 
+//     @Test                                   //TODO: AAF-111 exception fix
+//     public void testRootNS() throws RuntimeException{
+//             Define.ROOT_NS();
+//     }
+//
+//     @Test
+//     public void testRootCompany() throws RuntimeException{
+//             Define.ROOT_COMPANY();
+//     }
+
        @Test
        public void testVarReplace() {
-               Define.varReplace("AAF_NS.");
+               Define.varReplace(AAF_NS_DOT);
                Define.varReplace("test");
        }
 }