2 files changed, 88 insertions, 7 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 926c48302f..e7491b7ec7 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
@@ -314,19 +314,18 @@ public class CatalogDatabase implements Closeable {
      * @return HeatEnvironment object or null if none found
      */    
     public HeatEnvironment getHeatEnvironmentByArtifactUuid(String artifactUuid) {
-        long startTime = System.currentTimeMillis ();
-        LOGGER.debug ("Catalog database - get Heat Environment with artifactUuid " + artifactUuid);
+        long startTime = System.currentTimeMillis();
+        LOGGER.debug("Catalog database - get Heat Environment with artifactUuid " + artifactUuid);
 
         String hql = "FROM HeatEnvironment WHERE artifactUuid = :artifactUuidValue";
         Query query = getSession().createQuery(hql);
-        query.setParameter ("artifactUuidValue", artifactUuid);
+        query.setParameter("artifactUuidValue", artifactUuid);
         HeatEnvironment environment = null;
         try {
-        	environment = (HeatEnvironment) query.uniqueResult ();
+            environment = (HeatEnvironment) query.uniqueResult();
         } catch (org.hibernate.NonUniqueResultException nure) {
         	LOGGER.debug("Non Unique Result Exception - the Catalog Database does not match a unique row for Envt - data integrity error: artifactUuid='" + artifactUuid +"'", nure);
         	LOGGER.error(MessageEnum.GENERAL_EXCEPTION, " non unique result for heatEnvironment artifactUuid=" + artifactUuid, "", "", MsoLogger.ErrorCode.DataError, "Non unique result for artifactUuid==" + artifactUuid);
-        	environment = null;
         } catch (org.hibernate.HibernateException he) {
         	LOGGER.debug("Hibernate Exception - while searching for envt: artifactUuid='" + artifactUuid + "' " + he.getMessage());
         	LOGGER.error(MessageEnum.GENERAL_EXCEPTION, " Hibernate exception searching envt for artifactUuid=" + artifactUuid, "", "", MsoLogger.ErrorCode.DataError, "Hibernate exception searching envt for artifactUuid=" + artifactUuid);
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 84e697b20c..705f64c8cb 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
@@ -468,9 +468,91 @@ public class CatalogDatabaseTest {
         List<HeatTemplateParam> htList = cd.getParametersForHeatTemplate("12l3");
     }
 
+    @Test
+    public void getHeatEnvironmentByArtifactUuidTest(){
+
+        MockUp<Query> mockUpQuery = new MockUp<Query>() {
+
+            @Mock
+            public Object uniqueResult() {
+                HeatEnvironment heatEnvironment = new HeatEnvironment();
+                heatEnvironment.setArtifactUuid("123-uuid");
+                return heatEnvironment;
+            }
+        };
+
+        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();
+            }
+        };
+
+        HeatEnvironment he = cd.getHeatEnvironmentByArtifactUuid("123");
+        assertEquals("123-uuid", he.getArtifactUuid());
+    }
+
+    @Test(expected = HibernateException.class)
+    public void getHeatEnvironmentByArtifactUuidHibernateExceptionTest(){
+
+        MockUp<Query> mockUpQuery = new MockUp<Query>() {
+
+            @Mock
+            public Object uniqueResult() {
+                throw new HibernateException("hibernate exception");
+            }
+        };
+
+        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();
+            }
+        };
+
+        HeatEnvironment he = cd.getHeatEnvironmentByArtifactUuid("123");
+    }
+
     @Test(expected = Exception.class)
-    public void getHeatEnvironmentByArtifactUuidTestException(){
-        HeatEnvironment ht = cd.getHeatEnvironmentByArtifactUuid("123");
+    public void getHeatEnvironmentByArtifactUuidExceptionTest(){
+
+        MockUp<Query> mockUpQuery = new MockUp<Query>() {
+
+            @Mock
+            public Object uniqueResult() throws Exception {
+                throw new Exception();
+            }
+        };
+
+        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();
+            }
+        };
+
+        HeatEnvironment he = cd.getHeatEnvironmentByArtifactUuid("123");
     }
 
     @Test(expected = Exception.class)