From d87f1e44f4778592029423078109c3c309a0e6fb Mon Sep 17 00:00:00 2001 From: Miguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org> Date: Mon, 7 Aug 2017 15:04:04 +0200 Subject: [PATCH] TC_CSE_DMR_DEL_003 - Fixed. Unexisting resource address generated according to addressing method and primitive scope variables Signed-off-by: Miguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org> --- OneM2M_Testcases.ttcn | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/OneM2M_Testcases.ttcn b/OneM2M_Testcases.ttcn index fa68656..34d9891 100644 --- a/OneM2M_Testcases.ttcn +++ b/OneM2M_Testcases.ttcn @@ -7,7 +7,7 @@ * * @author oneM2M * @version $URL: https://oldforge.etsi.org/svn/oneM2M/trunk/ttcn/OneM2M_Testcases.ttcn $ - * $Id: OneM2M_Testcases.ttcn 341 2017-08-07 12:44:50Z reinaortega $ + * $Id: OneM2M_Testcases.ttcn 342 2017-08-07 13:03:50Z reinaortega $ * @desc Module containing test cases for oneM2M * */ @@ -12131,7 +12131,7 @@ module OneM2M_Testcases { var MsgIn v_response; var RequestPrimitive v_request; var integer v_aeIndex := -1; - var charstring c_falseAdressResource := "NoExistingResource"; + var charstring v_resourceIdOrName := "NotExistingResource"; // Test control @@ -12144,7 +12144,11 @@ module OneM2M_Testcases { v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi); // Test Body - v_request := valueof(m_deleteRequest(f_getResourceAddress(v_aeIndex) & "/" & c_falseAdressResource)); + if(vc_addressingMethod == e_nonHierarchical and (vc_primitiveScope == e_cseRelative)) { + v_request := valueof(m_deleteRequest(v_resourceIdOrName)); + } else { + v_request := valueof(m_deleteRequest(f_getResourceAddress(v_aeIndex) & "/" & v_resourceIdOrName)); + } mcaPort.send(m_request(v_request)); tc_ac.start; -- GitLab