diff --git a/OneM2M_Testcases_CSE_Release_1.ttcn b/OneM2M_Testcases_CSE_Release_1.ttcn
index 94e7d7c31571645926399958bfc81a5008cc8d63..00ec5b73fe4dd488498c58f247f120b96ff28128 100644
--- a/OneM2M_Testcases_CSE_Release_1.ttcn
+++ b/OneM2M_Testcases_CSE_Release_1.ttcn
@@ -987,7 +987,7 @@ module OneM2M_Testcases_CSE_Release_1 {
vc_cse1.start(f_cse_announcementProcedure_updateHandler(v_updateAeAnnc));
v_request := valueof(m_createAe(PX_APP_ID, omit, f_getResourceId(vc_resourcesList[v_aeIndex].resource)));
- mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
@@ -1411,11 +1411,8 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_REG_CRE_020() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
- v_ae1.done;
v_ae1.start(f_CSE_REG_CRE_020());
-
v_ae1.done;
}
@@ -1442,7 +1439,7 @@ module OneM2M_Testcases_CSE_Release_1 {
v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, -1);
- mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
@@ -2014,12 +2011,9 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_REG_CRE_029() runs on Tester system CseSystem {
var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
- v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
- v_cse1.done;
v_cse1.start(f_CSE_REG_CRE_029());
-
- v_cse1.done;
+ v_cse1.done;
}
@@ -2049,7 +2043,7 @@ module OneM2M_Testcases_CSE_Release_1 {
v_request := f_getCreateRequestPrimitive(int10002, v_request, vc_remoteCseIndex);
v_primitiveContent.aEAnnc := mw_contentAeAnnc_base;
- mccPort.send(f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mcc_port, m_request(v_request));
tc_ac.start;
alt {
@@ -2090,12 +2084,9 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_REG_CRE_030() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
- v_ae1.done;
v_ae1.start(f_CSE_REG_CRE_030());
-
- v_ae1.done;
+ v_ae1.done;
}
@@ -2122,7 +2113,7 @@ module OneM2M_Testcases_CSE_Release_1 {
v_request := valueof(m_createAe(PX_APP_ID, omit, PX_ALLOWED_S_AE_IDS[0]));
v_request := f_getCreateRequestPrimitive(int2, v_request, -1);
- mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
@@ -2163,12 +2154,9 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_REG_CRE_031() runs on Tester system CseSystem {
var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
- v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
- v_cse1.done;
v_cse1.start(f_CSE_REG_CRE_031());
-
- v_cse1.done;
+ v_cse1.done;
}
@@ -2201,7 +2189,7 @@ module OneM2M_Testcases_CSE_Release_1 {
v_request := f_getCreateRequestPrimitive(int10002, v_request, vc_remoteCseIndex);
v_primitiveContent.aEAnnc := mw_contentAeAnnc_base;
- mccPort.send(f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mcc_port, m_request(v_request));
tc_ac.start;
alt {
@@ -3366,11 +3354,8 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_REG_DEL_005() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
- v_ae1.done;
v_ae1.start(f_CSE_REG_DEL_005());
-
v_ae1.done;
}
@@ -3397,7 +3382,7 @@ module OneM2M_Testcases_CSE_Release_1 {
// Test Body
v_request := valueof(m_delete(f_getResourceAddress(v_aeIndex), f_getOriginator(v_aeIndex)));
- mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2002))) {
@@ -3433,12 +3418,9 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_REG_DEL_006() runs on Tester system CseSystem {
var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
- v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
- v_cse1.done;
v_cse1.start(f_CSE_REG_DEL_006());
-
- v_cse1.done;
+ v_cse1.done;
}
@@ -3484,7 +3466,7 @@ module OneM2M_Testcases_CSE_Release_1 {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ": AE Announced UPDATE received");
f_processUpdateRequestPrimitive(vc_request.primitive.requestPrimitive);
- mccPortIn.send(f_getMsgOutPrimitive(m_response(vc_response.primitive.responsePrimitive)));
+ f_send(e_mcc_in_port, m_response(vc_response.primitive.responsePrimitive));
}
[] mccPortIn.receive(mw_request(mw_update)) {
tc_ac.stop;
@@ -3512,8 +3494,6 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_REG_DEL_007() runs on Tester system CseSystem {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
- v_ae1.done;
v_ae1.start(f_CSE_REG_DEL_007());
v_ae1.done;
@@ -3549,7 +3529,7 @@ module OneM2M_Testcases_CSE_Release_1 {
vc_cse1.start(f_cse_announcementProcedure_updateHandler(v_updateAeAnnc));
v_request := valueof(m_delete(f_getResourceAddress(v_aeIndex), f_getOriginator(v_aeIndex)));
- mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
+ f_send(e_mca_port, m_request(v_request));
//Test Body
f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);