From 4678f9635f74821a4781a2ac3e9765ed9ba42ded Mon Sep 17 00:00:00 2001 From: reinaortega <miguelangel.reinaortega@etsi.org> Date: Tue, 23 May 2017 08:47:53 +0200 Subject: [PATCH] g_CSE_DMR_RET_BV_013 corrected. No need to return the response received Signed-off-by: reinaortega <miguelangel.reinaortega@etsi.org> --- OneM2M_Testcases.ttcn | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/OneM2M_Testcases.ttcn b/OneM2M_Testcases.ttcn index e8fc8b5..14c5446 100644 --- a/OneM2M_Testcases.ttcn +++ b/OneM2M_Testcases.ttcn @@ -7,7 +7,7 @@ * * @author oneM2M * @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/OneM2M_Testcases.ttcn $ - * $Id: OneM2M_Testcases.ttcn 291 2017-05-23 04:47:01Z reinaortega $ + * $Id: OneM2M_Testcases.ttcn 293 2017-05-23 06:47:09Z reinaortega $ * @desc Module containing test cases for oneM2M * */ @@ -4424,71 +4424,65 @@ module OneM2M_Testcases { testcase TC_CSE_DMR_RET_BV_013_01() runs on CseTester system CseSystem { // Local variables - var ResponsePrimitive v_responsePrimitive; var template PrimitiveContent v_contentResponse; v_contentResponse.any_1[0].AccessControlPolicy_optional := mw_contentAcp_rc1; - v_responsePrimitive := f_CSE_DMR_RET_BV_013(int1, m_createAcpBase, v_contentResponse);//AccessControlPolicy + f_CSE_DMR_RET_BV_013(int1, m_createAcpBase, v_contentResponse);//AccessControlPolicy } testcase TC_CSE_DMR_RET_BV_013_02() runs on CseTester system CseSystem { // Local variables - var ResponsePrimitive v_responsePrimitive; var template PrimitiveContent v_contentResponse; v_contentResponse.any_1[0].AE_optional := mw_contentAeBase; - v_responsePrimitive := f_CSE_DMR_RET_BV_013(int2, m_createAe(PX_APP_ID), v_contentResponse);//AE + f_CSE_DMR_RET_BV_013(int2, m_createAe(PX_APP_ID), v_contentResponse);//AE } testcase TC_CSE_DMR_RET_BV_013_03() runs on CseTester system CseSystem { // Local variables - var ResponsePrimitive v_responsePrimitive; var template PrimitiveContent v_contentResponse; v_contentResponse.any_1[0].Container_optional := mw_contentContainer_rc1; - v_responsePrimitive := f_CSE_DMR_RET_BV_013(int3, m_createContainerBase, v_contentResponse);//Container + f_CSE_DMR_RET_BV_013(int3, m_createContainerBase, v_contentResponse);//Container } testcase TC_CSE_DMR_RET_BV_013_05() runs on CseTester system CseSystem { // Local variables - var ResponsePrimitive v_responsePrimitive; var template PrimitiveContent v_contentResponse; v_contentResponse.any_1[0].Group_optional := mw_contentGroup_rc1; - v_responsePrimitive := f_CSE_DMR_RET_BV_013(int9, m_createGroupBase, v_contentResponse);//Group + f_CSE_DMR_RET_BV_013(int9, m_createGroupBase, v_contentResponse);//Group } testcase TC_CSE_DMR_RET_BV_013_11() runs on CseTester system CseSystem { // Local variables - var ResponsePrimitive v_responsePrimitive; var template PrimitiveContent v_contentResponse; v_contentResponse.any_1[0].Schedule_optional := mw_contentSchedule_rc1; - v_responsePrimitive := f_CSE_DMR_RET_BV_013(int18, m_createScheduleBase, v_contentResponse);//Schedule + f_CSE_DMR_RET_BV_013(int18, m_createScheduleBase, v_contentResponse);//Schedule } testcase TC_CSE_DMR_RET_BV_013_14() runs on CseTester system CseSystem { // Local variables - var ResponsePrimitive v_responsePrimitive; var template PrimitiveContent v_contentResponse; v_contentResponse.any_1[0].Subscription_optional := mw_contentSubscription_rc1; - v_responsePrimitive := f_CSE_DMR_RET_BV_013(int23, m_createSubscriptionBase, v_contentResponse);//Subscription + f_CSE_DMR_RET_BV_013(int23, m_createSubscriptionBase, v_contentResponse);//Subscription } - function f_CSE_DMR_RET_BV_013(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on CseTester return ResponsePrimitive { + function f_CSE_DMR_RET_BV_013(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on CseTester { // Local variables var MsgIn v_response; @@ -4530,7 +4524,7 @@ module OneM2M_Testcases { setverdict(fail, testcasename() & ": Error while retrieving resource"); } [] tc_ac.timeout { - setverdict(inconc, testcasename() & ": No answer while retrieving resource"); + setverdict(fail, testcasename() & ": No answer while retrieving resource"); } } @@ -4540,8 +4534,6 @@ module OneM2M_Testcases { // Tear down f_cf01Down(); - return v_response.primitive.responsePrimitive; - }//end f_CSE_DMR_RET_BV_013 } // end g_CSE_DMR_RET_BV_013 -- GitLab