Fix Compilation Error in Unit Tests for Ubuntu 12.04

Change-Id: I52afd83777cb25cc25d0cad37b816676f9f4ff0d
Signed-off-by: Karthik.S <siva-karthik@hcl.com>

diff --git a/coordinator/test/modules/tc/ut/test_tcmsg.cc b/coordinator/test/modules/tc/ut/test_tcmsg.cc
index da24e76be12f1187c0212477c788167ca9ba4cf2..f32208f3ec68425f18b35a39fb450e1186a2687c 100644 (file)
--- a/coordinator/test/modules/tc/ut/test_tcmsg.cc
+++ b/coordinator/test/modules/tc/ut/test_tcmsg.cc
@@ -38,7 +38,8 @@ TEST(TcMsg, CreateInstance) {
   TcChannelNameMap daemon_names;
   /*invalid Opertype*/
   TcMsg* tcmsg =  TcMsg::CreateInstance(sess_id,  opertype,  daemon_names);
-  EXPECT_EQ(NULL, tcmsg);
+  TcMsg* compare_tcmsg = NULL;
+  EXPECT_EQ(compare_tcmsg, tcmsg);
 
   daemon_names = GetChannelNameMap(SET);
   int array_len = (sizeof(OpArray)/sizeof(int));
@@ -549,7 +550,8 @@ TEST(CommitSendAbortRequest, Execute)  {
   TestCommit Ctest(sess_id,  opertype);
   Ctest.channel_names_ =  GetChannelNameMap(SET);
 
-  Ctest.config_id_ =  SET; Ctest.session_id_ =  1;
+  Ctest.config_id_ =  SET;
+  Ctest.session_id_ =  1;
   retval =  Ctest.TestSendAbortRequest(PopulateAbortVector());
   EXPECT_EQ(TCOPER_RET_SUCCESS,  retval);
 
@@ -608,7 +610,8 @@ TEST(CommitSendTransEndRequest, Execute_Success)  {
   TcOperRet retval =  TCOPER_RET_SUCCESS;
   TestCommit Ctest(sess_id,  opertype);
   Ctest.channel_names_ =  (GetChannelNameMap(SET));
-  Ctest.config_id_ =  SET; Ctest.session_id_ =  1;
+  Ctest.config_id_ =  SET;
+  Ctest.session_id_ =  1;
   retval =  Ctest.TestSendTransEndRequest(PopulateAbortVector());
   EXPECT_EQ(TCOPER_RET_SUCCESS,  retval);
   CLEAR_STUB_FLAGS();
@@ -1005,7 +1008,7 @@ TEST(GetControllerInfo,  Execute)  {
   retval =  C2phase.TestGetControllerInfo(c_sess);
   EXPECT_EQ(TCOPER_RET_SUCCESS, retval);
   if (c_sess !=  0) {
-    TcClientSessionUtils::tc_session_close(&c_sess,conn);
+    TcClientSessionUtils::tc_session_close(&c_sess, conn);
     delete c_sess;
     c_sess =  NULL;
   }
@@ -1269,9 +1272,10 @@ TEST(AuditSendAbortRequest, Execute)  {
   TcMsgOperType opertype =  MSG_AUDIT_VOTE;
   TcOperRet retval =  TCOPER_RET_SUCCESS;
 
-  TestAudit Ctest(sess_id,  opertype);
+  TestAudit Ctest(sess_id, opertype);
   Ctest.channel_names_ =  GetChannelNameMap(SET);
-  Ctest.driver_id_ =  UNC_CT_PFC; Ctest.controller_id_ =  "C1";
+  Ctest.driver_id_ =  UNC_CT_PFC;
+  Ctest.controller_id_ =  "C1";
   retval =  Ctest.TestSendAbortRequest(PopulateAbortVector());
   EXPECT_EQ(TCOPER_RET_SUCCESS,  retval);
 

diff --git a/coordinator/test/modules/tclib/ut/api_test.cc b/coordinator/test/modules/tclib/ut/api_test.cc
index 158444f646ed6561eb118143ed826a01c1a9c79c..9b828b13a2a30987886bd90076abc881198a42d8 100644 (file)
--- a/coordinator/test/modules/tclib/ut/api_test.cc
+++ b/coordinator/test/modules/tclib/ut/api_test.cc
@@ -35,11 +35,11 @@ TEST(test_24, test_TcLibRegisterHandler) {
   mattr.pma_name = "tclib";
   TcLibModule tclib_obj(&mattr);
   tclib_obj.init();
-
+  TcLibInterface *compare_pTcLibInterface_ = NULL;
   //  pTcLibInterface_ NULL
   ret = tclib_obj.TcLibRegisterHandler(NULL);
   EXPECT_EQ(TC_INVALID_PARAM, ret);
-  EXPECT_EQ(NULL, tclib_obj.pTcLibInterface_);
+  EXPECT_EQ(compare_pTcLibInterface_, tclib_obj.pTcLibInterface_);
 
   TcLibInterfaceStub if_stub_obj;
   ret = tclib_obj.TcLibRegisterHandler(&if_stub_obj);

diff --git a/coordinator/test/modules/tclib/ut/tclib_common.cc b/coordinator/test/modules/tclib/ut/tclib_common.cc
index be34854184fe2014c97695d5c8fc9db574955d7b..e5d3b495a721ef50feee0dcadb66a1b2f3ea7182 100644 (file)
--- a/coordinator/test/modules/tclib/ut/tclib_common.cc
+++ b/coordinator/test/modules/tclib/ut/tclib_common.cc
@@ -370,9 +370,10 @@ TEST(test_31, test_fini) {
   mattr.pma_name = "tclib";
   TcLibModule tclib_obj(&mattr);
   tclib_obj.init();
-
-  EXPECT_EQ(NULL, tclib_obj.pTcLibInterface_);
-  EXPECT_EQ(NULL, tclib_obj.sess_);
+  TcLibInterface *compare_ptr = NULL;
+  pfc::core::ipc::ServerSession *compare_sess_ptr = NULL;
+  EXPECT_EQ(compare_ptr, tclib_obj.pTcLibInterface_);
+  EXPECT_EQ(compare_sess_ptr, tclib_obj.sess_);
   EXPECT_EQ(TC_DEFAULT_VALUE, tclib_obj.session_id_);
   EXPECT_EQ(TC_DEFAULT_VALUE, tclib_obj.config_id_);
   EXPECT_EQ(MSG_NONE, tclib_obj.oper_state_);

diff --git a/coordinator/test/modules/upll/ut/vtn_momgr_ut.cc b/coordinator/test/modules/upll/ut/vtn_momgr_ut.cc
index 9e58863001e2402723aa40615bd8aa8166881655..a85e27980bcf3658bb6643e0592c5e49cc4df9ac 100644 (file)
--- a/coordinator/test/modules/upll/ut/vtn_momgr_ut.cc
+++ b/coordinator/test/modules/upll/ut/vtn_momgr_ut.cc
@@ -259,10 +259,11 @@ TEST_F(VtnMoMgrTest, GetValid_nullValue) {
   void *val = NULL;
   uint64_t index = uudst::vtn::kDbiVtnOperStatus;
   uint8_t *valid = NULL;
+  uint8_t *compare_valid = NULL;
   upll_keytype_datatype_t dtType = UPLL_DT_STATE;
 
   EXPECT_EQ(UPLL_RC_ERR_GENERIC, vtn.GetValid(val, index, valid, dtType, MAINTBL));
-  EXPECT_EQ(NULL, valid);
+  EXPECT_EQ(compare_valid, valid);
 }
 
 // Passing operstatus to the function

diff --git a/coordinator/test/modules/vtndrvintf/controller/ut/controller_fw_ut.cc b/coordinator/test/modules/vtndrvintf/controller/ut/controller_fw_ut.cc
index 783351908d594545a7c55a66335160f9cf5d314d..245d05d798b363adc2269b7ce20d4807eee1db9e 100644 (file)
--- a/coordinator/test/modules/vtndrvintf/controller/ut/controller_fw_ut.cc
+++ b/coordinator/test/modules/vtndrvintf/controller/ut/controller_fw_ut.cc
@@ -25,7 +25,7 @@ TEST_F(ControllerFrameworkTest, GetControllerInst_success) {
   std::string ctr_name = "ctr_demo";
   pfc_taskq_t id = 1;
   pfc::core::TaskQueue* taskq_ = new pfc::core::TaskQueue(id);
-  ControllerFramework *CtrObj = new ControllerFramework(taskq_,1);
+  ControllerFramework *CtrObj = new ControllerFramework(taskq_, 1);
   driver *drv_instance = static_cast <driver*>(new OdcDriver());
   controller *ctr_instance = static_cast <controller*>(new OdcController());
   CtrObj->AddController(ctr_name, ctr_instance, drv_instance);
@@ -46,7 +46,7 @@ TEST_F(ControllerFrameworkTest, GetDriver_success) {
   std::string ctr_name = "ctr_demo";
   pfc_taskq_t id = 1;
   pfc::core::TaskQueue* taskq_ = new pfc::core::TaskQueue(id);
-  ControllerFramework *CtrObj = new ControllerFramework(taskq_,1);
+  ControllerFramework *CtrObj = new ControllerFramework(taskq_, 1);
   driver *drv_instance = static_cast <driver*>(new OdcDriver());
   controller *ctr_instance = static_cast <controller*>(new OdcController());
   CtrObj->AddController(ctr_name, ctr_instance, drv_instance);
@@ -74,7 +74,7 @@ TEST_F(ControllerFrameworkTest, GetDriver_failure) {
   std::string ctr_name = "ctr_demo";
   pfc_taskq_t id = 1;
   pfc::core::TaskQueue* taskq_ = new pfc::core::TaskQueue(id);
-  ControllerFramework *CtrObj = new ControllerFramework(taskq_,1);
+  ControllerFramework *CtrObj = new ControllerFramework(taskq_, 1);
   driver *drv_instance = static_cast <driver*>(new OdcDriver());
   controller *ctr_instance = static_cast <controller*>(new OdcController());
   CtrObj->AddController(ctr_name, ctr_instance, drv_instance);
@@ -101,7 +101,7 @@ TEST_F(ControllerFrameworkTest, PingController_success) {
   std::string ctr_name = "ctr_post";
   pfc_taskq_t id = 1;
   pfc::core::TaskQueue* taskq_ = new pfc::core::TaskQueue(id);
-  ControllerFramework *CtrObj = new ControllerFramework(taskq_,1);
+  ControllerFramework *CtrObj = new ControllerFramework(taskq_, 1);
   pfc::core::ipc::ServerSession::set_rest(1);
   ReadParams fun_obj(ctr_name, CtrObj);
   driver *drv_instance = static_cast <driver*>(new OdcDriver());
@@ -125,7 +125,7 @@ TEST_F(ControllerFrameworkTest, PingController_Failure) {
   std::string ctr_name = "ctr_post";
   pfc_taskq_t id = 1;
   pfc::core::TaskQueue* taskq_ = new pfc::core::TaskQueue(id);
-  ControllerFramework *CtrObj = new ControllerFramework(taskq_,1);
+  ControllerFramework *CtrObj = new ControllerFramework(taskq_, 1);
   pfc::core::ipc::ServerSession::set_rest(1);
   ReadParams fun_obj(ctr_name, CtrObj);
   OdcDriver *odcdrv(new OdcDriver());
@@ -155,7 +155,7 @@ TEST_F(ControllerFrameworkTest, GetDriver_AfterUpdate) {
   const val_ctr_t* val_ctr = new val_ctr_t;
   pfc_taskq_t id = 1;
   pfc::core::TaskQueue* taskq_ = new pfc::core::TaskQueue(id);
-  ControllerFramework *CtrObj = new ControllerFramework(taskq_,1);
+  ControllerFramework *CtrObj = new ControllerFramework(taskq_, 1);
   driver *drv_instance = static_cast <driver*>(new OdcDriver());
   controller *ctr_instance = static_cast <controller*>(new OdcController());
   CtrObj->AddController(ctr_name_1, ctr_instance, drv_instance);
@@ -185,7 +185,7 @@ TEST_F(ControllerFrameworkTest, PostTimer) {
   pfc_taskq_t id = 1;
   pfc::core::TaskQueue* taskq_ = new pfc::core::TaskQueue(id);
   uint32_t ping_interval = 0;
-  ControllerFramework *CtrObj = new ControllerFramework(taskq_,1);
+  ControllerFramework *CtrObj = new ControllerFramework(taskq_, 1);
   driver *drv_instance = static_cast <driver*>(new OdcDriver());
   controller *ctr_instance = static_cast <controller*>(new OdcController());
   CtrObj->AddController(ctr_name, ctr_instance, drv_instance);
@@ -202,16 +202,18 @@ TEST_F(ControllerFrameworkTest, AddController_success) {
   std::string ctr_name = "ctr1";
   pfc_taskq_t id = 1;
   pfc::core::TaskQueue* taskq_ = new pfc::core::TaskQueue(id);
-  ControllerFramework *CtrObj = new ControllerFramework(taskq_,1);
+  ControllerFramework *CtrObj = new ControllerFramework(taskq_, 1);
   OdcDriver *drv_instance = new OdcDriver();
   OdcController *ctr_instance = new OdcController();
 
   driver *drv(NULL);
+  driver *compare_drv_ptr(NULL);
   controller *ctr(NULL);
+  controller *compare_ctr_ptr(NULL);
   EXPECT_EQ(DRVAPI_RESPONSE_FAILURE,
             CtrObj->GetDriverByControllerName(ctr_name, &ctr, &drv));
-  EXPECT_EQ(NULL, ctr);
-  EXPECT_EQ(NULL, drv);
+  EXPECT_EQ(compare_ctr_ptr, ctr);
+  EXPECT_EQ(compare_drv_ptr, drv);
 
   CtrObj->AddController(ctr_name, ctr_instance, drv_instance);
 
@@ -234,7 +236,7 @@ TEST_F(ControllerFrameworkTest, Add_MultiCtr_success) {
   std::string ctr_name_2 = "ctr2";
   pfc_taskq_t id = 1;
   pfc::core::TaskQueue* taskq_ = new pfc::core::TaskQueue(id);
-  ControllerFramework *CtrObj = new ControllerFramework(taskq_,1);
+  ControllerFramework *CtrObj = new ControllerFramework(taskq_, 1);
   driver *drv_instance = static_cast <driver*>(new OdcDriver());
   driver *drv_instance1 = static_cast <driver*>(new OdcDriver());
   controller *ctr_instance = static_cast <controller*>(new OdcController());
@@ -267,7 +269,7 @@ TEST_F(ControllerFrameworkTest, UpdateCtr_success) {
   std::string ctr_name_1 = "ctr_up";
   pfc_taskq_t id = 2;
   pfc::core::TaskQueue* taskq_ = new pfc::core::TaskQueue(id);
-  ControllerFramework *CtrObj = new ControllerFramework(taskq_,1);
+  ControllerFramework *CtrObj = new ControllerFramework(taskq_, 1);
   const key_ctr_t *key_ctr = new key_ctr_t;
   const val_ctr_t *val_ctr = new val_ctr_t;
   driver *drv_instance = static_cast <driver*>(new OdcDriver());
@@ -297,14 +299,16 @@ TEST_F(ControllerFrameworkTest, RemoveCtr_success) {
   std::string ctr_name = "ctr_remove";
   pfc_taskq_t id = 1;
   pfc::core::TaskQueue* taskq_ = new pfc::core::TaskQueue(id);
-  ControllerFramework *CtrObj = new ControllerFramework(taskq_,1);
+  ControllerFramework *CtrObj = new ControllerFramework(taskq_, 1);
   const key_ctr_t *key_ctr = new key_ctr_t;
   const val_ctr_t *val_ctr = new val_ctr_t;
   driver *drv_instance = static_cast <driver*>(new OdcDriver());
   controller *ctr_instance = static_cast <controller*>(new OdcController());
   CtrObj->AddController(ctr_name, ctr_instance, drv_instance);
 
+  controller *compare_ctr_ptr(NULL);
   controller *ctr(NULL);
+  driver *compare_drv_ptr(NULL);
   driver *drv(NULL);
   EXPECT_EQ(DRVAPI_RESPONSE_SUCCESS,
             CtrObj->GetControllerInstance(ctr_name, &ctr, &drv));
@@ -325,8 +329,8 @@ TEST_F(ControllerFrameworkTest, RemoveCtr_success) {
   drv = NULL;
   EXPECT_EQ(DRVAPI_RESPONSE_FAILURE,
             CtrObj->GetControllerInstance(ctr_name, &ctr, &drv));
-  EXPECT_EQ(NULL, ctr);
-  EXPECT_EQ(NULL, drv);
+  EXPECT_EQ(compare_ctr_ptr, ctr);
+  EXPECT_EQ(compare_drv_ptr, drv);
 
   delete CtrObj;
   delete key_ctr;
@@ -341,7 +345,7 @@ TEST_F(ControllerFrameworkTest, RemoveCtr_Failure) {
   std::string ctr_unknown = "ctr_unkown";
   pfc_taskq_t id = 1;
   pfc::core::TaskQueue* taskq_ = new pfc::core::TaskQueue(id);
-  ControllerFramework *CtrObj = new ControllerFramework(taskq_,1);
+  ControllerFramework *CtrObj = new ControllerFramework(taskq_, 1);
   const key_ctr_t *key_ctr = new key_ctr_t;
   const val_ctr_t *val_ctr = new val_ctr_t;
   driver *drv_instance = static_cast <driver*>(new OdcDriver());
@@ -384,7 +388,7 @@ TEST_F(ControllerFrameworkTest, RemoveController_List_Empty) {
   std::string ctr_name = "ctr1";
   pfc_taskq_t id = 1;
   pfc::core::TaskQueue* taskq_ = new pfc::core::TaskQueue(id);
-  ControllerFramework *CtrObj = new ControllerFramework(taskq_,1);
+  ControllerFramework *CtrObj = new ControllerFramework(taskq_, 1);
   OdcDriver *drv_instance = new OdcDriver();
   OdcController *ctr_instance = new OdcController();
   drv_resp_code_t ret_code;
@@ -406,11 +410,11 @@ TEST_F(ControllerFrameworkTest, RegisterDriver_success) {
   std::string ctr_name_1 = "ctr_add";
   pfc_taskq_t id = 1;
   pfc::core::TaskQueue* taskq_ = new pfc::core::TaskQueue(id);
-  ControllerFramework *CtrObj = new ControllerFramework(taskq_,1);
+  ControllerFramework *CtrObj = new ControllerFramework(taskq_, 1);
   unc_keytype_ctrtype_t controller_type = UNC_CT_ODC;
   OdcDriver *drv_instance = new OdcDriver();
-
-  EXPECT_EQ(NULL, CtrObj->GetDriverInstance(controller_type));
+  driver *compare_drv_ptr = NULL;
+  EXPECT_EQ(compare_drv_ptr, CtrObj->GetDriverInstance(controller_type));
   EXPECT_EQ(DRVAPI_RESPONSE_SUCCESS,
             CtrObj->RegisterDriver(controller_type, drv_instance));
   EXPECT_EQ(drv_instance, CtrObj->GetDriverInstance(controller_type));
@@ -429,7 +433,8 @@ TEST_F(ControllerFrameworkTest, RegisterDriver_success) {
 TEST_F(ControllerFrameworkTest, RegisterDriver_MultipleEntry_success) {
   pfc_taskq_t id = 1;
   pfc::core::TaskQueue* taskq_ = new pfc::core::TaskQueue(id);
-  ControllerFramework *CtrObj = new ControllerFramework(taskq_,1);
+  ControllerFramework *CtrObj = new ControllerFramework(taskq_, 1);
+  driver *compare_drv_ptr(NULL);
   struct testdrv {
     unc_keytype_ctrtype_t  type;
     OdcDriver *driver;
@@ -440,7 +445,7 @@ TEST_F(ControllerFrameworkTest, RegisterDriver_MultipleEntry_success) {
   };
 
   for (tdp = testdrv; tdp < PFC_ARRAY_LIMIT(testdrv); tdp++) {
-    EXPECT_EQ(NULL, CtrObj->GetDriverInstance(tdp->type));
+    EXPECT_EQ(compare_drv_ptr, CtrObj->GetDriverInstance(tdp->type));
   }
   for (tdp = testdrv; tdp < PFC_ARRAY_LIMIT(testdrv); tdp++) {
     tdp->driver = new OdcDriver();
@@ -463,12 +468,13 @@ TEST_F(ControllerFrameworkTest, RegisterDriver_MultipleEntry_success) {
 TEST_F(ControllerFrameworkTest, RegisterDriver_DrvInst_NULL) {
   pfc_taskq_t id = 1;
   pfc::core::TaskQueue* taskq_ = new pfc::core::TaskQueue(id);
-  ControllerFramework *CtrObj = new ControllerFramework(taskq_,1);
+  ControllerFramework *CtrObj = new ControllerFramework(taskq_, 1);
   unc_keytype_ctrtype_t controller_type = UNC_CT_ODC;
   OdcDriver *drv_instance = NULL;
+  driver *compare_drv_ptr = NULL;
   EXPECT_EQ(DRVAPI_RESPONSE_FAILURE,
             CtrObj->RegisterDriver(controller_type, drv_instance));
-  EXPECT_EQ(NULL, CtrObj->GetDriverInstance(controller_type));
+  EXPECT_EQ(compare_drv_ptr, CtrObj->GetDriverInstance(controller_type));
   delete taskq_;
   delete CtrObj;
   CtrObj = NULL;
@@ -478,7 +484,7 @@ TEST_F(ControllerFrameworkTest, GetDriver_CtrName_NotFound) {
   std::string ctr_name = "ctr_demo";
   pfc_taskq_t id = 1;
   pfc::core::TaskQueue* taskq_ = new pfc::core::TaskQueue(id);
-  ControllerFramework *CtrObj = new ControllerFramework(taskq_,1);
+  ControllerFramework *CtrObj = new ControllerFramework(taskq_, 1);
   driver *drv_instance = static_cast <driver*>(new OdcDriver());
   controller *ctr_instance = static_cast <controller*>(new OdcController());
   EXPECT_EQ(DRVAPI_RESPONSE_FAILURE,
@@ -495,7 +501,7 @@ TEST_F(ControllerFrameworkTest, GetControllerInst_CtrName_NotFound) {
   std::string ctr_name = "controller_unknown";
   pfc_taskq_t id = 1;
   pfc::core::TaskQueue* taskq_ = new pfc::core::TaskQueue(id);
-  ControllerFramework *CtrObj = new ControllerFramework(taskq_,1);
+  ControllerFramework *CtrObj = new ControllerFramework(taskq_, 1);
   driver *drv_instance = static_cast <driver*>(new OdcDriver());
   controller *ctr_instance = static_cast <controller*>(new OdcController());
   EXPECT_EQ(DRVAPI_RESPONSE_FAILURE,
@@ -513,7 +519,7 @@ TEST_F(ControllerFrameworkTest, SendNotificationToPhysicalDown) {
   ConnectionStatus type = CONNECTION_DOWN;
   pfc_taskq_t id = 1;
   pfc::core::TaskQueue* taskq_ = new pfc::core::TaskQueue(id);
-  ControllerFramework *CtrObj = new ControllerFramework(taskq_,1);
+  ControllerFramework *CtrObj = new ControllerFramework(taskq_, 1);
   pfc::core::ipc::ServerSession::set_rest(1);
   CtrObj->SendNotificationToPhysical(ctr_name, type);
   delete CtrObj;