Merge "UT for catalogDatabase"

2 files changed, 480 insertions, 335 deletions

diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/CatalogDatabase.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/CatalogDatabase.java
index dd60bc7d9c..cdde98dd36 100644
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/CatalogDatabase.java
+++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/CatalogDatabase.java
@@ -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);
     }
 
     /**
diff --git a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/test/CatalogDatabaseTest.java b/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/test/CatalogDatabaseTest.java
index a00079d8a9..9b0f120222 100644
--- a/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/test/CatalogDatabaseTest.java
+++ b/mso-catalog-db/src/test/java/org/openecomp/mso/db/catalog/test/CatalogDatabaseTest.java
@@ -20,16 +20,59 @@
 

 package org.openecomp.mso.db.catalog.test;

 

+import static org.junit.Assert.assertEquals;

 import static org.junit.Assert.assertFalse;

 import static org.junit.Assert.assertTrue;

 

+import java.io.Serializable;

+import java.math.BigDecimal;

+import java.math.BigInteger;

+import java.sql.Connection;

 import java.util.ArrayList;

+import java.util.Arrays;

+import java.util.Calendar;

+import java.util.Collection;

+import java.util.Date;

 import java.util.HashMap;

 import java.util.HashSet;

+import java.util.Iterator;

 import java.util.List;

+import java.util.Locale;

 import java.util.Map;

 import java.util.Set;

 

+import mockit.Mock;

+import mockit.MockUp;

+import org.hibernate.CacheMode;

+import org.hibernate.Criteria;

+import org.hibernate.Filter;

+import org.hibernate.FlushMode;

+import org.hibernate.HibernateException;

+import org.hibernate.IdentifierLoadAccess;

+import org.hibernate.LobHelper;

+import org.hibernate.LockMode;

+import org.hibernate.LockOptions;

+import org.hibernate.NaturalIdLoadAccess;

+import org.hibernate.Query;

+import org.hibernate.ReplicationMode;

+import org.hibernate.SQLQuery;

+import org.hibernate.ScrollMode;

+import org.hibernate.ScrollableResults;

+import org.hibernate.Session;

+import org.hibernate.SessionEventListener;

+import org.hibernate.SessionFactory;

+import org.hibernate.SharedSessionBuilder;

+import org.hibernate.SimpleNaturalIdLoadAccess;

+import org.hibernate.Transaction;

+import org.hibernate.TypeHelper;

+import org.hibernate.UnknownProfileException;

+import org.hibernate.jdbc.ReturningWork;

+import org.hibernate.jdbc.Work;

+import org.hibernate.metamodel.source.annotations.xml.mocker.MockHelper;

+import org.hibernate.procedure.ProcedureCall;

+import org.hibernate.stat.SessionStatistics;

+import org.hibernate.transform.ResultTransformer;

+import org.hibernate.type.Type;

 import org.junit.Before;

 import org.junit.Test;

 import org.openecomp.mso.db.catalog.CatalogDatabase;

@@ -58,268 +101,370 @@ import org.openecomp.mso.db.catalog.utils.RecordNotFoundException;
 

 public class CatalogDatabaseTest {

 

-	CatalogDatabase cd = null;

-	

-	@Before

-	public void setup(){

-		cd = CatalogDatabase.getInstance();

-	}

-	@Test(expected = Exception.class)

-	public void getAllHeatTemplatesTestException(){

-		List <HeatTemplate> list = cd.getAllHeatTemplates();

-	}

-	

-	@Test(expected = Exception.class)

-	public void getHeatTemplateTestException(){

-		HeatTemplate ht = cd.getHeatTemplate(10);

-	}

-	

-	@Test(expected = Exception.class)

-	public void getHeatTemplateTest2Exception(){

-		HeatTemplate ht = cd.getHeatTemplate("heat123");

-	}

-	

-	@Test(expected = Exception.class)

-	public void getHeatTemplateTest3Exception(){

-		HeatTemplate ht = cd.getHeatTemplate("heat123","v2");

-	}

-	

-	@Test(expected = Exception.class)

-	public void getHeatTemplateByArtifactUuidException(){

-		HeatTemplate ht = cd.getHeatTemplateByArtifactUuid("123");

-	}

-	

-	@Test(expected = Exception.class)

-	public void getHeatTemplateByArtifactUuidRegularQueryException(){

-		HeatTemplate ht = cd.getHeatTemplateByArtifactUuidRegularQuery("123");

-	}

-	

-	@Test(expected = Exception.class)

-	public void getParametersForHeatTemplateTestException(){

-		List<HeatTemplateParam> ht = cd.getParametersForHeatTemplate("123");

-	}

-	

-	@Test(expected = Exception.class)

-	public void getHeatEnvironmentByArtifactUuidTestException(){

-		HeatEnvironment ht = cd.getHeatEnvironmentByArtifactUuid("123");

-	}

-	

-	@Test(expected = Exception.class)

-	public void getServiceByInvariantUUIDTestException(){

-		Service ht = cd.getServiceByInvariantUUID("123");

-	}

-	

-	@Test(expected = Exception.class)

-	public void getServiceTestException(){

-		Service ht = cd.getService("123");

-	}

-	

-	@Test(expected = Exception.class)

-	public void getServiceByModelUUIDTestException(){

-		Service ht = cd.getServiceByModelUUID("123");

-	}

-	

-	@Test(expected = Exception.class)

-	public void getService2TestException(){

-		HashMap<String, String> map = new HashMap<>();

-		map.put("serviceNameVersionId", "v2");

-		Service ht = cd.getService(map, "123");

-	}

-	

-	@Test(expected = Exception.class)

-	public void getServiceByModelNameTestException(){

-		Service ht = cd.getServiceByModelName("123");

-	}

-	

-	@Test(expected = Exception.class)

-	public void getServiceByVersionAndInvariantIdTestException() throws Exception{

-		Service ht = cd.getServiceByVersionAndInvariantId("123","tetwe");

-	}

-	

-	@Test(expected = Exception.class)

-	public void getServiceRecipeTestException() throws Exception{

-		ServiceRecipe ht = cd.getServiceRecipe("123","tetwe");

-	}

-	

-	@Test(expected = Exception.class)

-	public void getServiceRecipeByServiceModelUuidTestException() throws Exception{

-		ServiceRecipe ht = cd.getServiceRecipeByServiceModelUuid("123","tetwe");

-	}

-	

-	@Test(expected = Exception.class)

-	public void getServiceRecipesTestException() throws Exception{

-		List<ServiceRecipe> ht = cd.getServiceRecipes("123");

-	}

-	

-	@Test(expected = Exception.class)

-	public void getVnfComponentTestException() throws Exception{

-		VnfComponent ht = cd.getVnfComponent(123,"vnf");

-	}

-	

-	@Test(expected = Exception.class)

-	public void getVnfResourceTestException() throws Exception{

-		VnfResource ht = cd.getVnfResource("vnf");

-	}

-	

-	@Test(expected = Exception.class)

-	public void getVnfResource2TestException() throws Exception{

-		VnfResource ht = cd.getVnfResource("vnf","3992");

-	}

-	

-	@Test(expected = Exception.class)

-	public void getVnfResourceByModelCustomizationIdTestException() throws Exception{

-		VnfResource ht = cd.getVnfResourceByModelCustomizationId("3992");

-	}

-

-    @Test(expected = Exception.class)

-	public void getServiceRecipeTest2Exception() throws Exception{

-		ServiceRecipe ht = cd.getServiceRecipe(1001,"3992");

-	}

-    

+    CatalogDatabase cd = null;

+

+    @Before

+    public void setup(){

+        cd = CatalogDatabase.getInstance();

+    }

+

+

+    @Test

+    public void getAllHeatTemplatesTest(){

+

+        MockUp<Query> mockUpQuery = new MockUp<Query>() {

+            @Mock

+            public List<HeatTemplate> list() {

+                HeatTemplate heatTemplate = new HeatTemplate();

+                return Arrays.asList(heatTemplate);

+            }

+        };

+

+        MockUp<Session> mockedSession = new MockUp<Session>() {

+            @Mock

+            public Query createQuery(String hql) {

+                return mockUpQuery.getMockInstance();

+            }

+        };

+

+        new MockUp<CatalogDatabase>() {

+            @Mock

+            private Session getSession() {

+                return mockedSession.getMockInstance();

+            }

+        };

+

+        List <HeatTemplate> list = cd.getAllHeatTemplates();

+        assertEquals(list.size(), 1);

+    }

+

+    @Test

+    public void getHeatTemplateByIdTest(){

+

+        MockUp<Session> mockedSession = new MockUp<Session>() {

+            @Mock

+            public Object get(Class cls, Serializable id) {

+                HeatTemplate heatTemplate = new HeatTemplate();

+                heatTemplate.setAsdcUuid("123-uuid");

+                return heatTemplate;

+            }

+        };

+

+        new MockUp<CatalogDatabase>() {

+            @Mock

+            private Session getSession() {

+                return mockedSession.getMockInstance();

+            }

+        };

+

+        HeatTemplate ht = cd.getHeatTemplate(10);

+        assertEquals("123-uuid", ht.getAsdcUuid());

+    }

+

+    @Test

+    public void getHeatTemplateByNameEmptyListTest(){

+

+        MockUp<Query> mockUpQuery = new MockUp<Query>() {

+            @Mock

+            public List<HeatTemplate> list() {

+                HeatTemplate heatTemplate = new HeatTemplate();

+                return Arrays.asList();

+            }

+        };

+

+        MockUp<Session> mockedSession = new MockUp<Session>() {

+            @Mock

+            public Query createQuery(String hql) {

+                return mockUpQuery.getMockInstance();

+            }

+        };

+

+        new MockUp<CatalogDatabase>() {

+            @Mock

+            private Session getSession() {

+                return mockedSession.getMockInstance();

+            }

+        };

+

+        HeatTemplate ht = cd.getHeatTemplate("heat123");

+        assertEquals(null, ht);

+    }

+

+    @Test

+    public void getHeatTemplateByNameTest(){

+

+        MockUp<Query> mockUpQuery = new MockUp<Query>() {

+            @Mock

+            public List<HeatTemplate> list() {

+                HeatTemplate heatTemplate1 = new HeatTemplate();

+                heatTemplate1.setAsdcUuid("123-uuid");

+                heatTemplate1.setVersion("1.2");

+                HeatTemplate heatTemplate2 = new HeatTemplate();

+                heatTemplate2.setAsdcUuid("456-uuid");

+                heatTemplate2.setVersion("1.3");

+                return Arrays.asList(heatTemplate1, heatTemplate2);

+            }

+        };

+

+        MockUp<Session> mockedSession = new MockUp<Session>() {

+            @Mock

+            public Query createQuery(String hql) {

+                return mockUpQuery.getMockInstance();

+            }

+        };

+

+        new MockUp<CatalogDatabase>() {

+            @Mock

+            private Session getSession() {

+                return mockedSession.getMockInstance();

+            }

+        };

+

+        HeatTemplate ht = cd.getHeatTemplate("heat123");

+        assertEquals("456-uuid", ht.getAsdcUuid());

+    }

+

+    @Test(expected = Exception.class)

+    public void getHeatTemplateTest3Exception(){

+        HeatTemplate ht = cd.getHeatTemplate("heat123","v2");

+    }

+

+    @Test(expected = Exception.class)

+    public void getHeatTemplateByArtifactUuidException(){

+        HeatTemplate ht = cd.getHeatTemplateByArtifactUuid("123");

+    }

+

+    @Test(expected = Exception.class)

+    public void getHeatTemplateByArtifactUuidRegularQueryException(){

+        HeatTemplate ht = cd.getHeatTemplateByArtifactUuidRegularQuery("123");

+    }

+

+    @Test(expected = Exception.class)

+    public void getParametersForHeatTemplateTestException(){

+        List<HeatTemplateParam> ht = cd.getParametersForHeatTemplate("123");

+    }

+

+    @Test(expected = Exception.class)

+    public void getHeatEnvironmentByArtifactUuidTestException(){

+        HeatEnvironment ht = cd.getHeatEnvironmentByArtifactUuid("123");

+    }

+

+    @Test(expected = Exception.class)

+    public void getServiceByInvariantUUIDTestException(){

+        Service ht = cd.getServiceByInvariantUUID("123");

+    }

+

+    @Test(expected = Exception.class)

+    public void getServiceTestException(){

+        Service ht = cd.getService("123");

+    }

+

+    @Test(expected = Exception.class)

+    public void getServiceByModelUUIDTestException(){

+        Service ht = cd.getServiceByModelUUID("123");

+    }

+

+    @Test(expected = Exception.class)

+    public void getService2TestException(){

+        HashMap<String, String> map = new HashMap<>();

+        map.put("serviceNameVersionId", "v2");

+        Service ht = cd.getService(map, "123");

+    }

+

+    @Test(expected = Exception.class)

+    public void getServiceByModelNameTestException(){

+        Service ht = cd.getServiceByModelName("123");

+    }

+

+    @Test(expected = Exception.class)

+    public void getServiceByVersionAndInvariantIdTestException() throws Exception{

+        Service ht = cd.getServiceByVersionAndInvariantId("123","tetwe");

+    }

+

+    @Test(expected = Exception.class)

+    public void getServiceRecipeTestException() throws Exception{

+        ServiceRecipe ht = cd.getServiceRecipe("123","tetwe");

+    }

+

+    @Test(expected = Exception.class)

+    public void getServiceRecipeByServiceModelUuidTestException() throws Exception{

+        ServiceRecipe ht = cd.getServiceRecipeByServiceModelUuid("123","tetwe");

+    }

+

+    @Test(expected = Exception.class)

+    public void getServiceRecipesTestException() throws Exception{

+        List<ServiceRecipe> ht = cd.getServiceRecipes("123");

+    }

+

+    @Test(expected = Exception.class)

+    public void getVnfComponentTestException() throws Exception{

+        VnfComponent ht = cd.getVnfComponent(123,"vnf");

+    }

+

+    @Test(expected = Exception.class)

+    public void getVnfResourceTestException() throws Exception{

+        VnfResource ht = cd.getVnfResource("vnf");

+    }

+

+    @Test(expected = Exception.class)

+    public void getVnfResource2TestException() throws Exception{

+        VnfResource ht = cd.getVnfResource("vnf","3992");

+    }

+

+    @Test(expected = Exception.class)

+    public void getVnfResourceByModelCustomizationIdTestException() throws Exception{

+        VnfResource ht = cd.getVnfResourceByModelCustomizationId("3992");

+    }

+

+    @Test(expected = Exception.class)

+    public void getServiceRecipeTest2Exception() throws Exception{

+        ServiceRecipe ht = cd.getServiceRecipe(1001,"3992");

+    }

+

     @Test(expected = Exception.class)

     public void getVnfResourceCustomizationByModelCustomizationNameTestException(){

-    	VnfResourceCustomization vnf = cd.getVnfResourceCustomizationByModelCustomizationName("test", "test234");

+        VnfResourceCustomization vnf = cd.getVnfResourceCustomizationByModelCustomizationName("test", "test234");

     }

-    

+

     @Test(expected = Exception.class)

     public void getVnfResourceByModelInvariantIdTestException(){

-    	VnfResource vnf = cd.getVnfResourceByModelInvariantId("test", "test234");

+        VnfResource vnf = cd.getVnfResourceByModelInvariantId("test", "test234");

     }

-    

+

     @Test(expected = Exception.class)

     public void getVnfResourceByIdTestException(){

-    	VnfResource vnf = cd.getVnfResourceById(19299);

+        VnfResource vnf = cd.getVnfResourceById(19299);

     }

-    

+

     @Test(expected = Exception.class)

     public void getVfModuleModelNameTestException(){

-    	VfModule vnf = cd.getVfModuleModelName("tetes");

+        VfModule vnf = cd.getVfModuleModelName("tetes");

     }

-    

+

     @Test(expected = Exception.class)

     public void getVfModuleModelName2TestException(){

-    	VfModule vnf = cd.getVfModuleModelName("tetes","4kidsl");

+        VfModule vnf = cd.getVfModuleModelName("tetes","4kidsl");

     }

-    

+

     @Test(expected = Exception.class)

     public void ggetVfModuleCustomizationByModelNameTestException(){

-    	VfModuleCustomization vnf = cd.getVfModuleCustomizationByModelName("tetes");

+        VfModuleCustomization vnf = cd.getVfModuleCustomizationByModelName("tetes");

     }

-    

+

     @Test(expected = Exception.class)

     public void getNetworkResourceTestException(){

-    	NetworkResource vnf = cd.getNetworkResource("tetes");

+        NetworkResource vnf = cd.getNetworkResource("tetes");

     }

-    

+

     @Test(expected = Exception.class)

     public void getVnfRecipeTestException(){

-    	VnfRecipe vnf = cd.getVnfRecipe("tetes","ergfedrf","4993493");

+        VnfRecipe vnf = cd.getVnfRecipe("tetes","ergfedrf","4993493");

     }

-    

+

     @Test(expected = Exception.class)

     public void getVnfRecipe2TestException(){

-    	VnfRecipe vnf = cd.getVnfRecipe("tetes","4993493");

+        VnfRecipe vnf = cd.getVnfRecipe("tetes","4993493");

     }

-    

+

     @Test(expected = Exception.class)

     public void getVnfRecipeByVfModuleIdTestException(){

-    	VnfRecipe vnf = cd.getVnfRecipeByVfModuleId("tetes","4993493","vnf");

+        VnfRecipe vnf = cd.getVnfRecipeByVfModuleId("tetes","4993493","vnf");

     }

-    

+

     @Test(expected = Exception.class)

     public void getVfModuleTypeTestException(){

-    	VfModule vnf = cd.getVfModuleType("4993493");

+        VfModule vnf = cd.getVfModuleType("4993493");

     }

-    

+

     @Test(expected = Exception.class)

     public void getVfModuleType2TestException(){

-    	VfModule vnf = cd.getVfModuleType("4993493","vnf");

+        VfModule vnf = cd.getVfModuleType("4993493","vnf");

     }

     @Test(expected = Exception.class)

     public void getVnfResourceByServiceUuidTestException(){

-    	VnfResource vnf = cd.getVnfResourceByServiceUuid("4993493");

+        VnfResource vnf = cd.getVnfResourceByServiceUuid("4993493");

     }

     @Test(expected = Exception.class)

     public void getVnfResourceByVnfUuidTestException(){

-    	VnfResource vnf = cd.getVnfResourceByVnfUuid("4993493");

+        VnfResource vnf = cd.getVnfResourceByVnfUuid("4993493");

     }

     @Test(expected = Exception.class)

     public void getVfModuleByModelInvariantUuidTestException(){

-    	VfModule vnf = cd.getVfModuleByModelInvariantUuid("4993493");

+        VfModule vnf = cd.getVfModuleByModelInvariantUuid("4993493");

     }

     @Test(expected = Exception.class)

     public void getVfModuleByModelCustomizationUuidTestException(){

-    	VfModuleCustomization vnf = cd.getVfModuleByModelCustomizationUuid("4993493");

+        VfModuleCustomization vnf = cd.getVfModuleByModelCustomizationUuid("4993493");

     }

     @Test(expected = Exception.class)

     public void getVfModuleByModelInvariantUuidAndModelVersionTestException(){

-    	VfModule vnf = cd.getVfModuleByModelInvariantUuidAndModelVersion("4993493","vnf");

+        VfModule vnf = cd.getVfModuleByModelInvariantUuidAndModelVersion("4993493","vnf");

     }

     @Test(expected = Exception.class)

     public void getVfModuleCustomizationByModelCustomizationIdTestException(){

-    	VfModuleCustomization vnf = cd.getVfModuleCustomizationByModelCustomizationId("4993493");

+        VfModuleCustomization vnf = cd.getVfModuleCustomizationByModelCustomizationId("4993493");

     }

     @Test(expected = Exception.class)

     public void getVfModuleByModelUuidTestException(){

-    	VfModule vnf = cd.getVfModuleByModelUuid("4993493");

+        VfModule vnf = cd.getVfModuleByModelUuid("4993493");

     }

     @Test(expected = Exception.class)

     public void getVnfResourceCustomizationByModelCustomizationUuidTestException(){

-    	VnfResourceCustomization vnf = cd.getVnfResourceCustomizationByModelCustomizationUuid("4993493");

+        VnfResourceCustomization vnf = cd.getVnfResourceCustomizationByModelCustomizationUuid("4993493");

     }

     @Test(expected = Exception.class)

     public void getVnfResourceCustomizationByModelVersionIdTestException(){

-    	VnfResourceCustomization vnf = cd.getVnfResourceCustomizationByModelVersionId("4993493");

+        VnfResourceCustomization vnf = cd.getVnfResourceCustomizationByModelVersionId("4993493");

     }

     @Test(expected = Exception.class)

     public void getVfModuleByModelCustomizationIdAndVersionTestException(){

-    	cd.getVfModuleByModelCustomizationIdAndVersion("4993493","test");

+        cd.getVfModuleByModelCustomizationIdAndVersion("4993493","test");

     }

     @Test(expected = Exception.class)

     public void getVfModuleByModelCustomizationIdModelVersionAndModelInvariantIdTestException(){

-    	cd.getVfModuleByModelCustomizationIdModelVersionAndModelInvariantId("4993493","vnf","test");

+        cd.getVfModuleByModelCustomizationIdModelVersionAndModelInvariantId("4993493","vnf","test");

     }

     @Test(expected = Exception.class)

     public void getVnfResourceCustomizationByModelInvariantIdTest(){

-    	cd.getVnfResourceCustomizationByModelInvariantId("4993493","vnf","test");

+        cd.getVnfResourceCustomizationByModelInvariantId("4993493","vnf","test");

     }

     @Test(expected = Exception.class)

     public void getVfModuleCustomizationByVnfModuleCustomizationUuidTest(){

-    	cd.getVfModuleCustomizationByVnfModuleCustomizationUuid("4993493");

+        cd.getVfModuleCustomizationByVnfModuleCustomizationUuid("4993493");

     }

     @Test(expected = Exception.class)

     public void getVnfResourceCustomizationByVnfModelCustomizationNameAndModelVersionIdTest(){

-    	cd.getVnfResourceCustomizationByVnfModelCustomizationNameAndModelVersionId("4993493","test");

+        cd.getVnfResourceCustomizationByVnfModelCustomizationNameAndModelVersionId("4993493","test");

     }

     @Test(expected = Exception.class)

     public void getAllVfModuleCustomizationstest(){

-    	cd.getAllVfModuleCustomizations("4993493");

+        cd.getAllVfModuleCustomizations("4993493");

     }

     @Test(expected = Exception.class)

     public void getVnfResourceByModelUuidTest(){

-    	cd.getVnfResourceByModelUuid("4993493");

+        cd.getVnfResourceByModelUuid("4993493");

     }

     @Test(expected = Exception.class)

     public void getVnfResCustomToVfModuleTest(){

-    	cd.getVnfResCustomToVfModule("4993493","test");

+        cd.getVnfResCustomToVfModule("4993493","test");

     }

     @Test(expected = Exception.class)

     public void getVfModulesForVnfResourceTest(){

-    	VnfResource vnfResource = new VnfResource();

-    	vnfResource.setModelUuid("48839");

-    	cd.getVfModulesForVnfResource(vnfResource);

+        VnfResource vnfResource = new VnfResource();

+        vnfResource.setModelUuid("48839");

+        cd.getVfModulesForVnfResource(vnfResource);

     }

     @Test(expected = Exception.class)

     public void getVfModulesForVnfResource2Test(){

-    	cd.getVfModulesForVnfResource("4993493");

+        cd.getVfModulesForVnfResource("4993493");

     }

     @Test(expected = Exception.class)

     public void getServiceByUuidTest(){

-    	cd.getServiceByUuid("4993493");

+        cd.getServiceByUuid("4993493");

     }

     @Test(expected = Exception.class)

     public void getNetworkResourceById2Test(){

-    	cd.getNetworkResourceById(4993493);

+        cd.getNetworkResourceById(4993493);

     }

     @Test(expected = Exception.class)

     public void getNetworkResourceByIdTest(){

@@ -327,431 +472,431 @@ public class CatalogDatabaseTest {
     }

     @Test

     public void isEmptyOrNullTest(){

-    	boolean is = cd.isEmptyOrNull("4993493");

-    	assertFalse(is);

+        boolean is = cd.isEmptyOrNull("4993493");

+        assertFalse(is);

     }

     @Test(expected = Exception.class)

     public void getSTRTest(){

-    	cd.getSTR("4993493","test","vnf");

+        cd.getSTR("4993493","test","vnf");

     }

     @Test(expected = Exception.class)

     public void getVRCtoVFMCTest(){

-    	cd.getVRCtoVFMC("4993493","388492");

+        cd.getVRCtoVFMC("4993493","388492");

     }

     @Test(expected = Exception.class)

     public void getVfModuleTypeByUuidTestException(){

-    	cd.getVfModuleTypeByUuid("4993493");

+        cd.getVfModuleTypeByUuid("4993493");

     }

-    

+

     @Test(expected = Exception.class)

     public void getTempNetworkHeatTemplateLookupTest(){

-    	cd.getTempNetworkHeatTemplateLookup("4993493");

+        cd.getTempNetworkHeatTemplateLookup("4993493");

     }

-    

+

     @Test(expected = Exception.class)

     public void getAllNetworksByServiceModelUuidTest(){

-    	cd.getAllNetworksByServiceModelUuid("4993493");

+        cd.getAllNetworksByServiceModelUuid("4993493");

     }

     @Test(expected = Exception.class)

     public void getAllNetworksByServiceModelInvariantUuidTest(){

-    	cd.getAllNetworksByServiceModelInvariantUuid("4993493");

+        cd.getAllNetworksByServiceModelInvariantUuid("4993493");

     }

     @Test(expected = Exception.class)

     public void getAllNetworksByServiceModelInvariantUuid2Test(){

-    	cd.getAllNetworksByServiceModelInvariantUuid("4993493","test");

+        cd.getAllNetworksByServiceModelInvariantUuid("4993493","test");

     }

     @Test(expected = Exception.class)

     public void getAllNetworksByNetworkModelCustomizationUuidTest(){

-    	cd.getAllNetworksByNetworkModelCustomizationUuid("4993493");

+        cd.getAllNetworksByNetworkModelCustomizationUuid("4993493");

     }

     @Test(expected = Exception.class)

     public void getAllNetworksByNetworkTypeTest(){

-    	cd.getAllNetworksByNetworkType("4993493");

+        cd.getAllNetworksByNetworkType("4993493");

     }

     @Test(expected = Exception.class)

     public void getAllVfmcForVrcTest(){

-    	VnfResourceCustomization re = new VnfResourceCustomization();

-    	re.setModelCustomizationUuid("377483");

-    	cd.getAllVfmcForVrc(re);

+        VnfResourceCustomization re = new VnfResourceCustomization();

+        re.setModelCustomizationUuid("377483");

+        cd.getAllVfmcForVrc(re);

     }

     @Test(expected = Exception.class)

     public void getAllVnfsByServiceModelUuidTest(){

-    	cd.getAllVnfsByServiceModelUuid("4993493");

+        cd.getAllVnfsByServiceModelUuid("4993493");

     }

     @Test(expected = Exception.class)

     public void getAllVnfsByServiceModelInvariantUuidTest(){

-    	cd.getAllVnfsByServiceModelInvariantUuid("4993493");

+        cd.getAllVnfsByServiceModelInvariantUuid("4993493");

     }

     @Test(expected = Exception.class)

     public void getAllVnfsByServiceModelInvariantUuid2Test(){

-    	cd.getAllVnfsByServiceModelInvariantUuid("4993493","test");

+        cd.getAllVnfsByServiceModelInvariantUuid("4993493","test");

     }

     @Test(expected = Exception.class)

     public void getAllVnfsByServiceNameTest(){

-    	cd.getAllVnfsByServiceName("4993493","test");

+        cd.getAllVnfsByServiceName("4993493","test");

     }

     @Test(expected = Exception.class)

     public void getAllVnfsByServiceName2Test(){

-    	cd.getAllVnfsByServiceName("4993493");

+        cd.getAllVnfsByServiceName("4993493");

     }

     @Test(expected = Exception.class)

     public void getAllVnfsByVnfModelCustomizationUuidTest(){

-    	cd.getAllVnfsByVnfModelCustomizationUuid("4993493");

+        cd.getAllVnfsByVnfModelCustomizationUuid("4993493");

     }

     @Test(expected = Exception.class)

     public void getAllAllottedResourcesByServiceModelUuidTest(){

-    	cd.getAllAllottedResourcesByServiceModelUuid("4993493");

+        cd.getAllAllottedResourcesByServiceModelUuid("4993493");

     }

     @Test(expected = Exception.class)

     public void getAllAllottedResourcesByServiceModelInvariantUuidTest(){

-    	cd.getAllAllottedResourcesByServiceModelInvariantUuid("4993493");

+        cd.getAllAllottedResourcesByServiceModelInvariantUuid("4993493");

     }

     @Test(expected = Exception.class)

     public void getAllAllottedResourcesByServiceModelInvariantUuid2Test(){

-    	cd.getAllAllottedResourcesByServiceModelInvariantUuid("4993493","test");

+        cd.getAllAllottedResourcesByServiceModelInvariantUuid("4993493","test");

     }

     @Test(expected = Exception.class)

     public void getAllAllottedResourcesByArModelCustomizationUuidTest(){

-    	cd.getAllAllottedResourcesByArModelCustomizationUuid("4993493");

+        cd.getAllAllottedResourcesByArModelCustomizationUuid("4993493");

     }

     @Test(expected = Exception.class)

     public void getAllottedResourceByModelUuidTest(){

-    	cd.getAllottedResourceByModelUuid("4993493");

+        cd.getAllottedResourceByModelUuid("4993493");

     }

     @Test(expected = Exception.class)

     public void getAllResourcesByServiceModelUuidTest(){

-    	cd.getAllResourcesByServiceModelUuid("4993493");

+        cd.getAllResourcesByServiceModelUuid("4993493");

     }

     @Test(expected = Exception.class)

     public void getAllResourcesByServiceModelInvariantUuidTest(){

-    	cd.getAllResourcesByServiceModelInvariantUuid("4993493");

+        cd.getAllResourcesByServiceModelInvariantUuid("4993493");

     }

-    

+

     @Test(expected = Exception.class)

     public void getAllResourcesByServiceModelInvariantUuid2Test(){

-    	cd.getAllResourcesByServiceModelInvariantUuid("4993493","test");

+        cd.getAllResourcesByServiceModelInvariantUuid("4993493","test");

     }

     @Test(expected = Exception.class)

     public void getSingleNetworkByModelCustomizationUuidTest(){

-    	cd.getSingleNetworkByModelCustomizationUuid("4993493");

+        cd.getSingleNetworkByModelCustomizationUuid("4993493");

     }

     @Test(expected = Exception.class)

     public void getSingleAllottedResourceByModelCustomizationUuidTest(){

-    	cd.getSingleAllottedResourceByModelCustomizationUuid("4993493");

+        cd.getSingleAllottedResourceByModelCustomizationUuid("4993493");

     }

     @Test(expected = Exception.class)

     public void getVfModuleRecipeTest(){

-    	cd.getVfModuleRecipe("4993493","test","get");

+        cd.getVfModuleRecipe("4993493","test","get");

     }

     @Test(expected = Exception.class)

     public void getVfModuleTest(){

-    	cd.getVfModule("4993493","test","get","v2","vnf");

+        cd.getVfModule("4993493","test","get","v2","vnf");

     }

     @Test(expected = Exception.class)

     public void getVnfComponentsRecipeTest(){

-    	cd.getVnfComponentsRecipe("4993493","test","v2","vnf","get","3992");

+        cd.getVnfComponentsRecipe("4993493","test","v2","vnf","get","3992");

     }

     @Test(expected = Exception.class)

     public void getVnfComponentsRecipeByVfModuleTest(){

-    	List <VfModule> resultList = new ArrayList<>();

-    	VfModule m = new VfModule();

-    	resultList.add(m);

-    	cd.getVnfComponentsRecipeByVfModule(resultList,"4993493");

+        List <VfModule> resultList = new ArrayList<>();

+        VfModule m = new VfModule();

+        resultList.add(m);

+        cd.getVnfComponentsRecipeByVfModule(resultList,"4993493");

     }

     @Test(expected = Exception.class)

     public void getAllVnfResourcesTest(){

-    	cd.getAllVnfResources();

+        cd.getAllVnfResources();

     }

     @Test(expected = Exception.class)

     public void getVnfResourcesByRoleTest(){

-    	cd.getVnfResourcesByRole("4993493");

+        cd.getVnfResourcesByRole("4993493");

     }

     @Test(expected = Exception.class)

     public void getVnfResourceCustomizationsByRoleTest(){

-    	cd.getVnfResourceCustomizationsByRole("4993493");

+        cd.getVnfResourceCustomizationsByRole("4993493");

     }

     @Test(expected = Exception.class)

     public void getAllNetworkResourcesTest(){

-    	cd.getAllNetworkResources();

+        cd.getAllNetworkResources();

     }

     @Test(expected = Exception.class)

     public void getAllNetworkResourceCustomizationsTest(){

-    	cd.getAllNetworkResourceCustomizations();

+        cd.getAllNetworkResourceCustomizations();

     }

     @Test(expected = Exception.class)

     public void getAllVfModulesTest(){

-    	cd.getAllVfModules();

+        cd.getAllVfModules();

     }

     @Test(expected = Exception.class)

     public void getAllVfModuleCustomizationsTest(){

-    	cd.getAllVfModuleCustomizations();

+        cd.getAllVfModuleCustomizations();

     }

     @Test(expected = Exception.class)

     public void getAllHeatEnvironmentTest(){

-    	cd.getAllHeatEnvironment();

+        cd.getAllHeatEnvironment();

     }

     @Test(expected = Exception.class)

     public void getHeatEnvironment2Test(){

-    	cd.getHeatEnvironment(4993493);

+        cd.getHeatEnvironment(4993493);

     }

     @Test(expected = Exception.class)

     public void getNestedTemplatesTest(){

-    	cd.getNestedTemplates(4993493);

+        cd.getNestedTemplates(4993493);

     }

     @Test(expected = Exception.class)

     public void getNestedTemplates2Test(){

-    	cd.getNestedTemplates("4993493");

+        cd.getNestedTemplates("4993493");

     }

     @Test(expected = Exception.class)

     public void getHeatFilesTest(){

-    	cd.getHeatFiles(4993493);

+        cd.getHeatFiles(4993493);

     }

     @Test(expected = Exception.class)

     public void getVfModuleToHeatFilesEntryTest(){

-    	cd.getVfModuleToHeatFilesEntry("4993493","49959499");

+        cd.getVfModuleToHeatFilesEntry("4993493","49959499");

     }

     @Test(expected = Exception.class)

     public void getServiceToResourceCustomization(){

-    	cd.getServiceToResourceCustomization("4993493","599349","49900");

+        cd.getServiceToResourceCustomization("4993493","599349","49900");

     }

     @Test(expected = Exception.class)

     public void getHeatFilesForVfModuleTest(){

-    	cd.getHeatFilesForVfModule("4993493");

+        cd.getHeatFilesForVfModule("4993493");

     }

     @Test(expected = Exception.class)

     public void getHeatTemplateTest(){

-    	cd.getHeatTemplate("4993493","test","heat");

+        cd.getHeatTemplate("4993493","test","heat");

     }

-    

+

     @Test(expected = Exception.class)

     public void saveHeatTemplateTest(){

-    	HeatTemplate heat = new HeatTemplate();

-    	Set <HeatTemplateParam> paramSet = new HashSet<HeatTemplateParam>();

-    	cd.saveHeatTemplate(heat,paramSet);

+        HeatTemplate heat = new HeatTemplate();

+        Set <HeatTemplateParam> paramSet = new HashSet<HeatTemplateParam>();

+        cd.saveHeatTemplate(heat,paramSet);

     }

     @Test(expected = Exception.class)

     public void getHeatEnvironmentTest(){

-    	cd.getHeatEnvironment("4993493","test","heat");

+        cd.getHeatEnvironment("4993493","test","heat");

     }

     @Test(expected = Exception.class)

     public void getHeatEnvironment3Test(){

-    	cd.getHeatEnvironment("4993493","test");

+        cd.getHeatEnvironment("4993493","test");

     }

     @Test(expected = Exception.class)

     public void saveHeatEnvironmentTest(){

-    	HeatEnvironment en = new HeatEnvironment();

-    	cd.saveHeatEnvironment(en);

+        HeatEnvironment en = new HeatEnvironment();

+        cd.saveHeatEnvironment(en);

     }

     @Test(expected = Exception.class)

     public void saveHeatTemplate2Test(){

-    	HeatTemplate heat = new HeatTemplate();

-    	cd.saveHeatTemplate(heat);

+        HeatTemplate heat = new HeatTemplate();

+        cd.saveHeatTemplate(heat);

     }

     @Test(expected = Exception.class)

     public void saveHeatFileTest(){

-    	HeatFiles hf = new HeatFiles();

-    	cd.saveHeatFile(hf);

+        HeatFiles hf = new HeatFiles();

+        cd.saveHeatFile(hf);

     }

     @Test(expected = Exception.class)

     public void saveVnfRecipeTest(){

-    	VnfRecipe vr = new VnfRecipe();

-    	cd.saveVnfRecipe(vr);

+        VnfRecipe vr = new VnfRecipe();

+        cd.saveVnfRecipe(vr);

     }

     @Test(expected = Exception.class)

     public void saveVnfComponentsRecipe(){

-    	VnfComponentsRecipe vr = new VnfComponentsRecipe();

-    	cd.saveVnfComponentsRecipe(vr);

+        VnfComponentsRecipe vr = new VnfComponentsRecipe();

+        cd.saveVnfComponentsRecipe(vr);

     }

     @Test(expected = Exception.class)

     public void saveOrUpdateVnfResourceTest(){

-    	VnfResource vr = new VnfResource();

-    	cd.saveOrUpdateVnfResource(vr);

+        VnfResource vr = new VnfResource();

+        cd.saveOrUpdateVnfResource(vr);

     }

     @Test(expected = Exception.class)

     public void saveVnfResourceCustomizationTest(){

-    	VnfResourceCustomization vr = new VnfResourceCustomization();

-    	cd.saveVnfResourceCustomization(vr);

+        VnfResourceCustomization vr = new VnfResourceCustomization();

+        cd.saveVnfResourceCustomization(vr);

     }

     @Test(expected = Exception.class)

     public void saveAllottedResourceCustomizationTest(){

-    	AllottedResourceCustomization arc = new AllottedResourceCustomization();

-    	cd.saveAllottedResourceCustomization(arc);

+        AllottedResourceCustomization arc = new AllottedResourceCustomization();

+        cd.saveAllottedResourceCustomization(arc);

     }

     @Test(expected = Exception.class)

     public void saveAllottedResourceTest(){

-    	AllottedResource ar = new AllottedResource();

-    	cd.saveAllottedResource(ar);

+        AllottedResource ar = new AllottedResource();

+        cd.saveAllottedResource(ar);

     }

     @Test(expected = Exception.class)

     public void saveNetworkResourceTest() throws RecordNotFoundException {

-    	NetworkResource nr = new NetworkResource();

-    	cd.saveNetworkResource(nr);

+        NetworkResource nr = new NetworkResource();

+        cd.saveNetworkResource(nr);

     }

     @Test(expected = Exception.class)

     public void saveToscaCsarTest()throws RecordNotFoundException {

-    	ToscaCsar ts = new ToscaCsar();

-    	cd.saveToscaCsar(ts);

+        ToscaCsar ts = new ToscaCsar();

+        cd.saveToscaCsar(ts);

     }

     @Test(expected = Exception.class)

     public void getToscaCsar(){

-    	cd.getToscaCsar("4993493");

+        cd.getToscaCsar("4993493");

     }

     @Test(expected = Exception.class)

     public void saveTempNetworkHeatTemplateLookupTest(){

-    	TempNetworkHeatTemplateLookup t = new TempNetworkHeatTemplateLookup();

-    	cd.saveTempNetworkHeatTemplateLookup(t);

+        TempNetworkHeatTemplateLookup t = new TempNetworkHeatTemplateLookup();

+        cd.saveTempNetworkHeatTemplateLookup(t);

     }

     @Test(expected = Exception.class)

     public void saveVfModuleToHeatFiles(){

-    	VfModuleToHeatFiles v = new VfModuleToHeatFiles();

-    	cd.saveVfModuleToHeatFiles(v);

+        VfModuleToHeatFiles v = new VfModuleToHeatFiles();

+        cd.saveVfModuleToHeatFiles(v);

     }

     @Test(expected = Exception.class)

     public void saveVnfResourceToVfModuleCustomizationTest() throws RecordNotFoundException {

-    	VnfResourceCustomization v =new VnfResourceCustomization();

-    	VfModuleCustomization vm = new VfModuleCustomization();

-    	cd.saveVnfResourceToVfModuleCustomization(v, vm);

+        VnfResourceCustomization v =new VnfResourceCustomization();

+        VfModuleCustomization vm = new VfModuleCustomization();

+        cd.saveVnfResourceToVfModuleCustomization(v, vm);

     }

     @Test(expected = Exception.class)

     public void saveNetworkResourceCustomizationTest() throws RecordNotFoundException {

-    	NetworkResourceCustomization nrc = new NetworkResourceCustomization();

-    	cd.saveNetworkResourceCustomization(nrc);

+        NetworkResourceCustomization nrc = new NetworkResourceCustomization();

+        cd.saveNetworkResourceCustomization(nrc);

     }

-    

+

     @Test(expected = Exception.class)

     public void saveServiceToNetworksTest(){

-    	AllottedResource ar = new AllottedResource();

-    	cd.saveAllottedResource(ar);

+        AllottedResource ar = new AllottedResource();

+        cd.saveAllottedResource(ar);

     }

     @Test(expected = Exception.class)

     public void saveServiceToResourceCustomizationTest(){

-    	ServiceToResourceCustomization ar = new ServiceToResourceCustomization();

-    	cd.saveServiceToResourceCustomization(ar);

+        ServiceToResourceCustomization ar = new ServiceToResourceCustomization();

+        cd.saveServiceToResourceCustomization(ar);

     }

     @Test(expected = Exception.class)

     public void saveServiceTest(){

-    	Service ar = new Service();

-    	cd.saveService(ar);

+        Service ar = new Service();

+        cd.saveService(ar);

     }

     @Test(expected = Exception.class)

     public void saveOrUpdateVfModuleTest(){

-    	VfModule ar = new VfModule();

-    	cd.saveOrUpdateVfModule(ar);

+        VfModule ar = new VfModule();

+        cd.saveOrUpdateVfModule(ar);

     }

     @Test(expected = Exception.class)

     public void saveOrUpdateVfModuleCustomizationTest(){

-    	VfModuleCustomization ar = new VfModuleCustomization();

-    	cd.saveOrUpdateVfModuleCustomization(ar);

+        VfModuleCustomization ar = new VfModuleCustomization();

+        cd.saveOrUpdateVfModuleCustomization(ar);

     }

-    

+

     @Test(expected = Exception.class)

     public void getNestedHeatTemplateTest(){

-    	cd.getNestedHeatTemplate(101,201);

+        cd.getNestedHeatTemplate(101,201);

     }

     @Test(expected = Exception.class)

     public void getNestedHeatTemplate2Test(){

-    	cd.getNestedHeatTemplate("1002","1002");

+        cd.getNestedHeatTemplate("1002","1002");

     }

     @Test(expected = Exception.class)

     public void saveNestedHeatTemplateTest(){

-    	HeatTemplate ar = new HeatTemplate();

-    	cd.saveNestedHeatTemplate("1001",ar,"test");

+        HeatTemplate ar = new HeatTemplate();

+        cd.saveNestedHeatTemplate("1001",ar,"test");

     }

     @Test(expected = Exception.class)

     public void getHeatFiles2Test(){

-    	VfModuleCustomization ar = new VfModuleCustomization();

-    	cd.getHeatFiles(101,"test","1001","v2");

+        VfModuleCustomization ar = new VfModuleCustomization();

+        cd.getHeatFiles(101,"test","1001","v2");

     }

     @Test(expected = Exception.class)

     public void getHeatFiles3Test(){

-    	VfModuleCustomization ar = new VfModuleCustomization();

-    	cd.getHeatFiles("200192");

+        VfModuleCustomization ar = new VfModuleCustomization();

+        cd.getHeatFiles("200192");

     }

     @Test(expected = Exception.class)

     public void saveHeatFilesTest(){

-    	HeatFiles ar = new HeatFiles();

-    	cd.saveHeatFiles(ar);

+        HeatFiles ar = new HeatFiles();

+        cd.saveHeatFiles(ar);

     }

     @Test(expected = Exception.class)

     public void saveVfModuleToHeatFilesTest(){

-    	HeatFiles ar = new HeatFiles();

-    	cd.saveVfModuleToHeatFiles("3772893",ar);

+        HeatFiles ar = new HeatFiles();

+        cd.saveVfModuleToHeatFiles("3772893",ar);

     }

     @Test

     public void getNetworkResourceByModelUuidTest(){

-    	

-    	cd.getNetworkResourceByModelUuid("3899291");

+

+        cd.getNetworkResourceByModelUuid("3899291");

     }

     @Test(expected = Exception.class)

     public void getNetworkRecipeTest(){

-    	

-    	cd.getNetworkRecipe("test","test1","test2");

+

+        cd.getNetworkRecipe("test","test1","test2");

     }

     @Test(expected = Exception.class)

     public void getNetworkRecipe2Test(){

-    	

-    	cd.getNetworkRecipe("test","test1");

+

+        cd.getNetworkRecipe("test","test1");

     }

     @Test

     public void getNetworkResourceByModelCustUuidTest(){

-    	

-    	cd.getNetworkResourceByModelCustUuid("test");

+

+        cd.getNetworkResourceByModelCustUuid("test");

     }

     @Test(expected = Exception.class)

     public void getVnfComponentsRecipe2Test(){

-    	

-    	cd.getVnfComponentsRecipe("test1","test2","test3","test4");

+

+        cd.getVnfComponentsRecipe("test1","test2","test3","test4");

     }

     @Test(expected = Exception.class)

     public void getVnfComponentsRecipeByVfModuleModelUUIdTest(){

-    	

-    	cd.getVnfComponentsRecipeByVfModuleModelUUId("test1","test2","test3");

+

+        cd.getVnfComponentsRecipeByVfModuleModelUUId("test1","test2","test3");

     }

     @Test(expected = Exception.class)

     public void getVnfComponentRecipesTest(){

-    	

-    	cd.getVnfComponentRecipes("test");

+

+        cd.getVnfComponentRecipes("test");

     }

     @Test(expected = Exception.class)

     public void saveOrUpdateVnfComponentTest(){

-    	VnfComponent ar = new VnfComponent();

-    	cd.saveOrUpdateVnfComponent(ar);

+        VnfComponent ar = new VnfComponent();

+        cd.saveOrUpdateVnfComponent(ar);

     }

-    

+

     @Test(expected = Exception.class)

     public void getVfModule2Test(){

-    	

-    	cd.getVfModule("test");

+

+        cd.getVfModule("test");

     }

     @Test(expected = Exception.class)

     public void getVfModuleByModelUUIDTest(){

-    	

-    	cd.getVfModuleByModelUUID("test");

+

+        cd.getVfModuleByModelUUID("test");

     }

     @Test(expected = Exception.class)

     public void getServiceRecipeByModelUUIDTest(){

-    	

-    	cd.getServiceRecipeByModelUUID("test1","test2");

+

+        cd.getServiceRecipeByModelUUID("test1","test2");

     }

     @Test(expected = Exception.class)

     public void getModelRecipeTest(){

-    	

-    	cd.getModelRecipe("test1","test2","test3");

+

+        cd.getModelRecipe("test1","test2","test3");

     }

     @Test(expected = Exception.class)

     public void healthCheck(){

-    	

-    	cd.healthCheck();

+

+        cd.healthCheck();

     }

     @Test(expected = Exception.class)

     public void executeQuerySingleRow(){

-    	VnfComponent ar = new VnfComponent();

-    	HashMap<String, String> variables = new HashMap<String, String>();

-    	cd.executeQuerySingleRow("tets",variables,false);

+        VnfComponent ar = new VnfComponent();

+        HashMap<String, String> variables = new HashMap<String, String>();

+        cd.executeQuerySingleRow("tets",variables,false);

     }

     @Test(expected = Exception.class)

     public void executeQueryMultipleRows(){

-    	HashMap<String, String> variables = new HashMap<String, String>();

-    	cd.executeQueryMultipleRows("select",variables,false);

+        HashMap<String, String> variables = new HashMap<String, String>();

+        cd.executeQueryMultipleRows("select",variables,false);

     }

 }