2 files changed, 61 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 e7491b7ec7..7ac188b027 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
@@ -351,11 +351,11 @@ public class CatalogDatabase implements Closeable {
      */
     public Service getServiceByInvariantUUID (String modelInvariantUUID) {
 
-        long startTime = System.currentTimeMillis ();
-        LOGGER.debug ("Catalog database - get service with Invariant UUID " + modelInvariantUUID);
+        long startTime = System.currentTimeMillis();
+        LOGGER.debug("Catalog database - get service with Invariant UUID " + modelInvariantUUID);
 
         String hql = "FROM Service WHERE modelInvariantUUID = :model_invariant_uuid";
-        Query query = getSession ().createQuery (hql);
+        Query query = getSession().createQuery(hql);
         query.setParameter ("model_invariant_uuid", modelInvariantUUID);
 
         @SuppressWarnings("unchecked")
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 705f64c8cb..7d39dd6409 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
@@ -555,9 +555,64 @@ public class CatalogDatabaseTest {
         HeatEnvironment he = cd.getHeatEnvironmentByArtifactUuid("123");
     }
 
-    @Test(expected = Exception.class)
-    public void getServiceByInvariantUUIDTestException(){
-        Service ht = cd.getServiceByInvariantUUID("123");
+    @Test
+    public void getServiceByInvariantUUIDTest(){
+
+        MockUp<Query> mockUpQuery = new MockUp<Query>() {
+
+            @Mock
+            public List<Service> list() {
+                Service service = new Service();
+                service.setModelUUID("123-uuid");
+                return Arrays.asList(service);
+            }
+        };
+
+        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();
+            }
+        };
+
+        Service service = cd.getServiceByInvariantUUID("123");
+        assertEquals("123-uuid", service.getModelUUID());
+    }
+
+    @Test
+    public void getServiceByInvariantUUIDEmptyResultTest(){
+
+        MockUp<Query> mockUpQuery = new MockUp<Query>() {
+
+            @Mock
+            public List<Service> list() {
+                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();
+            }
+        };
+
+        Service service = cd.getServiceByInvariantUUID("123");
+        assertEquals(null, service);
     }
 
     @Test(expected = Exception.class)