Commit f291530a authored by Miguel Angel Reina Ortega's avatar Miguel Angel Reina Ortega

Merge remote-tracking branch 'remotes/origin/Release1'

Signed-off-by: Miguel Angel Reina Ortega's avatarreinaortega <miguelangel.reinaortega@etsi.org>
parents 9013603a 06c12969
......@@ -2790,10 +2790,10 @@ module OneM2M_Testcases_CSE_Release_1 {
v_localResourceIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
if(v_localResourceIndex == -1)
{
log(__SCOPE__&": ERROR: Retrieve request target not found");
setverdict(fail, __SCOPE__ & ": ERROR: Retrieve request target not found");
v_response := valueof(m_responsePrimitive(int4004,v_request.primitive.requestPrimitive.requestIdentifier));
} else if(v_localResourceIndex != vc_remoteCseIndex) {
log(__SCOPE__&": ERROR: Retrieve request target not expected");
} else if(v_localResourceIndex != vc_localRemoteCseIndex) {
setverdict(fail, __SCOPE__ & ": ERROR: Retrieve request target not expected");
v_response := valueof(m_responsePrimitive(int4004,v_request.primitive.requestPrimitive.requestIdentifier));
} else {
setverdict(pass, __SCOPE__ & ": Retrieve Request received successfully");
......@@ -2804,9 +2804,9 @@ module OneM2M_Testcases_CSE_Release_1 {
v_response.to_ := v_request.primitive.requestPrimitive.from_;
mccPortIn.send(f_getMsgOutPrimitive(m_response(v_response)));
}
[] mccPortIn.receive {
[] mccPortIn.receive(mw_request(?)) {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Error Retrieve request was not received");
setverdict(fail, __SCOPE__ & ": ERROR: Unexpected request received");
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ": No answer while waiting to receive Retrieve request");
......@@ -3349,10 +3349,10 @@ module OneM2M_Testcases_CSE_Release_1 {
v_localResourceIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
if(v_localResourceIndex == -1)
{
log(__SCOPE__&": ERROR: Delete request target not found");
setverdict(fail, __SCOPE__&": ERROR: Delete request target not found");
v_response := valueof(m_responsePrimitive(int4004,v_request.primitive.requestPrimitive.requestIdentifier));
} else if(v_localResourceIndex != vc_remoteCseIndex) {
log(__SCOPE__&": ERROR: Delete request target not expected");
} else if(v_localResourceIndex != vc_localRemoteCseIndex) {
setverdict(fail, __SCOPE__&": ERROR: Delete request target not expected");
v_response := valueof(m_responsePrimitive(int4004,v_request.primitive.requestPrimitive.requestIdentifier));
} else {
setverdict(pass, __SCOPE__ & ": <remoteCSE> delete request has been received");
......@@ -3362,7 +3362,7 @@ module OneM2M_Testcases_CSE_Release_1 {
v_response.to_ := v_request.primitive.requestPrimitive.from_;
mccPortIn.send(f_getMsgOutPrimitive(m_response(v_response)));
}
[] mccPortIn.receive {
[] mccPortIn.receive(mw_request(?)) {
tc_ac.stop;
setverdict(fail, __SCOPE__ & ": Error while receiving <remoteCSE> delete request");
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment