improve sonar coverage for uui-server

Change-Id: Iaaa2beab21317562c076b8b2851bf5a104f6b098
Issue-ID: USECASEUI-103
Signed-off-by: zhangab <zhanganbing@chinamobile.com>

diff --git a/server/src/main/java/org/onap/usecaseui/server/service/impl/AlarmsHeaderServiceImpl.java b/server/src/main/java/org/onap/usecaseui/server/service/impl/AlarmsHeaderServiceImpl.java
index 6f8904a..4812589 100755 (executable)
--- a/server/src/main/java/org/onap/usecaseui/server/service/impl/AlarmsHeaderServiceImpl.java
+++ b/server/src/main/java/org/onap/usecaseui/server/service/impl/AlarmsHeaderServiceImpl.java
@@ -158,9 +158,9 @@ public class AlarmsHeaderServiceImpl implements AlarmsHeaderService {
                        }\r
                        Query query = session.createQuery(count.toString());\r
                        query.setString("status",status);\r
-                       String num = query.uniqueResult().toString();\r
+                       Object obj = query.uniqueResult();\r
                        session.flush();\r
-                       return Integer.parseInt(num);\r
+                       return Integer.parseInt(obj.toString());\r
                }catch (Exception e){\r
                        logger.error("exception occurred while performing AlarmsHeaderServiceImpl getAllCount."+e.getMessage());\r
                        return 0;\r
@@ -261,9 +261,9 @@ public class AlarmsHeaderServiceImpl implements AlarmsHeaderService {
                                query.setString("eventServrity", eventServrity);\r
                        }\r
 \r
-                       String num = query.uniqueResult().toString();\r
+                       Object obj = query.uniqueResult();\r
                        session.flush();\r
-                       return Integer.parseInt(num);\r
+                       return Integer.parseInt(obj.toString());\r
                }catch (Exception e){\r
                        logger.error("exception occurred while performing AlarmsHeaderServiceImpl getAllCount."+e.getMessage());\r
                        return 0;\r
@@ -379,9 +379,9 @@ public class AlarmsHeaderServiceImpl implements AlarmsHeaderService {
                     query.setDate("endTime",alarmsHeader.getUpdateTime());\r
                 }\r
 \r
-                       String num = query.uniqueResult().toString();\r
+                       Object obj = query.uniqueResult();\r
             session.flush();\r
-                       return Integer.parseInt(num);\r
+                       return Integer.parseInt(obj.toString());\r
         } catch (Exception e) {\r
             logger.error("exception occurred while performing AlarmsHeaderServiceImpl getAllCount. Details:" + e.getMessage());\r
             return -1;\r
@@ -530,7 +530,8 @@ public class AlarmsHeaderServiceImpl implements AlarmsHeaderService {
                        }\r
                        List<AlarmsHeader> list = new ArrayList<AlarmsHeader>();\r
                        Query query = session.createQuery("from AlarmsHeader a where a.eventName IN (:alist)");\r
-                       list = query.setParameterList("alist", id).list();\r
+                       query = query.setParameterList("alist", id);\r
+                       list = query.list();\r
                        return list;\r
                } catch (Exception e) {\r
                        logger.error("exception occurred while performing AlarmsHeaderServiceImpl queryId. Details:" + e.getMessage());\r
@@ -542,12 +543,15 @@ public class AlarmsHeaderServiceImpl implements AlarmsHeaderService {
     public String queryStatusCount(String status) {\r
         try(Session session = getSession()){\r
             String hql = "select count(status) from AlarmsHeader a";\r
-            if (!status.equals("0"))\r
+            if (!status.equals("0")) {\r
                 hql+=" where a.status = :status";\r
+                       }\r
             Query query = session.createQuery(hql);\r
-            if (!status.equals("0"))\r
+            if (!status.equals("0")){\r
                 query.setString("status",status);\r
-            return query.uniqueResult().toString();\r
+                       }\r
+                       Object obj = query.uniqueResult();\r
+            return obj.toString();\r
         } catch (Exception e) {\r
             logger.error("exception occurred while performing AlarmsHeaderServiceImpl queryStatusCount. Details:" + e.getMessage());\r
             return null;\r

diff --git a/server/src/main/java/org/onap/usecaseui/server/service/impl/AlarmsInformationServiceImpl.java b/server/src/main/java/org/onap/usecaseui/server/service/impl/AlarmsInformationServiceImpl.java
index c099e1f..f0ac9c3 100755 (executable)
--- a/server/src/main/java/org/onap/usecaseui/server/service/impl/AlarmsInformationServiceImpl.java
+++ b/server/src/main/java/org/onap/usecaseui/server/service/impl/AlarmsInformationServiceImpl.java
@@ -185,7 +185,8 @@ public class AlarmsInformationServiceImpl implements AlarmsInformationService {
                        List<AlarmsInformation> list = new ArrayList<AlarmsInformation>();\r
                        Session session = getSession();\r
                        Query query = session.createQuery("from AlarmsInformation a where a.eventId IN (:alist)");\r
-                       list = query.setParameterList("alist", id).list();\r
+                       query = query.setParameterList("alist", id);\r
+                       list = query.list();\r
                        session.close();\r
                        return list;\r
                } catch (Exception e) {\r
@@ -216,7 +217,8 @@ public class AlarmsInformationServiceImpl implements AlarmsInformationService {
                        if (startTime != null && !"".equals(startTime) && endTime != null && !"".equals(endTime)){\r
                                query.setString("startTime", startTime).setString("endTime", endTime);\r
                        }\r
-                       Iterator it= query.list().iterator();\r
+                       List<Object[]> queryResult = query.list();\r
+                       Iterator it= queryResult.iterator();\r
                        while(it.hasNext()){\r
                                Object[] res=(Object[]) it.next();\r
                                Map<String,String> map = new HashMap<>();\r

diff --git a/server/src/test/java/org/onap/usecaseui/server/service/impl/AlarmsHeaderServiceImplTest.java b/server/src/test/java/org/onap/usecaseui/server/service/impl/AlarmsHeaderServiceImplTest.java
index a3fc719..bb769e2 100644 (file)
--- a/server/src/test/java/org/onap/usecaseui/server/service/impl/AlarmsHeaderServiceImplTest.java
+++ b/server/src/test/java/org/onap/usecaseui/server/service/impl/AlarmsHeaderServiceImplTest.java
@@ -157,11 +157,23 @@ public class AlarmsHeaderServiceImplTest {
 
        @Test
        public void testGetStatusBySourceName() throws Exception {
+               new MockUp<Query>() {
+                       @Mock
+                       public Object uniqueResult() {
+                               return "active";
+                       }
+               };
                alarmsHeaderServiceImpl.getStatusBySourceName("sourceName");
        }
 
        @Test
        public void testGetIdByStatusSourceName() throws Exception {
+               new MockUp<Query>() {
+                       @Mock
+                       public Object uniqueResult() {
+                               return "AlarmsHeader";
+                       }
+               };
                alarmsHeaderServiceImpl.getIdByStatusSourceName("sourceName");
        }
 
@@ -173,6 +185,12 @@ public class AlarmsHeaderServiceImplTest {
 
        @Test
        public void testGetAllCountByStatus() throws Exception {
+               new MockUp<Query>() {
+                       @Mock
+                       public Object uniqueResult() {
+                               return "1";
+                       }
+               };
                alarmsHeaderServiceImpl.getAllCountByStatus("status");
        }
 
@@ -183,17 +201,35 @@ public class AlarmsHeaderServiceImplTest {
 
        @Test
        public void testGetAlarmsHeaderDetail() throws Exception {
+               new MockUp<Query>() {
+                       @Mock
+                       public Object uniqueResult() {
+                               return "AlarmsHeader";
+                       }
+               };
                alarmsHeaderServiceImpl.getAlarmsHeaderDetail(1);
        }
 
        @Test
        public void testGetAllByDatetime() throws Exception {
+               new MockUp<Query>() {
+                       @Mock
+                       public Object uniqueResult() {
+                               return "1";
+                       }
+               };
                alarmsHeaderServiceImpl.getAllCountByStatus("status");
                alarmsHeaderServiceImpl.getAllByDatetime("status", "eventId", "eventServrity", "createTime");
        }
 
        @Test
        public void testGetAllCount() throws Exception {
+               new MockUp<Query>() {
+                       @Mock
+                       public Object uniqueResult() {
+                               return "1";
+                       }
+               };
                AlarmsHeader ah = new AlarmsHeader();
                ah.setVersion("va2");
                ah.setEventName("a");
@@ -264,6 +300,12 @@ public class AlarmsHeaderServiceImplTest {
 
        @Test
        public void testQueryStatusCount() throws Exception {
+               new MockUp<Query>() {
+                       @Mock
+                       public Object uniqueResult() {
+                               return "1";
+                       }
+               };
                alarmsHeaderServiceImpl.queryStatusCount("status");
        }
 

diff --git a/server/src/test/java/org/onap/usecaseui/server/service/impl/AlarmsInformationServiceImplTest.java b/server/src/test/java/org/onap/usecaseui/server/service/impl/AlarmsInformationServiceImplTest.java
index 0993f67..d6dcc1b 100644 (file)
--- a/server/src/test/java/org/onap/usecaseui/server/service/impl/AlarmsInformationServiceImplTest.java
+++ b/server/src/test/java/org/onap/usecaseui/server/service/impl/AlarmsInformationServiceImplTest.java
@@ -138,10 +138,6 @@ public class AlarmsInformationServiceImplTest {
                        private Session getSession() {
                                return mockedSession.getMockInstance();
                        }
-                       @Mock
-                       private int getAllCount(AlarmsInformation alarmsInformation, int currentPage, int pageSize) {
-                               return 10;
-                       }
                };
        }
 
@@ -174,6 +170,12 @@ public class AlarmsInformationServiceImplTest {
 
        @Test
        public void testQueryAlarmsInformation() throws Exception {
+               new MockUp<AlarmsInformationServiceImpl>() {
+                       @Mock
+                       private int getAllCount(AlarmsInformation alarmsInformation, int currentPage, int pageSize) {
+                               return 10;
+                       }
+               };
                AlarmsInformation ai = new AlarmsInformation();
                ai.setName("name");
                ai.setValue("value");