Mass removal of all Tabs (Style Warnings)

[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 76e9959..68f359c 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,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");
+    }
 }