diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index fb12fa0cdbe96672106d33ae90d28ad00ac9aa37..0cd034e479e013ff2d977cd72971bf9ff0a4bf42 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -5831,17 +5831,17 @@ module OneM2M_PermutationFunctions {
mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive))));
tc_ac.start;
alt {
- [] mcaPort.receive(mw_response(mw_responsePrimitive(p_responseStatusCode))) -> value v_response {
+ [] mcaPort.receive(mw_response(mw_responsePrimitive(int2000))) -> value v_response {
tc_ac.stop;
- setverdict(pass, __SCOPE__ & ": creation successfull by using fanOutPoint in group resource");
+ setverdict(pass, __SCOPE__ & ": Operation performed successfully by using fanOutPoint in the Group resource");
if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list)){
- setverdict(fail, __SCOPE__ & ": Error, aggregatedResponse attribute not provided");
+ setverdict(fail, __SCOPE__ & ": Error, aggregatedResponse element not provided");
}
else {
for(i:=0; i<lengthof(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list); i := i+1){
- if(not match(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list[i], mw_responsePrimitiveOK)){
- setverdict(fail, __SCOPE__ & ": Error, one responsePrimitve of aggregatedResponse_list is not successful");
+ if(not match(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list[i], mw_responsePrimitive(p_responseStatusCode))){
+ setverdict(fail, __SCOPE__ & ": Error, one responsePrimitve of aggregatedResponse is not successful");
}
}
}
@@ -5852,10 +5852,10 @@ module OneM2M_PermutationFunctions {
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
tc_ac.stop;
- setverdict(fail, __SCOPE__ & ": Error while creating resource");
+ setverdict(fail, __SCOPE__ & ": Error while performing the operation");
}
[] tc_ac.timeout {
- setverdict(fail, __SCOPE__ & ": No answer while creating resource");
+ setverdict(fail, __SCOPE__ & ": No answer while performing the operation");
}
}
@@ -5975,17 +5975,17 @@ module OneM2M_PermutationFunctions {
mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive))));
tc_ac.start;
alt {
- [] mcaPort.receive(mw_response(mw_responsePrimitive(p_responseStatusCode))) -> value v_response {
+ [] mcaPort.receive(mw_response(mw_responsePrimitive(int2000))) -> value v_response {
tc_ac.stop;
- setverdict(pass, __SCOPE__ & ": creation successfull by using fanOutPoint in group resource");
+ setverdict(pass, __SCOPE__ & ": Operation performed successfully by using fanOutPoint in group resource");
if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list)){
- setverdict(fail, __SCOPE__ & ": Error, aggregatedResponse attribute not provided");
+ setverdict(fail, __SCOPE__ & ": Error, aggregatedResponse element not provided");
}
else {
for(i:=0; i<lengthof(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list); i := i+1){
- if(not match(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list[i], mw_responsePrimitiveOK)){
- setverdict(fail, __SCOPE__ & ": Error, one responsePrimitve of aggregatedResponse_list is not successful");
+ if(not match(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list[i], mw_responsePrimitive(p_responseStatusCode))){
+ setverdict(fail, __SCOPE__ & ": Error, one responsePrimitve of aggregatedResponse is not successful");
}
}
}
@@ -5996,10 +5996,10 @@ module OneM2M_PermutationFunctions {
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
tc_ac.stop;
- setverdict(fail, __SCOPE__ & ": Error while creating resource");
+ setverdict(fail, __SCOPE__ & ": Error while performing the operation");
}
[] tc_ac.timeout {
- setverdict(fail, __SCOPE__ & ": No answer while creating resource");
+ setverdict(fail, __SCOPE__ & ": No answer while performing the operation");
}
}
@@ -6077,7 +6077,7 @@ module OneM2M_PermutationFunctions {
} // end f_CSE_GMG_004
- function f_CSE_GMG_005(template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse, in ResponseStatusCode p_responseStatusCode) runs on AeSimu {
+ function f_CSE_GMG_005(template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on AeSimu {
//Local constants
const integer c_numberOfResponsePrimitive := 2;
@@ -6115,7 +6115,7 @@ module OneM2M_PermutationFunctions {
mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive))));
tc_ac.start;
alt {
- [] mcaPort.receive(mw_response(mw_responsePrimitive(p_responseStatusCode))) -> value v_response {
+ [] mcaPort.receive(mw_response(mw_responsePrimitive(int2000))) -> value v_response {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ": creation successfull by using fanOutPoint in group resource");
@@ -6141,10 +6141,10 @@ module OneM2M_PermutationFunctions {
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
tc_ac.stop;
- setverdict(fail, __SCOPE__ & ": Error while creating resource");
+ setverdict(fail, __SCOPE__ & ": Error while performing the operation");
}
[] tc_ac.timeout {
- setverdict(fail, __SCOPE__ & ": No answer while creating resource");
+ setverdict(fail, __SCOPE__ & ": No answer while performing the operation");
}
}
@@ -6156,7 +6156,7 @@ module OneM2M_PermutationFunctions {
} // end f_CSE_GMG_005
- function f_CSE_GMG_006(template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse, in ResponseStatusCode p_responseStatusCode) runs on AeSimu {
+ function f_CSE_GMG_006(template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on AeSimu {
//Local constants
const integer c_numberOfResponsePrimitive := 2;
@@ -6202,9 +6202,9 @@ module OneM2M_PermutationFunctions {
mcaPort.send(f_getMsgOutPrimitive(m_request(v_createRequest)));
tc_ac.start;
alt {
- [] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
+ [] mcaPort.receive(mw_response(mw_responsePrimitive(int2000))) -> value v_response {
tc_ac.stop;
- setverdict(pass, __SCOPE__ & ": creation successfull by using fanOutPoint in group resource");
+ setverdict(pass, __SCOPE__ & ": Operation performed successfully by using fanOutPoint in group resource");
if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list)){
setverdict(fail, __SCOPE__ & ": Error, aggregatedResponse attribute not provided");
@@ -6228,10 +6228,10 @@ module OneM2M_PermutationFunctions {
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
tc_ac.stop;
- setverdict(fail, __SCOPE__ & ": Error while creating resource");
+ setverdict(fail, __SCOPE__ & ": Error while performing the operation");
}
[] tc_ac.timeout {
- setverdict(fail, __SCOPE__ & ": No answer while creating resource");
+ setverdict(fail, __SCOPE__ & ": No answer while performing the operation");
}
}
diff --git a/OneM2M_Testcases_CSE_Release_1.ttcn b/OneM2M_Testcases_CSE_Release_1.ttcn
index 5c75962e05bd4c0aa135441279bde3650b620a76..ba0db25bf658f4f715c3b509732181247fc93499 100644
--- a/OneM2M_Testcases_CSE_Release_1.ttcn
+++ b/OneM2M_Testcases_CSE_Release_1.ttcn
@@ -12690,7 +12690,7 @@ module OneM2M_Testcases_CSE_Release_1 {
v_contentResponse.container := mw_contentContainer_rc1;
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
- v_ae1.start(f_CSE_GMG_005(m_createContainerBase, v_contentResponse, int2001));
+ v_ae1.start(f_CSE_GMG_005(m_createContainerBase, v_contentResponse));
v_ae1.done;
}//end TC_CSE_GMG_005_CRE
@@ -12706,7 +12706,7 @@ module OneM2M_Testcases_CSE_Release_1 {
v_contentResponse.container.labels := ?;
v_updateRequest.primitiveContent.container.labels := v_labels_1;
- v_ae1.start(f_CSE_GMG_005(v_updateRequest, v_contentResponse, int2004));
+ v_ae1.start(f_CSE_GMG_005(v_updateRequest, v_contentResponse));
v_ae1.done;
}//end TC_CSE_GMG_005_UPD
@@ -12718,7 +12718,7 @@ module OneM2M_Testcases_CSE_Release_1 {
v_ae1.done;
v_contentResponse.container := mw_contentContainerBase;
- v_ae1.start(f_CSE_GMG_005(m_retrieve("Temporary", "Temporary"), v_contentResponse, int2000));
+ v_ae1.start(f_CSE_GMG_005(m_retrieve("Temporary", "Temporary"), v_contentResponse));
v_ae1.done;
}//end TC_CSE_GMG_005_RET
@@ -12728,7 +12728,7 @@ module OneM2M_Testcases_CSE_Release_1 {
v_contentResponse.container := mw_contentContainerBase;// TODO see with wath should it be matched
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
- v_ae1.start(f_CSE_GMG_005(m_delete("Temporary", "Temporary"), v_contentResponse, int2002));
+ v_ae1.start(f_CSE_GMG_005(m_delete("Temporary", "Temporary"), v_contentResponse));
v_ae1.done;
}//end TC_CSE_GMG_005_DEL
@@ -12748,7 +12748,7 @@ module OneM2M_Testcases_CSE_Release_1 {
v_ae1.done;
v_contentResponse.container := mw_contentContainer_rc1;
- v_ae1.start(f_CSE_GMG_006(m_createContainerBase, v_contentResponse, int2001));
+ v_ae1.start(f_CSE_GMG_006(m_createContainerBase, v_contentResponse));
v_ae1.done;
}//end TC_CSE_GMG_006_CRE
@@ -12763,7 +12763,7 @@ module OneM2M_Testcases_CSE_Release_1 {
v_contentResponse.container.labels := ?;
v_updateRequest.primitiveContent.container.labels := v_labels_1;
- v_ae1.start(f_CSE_GMG_006(v_updateRequest, v_contentResponse, int2004));
+ v_ae1.start(f_CSE_GMG_006(v_updateRequest, v_contentResponse));
v_ae1.done;
}//end TC_CSE_GMG_006_UPD
@@ -12775,7 +12775,7 @@ module OneM2M_Testcases_CSE_Release_1 {
v_ae1.done;
v_contentResponse.container := mw_contentContainerBase;
- v_ae1.start(f_CSE_GMG_006(m_retrieve("Temporary", "Temporary"), v_contentResponse, int2000));
+ v_ae1.start(f_CSE_GMG_006(m_retrieve("Temporary", "Temporary"), v_contentResponse));
v_ae1.done;
}//end TC_CSE_GMG_006_RET
@@ -12787,7 +12787,7 @@ module OneM2M_Testcases_CSE_Release_1 {
v_ae1.done;
v_contentResponse.container := mw_contentContainerBase;// TODO see with wath should it be matched
- v_ae1.start(f_CSE_GMG_006(m_delete("Temporary", "Temporary"), v_contentResponse, int2002));
+ v_ae1.start(f_CSE_GMG_006(m_delete("Temporary", "Temporary"), v_contentResponse));
v_ae1.done;
}//end TC_CSE_GMG_006_DEL