Convert tabs to spaces basic refactoring

[policy/engine.git] / ONAP-REST / src / test / java / org / onap / policy / rest / util / MSModelUtilsTest.java

diff --git a/ONAP-REST/src/test/java/org/onap/policy/rest/util/MSModelUtilsTest.java b/ONAP-REST/src/test/java/org/onap/policy/rest/util/MSModelUtilsTest.java
index 6a9c4c4..e06103f 100644 (file)
--- a/ONAP-REST/src/test/java/org/onap/policy/rest/util/MSModelUtilsTest.java
+++ b/ONAP-REST/src/test/java/org/onap/policy/rest/util/MSModelUtilsTest.java
@@ -36,102 +36,102 @@ import org.onap.policy.common.logging.flexlogger.Logger;
 import org.onap.policy.rest.util.MSModelUtils.MODEL_TYPE;
 
 public class MSModelUtilsTest {
-       private static Logger logger = FlexLogger.getLogger(MSModelUtilsTest.class);    
-       @Test
-       public void testMSModelUtils(){
-               HashMap<String, MSAttributeObject> classMap = new HashMap<>();
-               ClassLoader classLoader = getClass().getClassLoader();
-               File file = new File(classLoader.getResource("DKaTVESPolicy-v1802.xmi").getFile());
-               MSModelUtils utils = new MSModelUtils("http://org.onap", "http://org.onap.policy");
-               Map<String, MSAttributeObject> tempMap = utils.processEpackage(file.getAbsolutePath().toString(), MODEL_TYPE.XMI);
-               classMap.putAll(tempMap);
-               MSAttributeObject mainClass = classMap.get("StandardDeviationThreshold");
-               String dependTemp = StringUtils.replaceEach(mainClass.getDependency(), new String[]{"[", "]", " "}, new String[]{"", "", ""});
-               List<String> dependency = new ArrayList<String>(Arrays.asList(dependTemp.split(",")));
-               dependency = utils.getFullDependencyList(dependency, classMap);
-               String subAttribute = utils.createSubAttributes(dependency, classMap, "StandardDeviationThreshold");
-               assertTrue(subAttribute != null);
-       }
-       
-       
-       /**
-        * Run the void stringBetweenDots(String, String) method test
-        */
-       
-        @Test
-       public void testStringBetweenDots() {
-
-               //expect: uniqueKeys should contain a string value 
-                MSModelUtils controllerA = new MSModelUtils();
-               String str = "testing\\.byCorrectWay\\.OfDATA";
-               assertEquals(1, controllerA.stringBetweenDots(str));
-               
-               //expect: uniqueKeys should not contain a string value 
-               str = "testing\byWrongtWay.\\OfDATA";
-               MSModelUtils controllerB = new MSModelUtils();
-           assertEquals(0, controllerB.stringBetweenDots(str));
-       }
-
-       /**
-        * Run the Map<String,String> load(String) method test
-        */
-       
-       @Test
-       public void testLoad() {
-               
-               boolean isLocalTesting = true;
-               MSModelUtils controller = new MSModelUtils();
-               String fileName = null;
-               Map<String,String> result = null;
-               try {
-                       ClassLoader classLoader = getClass().getClassLoader();
-                       fileName = new File(classLoader.getResource("policy_tosca_tca-v1707.yml").getFile()).getAbsolutePath();
-               } catch (Exception e1) {
-                       logger.error("Exception Occured while loading file"+e1);
-               }
-               if(isLocalTesting){
-                       try {
-                               result = controller.load(fileName);
-                       } catch (IOException e) {
-                               logger.error("testLoad", e);
-                               result = null;
-                       }catch(ParserException e){
-                               logger.error("testLoad", e);
-                       }
-                       
-                       assertTrue(result != null && !result.isEmpty());                                
-                       logger.debug("result : " + result);
-               }
-
-               logger.debug("testLoad: exit");
-       }
-       
-       /**
-        * Run the void parseTosca(String) method test
-        */
-       
-       @Test
-       public void testParseTosca() {
-               
-               logger.debug("testParseTosca: enter");
-               boolean isLocalTesting = true;
-               String fileName = null;
-               try {
-                       ClassLoader classLoader = getClass().getClassLoader();
-                       fileName = new File(classLoader.getResource("policy_tosca_tca-v1707.yml").getFile()).getAbsolutePath();
-               } catch (Exception e1) {
-                       logger.error("Exception Occured while loading file"+e1);
-               }
-               
-               MSModelUtils controller = new MSModelUtils();
+    private static Logger logger = FlexLogger.getLogger(MSModelUtilsTest.class);
+    @Test
+    public void testMSModelUtils(){
+        HashMap<String, MSAttributeObject> classMap = new HashMap<>();
+        ClassLoader classLoader = getClass().getClassLoader();
+        File file = new File(classLoader.getResource("DKaTVESPolicy-v1802.xmi").getFile());
+        MSModelUtils utils = new MSModelUtils("http://org.onap", "http://org.onap.policy");
+        Map<String, MSAttributeObject> tempMap = utils.processEpackage(file.getAbsolutePath().toString(), MODEL_TYPE.XMI);
+        classMap.putAll(tempMap);
+        MSAttributeObject mainClass = classMap.get("StandardDeviationThreshold");
+        String dependTemp = StringUtils.replaceEach(mainClass.getDependency(), new String[]{"[", "]", " "}, new String[]{"", "", ""});
+        List<String> dependency = new ArrayList<String>(Arrays.asList(dependTemp.split(",")));
+        dependency = utils.getFullDependencyList(dependency, classMap);
+        String subAttribute = utils.createSubAttributes(dependency, classMap, "StandardDeviationThreshold");
+        assertTrue(subAttribute != null);
+    }
+
+
+    /**
+     * Run the void stringBetweenDots(String, String) method test
+     */
+
+     @Test
+    public void testStringBetweenDots() {
+
+        //expect: uniqueKeys should contain a string value
+         MSModelUtils controllerA = new MSModelUtils();
+        String str = "testing\\.byCorrectWay\\.OfDATA";
+        assertEquals(1, controllerA.stringBetweenDots(str));
+
+        //expect: uniqueKeys should not contain a string value
+        str = "testing\byWrongtWay.\\OfDATA";
+        MSModelUtils controllerB = new MSModelUtils();
+        assertEquals(0, controllerB.stringBetweenDots(str));
+    }
+
+    /**
+     * Run the Map<String,String> load(String) method test
+     */
+
+    @Test
+    public void testLoad() {
+
+        boolean isLocalTesting = true;
+        MSModelUtils controller = new MSModelUtils();
+        String fileName = null;
+        Map<String,String> result = null;
+        try {
+            ClassLoader classLoader = getClass().getClassLoader();
+            fileName = new File(classLoader.getResource("policy_tosca_tca-v1707.yml").getFile()).getAbsolutePath();
+        } catch (Exception e1) {
+            logger.error("Exception Occured while loading file"+e1);
+        }
+        if(isLocalTesting){
+            try {
+                result = controller.load(fileName);
+            } catch (IOException e) {
+                logger.error("testLoad", e);
+                result = null;
+            }catch(ParserException e){
+                logger.error("testLoad", e);
+            }
+
+            assertTrue(result != null && !result.isEmpty());
+            logger.debug("result : " + result);
+        }
+
+        logger.debug("testLoad: exit");
+    }
+
+    /**
+     * Run the void parseTosca(String) method test
+     */
+
+    @Test
+    public void testParseTosca() {
+
+        logger.debug("testParseTosca: enter");
+        boolean isLocalTesting = true;
+        String fileName = null;
+        try {
+            ClassLoader classLoader = getClass().getClassLoader();
+            fileName = new File(classLoader.getResource("policy_tosca_tca-v1707.yml").getFile()).getAbsolutePath();
+        } catch (Exception e1) {
+            logger.error("Exception Occured while loading file"+e1);
+        }
+
+        MSModelUtils controller = new MSModelUtils();
         if(isLocalTesting){
-                       try {
-                           controller.parseTosca(fileName);
-                       }catch (Exception e) {
-                               fail("parseTosca caused error: " + e);
-                       }
+            try {
+                controller.parseTosca(fileName);
+            }catch (Exception e) {
+                fail("parseTosca caused error: " + e);
+            }
         }
-               logger.debug("testParseTosca: exit");
-       }
+        logger.debug("testParseTosca: exit");
+    }
 
 }
\ No newline at end of file