UT for catalogDatabase 47/27947/1
authorsubhash kumar singh <subhash.kumar.singh@huawei.com>
Thu, 11 Jan 2018 10:35:01 +0000 (10:35 +0000)
committersubhash kumar singh <subhash.kumar.singh@huawei.com>
Thu, 11 Jan 2018 10:35:01 +0000 (10:35 +0000)
Fix the UT's for catalogDatabase.java.

Change-Id: Id385b5318c52e58d5de41a0a9032964de1bc63fa
Issue-ID: SO-360
Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
mso-catalog-db/pom.xml
mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/CatalogDatabase.java
mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/test/CatalogDatabaseTest.java

index 8b663c1..0dc9e34 100644 (file)
                        <artifactId>common</artifactId>
                        <version>${project.version}</version>
                </dependency>
-       </dependencies>
+        <dependency>
+            <groupId>org.jmockit</groupId>
+            <artifactId>jmockit</artifactId>
+            <version>1.8</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
 </project>
index dd60bc7..cdde98d 100644 (file)
@@ -155,29 +155,29 @@ public class CatalogDatabase implements Closeable {
      * @return A list of HeatTemplate objects
      */
     @SuppressWarnings("unchecked")
-    public List <HeatTemplate> getAllHeatTemplates () {
-        long startTime = System.currentTimeMillis ();
-        LOGGER.debug ("Catalog database - get all Heat templates");
+    public List <HeatTemplate> getAllHeatTemplates() {
+        long startTime = System.currentTimeMillis();
+        LOGGER.debug("Catalog database - get all Heat templates");
         String hql = "FROM HeatTemplate";
-        Query query = getSession ().createQuery (hql);
+        Query query = getSession().createQuery(hql);
 
-        List <HeatTemplate> result = query.list ();
-        LOGGER.recordMetricEvent (startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, "Successfully", "CatalogDB", "getAllHeatTemplates", null);
+        List <HeatTemplate> result = query.list();
+        LOGGER.recordMetricEvent(startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, "Successfully", "CatalogDB", "getAllHeatTemplates", null);
         return result;
     }
 
     /**
      * Fetch a specific Heat Template by ID.
      *
-     * @param templateId
+     * @param templateId template id
      * @return HeatTemplate object or null if none found
      */
     @Deprecated
-    public HeatTemplate getHeatTemplate (int templateId) {
-        long startTime = System.currentTimeMillis ();
+    public HeatTemplate getHeatTemplate(int templateId) {
+        long startTime = System.currentTimeMillis();
         LOGGER.debug ("Catalog database - get Heat template with id " + templateId);
 
-        HeatTemplate template = (HeatTemplate) getSession ().get (HeatTemplate.class, templateId);
+        HeatTemplate template = (HeatTemplate) getSession().get(HeatTemplate.class, templateId);
         LOGGER.recordMetricEvent (startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, "Successfully", "CatalogDB", "getHeatTemplate", null);
         return template;
     }
@@ -185,31 +185,31 @@ public class CatalogDatabase implements Closeable {
     /**
      * Return the newest version of a specific Heat Template (queried by Name).
      *
-     * @param templateName
+     * @param templateName template name
      * @return HeatTemplate object or null if none found
      */
-    public HeatTemplate getHeatTemplate (String templateName) {
+    public HeatTemplate getHeatTemplate(String templateName) {
 
-        long startTime = System.currentTimeMillis ();
-        LOGGER.debug ("Catalog database - get Heat template with name " + templateName);
+        long startTime = System.currentTimeMillis();
+        LOGGER.debug("Catalog database - get Heat template with name " + templateName);
 
         String hql = "FROM HeatTemplate WHERE templateName = :template_name";
-        Query query = getSession ().createQuery (hql);
-        query.setParameter ("template_name", templateName);
+        Query query = getSession().createQuery (hql);
+        query.setParameter("template_name", templateName);
 
         @SuppressWarnings("unchecked")
-        List <HeatTemplate> resultList = query.list ();
+        List <HeatTemplate> resultList = query.list();
 
         // See if something came back. Name is unique, so
         if (resultList.isEmpty ()) {
             LOGGER.recordMetricEvent (startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, "Successfully. No template found", "CatalogDB", "getHeatTemplate", null);
             return null;
         }
-        Collections.sort (resultList, new MavenLikeVersioningComparator ());
-        Collections.reverse (resultList);
+        Collections.sort(resultList, new MavenLikeVersioningComparator());
+        Collections.reverse(resultList);
 
-        LOGGER.recordMetricEvent (startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, "Successfully", "CatalogDB", "getHeatTemplate", null);
-        return resultList.get (0);
+        LOGGER.recordMetricEvent(startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, "Successfully", "CatalogDB", "getHeatTemplate", null);
+        return resultList.get(0);
     }
 
     /**
index a00079d..9b0f120 100644 (file)
 \r
 package org.openecomp.mso.db.catalog.test;\r
 \r
+import static org.junit.Assert.assertEquals;\r
 import static org.junit.Assert.assertFalse;\r
 import static org.junit.Assert.assertTrue;\r
 \r
+import java.io.Serializable;\r
+import java.math.BigDecimal;\r
+import java.math.BigInteger;\r
+import java.sql.Connection;\r
 import java.util.ArrayList;\r
+import java.util.Arrays;\r
+import java.util.Calendar;\r
+import java.util.Collection;\r
+import java.util.Date;\r
 import java.util.HashMap;\r
 import java.util.HashSet;\r
+import java.util.Iterator;\r
 import java.util.List;\r
+import java.util.Locale;\r
 import java.util.Map;\r
 import java.util.Set;\r
 \r
+import mockit.Mock;\r
+import mockit.MockUp;\r
+import org.hibernate.CacheMode;\r
+import org.hibernate.Criteria;\r
+import org.hibernate.Filter;\r
+import org.hibernate.FlushMode;\r
+import org.hibernate.HibernateException;\r
+import org.hibernate.IdentifierLoadAccess;\r
+import org.hibernate.LobHelper;\r
+import org.hibernate.LockMode;\r
+import org.hibernate.LockOptions;\r
+import org.hibernate.NaturalIdLoadAccess;\r
+import org.hibernate.Query;\r
+import org.hibernate.ReplicationMode;\r
+import org.hibernate.SQLQuery;\r
+import org.hibernate.ScrollMode;\r
+import org.hibernate.ScrollableResults;\r
+import org.hibernate.Session;\r
+import org.hibernate.SessionEventListener;\r
+import org.hibernate.SessionFactory;\r
+import org.hibernate.SharedSessionBuilder;\r
+import org.hibernate.SimpleNaturalIdLoadAccess;\r
+import org.hibernate.Transaction;\r
+import org.hibernate.TypeHelper;\r
+import org.hibernate.UnknownProfileException;\r
+import org.hibernate.jdbc.ReturningWork;\r
+import org.hibernate.jdbc.Work;\r
+import org.hibernate.metamodel.source.annotations.xml.mocker.MockHelper;\r
+import org.hibernate.procedure.ProcedureCall;\r
+import org.hibernate.stat.SessionStatistics;\r
+import org.hibernate.transform.ResultTransformer;\r
+import org.hibernate.type.Type;\r
 import org.junit.Before;\r
 import org.junit.Test;\r
 import org.openecomp.mso.db.catalog.CatalogDatabase;\r
@@ -58,268 +101,370 @@ import org.openecomp.mso.db.catalog.utils.RecordNotFoundException;
 \r
 public class CatalogDatabaseTest {\r
 \r
-       CatalogDatabase cd = null;\r
-       \r
-       @Before\r
-       public void setup(){\r
-               cd = CatalogDatabase.getInstance();\r
-       }\r
-       @Test(expected = Exception.class)\r
-       public void getAllHeatTemplatesTestException(){\r
-               List <HeatTemplate> list = cd.getAllHeatTemplates();\r
-       }\r
-       \r
-       @Test(expected = Exception.class)\r
-       public void getHeatTemplateTestException(){\r
-               HeatTemplate ht = cd.getHeatTemplate(10);\r
-       }\r
-       \r
-       @Test(expected = Exception.class)\r
-       public void getHeatTemplateTest2Exception(){\r
-               HeatTemplate ht = cd.getHeatTemplate("heat123");\r
-       }\r
-       \r
-       @Test(expected = Exception.class)\r
-       public void getHeatTemplateTest3Exception(){\r
-               HeatTemplate ht = cd.getHeatTemplate("heat123","v2");\r
-       }\r
-       \r
-       @Test(expected = Exception.class)\r
-       public void getHeatTemplateByArtifactUuidException(){\r
-               HeatTemplate ht = cd.getHeatTemplateByArtifactUuid("123");\r
-       }\r
-       \r
-       @Test(expected = Exception.class)\r
-       public void getHeatTemplateByArtifactUuidRegularQueryException(){\r
-               HeatTemplate ht = cd.getHeatTemplateByArtifactUuidRegularQuery("123");\r
-       }\r
-       \r
-       @Test(expected = Exception.class)\r
-       public void getParametersForHeatTemplateTestException(){\r
-               List<HeatTemplateParam> ht = cd.getParametersForHeatTemplate("123");\r
-       }\r
-       \r
-       @Test(expected = Exception.class)\r
-       public void getHeatEnvironmentByArtifactUuidTestException(){\r
-               HeatEnvironment ht = cd.getHeatEnvironmentByArtifactUuid("123");\r
-       }\r
-       \r
-       @Test(expected = Exception.class)\r
-       public void getServiceByInvariantUUIDTestException(){\r
-               Service ht = cd.getServiceByInvariantUUID("123");\r
-       }\r
-       \r
-       @Test(expected = Exception.class)\r
-       public void getServiceTestException(){\r
-               Service ht = cd.getService("123");\r
-       }\r
-       \r
-       @Test(expected = Exception.class)\r
-       public void getServiceByModelUUIDTestException(){\r
-               Service ht = cd.getServiceByModelUUID("123");\r
-       }\r
-       \r
-       @Test(expected = Exception.class)\r
-       public void getService2TestException(){\r
-               HashMap<String, String> map = new HashMap<>();\r
-               map.put("serviceNameVersionId", "v2");\r
-               Service ht = cd.getService(map, "123");\r
-       }\r
-       \r
-       @Test(expected = Exception.class)\r
-       public void getServiceByModelNameTestException(){\r
-               Service ht = cd.getServiceByModelName("123");\r
-       }\r
-       \r
-       @Test(expected = Exception.class)\r
-       public void getServiceByVersionAndInvariantIdTestException() throws Exception{\r
-               Service ht = cd.getServiceByVersionAndInvariantId("123","tetwe");\r
-       }\r
-       \r
-       @Test(expected = Exception.class)\r
-       public void getServiceRecipeTestException() throws Exception{\r
-               ServiceRecipe ht = cd.getServiceRecipe("123","tetwe");\r
-       }\r
-       \r
-       @Test(expected = Exception.class)\r
-       public void getServiceRecipeByServiceModelUuidTestException() throws Exception{\r
-               ServiceRecipe ht = cd.getServiceRecipeByServiceModelUuid("123","tetwe");\r
-       }\r
-       \r
-       @Test(expected = Exception.class)\r
-       public void getServiceRecipesTestException() throws Exception{\r
-               List<ServiceRecipe> ht = cd.getServiceRecipes("123");\r
-       }\r
-       \r
-       @Test(expected = Exception.class)\r
-       public void getVnfComponentTestException() throws Exception{\r
-               VnfComponent ht = cd.getVnfComponent(123,"vnf");\r
-       }\r
-       \r
-       @Test(expected = Exception.class)\r
-       public void getVnfResourceTestException() throws Exception{\r
-               VnfResource ht = cd.getVnfResource("vnf");\r
-       }\r
-       \r
-       @Test(expected = Exception.class)\r
-       public void getVnfResource2TestException() throws Exception{\r
-               VnfResource ht = cd.getVnfResource("vnf","3992");\r
-       }\r
-       \r
-       @Test(expected = Exception.class)\r
-       public void getVnfResourceByModelCustomizationIdTestException() throws Exception{\r
-               VnfResource ht = cd.getVnfResourceByModelCustomizationId("3992");\r
-       }\r
-\r
-    @Test(expected = Exception.class)\r
-       public void getServiceRecipeTest2Exception() throws Exception{\r
-               ServiceRecipe ht = cd.getServiceRecipe(1001,"3992");\r
-       }\r
-    \r
+    CatalogDatabase cd = null;\r
+\r
+    @Before\r
+    public void setup(){\r
+        cd = CatalogDatabase.getInstance();\r
+    }\r
+\r
+\r
+    @Test\r
+    public void getAllHeatTemplatesTest(){\r
+\r
+        MockUp<Query> mockUpQuery = new MockUp<Query>() {\r
+            @Mock\r
+            public List<HeatTemplate> list() {\r
+                HeatTemplate heatTemplate = new HeatTemplate();\r
+                return Arrays.asList(heatTemplate);\r
+            }\r
+        };\r
+\r
+        MockUp<Session> mockedSession = new MockUp<Session>() {\r
+            @Mock\r
+            public Query createQuery(String hql) {\r
+                return mockUpQuery.getMockInstance();\r
+            }\r
+        };\r
+\r
+        new MockUp<CatalogDatabase>() {\r
+            @Mock\r
+            private Session getSession() {\r
+                return mockedSession.getMockInstance();\r
+            }\r
+        };\r
+\r
+        List <HeatTemplate> list = cd.getAllHeatTemplates();\r
+        assertEquals(list.size(), 1);\r
+    }\r
+\r
+    @Test\r
+    public void getHeatTemplateByIdTest(){\r
+\r
+        MockUp<Session> mockedSession = new MockUp<Session>() {\r
+            @Mock\r
+            public Object get(Class cls, Serializable id) {\r
+                HeatTemplate heatTemplate = new HeatTemplate();\r
+                heatTemplate.setAsdcUuid("123-uuid");\r
+                return heatTemplate;\r
+            }\r
+        };\r
+\r
+        new MockUp<CatalogDatabase>() {\r
+            @Mock\r
+            private Session getSession() {\r
+                return mockedSession.getMockInstance();\r
+            }\r
+        };\r
+\r
+        HeatTemplate ht = cd.getHeatTemplate(10);\r
+        assertEquals("123-uuid", ht.getAsdcUuid());\r
+    }\r
+\r
+    @Test\r
+    public void getHeatTemplateByNameEmptyListTest(){\r
+\r
+        MockUp<Query> mockUpQuery = new MockUp<Query>() {\r
+            @Mock\r
+            public List<HeatTemplate> list() {\r
+                HeatTemplate heatTemplate = new HeatTemplate();\r
+                return Arrays.asList();\r
+            }\r
+        };\r
+\r
+        MockUp<Session> mockedSession = new MockUp<Session>() {\r
+            @Mock\r
+            public Query createQuery(String hql) {\r
+                return mockUpQuery.getMockInstance();\r
+            }\r
+        };\r
+\r
+        new MockUp<CatalogDatabase>() {\r
+            @Mock\r
+            private Session getSession() {\r
+                return mockedSession.getMockInstance();\r
+            }\r
+        };\r
+\r
+        HeatTemplate ht = cd.getHeatTemplate("heat123");\r
+        assertEquals(null, ht);\r
+    }\r
+\r
+    @Test\r
+    public void getHeatTemplateByNameTest(){\r
+\r
+        MockUp<Query> mockUpQuery = new MockUp<Query>() {\r
+            @Mock\r
+            public List<HeatTemplate> list() {\r
+                HeatTemplate heatTemplate1 = new HeatTemplate();\r
+                heatTemplate1.setAsdcUuid("123-uuid");\r
+                heatTemplate1.setVersion("1.2");\r
+                HeatTemplate heatTemplate2 = new HeatTemplate();\r
+                heatTemplate2.setAsdcUuid("456-uuid");\r
+                heatTemplate2.setVersion("1.3");\r
+                return Arrays.asList(heatTemplate1, heatTemplate2);\r
+            }\r
+        };\r
+\r
+        MockUp<Session> mockedSession = new MockUp<Session>() {\r
+            @Mock\r
+            public Query createQuery(String hql) {\r
+                return mockUpQuery.getMockInstance();\r
+            }\r
+        };\r
+\r
+        new MockUp<CatalogDatabase>() {\r
+            @Mock\r
+            private Session getSession() {\r
+                return mockedSession.getMockInstance();\r
+            }\r
+        };\r
+\r
+        HeatTemplate ht = cd.getHeatTemplate("heat123");\r
+        assertEquals("456-uuid", ht.getAsdcUuid());\r
+    }\r
+\r
+    @Test(expected = Exception.class)\r
+    public void getHeatTemplateTest3Exception(){\r
+        HeatTemplate ht = cd.getHeatTemplate("heat123","v2");\r
+    }\r
+\r
+    @Test(expected = Exception.class)\r
+    public void getHeatTemplateByArtifactUuidException(){\r
+        HeatTemplate ht = cd.getHeatTemplateByArtifactUuid("123");\r
+    }\r
+\r
+    @Test(expected = Exception.class)\r
+    public void getHeatTemplateByArtifactUuidRegularQueryException(){\r
+        HeatTemplate ht = cd.getHeatTemplateByArtifactUuidRegularQuery("123");\r
+    }\r
+\r
+    @Test(expected = Exception.class)\r
+    public void getParametersForHeatTemplateTestException(){\r
+        List<HeatTemplateParam> ht = cd.getParametersForHeatTemplate("123");\r
+    }\r
+\r
+    @Test(expected = Exception.class)\r
+    public void getHeatEnvironmentByArtifactUuidTestException(){\r
+        HeatEnvironment ht = cd.getHeatEnvironmentByArtifactUuid("123");\r
+    }\r
+\r
+    @Test(expected = Exception.class)\r
+    public void getServiceByInvariantUUIDTestException(){\r
+        Service ht = cd.getServiceByInvariantUUID("123");\r
+    }\r
+\r
+    @Test(expected = Exception.class)\r
+    public void getServiceTestException(){\r
+        Service ht = cd.getService("123");\r
+    }\r
+\r
+    @Test(expected = Exception.class)\r
+    public void getServiceByModelUUIDTestException(){\r
+        Service ht = cd.getServiceByModelUUID("123");\r
+    }\r
+\r
+    @Test(expected = Exception.class)\r
+    public void getService2TestException(){\r
+        HashMap<String, String> map = new HashMap<>();\r
+        map.put("serviceNameVersionId", "v2");\r
+        Service ht = cd.getService(map, "123");\r
+    }\r
+\r
+    @Test(expected = Exception.class)\r
+    public void getServiceByModelNameTestException(){\r
+        Service ht = cd.getServiceByModelName("123");\r
+    }\r
+\r
+    @Test(expected = Exception.class)\r
+    public void getServiceByVersionAndInvariantIdTestException() throws Exception{\r
+        Service ht = cd.getServiceByVersionAndInvariantId("123","tetwe");\r
+    }\r
+\r
+    @Test(expected = Exception.class)\r
+    public void getServiceRecipeTestException() throws Exception{\r
+        ServiceRecipe ht = cd.getServiceRecipe("123","tetwe");\r
+    }\r
+\r
+    @Test(expected = Exception.class)\r
+    public void getServiceRecipeByServiceModelUuidTestException() throws Exception{\r
+        ServiceRecipe ht = cd.getServiceRecipeByServiceModelUuid("123","tetwe");\r
+    }\r
+\r
+    @Test(expected = Exception.class)\r
+    public void getServiceRecipesTestException() throws Exception{\r
+        List<ServiceRecipe> ht = cd.getServiceRecipes("123");\r
+    }\r
+\r
+    @Test(expected = Exception.class)\r
+    public void getVnfComponentTestException() throws Exception{\r
+        VnfComponent ht = cd.getVnfComponent(123,"vnf");\r
+    }\r
+\r
+    @Test(expected = Exception.class)\r
+    public void getVnfResourceTestException() throws Exception{\r
+        VnfResource ht = cd.getVnfResource("vnf");\r
+    }\r
+\r
+    @Test(expected = Exception.class)\r
+    public void getVnfResource2TestException() throws Exception{\r
+        VnfResource ht = cd.getVnfResource("vnf","3992");\r
+    }\r
+\r
+    @Test(expected = Exception.class)\r
+    public void getVnfResourceByModelCustomizationIdTestException() throws Exception{\r
+        VnfResource ht = cd.getVnfResourceByModelCustomizationId("3992");\r
+    }\r
+\r
+    @Test(expected = Exception.class)\r
+    public void getServiceRecipeTest2Exception() throws Exception{\r
+        ServiceRecipe ht = cd.getServiceRecipe(1001,"3992");\r
+    }\r
+\r
     @Test(expected = Exception.class)\r
     public void getVnfResourceCustomizationByModelCustomizationNameTestException(){\r
-       VnfResourceCustomization vnf = cd.getVnfResourceCustomizationByModelCustomizationName("test", "test234");\r
+        VnfResourceCustomization vnf = cd.getVnfResourceCustomizationByModelCustomizationName("test", "test234");\r
     }\r
-    \r
+\r
     @Test(expected = Exception.class)\r
     public void getVnfResourceByModelInvariantIdTestException(){\r
-       VnfResource vnf = cd.getVnfResourceByModelInvariantId("test", "test234");\r
+        VnfResource vnf = cd.getVnfResourceByModelInvariantId("test", "test234");\r
     }\r
-    \r
+\r
     @Test(expected = Exception.class)\r
     public void getVnfResourceByIdTestException(){\r
-       VnfResource vnf = cd.getVnfResourceById(19299);\r
+        VnfResource vnf = cd.getVnfResourceById(19299);\r
     }\r
-    \r
+\r
     @Test(expected = Exception.class)\r
     public void getVfModuleModelNameTestException(){\r
-       VfModule vnf = cd.getVfModuleModelName("tetes");\r
+        VfModule vnf = cd.getVfModuleModelName("tetes");\r
     }\r
-    \r
+\r
     @Test(expected = Exception.class)\r
     public void getVfModuleModelName2TestException(){\r
-       VfModule vnf = cd.getVfModuleModelName("tetes","4kidsl");\r
+        VfModule vnf = cd.getVfModuleModelName("tetes","4kidsl");\r
     }\r
-    \r
+\r
     @Test(expected = Exception.class)\r
     public void ggetVfModuleCustomizationByModelNameTestException(){\r
-       VfModuleCustomization vnf = cd.getVfModuleCustomizationByModelName("tetes");\r
+        VfModuleCustomization vnf = cd.getVfModuleCustomizationByModelName("tetes");\r
     }\r
-    \r
+\r
     @Test(expected = Exception.class)\r
     public void getNetworkResourceTestException(){\r
-       NetworkResource vnf = cd.getNetworkResource("tetes");\r
+        NetworkResource vnf = cd.getNetworkResource("tetes");\r
     }\r
-    \r
+\r
     @Test(expected = Exception.class)\r
     public void getVnfRecipeTestException(){\r
-       VnfRecipe vnf = cd.getVnfRecipe("tetes","ergfedrf","4993493");\r
+        VnfRecipe vnf = cd.getVnfRecipe("tetes","ergfedrf","4993493");\r
     }\r
-    \r
+\r
     @Test(expected = Exception.class)\r
     public void getVnfRecipe2TestException(){\r
-       VnfRecipe vnf = cd.getVnfRecipe("tetes","4993493");\r
+        VnfRecipe vnf = cd.getVnfRecipe("tetes","4993493");\r
     }\r
-    \r
+\r
     @Test(expected = Exception.class)\r
     public void getVnfRecipeByVfModuleIdTestException(){\r
-       VnfRecipe vnf = cd.getVnfRecipeByVfModuleId("tetes","4993493","vnf");\r
+        VnfRecipe vnf = cd.getVnfRecipeByVfModuleId("tetes","4993493","vnf");\r
     }\r
-    \r
+\r
     @Test(expected = Exception.class)\r
     public void getVfModuleTypeTestException(){\r
-       VfModule vnf = cd.getVfModuleType("4993493");\r
+        VfModule vnf = cd.getVfModuleType("4993493");\r
     }\r
-    \r
+\r
     @Test(expected = Exception.class)\r
     public void getVfModuleType2TestException(){\r
-       VfModule vnf = cd.getVfModuleType("4993493","vnf");\r
+        VfModule vnf = cd.getVfModuleType("4993493","vnf");\r
     }\r
     @Test(expected = Exception.class)\r
     public void getVnfResourceByServiceUuidTestException(){\r
-       VnfResource vnf = cd.getVnfResourceByServiceUuid("4993493");\r
+        VnfResource vnf = cd.getVnfResourceByServiceUuid("4993493");\r
     }\r
     @Test(expected = Exception.class)\r
     public void getVnfResourceByVnfUuidTestException(){\r
-       VnfResource vnf = cd.getVnfResourceByVnfUuid("4993493");\r
+        VnfResource vnf = cd.getVnfResourceByVnfUuid("4993493");\r
     }\r
     @Test(expected = Exception.class)\r
     public void getVfModuleByModelInvariantUuidTestException(){\r
-       VfModule vnf = cd.getVfModuleByModelInvariantUuid("4993493");\r
+        VfModule vnf = cd.getVfModuleByModelInvariantUuid("4993493");\r
     }\r
     @Test(expected = Exception.class)\r
     public void getVfModuleByModelCustomizationUuidTestException(){\r
-       VfModuleCustomization vnf = cd.getVfModuleByModelCustomizationUuid("4993493");\r
+        VfModuleCustomization vnf = cd.getVfModuleByModelCustomizationUuid("4993493");\r
     }\r
     @Test(expected = Exception.class)\r
     public void getVfModuleByModelInvariantUuidAndModelVersionTestException(){\r
-       VfModule vnf = cd.getVfModuleByModelInvariantUuidAndModelVersion("4993493","vnf");\r
+        VfModule vnf = cd.getVfModuleByModelInvariantUuidAndModelVersion("4993493","vnf");\r
     }\r
     @Test(expected = Exception.class)\r
     public void getVfModuleCustomizationByModelCustomizationIdTestException(){\r
-       VfModuleCustomization vnf = cd.getVfModuleCustomizationByModelCustomizationId("4993493");\r
+        VfModuleCustomization vnf = cd.getVfModuleCustomizationByModelCustomizationId("4993493");\r
     }\r
     @Test(expected = Exception.class)\r
     public void getVfModuleByModelUuidTestException(){\r
-       VfModule vnf = cd.getVfModuleByModelUuid("4993493");\r
+        VfModule vnf = cd.getVfModuleByModelUuid("4993493");\r
     }\r
     @Test(expected = Exception.class)\r
     public void getVnfResourceCustomizationByModelCustomizationUuidTestException(){\r
-       VnfResourceCustomization vnf = cd.getVnfResourceCustomizationByModelCustomizationUuid("4993493");\r
+        VnfResourceCustomization vnf = cd.getVnfResourceCustomizationByModelCustomizationUuid("4993493");\r
     }\r
     @Test(expected = Exception.class)\r
     public void getVnfResourceCustomizationByModelVersionIdTestException(){\r
-       VnfResourceCustomization vnf = cd.getVnfResourceCustomizationByModelVersionId("4993493");\r
+        VnfResourceCustomization vnf = cd.getVnfResourceCustomizationByModelVersionId("4993493");\r
     }\r
     @Test(expected = Exception.class)\r
     public void getVfModuleByModelCustomizationIdAndVersionTestException(){\r
-       cd.getVfModuleByModelCustomizationIdAndVersion("4993493","test");\r
+        cd.getVfModuleByModelCustomizationIdAndVersion("4993493","test");\r
     }\r
     @Test(expected = Exception.class)\r
     public void getVfModuleByModelCustomizationIdModelVersionAndModelInvariantIdTestException(){\r
-       cd.getVfModuleByModelCustomizationIdModelVersionAndModelInvariantId("4993493","vnf","test");\r
+        cd.getVfModuleByModelCustomizationIdModelVersionAndModelInvariantId("4993493","vnf","test");\r
     }\r
     @Test(expected = Exception.class)\r
     public void getVnfResourceCustomizationByModelInvariantIdTest(){\r
-       cd.getVnfResourceCustomizationByModelInvariantId("4993493","vnf","test");\r
+        cd.getVnfResourceCustomizationByModelInvariantId("4993493","vnf","test");\r
     }\r
     @Test(expected = Exception.class)\r
     public void getVfModuleCustomizationByVnfModuleCustomizationUuidTest(){\r
-       cd.getVfModuleCustomizationByVnfModuleCustomizationUuid("4993493");\r
+        cd.getVfModuleCustomizationByVnfModuleCustomizationUuid("4993493");\r
     }\r
     @Test(expected = Exception.class)\r
     public void getVnfResourceCustomizationByVnfModelCustomizationNameAndModelVersionIdTest(){\r
-       cd.getVnfResourceCustomizationByVnfModelCustomizationNameAndModelVersionId("4993493","test");\r
+        cd.getVnfResourceCustomizationByVnfModelCustomizationNameAndModelVersionId("4993493","test");\r
     }\r
     @Test(expected = Exception.class)\r
     public void getAllVfModuleCustomizationstest(){\r
-       cd.getAllVfModuleCustomizations("4993493");\r
+        cd.getAllVfModuleCustomizations("4993493");\r
     }\r
     @Test(expected = Exception.class)\r
     public void getVnfResourceByModelUuidTest(){\r
-       cd.getVnfResourceByModelUuid("4993493");\r
+        cd.getVnfResourceByModelUuid("4993493");\r
     }\r
     @Test(expected = Exception.class)\r
     public void getVnfResCustomToVfModuleTest(){\r
-       cd.getVnfResCustomToVfModule("4993493","test");\r
+        cd.getVnfResCustomToVfModule("4993493","test");\r
     }\r
     @Test(expected = Exception.class)\r
     public void getVfModulesForVnfResourceTest(){\r
-       VnfResource vnfResource = new VnfResource();\r
-       vnfResource.setModelUuid("48839");\r
-       cd.getVfModulesForVnfResource(vnfResource);\r
+        VnfResource vnfResource = new VnfResource();\r
+        vnfResource.setModelUuid("48839");\r
+        cd.getVfModulesForVnfResource(vnfResource);\r
     }\r
     @Test(expected = Exception.class)\r
     public void getVfModulesForVnfResource2Test(){\r
-       cd.getVfModulesForVnfResource("4993493");\r
+        cd.getVfModulesForVnfResource("4993493");\r
     }\r
     @Test(expected = Exception.class)\r
     public void getServiceByUuidTest(){\r
-       cd.getServiceByUuid("4993493");\r
+        cd.getServiceByUuid("4993493");\r
     }\r
     @Test(expected = Exception.class)\r
     public void getNetworkResourceById2Test(){\r
-       cd.getNetworkResourceById(4993493);\r
+        cd.getNetworkResourceById(4993493);\r
     }\r
     @Test(expected = Exception.class)\r
     public void getNetworkResourceByIdTest(){\r
@@ -327,431 +472,431 @@ public class CatalogDatabaseTest {
     }\r
     @Test\r
     public void isEmptyOrNullTest(){\r
-       boolean is = cd.isEmptyOrNull("4993493");\r
-       assertFalse(is);\r
+        boolean is = cd.isEmptyOrNull("4993493");\r
+        assertFalse(is);\r
     }\r
     @Test(expected = Exception.class)\r
     public void getSTRTest(){\r
-       cd.getSTR("4993493","test","vnf");\r
+        cd.getSTR("4993493","test","vnf");\r
     }\r
     @Test(expected = Exception.class)\r
     public void getVRCtoVFMCTest(){\r
-       cd.getVRCtoVFMC("4993493","388492");\r
+        cd.getVRCtoVFMC("4993493","388492");\r
     }\r
     @Test(expected = Exception.class)\r
     public void getVfModuleTypeByUuidTestException(){\r
-       cd.getVfModuleTypeByUuid("4993493");\r
+        cd.getVfModuleTypeByUuid("4993493");\r
     }\r
-    \r
+\r
     @Test(expected = Exception.class)\r
     public void getTempNetworkHeatTemplateLookupTest(){\r
-       cd.getTempNetworkHeatTemplateLookup("4993493");\r
+        cd.getTempNetworkHeatTemplateLookup("4993493");\r
     }\r
-    \r
+\r
     @Test(expected = Exception.class)\r
     public void getAllNetworksByServiceModelUuidTest(){\r
-       cd.getAllNetworksByServiceModelUuid("4993493");\r
+        cd.getAllNetworksByServiceModelUuid("4993493");\r
     }\r
     @Test(expected = Exception.class)\r
     public void getAllNetworksByServiceModelInvariantUuidTest(){\r
-       cd.getAllNetworksByServiceModelInvariantUuid("4993493");\r
+        cd.getAllNetworksByServiceModelInvariantUuid("4993493");\r
     }\r
     @Test(expected = Exception.class)\r
     public void getAllNetworksByServiceModelInvariantUuid2Test(){\r
-       cd.getAllNetworksByServiceModelInvariantUuid("4993493","test");\r
+        cd.getAllNetworksByServiceModelInvariantUuid("4993493","test");\r
     }\r
     @Test(expected = Exception.class)\r
     public void getAllNetworksByNetworkModelCustomizationUuidTest(){\r
-       cd.getAllNetworksByNetworkModelCustomizationUuid("4993493");\r
+        cd.getAllNetworksByNetworkModelCustomizationUuid("4993493");\r
     }\r
     @Test(expected = Exception.class)\r
     public void getAllNetworksByNetworkTypeTest(){\r
-       cd.getAllNetworksByNetworkType("4993493");\r
+        cd.getAllNetworksByNetworkType("4993493");\r
     }\r
     @Test(expected = Exception.class)\r
     public void getAllVfmcForVrcTest(){\r
-       VnfResourceCustomization re = new VnfResourceCustomization();\r
-       re.setModelCustomizationUuid("377483");\r
-       cd.getAllVfmcForVrc(re);\r
+        VnfResourceCustomization re = new VnfResourceCustomization();\r
+        re.setModelCustomizationUuid("377483");\r
+        cd.getAllVfmcForVrc(re);\r
     }\r
     @Test(expected = Exception.class)\r
     public void getAllVnfsByServiceModelUuidTest(){\r
-       cd.getAllVnfsByServiceModelUuid("4993493");\r
+        cd.getAllVnfsByServiceModelUuid("4993493");\r
     }\r
     @Test(expected = Exception.class)\r
     public void getAllVnfsByServiceModelInvariantUuidTest(){\r
-       cd.getAllVnfsByServiceModelInvariantUuid("4993493");\r
+        cd.getAllVnfsByServiceModelInvariantUuid("4993493");\r
     }\r
     @Test(expected = Exception.class)\r
     public void getAllVnfsByServiceModelInvariantUuid2Test(){\r
-       cd.getAllVnfsByServiceModelInvariantUuid("4993493","test");\r
+        cd.getAllVnfsByServiceModelInvariantUuid("4993493","test");\r
     }\r
     @Test(expected = Exception.class)\r
     public void getAllVnfsByServiceNameTest(){\r
-       cd.getAllVnfsByServiceName("4993493","test");\r
+        cd.getAllVnfsByServiceName("4993493","test");\r
     }\r
     @Test(expected = Exception.class)\r
     public void getAllVnfsByServiceName2Test(){\r
-       cd.getAllVnfsByServiceName("4993493");\r
+        cd.getAllVnfsByServiceName("4993493");\r
     }\r
     @Test(expected = Exception.class)\r
     public void getAllVnfsByVnfModelCustomizationUuidTest(){\r
-       cd.getAllVnfsByVnfModelCustomizationUuid("4993493");\r
+        cd.getAllVnfsByVnfModelCustomizationUuid("4993493");\r
     }\r
     @Test(expected = Exception.class)\r
     public void getAllAllottedResourcesByServiceModelUuidTest(){\r
-       cd.getAllAllottedResourcesByServiceModelUuid("4993493");\r
+        cd.getAllAllottedResourcesByServiceModelUuid("4993493");\r
     }\r
     @Test(expected = Exception.class)\r
     public void getAllAllottedResourcesByServiceModelInvariantUuidTest(){\r
-       cd.getAllAllottedResourcesByServiceModelInvariantUuid("4993493");\r
+        cd.getAllAllottedResourcesByServiceModelInvariantUuid("4993493");\r
     }\r
     @Test(expected = Exception.class)\r
     public void getAllAllottedResourcesByServiceModelInvariantUuid2Test(){\r
-       cd.getAllAllottedResourcesByServiceModelInvariantUuid("4993493","test");\r
+        cd.getAllAllottedResourcesByServiceModelInvariantUuid("4993493","test");\r
     }\r
     @Test(expected = Exception.class)\r
     public void getAllAllottedResourcesByArModelCustomizationUuidTest(){\r
-       cd.getAllAllottedResourcesByArModelCustomizationUuid("4993493");\r
+        cd.getAllAllottedResourcesByArModelCustomizationUuid("4993493");\r
     }\r
     @Test(expected = Exception.class)\r
     public void getAllottedResourceByModelUuidTest(){\r
-       cd.getAllottedResourceByModelUuid("4993493");\r
+        cd.getAllottedResourceByModelUuid("4993493");\r
     }\r
     @Test(expected = Exception.class)\r
     public void getAllResourcesByServiceModelUuidTest(){\r
-       cd.getAllResourcesByServiceModelUuid("4993493");\r
+        cd.getAllResourcesByServiceModelUuid("4993493");\r
     }\r
     @Test(expected = Exception.class)\r
     public void getAllResourcesByServiceModelInvariantUuidTest(){\r
-       cd.getAllResourcesByServiceModelInvariantUuid("4993493");\r
+        cd.getAllResourcesByServiceModelInvariantUuid("4993493");\r
     }\r
-    \r
+\r
     @Test(expected = Exception.class)\r
     public void getAllResourcesByServiceModelInvariantUuid2Test(){\r
-       cd.getAllResourcesByServiceModelInvariantUuid("4993493","test");\r
+        cd.getAllResourcesByServiceModelInvariantUuid("4993493","test");\r
     }\r
     @Test(expected = Exception.class)\r
     public void getSingleNetworkByModelCustomizationUuidTest(){\r
-       cd.getSingleNetworkByModelCustomizationUuid("4993493");\r
+        cd.getSingleNetworkByModelCustomizationUuid("4993493");\r
     }\r
     @Test(expected = Exception.class)\r
     public void getSingleAllottedResourceByModelCustomizationUuidTest(){\r
-       cd.getSingleAllottedResourceByModelCustomizationUuid("4993493");\r
+        cd.getSingleAllottedResourceByModelCustomizationUuid("4993493");\r
     }\r
     @Test(expected = Exception.class)\r
     public void getVfModuleRecipeTest(){\r
-       cd.getVfModuleRecipe("4993493","test","get");\r
+        cd.getVfModuleRecipe("4993493","test","get");\r
     }\r
     @Test(expected = Exception.class)\r
     public void getVfModuleTest(){\r
-       cd.getVfModule("4993493","test","get","v2","vnf");\r
+        cd.getVfModule("4993493","test","get","v2","vnf");\r
     }\r
     @Test(expected = Exception.class)\r
     public void getVnfComponentsRecipeTest(){\r
-       cd.getVnfComponentsRecipe("4993493","test","v2","vnf","get","3992");\r
+        cd.getVnfComponentsRecipe("4993493","test","v2","vnf","get","3992");\r
     }\r
     @Test(expected = Exception.class)\r
     public void getVnfComponentsRecipeByVfModuleTest(){\r
-       List <VfModule> resultList = new ArrayList<>();\r
-       VfModule m = new VfModule();\r
-       resultList.add(m);\r
-       cd.getVnfComponentsRecipeByVfModule(resultList,"4993493");\r
+        List <VfModule> resultList = new ArrayList<>();\r
+        VfModule m = new VfModule();\r
+        resultList.add(m);\r
+        cd.getVnfComponentsRecipeByVfModule(resultList,"4993493");\r
     }\r
     @Test(expected = Exception.class)\r
     public void getAllVnfResourcesTest(){\r
-       cd.getAllVnfResources();\r
+        cd.getAllVnfResources();\r
     }\r
     @Test(expected = Exception.class)\r
     public void getVnfResourcesByRoleTest(){\r
-       cd.getVnfResourcesByRole("4993493");\r
+        cd.getVnfResourcesByRole("4993493");\r
     }\r
     @Test(expected = Exception.class)\r
     public void getVnfResourceCustomizationsByRoleTest(){\r
-       cd.getVnfResourceCustomizationsByRole("4993493");\r
+        cd.getVnfResourceCustomizationsByRole("4993493");\r
     }\r
     @Test(expected = Exception.class)\r
     public void getAllNetworkResourcesTest(){\r
-       cd.getAllNetworkResources();\r
+        cd.getAllNetworkResources();\r
     }\r
     @Test(expected = Exception.class)\r
     public void getAllNetworkResourceCustomizationsTest(){\r
-       cd.getAllNetworkResourceCustomizations();\r
+        cd.getAllNetworkResourceCustomizations();\r
     }\r
     @Test(expected = Exception.class)\r
     public void getAllVfModulesTest(){\r
-       cd.getAllVfModules();\r
+        cd.getAllVfModules();\r
     }\r
     @Test(expected = Exception.class)\r
     public void getAllVfModuleCustomizationsTest(){\r
-       cd.getAllVfModuleCustomizations();\r
+        cd.getAllVfModuleCustomizations();\r
     }\r
     @Test(expected = Exception.class)\r
     public void getAllHeatEnvironmentTest(){\r
-       cd.getAllHeatEnvironment();\r
+        cd.getAllHeatEnvironment();\r
     }\r
     @Test(expected = Exception.class)\r
     public void getHeatEnvironment2Test(){\r
-       cd.getHeatEnvironment(4993493);\r
+        cd.getHeatEnvironment(4993493);\r
     }\r
     @Test(expected = Exception.class)\r
     public void getNestedTemplatesTest(){\r
-       cd.getNestedTemplates(4993493);\r
+        cd.getNestedTemplates(4993493);\r
     }\r
     @Test(expected = Exception.class)\r
     public void getNestedTemplates2Test(){\r
-       cd.getNestedTemplates("4993493");\r
+        cd.getNestedTemplates("4993493");\r
     }\r
     @Test(expected = Exception.class)\r
     public void getHeatFilesTest(){\r
-       cd.getHeatFiles(4993493);\r
+        cd.getHeatFiles(4993493);\r
     }\r
     @Test(expected = Exception.class)\r
     public void getVfModuleToHeatFilesEntryTest(){\r
-       cd.getVfModuleToHeatFilesEntry("4993493","49959499");\r
+        cd.getVfModuleToHeatFilesEntry("4993493","49959499");\r
     }\r
     @Test(expected = Exception.class)\r
     public void getServiceToResourceCustomization(){\r
-       cd.getServiceToResourceCustomization("4993493","599349","49900");\r
+        cd.getServiceToResourceCustomization("4993493","599349","49900");\r
     }\r
     @Test(expected = Exception.class)\r
     public void getHeatFilesForVfModuleTest(){\r
-       cd.getHeatFilesForVfModule("4993493");\r
+        cd.getHeatFilesForVfModule("4993493");\r
     }\r
     @Test(expected = Exception.class)\r
     public void getHeatTemplateTest(){\r
-       cd.getHeatTemplate("4993493","test","heat");\r
+        cd.getHeatTemplate("4993493","test","heat");\r
     }\r
-    \r
+\r
     @Test(expected = Exception.class)\r
     public void saveHeatTemplateTest(){\r
-       HeatTemplate heat = new HeatTemplate();\r
-       Set <HeatTemplateParam> paramSet = new HashSet<HeatTemplateParam>();\r
-       cd.saveHeatTemplate(heat,paramSet);\r
+        HeatTemplate heat = new HeatTemplate();\r
+        Set <HeatTemplateParam> paramSet = new HashSet<HeatTemplateParam>();\r
+        cd.saveHeatTemplate(heat,paramSet);\r
     }\r
     @Test(expected = Exception.class)\r
     public void getHeatEnvironmentTest(){\r
-       cd.getHeatEnvironment("4993493","test","heat");\r
+        cd.getHeatEnvironment("4993493","test","heat");\r
     }\r
     @Test(expected = Exception.class)\r
     public void getHeatEnvironment3Test(){\r
-       cd.getHeatEnvironment("4993493","test");\r
+        cd.getHeatEnvironment("4993493","test");\r
     }\r
     @Test(expected = Exception.class)\r
     public void saveHeatEnvironmentTest(){\r
-       HeatEnvironment en = new HeatEnvironment();\r
-       cd.saveHeatEnvironment(en);\r
+        HeatEnvironment en = new HeatEnvironment();\r
+        cd.saveHeatEnvironment(en);\r
     }\r
     @Test(expected = Exception.class)\r
     public void saveHeatTemplate2Test(){\r
-       HeatTemplate heat = new HeatTemplate();\r
-       cd.saveHeatTemplate(heat);\r
+        HeatTemplate heat = new HeatTemplate();\r
+        cd.saveHeatTemplate(heat);\r
     }\r
     @Test(expected = Exception.class)\r
     public void saveHeatFileTest(){\r
-       HeatFiles hf = new HeatFiles();\r
-       cd.saveHeatFile(hf);\r
+        HeatFiles hf = new HeatFiles();\r
+        cd.saveHeatFile(hf);\r
     }\r
     @Test(expected = Exception.class)\r
     public void saveVnfRecipeTest(){\r
-       VnfRecipe vr = new VnfRecipe();\r
-       cd.saveVnfRecipe(vr);\r
+        VnfRecipe vr = new VnfRecipe();\r
+        cd.saveVnfRecipe(vr);\r
     }\r
     @Test(expected = Exception.class)\r
     public void saveVnfComponentsRecipe(){\r
-       VnfComponentsRecipe vr = new VnfComponentsRecipe();\r
-       cd.saveVnfComponentsRecipe(vr);\r
+        VnfComponentsRecipe vr = new VnfComponentsRecipe();\r
+        cd.saveVnfComponentsRecipe(vr);\r
     }\r
     @Test(expected = Exception.class)\r
     public void saveOrUpdateVnfResourceTest(){\r
-       VnfResource vr = new VnfResource();\r
-       cd.saveOrUpdateVnfResource(vr);\r
+        VnfResource vr = new VnfResource();\r
+        cd.saveOrUpdateVnfResource(vr);\r
     }\r
     @Test(expected = Exception.class)\r
     public void saveVnfResourceCustomizationTest(){\r
-       VnfResourceCustomization vr = new VnfResourceCustomization();\r
-       cd.saveVnfResourceCustomization(vr);\r
+        VnfResourceCustomization vr = new VnfResourceCustomization();\r
+        cd.saveVnfResourceCustomization(vr);\r
     }\r
     @Test(expected = Exception.class)\r
     public void saveAllottedResourceCustomizationTest(){\r
-       AllottedResourceCustomization arc = new AllottedResourceCustomization();\r
-       cd.saveAllottedResourceCustomization(arc);\r
+        AllottedResourceCustomization arc = new AllottedResourceCustomization();\r
+        cd.saveAllottedResourceCustomization(arc);\r
     }\r
     @Test(expected = Exception.class)\r
     public void saveAllottedResourceTest(){\r
-       AllottedResource ar = new AllottedResource();\r
-       cd.saveAllottedResource(ar);\r
+        AllottedResource ar = new AllottedResource();\r
+        cd.saveAllottedResource(ar);\r
     }\r
     @Test(expected = Exception.class)\r
     public void saveNetworkResourceTest() throws RecordNotFoundException {\r
-       NetworkResource nr = new NetworkResource();\r
-       cd.saveNetworkResource(nr);\r
+        NetworkResource nr = new NetworkResource();\r
+        cd.saveNetworkResource(nr);\r
     }\r
     @Test(expected = Exception.class)\r
     public void saveToscaCsarTest()throws RecordNotFoundException {\r
-       ToscaCsar ts = new ToscaCsar();\r
-       cd.saveToscaCsar(ts);\r
+        ToscaCsar ts = new ToscaCsar();\r
+        cd.saveToscaCsar(ts);\r
     }\r
     @Test(expected = Exception.class)\r
     public void getToscaCsar(){\r
-       cd.getToscaCsar("4993493");\r
+        cd.getToscaCsar("4993493");\r
     }\r
     @Test(expected = Exception.class)\r
     public void saveTempNetworkHeatTemplateLookupTest(){\r
-       TempNetworkHeatTemplateLookup t = new TempNetworkHeatTemplateLookup();\r
-       cd.saveTempNetworkHeatTemplateLookup(t);\r
+        TempNetworkHeatTemplateLookup t = new TempNetworkHeatTemplateLookup();\r
+        cd.saveTempNetworkHeatTemplateLookup(t);\r
     }\r
     @Test(expected = Exception.class)\r
     public void saveVfModuleToHeatFiles(){\r
-       VfModuleToHeatFiles v = new VfModuleToHeatFiles();\r
-       cd.saveVfModuleToHeatFiles(v);\r
+        VfModuleToHeatFiles v = new VfModuleToHeatFiles();\r
+        cd.saveVfModuleToHeatFiles(v);\r
     }\r
     @Test(expected = Exception.class)\r
     public void saveVnfResourceToVfModuleCustomizationTest() throws RecordNotFoundException {\r
-       VnfResourceCustomization v =new VnfResourceCustomization();\r
-       VfModuleCustomization vm = new VfModuleCustomization();\r
-       cd.saveVnfResourceToVfModuleCustomization(v, vm);\r
+        VnfResourceCustomization v =new VnfResourceCustomization();\r
+        VfModuleCustomization vm = new VfModuleCustomization();\r
+        cd.saveVnfResourceToVfModuleCustomization(v, vm);\r
     }\r
     @Test(expected = Exception.class)\r
     public void saveNetworkResourceCustomizationTest() throws RecordNotFoundException {\r
-       NetworkResourceCustomization nrc = new NetworkResourceCustomization();\r
-       cd.saveNetworkResourceCustomization(nrc);\r
+        NetworkResourceCustomization nrc = new NetworkResourceCustomization();\r
+        cd.saveNetworkResourceCustomization(nrc);\r
     }\r
-    \r
+\r
     @Test(expected = Exception.class)\r
     public void saveServiceToNetworksTest(){\r
-       AllottedResource ar = new AllottedResource();\r
-       cd.saveAllottedResource(ar);\r
+        AllottedResource ar = new AllottedResource();\r
+        cd.saveAllottedResource(ar);\r
     }\r
     @Test(expected = Exception.class)\r
     public void saveServiceToResourceCustomizationTest(){\r
-       ServiceToResourceCustomization ar = new ServiceToResourceCustomization();\r
-       cd.saveServiceToResourceCustomization(ar);\r
+        ServiceToResourceCustomization ar = new ServiceToResourceCustomization();\r
+        cd.saveServiceToResourceCustomization(ar);\r
     }\r
     @Test(expected = Exception.class)\r
     public void saveServiceTest(){\r
-       Service ar = new Service();\r
-       cd.saveService(ar);\r
+        Service ar = new Service();\r
+        cd.saveService(ar);\r
     }\r
     @Test(expected = Exception.class)\r
     public void saveOrUpdateVfModuleTest(){\r
-       VfModule ar = new VfModule();\r
-       cd.saveOrUpdateVfModule(ar);\r
+        VfModule ar = new VfModule();\r
+        cd.saveOrUpdateVfModule(ar);\r
     }\r
     @Test(expected = Exception.class)\r
     public void saveOrUpdateVfModuleCustomizationTest(){\r
-       VfModuleCustomization ar = new VfModuleCustomization();\r
-       cd.saveOrUpdateVfModuleCustomization(ar);\r
+        VfModuleCustomization ar = new VfModuleCustomization();\r
+        cd.saveOrUpdateVfModuleCustomization(ar);\r
     }\r
-    \r
+\r
     @Test(expected = Exception.class)\r
     public void getNestedHeatTemplateTest(){\r
-       cd.getNestedHeatTemplate(101,201);\r
+        cd.getNestedHeatTemplate(101,201);\r
     }\r
     @Test(expected = Exception.class)\r
     public void getNestedHeatTemplate2Test(){\r
-       cd.getNestedHeatTemplate("1002","1002");\r
+        cd.getNestedHeatTemplate("1002","1002");\r
     }\r
     @Test(expected = Exception.class)\r
     public void saveNestedHeatTemplateTest(){\r
-       HeatTemplate ar = new HeatTemplate();\r
-       cd.saveNestedHeatTemplate("1001",ar,"test");\r
+        HeatTemplate ar = new HeatTemplate();\r
+        cd.saveNestedHeatTemplate("1001",ar,"test");\r
     }\r
     @Test(expected = Exception.class)\r
     public void getHeatFiles2Test(){\r
-       VfModuleCustomization ar = new VfModuleCustomization();\r
-       cd.getHeatFiles(101,"test","1001","v2");\r
+        VfModuleCustomization ar = new VfModuleCustomization();\r
+        cd.getHeatFiles(101,"test","1001","v2");\r
     }\r
     @Test(expected = Exception.class)\r
     public void getHeatFiles3Test(){\r
-       VfModuleCustomization ar = new VfModuleCustomization();\r
-       cd.getHeatFiles("200192");\r
+        VfModuleCustomization ar = new VfModuleCustomization();\r
+        cd.getHeatFiles("200192");\r
     }\r
     @Test(expected = Exception.class)\r
     public void saveHeatFilesTest(){\r
-       HeatFiles ar = new HeatFiles();\r
-       cd.saveHeatFiles(ar);\r
+        HeatFiles ar = new HeatFiles();\r
+        cd.saveHeatFiles(ar);\r
     }\r
     @Test(expected = Exception.class)\r
     public void saveVfModuleToHeatFilesTest(){\r
-       HeatFiles ar = new HeatFiles();\r
-       cd.saveVfModuleToHeatFiles("3772893",ar);\r
+        HeatFiles ar = new HeatFiles();\r
+        cd.saveVfModuleToHeatFiles("3772893",ar);\r
     }\r
     @Test\r
     public void getNetworkResourceByModelUuidTest(){\r
-       \r
-       cd.getNetworkResourceByModelUuid("3899291");\r
+\r
+        cd.getNetworkResourceByModelUuid("3899291");\r
     }\r
     @Test(expected = Exception.class)\r
     public void getNetworkRecipeTest(){\r
-       \r
-       cd.getNetworkRecipe("test","test1","test2");\r
+\r
+        cd.getNetworkRecipe("test","test1","test2");\r
     }\r
     @Test(expected = Exception.class)\r
     public void getNetworkRecipe2Test(){\r
-       \r
-       cd.getNetworkRecipe("test","test1");\r
+\r
+        cd.getNetworkRecipe("test","test1");\r
     }\r
     @Test\r
     public void getNetworkResourceByModelCustUuidTest(){\r
-       \r
-       cd.getNetworkResourceByModelCustUuid("test");\r
+\r
+        cd.getNetworkResourceByModelCustUuid("test");\r
     }\r
     @Test(expected = Exception.class)\r
     public void getVnfComponentsRecipe2Test(){\r
-       \r
-       cd.getVnfComponentsRecipe("test1","test2","test3","test4");\r
+\r
+        cd.getVnfComponentsRecipe("test1","test2","test3","test4");\r
     }\r
     @Test(expected = Exception.class)\r
     public void getVnfComponentsRecipeByVfModuleModelUUIdTest(){\r
-       \r
-       cd.getVnfComponentsRecipeByVfModuleModelUUId("test1","test2","test3");\r
+\r
+        cd.getVnfComponentsRecipeByVfModuleModelUUId("test1","test2","test3");\r
     }\r
     @Test(expected = Exception.class)\r
     public void getVnfComponentRecipesTest(){\r
-       \r
-       cd.getVnfComponentRecipes("test");\r
+\r
+        cd.getVnfComponentRecipes("test");\r
     }\r
     @Test(expected = Exception.class)\r
     public void saveOrUpdateVnfComponentTest(){\r
-       VnfComponent ar = new VnfComponent();\r
-       cd.saveOrUpdateVnfComponent(ar);\r
+        VnfComponent ar = new VnfComponent();\r
+        cd.saveOrUpdateVnfComponent(ar);\r
     }\r
-    \r
+\r
     @Test(expected = Exception.class)\r
     public void getVfModule2Test(){\r
-       \r
-       cd.getVfModule("test");\r
+\r
+        cd.getVfModule("test");\r
     }\r
     @Test(expected = Exception.class)\r
     public void getVfModuleByModelUUIDTest(){\r
-       \r
-       cd.getVfModuleByModelUUID("test");\r
+\r
+        cd.getVfModuleByModelUUID("test");\r
     }\r
     @Test(expected = Exception.class)\r
     public void getServiceRecipeByModelUUIDTest(){\r
-       \r
-       cd.getServiceRecipeByModelUUID("test1","test2");\r
+\r
+        cd.getServiceRecipeByModelUUID("test1","test2");\r
     }\r
     @Test(expected = Exception.class)\r
     public void getModelRecipeTest(){\r
-       \r
-       cd.getModelRecipe("test1","test2","test3");\r
+\r
+        cd.getModelRecipe("test1","test2","test3");\r
     }\r
     @Test(expected = Exception.class)\r
     public void healthCheck(){\r
-       \r
-       cd.healthCheck();\r
+\r
+        cd.healthCheck();\r
     }\r
     @Test(expected = Exception.class)\r
     public void executeQuerySingleRow(){\r
-       VnfComponent ar = new VnfComponent();\r
-       HashMap<String, String> variables = new HashMap<String, String>();\r
-       cd.executeQuerySingleRow("tets",variables,false);\r
+        VnfComponent ar = new VnfComponent();\r
+        HashMap<String, String> variables = new HashMap<String, String>();\r
+        cd.executeQuerySingleRow("tets",variables,false);\r
     }\r
     @Test(expected = Exception.class)\r
     public void executeQueryMultipleRows(){\r
-       HashMap<String, String> variables = new HashMap<String, String>();\r
-       cd.executeQueryMultipleRows("select",variables,false);\r
+        HashMap<String, String> variables = new HashMap<String, String>();\r
+        cd.executeQueryMultipleRows("select",variables,false);\r
     }\r
 }\r