osaf/services/saf/amf/amfd/tests/test_ckpt_enc_dec.cc | 33 ++++++++----------
1 files changed, 15 insertions(+), 18 deletions(-)
diff --git a/osaf/services/saf/amf/amfd/tests/test_ckpt_enc_dec.cc
b/osaf/services/saf/amf/amfd/tests/test_ckpt_enc_dec.cc
--- a/osaf/services/saf/amf/amfd/tests/test_ckpt_enc_dec.cc
+++ b/osaf/services/saf/amf/amfd/tests/test_ckpt_enc_dec.cc
@@ -67,7 +67,7 @@
TEST_F(CkptEncDecTest, testEncDecAvdApp) {
int rc = 0;
std::string app_name {"AppName"};
- AVD_APP app(asSaNameT(app_name));
+ AVD_APP app(app_name);
app.saAmfApplicationAdminState = SA_AMF_ADMIN_LOCKED;
app.saAmfApplicationCurrNumSGs = 0x44332211;
@@ -100,10 +100,9 @@
delete [] tmpData;
- memset(&app, '\0', sizeof(AVD_APP));
decode_app(&enc.io_uba, &app);
- ASSERT_EQ(Amf::to_string(&app.name), "AppName");
+ ASSERT_EQ(app.name, "AppName");
ASSERT_EQ(app.saAmfApplicationAdminState, SA_AMF_ADMIN_LOCKED);
ASSERT_EQ(app.saAmfApplicationCurrNumSGs, static_cast<uint32_t>(0x44332211));
}
@@ -112,13 +111,13 @@
int rc = 0;
std::string comp_name{"CompName"};
std::string comp_proxy_name{"CompProxyName"};
- AVD_COMP comp(asSaNameT(comp_name));
+ AVD_COMP comp(comp_name);
comp.saAmfCompOperState = static_cast<SaAmfOperationalStateT>(0x44332211);
comp.saAmfCompReadinessState = static_cast<SaAmfReadinessStateT>(0x55443322);
comp.saAmfCompPresenceState = static_cast<SaAmfPresenceStateT>(0x66554433);
comp.saAmfCompRestartCount = 0x77665544;
- comp.saAmfCompCurrProxyName = *(asSaNameT(comp_proxy_name));
+ comp.saAmfCompCurrProxyName = comp_proxy_name;
rc = ncs_enc_init_space(&enc.io_uba);
ASSERT_TRUE(rc == NCSCC_RC_SUCCESS);
@@ -157,7 +156,6 @@
delete [] tmpData;
- memset(&comp, '\0', sizeof (AVD_COMP));
decode_comp(&enc.io_uba, &comp);
ASSERT_EQ(Amf::to_string(&comp.comp_info.name), "CompName");
@@ -165,7 +163,7 @@
ASSERT_EQ(comp.saAmfCompReadinessState,
static_cast<SaAmfReadinessStateT>(0x55443322));
ASSERT_EQ(comp.saAmfCompPresenceState,
static_cast<SaAmfPresenceStateT>(0x66554433));
ASSERT_EQ(comp.saAmfCompRestartCount, static_cast<uint32_t>(0x77665544));
- ASSERT_EQ(Amf::to_string(&comp.saAmfCompCurrProxyName), "CompProxyName");
+ ASSERT_EQ(comp.saAmfCompCurrProxyName, "CompProxyName");
}
TEST_F(CkptEncDecTest, testEncDecAvdSiAss) {
@@ -182,15 +180,15 @@
rc = ncs_enc_init_space(&enc.io_uba);
ASSERT_TRUE(rc == NCSCC_RC_SUCCESS);
- su.name = *(asSaNameT(su_name));
- si.name = *(asSaNameT(si_name));
+ su.name = su_name;
+ si.name = si_name;
susi.su = &su;
susi.si = &si;
susi.state = SA_AMF_HA_ACTIVE;
susi.fsm = AVD_SU_SI_STATE_ABSENT;
susi.csi_add_rem = SA_FALSE;
- susi.comp_name = *(asSaNameT(comp_name));
- susi.csi_name = *(asSaNameT(csi_name));
+ susi.comp_name = comp_name;
+ susi.csi_name = csi_name;
enc.io_msg_type = NCS_MBCSV_MSG_ASYNC_UPDATE;
enc.io_action = NCS_MBCSV_ACT_UPDATE;
@@ -281,10 +279,10 @@
std::string max_name("max_name");
AVSV_SI_TRANS_CKPT_MSG msg;
- min_assigned_su.name = *(asSaNameT(min_name));
- max_assigned_su.name = *(asSaNameT(max_name));
- tobe_redistributed.name = *(asSaNameT(si_name));
- sg.name = *(asSaNameT(sg_name));
+ min_assigned_su.name = min_name;
+ max_assigned_su.name = max_name;
+ tobe_redistributed.name = si_name;
+ sg.name = sg_name;
sg.si_tobe_redistributed = &tobe_redistributed;
sg.min_assigned_su = &min_assigned_su;
sg.max_assigned_su = &max_assigned_su;
@@ -333,7 +331,7 @@
avnd.node_info.member = SA_TRUE;
avnd.node_info.bootTimestamp = 0x3322118877665544;
avnd.node_info.initialViewNumber = 0x8877665544332211;
- avnd.name = *(asSaNameT(name));
+ avnd.name = name;
avnd.adest = 0x4433221188776655;
avnd.saAmfNodeAdminState = SA_AMF_ADMIN_UNLOCKED;
avnd.saAmfNodeOperState = SA_AMF_OPERATIONAL_ENABLED;
@@ -352,7 +350,6 @@
enc.i_peer_version = AVD_MBCSV_SUB_PART_VERSION_4;
encode_node_config(&enc.io_uba, &avnd, enc.i_peer_version);
- memset(&avnd, '\0', sizeof(AVD_AVND));
decode_node_config(&enc.io_uba, &avnd, enc.i_peer_version);
// convert decoded address to string
@@ -369,7 +366,7 @@
ASSERT_EQ(avnd.node_info.member, SA_TRUE);
ASSERT_EQ(avnd.node_info.bootTimestamp, 0x3322118877665544);
ASSERT_EQ(avnd.node_info.initialViewNumber, 0x8877665544332211);
- ASSERT_EQ(Amf::to_string(&avnd.name), name);
+ ASSERT_EQ(avnd.name, name);
ASSERT_EQ(avnd.adest, 0x4433221188776655);
ASSERT_EQ(avnd.saAmfNodeAdminState, SA_AMF_ADMIN_UNLOCKED);
ASSERT_EQ(avnd.saAmfNodeOperState, SA_AMF_OPERATIONAL_ENABLED);
------------------------------------------------------------------------------
Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=267308311&iu=/4140
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
