improve sonar coverage for uui-server

Change-Id: Ie1be992d1d6d4bd6f278417b3e793c994cfc889c
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 5f249ad..22988cf 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
@@ -68,7 +68,7 @@ public class AlarmsHeaderServiceImpl implements AlarmsHeaderService {
        public String updateAlarmsHeader2018(String status, Timestamp date, String startEpochMicrosecCleared, String lastEpochMicroSecCleared, String eventName, String reportingEntityName, String specificProblem) {\r
                try(Session session = getSession()){\r
                        logger.info("AlarmsInformationServiceImpl updateAlarmsInformation: alarmsInformation={}");\r
-                       session.beginTransaction();\r
+                       Transaction tx = session.beginTransaction();\r
 \r
             Query q=session.createQuery("update AlarmsHeader set status=:status, updateTime=:date, startEpochMicrosecCleared=:startEpochMicrosecCleared  ,lastEpochMicroSecCleared=:lastEpochMicroSecCleared    where eventName=:eventName and reportingEntityName=:reportingEntityName and specificProblem =:specificProblem");\r
             q.setString("status",status);\r
@@ -79,7 +79,8 @@ public class AlarmsHeaderServiceImpl implements AlarmsHeaderService {
             q.setString("reportingEntityName",reportingEntityName);\r
             q.setString("specificProblem",specificProblem);\r
             q.executeUpdate();\r
-                       session.getTransaction().commit();\r
+                       tx = session.getTransaction();\r
+                       tx.commit();\r
                        session.flush();\r
                        return "1";\r
                } catch (Exception e) {\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 f7be8c0..7afc0ec 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
@@ -48,14 +48,13 @@ import mockit.MockUp;
 */
 public class AlarmsHeaderServiceImplTest {
        @Before
-               public void before() throws Exception { 
+       public void before() throws Exception { 
        }
 
        @After
        public void after() throws Exception { 
        }
 
-       AlarmsHeaderServiceImpl alarmsHeaderServiceImpl = new AlarmsHeaderServiceImpl();
        private Session session;
        private Transaction transaction;
        private Query query;
@@ -85,14 +84,65 @@ public class AlarmsHeaderServiceImplTest {
                                return mockedSession.getMockInstance();
                        }
                };
+               AlarmsHeaderServiceImpl alarmsHeaderServiceImpl = new AlarmsHeaderServiceImpl();
                AlarmsHeader alarmsHeader = null;
                alarmsHeaderServiceImpl.saveAlarmsHeader(alarmsHeader);
        }
 
        @Test(expected = Exception.class)
        public void testSaveAlarmsHeaderError(){
+               AlarmsHeaderServiceImpl alarmsHeaderServiceImpl = new AlarmsHeaderServiceImpl();
                alarmsHeaderServiceImpl.saveAlarmsHeader(new AlarmsHeader());
        }
 
+       @Test
+       public void testUpdateAlarmsHeader2018() throws Exception { 
+               MockUp<Query> mockUpQuery = new MockUp<Query>() {
+                       @Mock
+                       public void setString(String str) {
+                       }
+                       @Mock
+                       public void setDate(Timestamp date) {
+                       }
+                       @Mock
+                       public void executeUpdate() {
+                       }
+               };
+               MockUp<Session> mockedSession = new MockUp<Session>() {
+                       @Mock
+                       public Query createQuery(String hql) {
+                               return mockUpQuery.getMockInstance();
+                       }
+                       @Mock
+                       public Transaction beginTransaction() {
+                               return transaction;
+                       }
+                       @Mock
+                       public void flush() {
+                       }
+               };
+               new MockUp<Transaction>() {
+                       @Mock
+                       public void getTransaction() {
+                       }
+                       @Mock
+                       public void commit() {
+                       }
+               };
+               new MockUp<AlarmsHeaderServiceImpl>() {
+                       @Mock
+                       private Session getSession() {
+                               return mockedSession.getMockInstance();
+                       }
+               };
+               AlarmsHeaderServiceImpl alarmsHeaderServiceImpl = new AlarmsHeaderServiceImpl();
+               alarmsHeaderServiceImpl.updateAlarmsHeader2018(null, null, null, null, null, null, null);
+       }
+
+       @Test(expected = Exception.class)
+       public void testUpdateAlarmsHeader2018Error(){
+               AlarmsHeaderServiceImpl alarmsHeaderServiceImpl = new AlarmsHeaderServiceImpl();
+               alarmsHeaderServiceImpl.updateAlarmsHeader2018(null, null, null, null, null, null, null);
+       }
 
 }