diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index bb0c6e044489444ff33b3c9d4330231efabd30a9..85df974ca9cc6be3ce60e2a2ab3436cd9e7c07f4 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -2129,7 +2129,7 @@ module OneM2M_Functions {
}
v_myResource.contentInstance.stateTag := 0;
v_myResource.contentInstance.contentSize := lengthof(v_myResource.contentInstance.content);
- v_myResource.contentInstance.content := p_resource.contentInstance.content;
+ v_myResource.contentInstance.content := valueof(p_resource.contentInstance.content);
}
}
@@ -2564,9 +2564,9 @@ module OneM2M_Functions {
* @param MsgOut MsgOut primitive
*/
- function f_getMsgOutPrimitive(MsgOut p_msgOut) runs on Tester return MsgOut {
+ function f_getMsgOutPrimitive(template MsgOut p_msgOut) runs on Tester return MsgOut {
p_msgOut.protocolBinding := vc_protocolBinding;
- return p_msgOut;
+ return valueof(p_msgOut);
}
/**
@@ -3664,13 +3664,13 @@ module OneM2M_Functions {
* @param data Corresponding information for the correct execution of the given action
* @verdict
*/
- function f_aeSimu_checkComponentDoneAndGetVerdict(AeSimu p_ae) runs on AeSimu {
+ function f_aeSimu_checkComponentDoneAndGetVerdict(Tester p_component) runs on AeSimu {
var verdicttype v_verdict := none;
tc_ac.start(15.0);
alt {
- [] p_ae.done -> value v_verdict {
+ [] p_component.done -> value v_verdict {
tc_ac.stop;
}
[] tc_ac.timeout {
@@ -3693,13 +3693,13 @@ module OneM2M_Functions {
* @param data Corresponding information for the correct execution of the given action
* @verdict
*/
- function f_cseSimu_checkComponentDoneAndGetVerdict(AeSimu p_ae) runs on CseSimu {
+ function f_cseSimu_checkComponentDoneAndGetVerdict(Tester p_component) runs on CseSimu {
var verdicttype v_verdict := none;
tc_ac.start(15.0);
alt {
- [] p_ae.done -> value v_verdict {
+ [] p_component.done -> value v_verdict {
tc_ac.stop;
}
[] tc_ac.timeout {
diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index 108f600841784a02f90841bb8ad7d7e798d6bd71..2a05ef403c75aec7edf1aad284fb8dc3c4e15d5a 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -183,7 +183,7 @@ module OneM2M_PermutationFunctions {
tc_ac.start;
alt {
- [] mcaPortIn.receive(mw_request(mw_updateContainer(-,v_utRequest.requestPrimitive.to_))) -> value (v_request) {
+ [] mcaPortIn.receive(mw_request(mw_updateContainer(-,v_utRequest.requestPrimitive.to_))) -> value v_request {
tc_ac.stop;
setverdict(pass, __SCOPE__ & " : Container update request received successfuly");
f_processUpdateRequestPrimitive(v_request.primitive.requestPrimitive);
@@ -274,7 +274,7 @@ module OneM2M_PermutationFunctions {
tc_ac.start;
alt {
- [] mcaPortIn.receive(mw_request(mw_retrieve(v_utRequest.requestPrimitive.to_))) -> value (v_request) {
+ [] mcaPortIn.receive(mw_request(mw_retrieve(v_utRequest.requestPrimitive.to_))) -> value v_request {
tc_ac.stop;
setverdict(pass, __SCOPE__ & " : Container retrieve request received successfuly");
f_processRetrieveRequestPrimitive(v_request.primitive.requestPrimitive);
@@ -509,7 +509,7 @@ module OneM2M_PermutationFunctions {
alt{
//receive MsgIn requestPrimitive
- [] mcaPortIn.receive(mw_request(p_request)) -> value (v_request) {
+ [] mcaPortIn.receive(mw_request(p_request)) -> value v_request {
tc_ac.stop;
setverdict(pass, __SCOPE__ & " : Container creation request is accepted!!");
v_resourceIndex := f_processCreateRequestPrimitive(v_request.primitive.requestPrimitive);
@@ -595,7 +595,7 @@ module OneM2M_PermutationFunctions {
alt{
//receive MsgIn requestPrimitive
- [] mcaPortIn.receive(mw_request(p_request)) -> value (v_request) {
+ [] mcaPortIn.receive(mw_request(p_request)) -> value v_request {
tc_ac.stop;
setverdict(pass, __SCOPE__ & " : Container update request is accepted!!");
f_processUpdateRequestPrimitive(v_request.primitive.requestPrimitive);
@@ -1432,7 +1432,7 @@ module OneM2M_PermutationFunctions {
}
- function f_CSE_REG_CRE_028(RequestPrimitive p_request, template PrimitiveContent p_contentResponse) runs on CseSimu{ //system CseSystem {
+ function f_CSE_REG_CRE_028(RequestPrimitive p_request, template PrimitiveContent p_contentResponse) runs on CseSimu {
//Local variables
var ResourceType v_resourceType := int16; //remoteCSE
// Test control
@@ -1913,7 +1913,7 @@ module OneM2M_PermutationFunctions {
}//end f_CSE_DMR_CRE_001_cseSimu
- function f_CSE_DMR_CRE_002(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on AeSimu return ResponsePrimitive{//system CseSystem { MRO system keyword not supported on functions in Titan
+ function f_CSE_DMR_CRE_002(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on AeSimu return ResponsePrimitive {
// Local variables
var MsgIn v_response;
@@ -1977,7 +1977,7 @@ module OneM2M_PermutationFunctions {
}//end f_CSE_DMR_CRE_002
- function f_CSE_DMR_CRE_003(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on AeSimu {//system CseSystem { MRO system keyword not supported on functions in Titan
+ function f_CSE_DMR_CRE_003(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on AeSimu {
// Local variables
var MsgIn v_response;
@@ -2037,7 +2037,7 @@ module OneM2M_PermutationFunctions {
}//end f_CSE_DMR_CRE_003
- function f_CSE_DMR_CRE_004(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on AeSimu {//system CseSystem { MRO system keyword not supported on functions in Titan
+ function f_CSE_DMR_CRE_004(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive) runs on AeSimu {
// Local variables
var MsgIn v_response;
diff --git a/OneM2M_Testcases_CSE_Release_1.ttcn b/OneM2M_Testcases_CSE_Release_1.ttcn
index a61c169c4c14400869b29b33ab37c14335973171..4d1c2b1c0745c716bb83044bbe5671a8df4f7b6d 100644
--- a/OneM2M_Testcases_CSE_Release_1.ttcn
+++ b/OneM2M_Testcases_CSE_Release_1.ttcn
@@ -3970,7 +3970,7 @@ module OneM2M_Testcases_CSE_Release_1 {
}
- function f_CSE_DMR_CRE_007() runs on AeSimu system CseSystem {
+ function f_CSE_DMR_CRE_007() runs on AeSimu {
// Local variables
var template RequestPrimitive v_createRequestContainer := m_createContainerBase;
var template RequestPrimitive v_createRequestContentInstance := m_createContentInstanceBase;
@@ -4054,7 +4054,7 @@ module OneM2M_Testcases_CSE_Release_1 {
v_ae1.done;
}
- function f_CSE_DMR_CRE_008() runs on AeSimu system CseSystem {
+ function f_CSE_DMR_CRE_008() runs on AeSimu {
//Local variables
var template RequestPrimitive v_createRequestContainer := m_createContainerBase;
var template RequestPrimitive v_createRequestContentInstance := m_createContentInstanceBase;
@@ -4142,7 +4142,7 @@ module OneM2M_Testcases_CSE_Release_1 {
}
- function f_CSE_DMR_CRE_009() runs on AeSimu system CseSystem {
+ function f_CSE_DMR_CRE_009() runs on AeSimu {
// Local variables
var template RequestPrimitive v_createRequest := m_createContainerBase;
var MsgIn v_response;
@@ -4222,7 +4222,7 @@ module OneM2M_Testcases_CSE_Release_1 {
}
- function f_CSE_DMR_CRE_010() runs on AeSimu system CseSystem {
+ function f_CSE_DMR_CRE_010() runs on AeSimu {
// Local variables
var template RequestPrimitive v_createRequest := m_createContainerBase;
var MsgIn v_response;
@@ -4302,7 +4302,7 @@ module OneM2M_Testcases_CSE_Release_1 {
}
- function f_CSE_DMR_CRE_011() runs on AeSimu system CseSystem {
+ function f_CSE_DMR_CRE_011() runs on AeSimu {
// Local variables
var template RequestPrimitive v_createRequest := m_createContainerBase;
var MsgIn v_response;
@@ -4570,7 +4570,7 @@ module OneM2M_Testcases_CSE_Release_1 {
}
- function f_CSE_DMR_CRE_013() runs on AeSimu system CseSystem {
+ function f_CSE_DMR_CRE_013() runs on AeSimu {
// Local variables
var template RequestPrimitive v_createRequest := m_createContainerBase;
var MsgIn v_response;
@@ -4799,7 +4799,7 @@ module OneM2M_Testcases_CSE_Release_1 {
}
- function f_CSE_DMR_RET_010() runs on AeSimu system CseSystem {
+ function f_CSE_DMR_RET_010() runs on AeSimu {
// Local variables
var integer v_aeIndex := -1;
var integer v_containerIndex := -1;
@@ -4876,7 +4876,7 @@ module OneM2M_Testcases_CSE_Release_1 {
}
- function f_CSE_DMR_RET_012() runs on AeSimu system CseSystem {
+ function f_CSE_DMR_RET_012() runs on AeSimu {
// Local variables
var integer v_aeIndex := -1;
var integer v_containerIndex := -1;
@@ -6418,7 +6418,7 @@ module OneM2M_Testcases_CSE_Release_1 {
v_ae1.done;
}
- function f_CSE_DMR_UPD_010() runs on AeSimu system CseSystem {
+ function f_CSE_DMR_UPD_010() runs on AeSimu {
var MsgIn v_response;
var integer v_aeIndex := -1;
var integer v_containerIndex := -1;
@@ -6493,7 +6493,7 @@ module OneM2M_Testcases_CSE_Release_1 {
v_ae1.done;
}
- function f_CSE_DMR_UPD_011() runs on AeSimu system CseSystem {
+ function f_CSE_DMR_UPD_011() runs on AeSimu {
// Local variables
var MsgIn v_response;
var RequestPrimitive v_request;
@@ -6576,7 +6576,7 @@ module OneM2M_Testcases_CSE_Release_1 {
v_ae1.done;
}
- function f_CSE_DMR_UPD_012() runs on AeSimu system CseSystem {
+ function f_CSE_DMR_UPD_012() runs on AeSimu {
// Local variables
var MsgIn v_response;
var RequestPrimitive v_request;
@@ -6661,7 +6661,7 @@ module OneM2M_Testcases_CSE_Release_1 {
v_ae1.done;
}
- function f_CSE_DMR_UPD_013() runs on AeSimu system CseSystem {
+ function f_CSE_DMR_UPD_013() runs on AeSimu {
// Local variables
var MsgIn v_response;
var RequestPrimitive v_request;
@@ -8275,7 +8275,7 @@ module OneM2M_Testcases_CSE_Release_1 {
}
- function f_CSE_DMR_DEL_005() runs on AeSimu system CseSystem {
+ function f_CSE_DMR_DEL_005() runs on AeSimu {
// Local variables
var MsgIn v_response;
var RequestPrimitive v_request;
@@ -8375,7 +8375,7 @@ module OneM2M_Testcases_CSE_Release_1 {
}
- function f_CSE_DMR_DEL_006() runs on AeSimu system CseSystem {
+ function f_CSE_DMR_DEL_006() runs on AeSimu {
// Local variables
var integer v_aeIndex := -1;
var integer v_containerIndex := -1;
@@ -8444,7 +8444,7 @@ module OneM2M_Testcases_CSE_Release_1 {
}
- function f_CSE_DMR_DEL_007() runs on AeSimu system CseSystem {
+ function f_CSE_DMR_DEL_007() runs on AeSimu {
// Local variables
var MsgIn v_response;
var RequestPrimitive v_request;
@@ -8538,7 +8538,7 @@ module OneM2M_Testcases_CSE_Release_1 {
}
- function f_CSE_DMR_DEL_009() runs on AeSimu system CseSystem {
+ function f_CSE_DMR_DEL_009() runs on AeSimu {
// Local variables
var MsgIn v_response;
var RequestPrimitive v_request;