X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aaf%2Fauthz.git;a=blobdiff_plain;f=auth%2Fauth-core%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Fcommon%2Ftest%2FJU_Define.java;h=76e9959c3d1e744ad1607b5e3cd4bdbada8ab055;hp=9de907d889e01f4613189f49f5bfd97163ceb123;hb=67bac2c1c44beab7752b39584553449e1c8a4e94;hpb=1eb6678db673759f0f95b1aedfcb4fe55c7152a2

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 9de907d8..76e9959c 100644
--- 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
@@ -27,9 +27,16 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.junit.Before;
 import static org.mockito.Mockito.*;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map.Entry;
+import java.util.Set;
+
 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.*;
@@ -48,27 +55,36 @@ 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.", "AAF_NS.");
+		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.", "AAF_NS.");
+		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.");