From 8fbea2dc58be6555e114f7c34e578104d33ea128 Mon Sep 17 00:00:00 2001
From: reinaortega <miguelangel.reinaortega@etsi.org>
Date: Wed, 25 Jul 2018 16:13:03 +0200
Subject: [PATCH] Fixing and improving of f_AE_DMR_RET_005
Signed-off-by: reinaortega <miguelangel.reinaortega@etsi.org>
---
OneM2M_Testcases_AE_Release_1.ttcn | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/OneM2M_Testcases_AE_Release_1.ttcn b/OneM2M_Testcases_AE_Release_1.ttcn
index 63ffede..0d652a4 100644
--- a/OneM2M_Testcases_AE_Release_1.ttcn
+++ b/OneM2M_Testcases_AE_Release_1.ttcn
@@ -1629,7 +1629,7 @@ module OneM2M_Testcases_AE_Release_1 {
var template UtTriggerPrimitive v_utRequest := m_utRetrieve("NotInitialized");
var MsgIn v_request;
var ResponsePrimitive v_responsePrimitive;
- var universal charstring v_action := __SCOPE__ & ": Please, send a valid RETRIEVE Request for retrieving the contentInstance";
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid RETRIEVE Request for retrieving the contentInstance to ";
//Test component configuration
f_cf03Up();
@@ -1640,7 +1640,7 @@ module OneM2M_Testcases_AE_Release_1 {
v_localResource := f_generateLocalResource(valueof(m_primitiveContentContentInstance(m_contentCreateContentInstance)), v_resourceIndex, int4);
v_resourceIndex := f_setLocalResource(v_localResource, int4, v_resourceIndex);
v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_resourceIndex);
- f_sendUtPrimitive(v_utRequest,v_action);
+ f_sendUtPrimitive(v_utRequest,v_action & f_getLocalResourceAddress(v_resourceIndex));
//Test behavior
tc_ac.start;
@@ -1648,13 +1648,12 @@ module OneM2M_Testcases_AE_Release_1 {
[] mcaPortIn.receive(mw_request(mw_retrieve(v_utRequest.requestPrimitive.to_))) -> value v_request {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : retrieve resource type request is accepted!!");
- v_resourceIndex := f_getResourceIndex(v_request.primitive.requestPrimitive.to_);
v_responsePrimitive := valueof(m_responsePrimitive(int2000, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
}
- [] mcaPortIn.receive {
+ [] mcaPortIn.receive(mw_request(mw_retrieve(?))) {
tc_ac.stop;
- setverdict(fail, __SCOPE__, " : error while retrieving resource !");
+ setverdict(fail, __SCOPE__, " : Retrieve Request for unexpected target");
mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
}
[] tc_ac.timeout{
--
GitLab