UT improvement for catalog db

UT improvement for catalog db.

Change-Id: Ie1a4554501ebc6e41a9a64b4613d72ae91e5ef03
Issue-ID: SO-360
Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>

1 files changed, 52 insertions, 3 deletions

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 d65928f508..2266392d9a 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
@@ -913,9 +913,58 @@ public class CatalogDatabaseTest {
         ServiceRecipe ht = cd.getServiceRecipe("123","tetwe");
     }
 
-    @Test(expected = Exception.class)
-    public void getServiceRecipeByServiceModelUuidTestException() throws Exception{
-        ServiceRecipe ht = cd.getServiceRecipeByServiceModelUuid("123","tetwe");
+    @Test
+    public void getServiceRecipeByServiceModelUuidTest() {
+        MockUp<Query> mockUpQuery = new MockUp<Query>() {
+            @Mock
+            public List<ServiceRecipe> list() throws Exception {
+                ServiceRecipe serviceRecipe = new ServiceRecipe();
+                serviceRecipe.setId(1);
+                return Arrays.asList(serviceRecipe);
+            }
+        };
+
+        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();
+            }
+        };
+        ServiceRecipe serviceRecipe = cd.getServiceRecipeByServiceModelUuid("123","tetwe");
+        assertEquals(1, serviceRecipe.getId());
+    }
+
+    @Test
+    public void getServiceRecipeByServiceModelUuidEmptyTest() {
+        MockUp<Query> mockUpQuery = new MockUp<Query>() {
+            @Mock
+            public List<ServiceRecipe> list() throws Exception {
+                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();
+            }
+        };
+        ServiceRecipe serviceRecipe = cd.getServiceRecipeByServiceModelUuid("123","tetwe");
+        assertEquals(null, serviceRecipe);
     }
 
     @Test(expected = Exception.class)