Added SVACE Fixes for C++ wrapper Unit TCs

[platform/upstream/iotivity.git] / service / notification / cpp-wrapper / unittest / NSProviderServiceTest.cpp

diff --git a/service/notification/cpp-wrapper/unittest/NSProviderServiceTest.cpp b/service/notification/cpp-wrapper/unittest/NSProviderServiceTest.cpp
old mode 100644 (file)
new mode 100755 (executable)
index a9acd13..e1b9f02
--- a/service/notification/cpp-wrapper/unittest/NSProviderServiceTest.cpp
+++ b/service/notification/cpp-wrapper/unittest/NSProviderServiceTest.cpp
@@ -52,7 +52,9 @@ class TestWithMock: public testing::Test
         MockRepository mocks;
 
     protected:
-        virtual ~TestWithMock() noexcept(noexcept(std::declval<Test>().~Test())) {}
+        virtual ~TestWithMock() noexcept(noexcept(std::declval<Test>().~Test()))
+        {
+        }
 
         virtual void TearDown()
         {
@@ -203,7 +205,7 @@ TEST_F(NotificationProviderServiceTest,
 TEST_F(NotificationProviderServiceTest, NeverCallNotifyOnConsumerByAcceptIsFalse)
 {
     bool expectTrue = true;
-    int msgID;
+    int msgID = 0;
 
     mocks.OnCallFunc(MessageCallbackFromConsumerEmpty).Do(
         [& expectTrue, &msgID](const int & id, const std::string &, const std::string &,
@@ -239,7 +241,7 @@ TEST_F(NotificationProviderServiceTest, NeverCallNotifyOnConsumerByAcceptIsFalse
 
 TEST_F(NotificationProviderServiceTest, ExpectCallNotifyOnConsumerByAcceptIsTrue)
 {
-    int msgID;
+    int msgID = 0;
 
     mocks.ExpectCallFunc(MessageCallbackFromConsumerEmpty).Do(
         [&msgID](const int & id, const std::string &, const std::string &, const std::string &)
@@ -266,7 +268,7 @@ TEST_F(NotificationProviderServiceTest, ExpectCallNotifyOnConsumerByAcceptIsTrue
 
 TEST_F(NotificationProviderServiceTest, ExpectCallbackSyncOnReadToConsumer)
 {
-    int id;
+    int id = 0;
 
     mocks.ExpectCallFunc(SyncCallbackFromConsumerEmpty).Do(
         [& id](int & type, int & syncId)
@@ -295,7 +297,7 @@ TEST_F(NotificationProviderServiceTest, ExpectCallbackSyncOnReadToConsumer)
 TEST_F(NotificationProviderServiceTest, ExpectCallbackSyncOnReadFromConsumer)
 {
     int type = (int)OIC::Service::NSSyncInfo::NSSyncType::NS_SYNC_READ;
-    int id;
+    int id = 0;
     mocks.ExpectCallFunc(MessageSynchronizedCallbackEmpty).Do(
         [& id](OIC::Service::NSSyncInfo * sync)
     {
@@ -353,6 +355,10 @@ TEST_F(NotificationProviderServiceTest, ExpectEqualAddedTopicsAndRegisteredTopic
 
     OIC::Service::NSProviderService::getInstance()->unregisterTopic(str1);
     OIC::Service::NSProviderService::getInstance()->unregisterTopic(str2);
+    if(topicList != nullptr)
+    {
+        delete topicList;
+    }
     responseCon.wait_for(lock, g_waitForResponse);
 }
 
@@ -386,6 +392,10 @@ TEST_F(NotificationProviderServiceTest, ExpectEqualUnregisteredTopicsAndRegister
     EXPECT_EQ(isSame, true);
 
     OIC::Service::NSProviderService::getInstance()->unregisterTopic(str1);
+    if(topicList != nullptr)
+    {
+        delete topicList;
+    }
     responseCon.wait_for(lock, g_waitForResponse);
 }
 
@@ -411,7 +421,7 @@ TEST_F(NotificationProviderServiceTest, ExpectEqualSetConsumerTopicsAndGetConsum
     else
     {
         std::string compString[10];
-        int i = 0, state[10];
+        int i = 0, state[10] = {0};
         for (auto itr : topicList->getTopicsList())
         {
             compString[i] = itr->getTopicName();
@@ -430,6 +440,10 @@ TEST_F(NotificationProviderServiceTest, ExpectEqualSetConsumerTopicsAndGetConsum
 
     OIC::Service::NSProviderService::getInstance()->unregisterTopic(str1);
     OIC::Service::NSProviderService::getInstance()->unregisterTopic(str2);
+    if(topicList != nullptr)
+    {
+        delete topicList;
+    }
     responseCon.wait_for(lock, g_waitForResponse);
 }
 
@@ -457,7 +471,7 @@ TEST_F(NotificationProviderServiceTest, ExpectEqualUnSetConsumerTopicsAndGetCons
     else
     {
         std::string compString[10];
-        int i = 0, state[10];
+        int i = 0, state[10] = {0};
         for (auto itr : topicList->getTopicsList())
         {
             compString[i] = itr->getTopicName();
@@ -476,6 +490,11 @@ TEST_F(NotificationProviderServiceTest, ExpectEqualUnSetConsumerTopicsAndGetCons
 
     OIC::Service::NSProviderService::getInstance()->unregisterTopic(str1);
     OIC::Service::NSProviderService::getInstance()->unregisterTopic(str2);
+    
+    if(topicList != nullptr)
+    {
+        delete topicList;
+    }
     responseCon.wait_for(lock, g_waitForResponse);
 }