X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-core%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Fcommon%2Ftest%2FJU_Define.java;h=0f986f24f396ff4840731b50fba2d83e68165d0a;hb=3aca33c5bb9af1ba4df574ceb90435f54d14ccf5;hp=89e1aa9496b7d90deda33d802b0027bb6977db26;hpb=71037c39a37d3549dcfe31926832a657744fbe05;p=aaf%2Fauthz.git

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 89e1aa94..0f986f24 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
@@ -7,9 +7,9 @@
  * * Licensed under the Apache License, Version 2.0 (the "License");
  * * you may not use this file except in compliance with the License.
  * * You may obtain a copy of the License at
- * * 
+ * *
  *  *      http://www.apache.org/licenses/LICENSE-2.0
- * * 
+ * *
  *  * Unless required by applicable law or agreed to in writing, software
  * * distributed under the License is distributed on an "AS IS" BASIS,
  * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -21,46 +21,64 @@
  ******************************************************************************/
 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.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)
-//TODO: Gabe [JUnit] class path/ class Define is missing, com.att.authz.common also missing
 public class JU_Define {
-	//Define 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;
-	
-	@Mock 
+	Access acc;
+	@Mock
 	Env envMock;
+
+
+	@Before
+	public void setUp() throws CadiException{
+		acc = mock(Access.class);
+	}
 	
-	
-//	@Before
-//	public void setUp(){
-//		define = new Define();
+	@Test
+	public void testSet() throws CadiException {
+		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 testSet() throws CadiException {
-//		PowerMockito.when(envMock.getProperty(Config.AAF_ROOT_NS)).thenReturn("aaf_root_ns");
-//		PowerMockito.when(envMock.getProperty(Config.AAF_ROOT_COMPANY)).thenReturn("aaf_root_company");
-//		//PowerMockito.when(envMock.init().log()).thenReturn(null);
-//		//PowerMockito.doNothing().doThrow(new CadiException()).when(envMock).init().log(Matchers.anyString());
-//		//define.set(envMock);
+//	public void testRootCompany() throws RuntimeException{
+//		Define.ROOT_COMPANY();
 //	}
 
 	@Test
-	public void netYetTested() {
-		fail("Tests not yet implemented");
+	public void testVarReplace() {
+		Define.varReplace(AAF_NS_DOT);
+		Define.varReplace("test");
 	}
 }