Fixing and improving of f_AE_DMR_RET_004

Signed-off-by: reinaortega <miguelangel.reinaortega@etsi.org>

OneM2M_Testcases_AE_Release_1.ttcn

@@ -1571,7 +1571,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 Container";
+					var universal charstring v_action :=  __SCOPE__ & ": Please, send a valid RETRIEVE Request for retrieving the Container to ";
 
 					//Test component configuration
 					f_cf03Up();
@@ -1580,7 +1580,7 @@ module OneM2M_Testcases_AE_Release_1 {
 					v_localResource := f_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
 					v_resourceIndex := f_setLocalResource(v_localResource, int3, vc_cSEBaseIndex);
 					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;
@@ -1588,13 +1588,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{