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=68f359c50af4f1bf03564adc60581803bfdb5f8f;hb=4b5a7d721d994a49057e9bfb403c7bff1b376660;hp=76e9959c3d1e744ad1607b5e3cd4bdbada8ab055;hpb=67bac2c1c44beab7752b39584553449e1c8a4e94;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 76e9959c..68f359c5 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
@@ -21,73 +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.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.*;
-
-//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 {
-	public static String ROOT_NS="NS.Not.Set";
-	public static String ROOT_COMPANY=ROOT_NS;
-	Access acc;
-	@Mock
-	Env envMock;
+    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;
+    @Mock
+    Env envMock;
 
 
-	@Before
-	public void setUp() throws CadiException{
-		acc = mock(Access.class);
-	}
-	
-	@Test
-	public void testSet() throws CadiException {
-		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);
-	}
+    @Before
+    public void setUp() throws CadiException{
+        acc = mock(Access.class);
+    }
+    
+    @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                    //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 testRootCompany() throws RuntimeException{
+//        Define.ROOT_COMPANY();
+//    }
 
-	@Test
-	public void testVarReplace() {
-		Define.varReplace("AAF_NS.");
-		Define.varReplace("test");
-	}
+    @Test
+    public void testVarReplace() {
+        Define.varReplace(AAF_NS_DOT);
+        Define.varReplace("test");
+    }
 }