2 files changed, 24 insertions, 6 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 9445cccb12..b9a69e78c7 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
@@ -266,10 +266,10 @@ public class CatalogDatabase implements Closeable {
      *
      * @param artifactUuid
      * @return HeatTemplate object or null if none found
-     */    
+     */
     public HeatTemplate getHeatTemplateByArtifactUuidRegularQuery(String artifactUuid) {
-       long startTime = System.currentTimeMillis ();
-        LOGGER.debug ("Catalog database - get Heat template (regular query) with artifactUuid " + artifactUuid);
+        long startTime = System.currentTimeMillis();
+        LOGGER.debug("Catalog database - get Heat template (regular query) with artifactUuid " + artifactUuid);
 
         String hql = "FROM HeatTemplate WHERE artifactUuid = :artifactUuidValue";
         HashMap<String, String> variables = new HashMap<>();
@@ -277,9 +277,9 @@ public class CatalogDatabase implements Closeable {
         HeatTemplate template = (HeatTemplate) this.executeQuerySingleRow(hql, variables, true);
 
         if (template == null) {
-        	LOGGER.recordMetricEvent (startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, "NotFound", "CatalogDB", "getHeatTemplateByArtifactUuidRegularQuery", null);
+            LOGGER.recordMetricEvent(startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, "NotFound", "CatalogDB", "getHeatTemplateByArtifactUuidRegularQuery", null);
         } else {
-        	LOGGER.recordMetricEvent (startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, "Successfully", "CatalogDB", "getHeatTemplateByArtifactUuidRegularQuery", null);
+            LOGGER.recordMetricEvent(startTime, MsoLogger.StatusCode.COMPLETE, MsoLogger.ResponseCode.Suc, "Successfully", "CatalogDB", "getHeatTemplateByArtifactUuidRegularQuery", null);
         }
         return template;
     }
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 5e6ccc4a86..e19c67f7d0 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
@@ -282,9 +282,27 @@ public class CatalogDatabaseTest {
         assertEquals(null, ht);
     }
 
-    @Test(expected = Exception.class)
+    @Test
     public void getHeatTemplateByArtifactUuidException(){
+
+        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.getHeatTemplateByArtifactUuid("123");
+        assertEquals("123-uuid", ht.getAsdcUuid());
     }
 
     @Test(expected = Exception.class)