diff --git a/OneM2M_Testcases_AE.ttcn b/OneM2M_Testcases_AE.ttcn index 1e90fefca4deb8cb2092551e835d7f5ec9444295..6a39dfb05ec1d694cd695c72013fbe45029a1fb3 100644 --- a/OneM2M_Testcases_AE.ttcn +++ b/OneM2M_Testcases_AE.ttcn @@ -73,6 +73,7 @@ module OneM2M_Testcases_AE { var ResponsePrimitive v_responsePrimtive; var template UtTriggerPrimitive v_utRequest := m_utCreateContainer; var UtTriggerAckPrimitive v_trigger_response; + var charstring v_action := "Please, send a valid CREATE Request for container containing To set to " & f_getResourceAddress(-1, e_nonHierarchical, p_primitiveScope); if(not(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) { setverdict(inconc, __SCOPE__, ": Unstructured-CSE-Relative-Resource-ID format support is required to run this test case"); @@ -84,7 +85,7 @@ module OneM2M_Testcases_AE { //Send Trigger Message v_utRequest.to_ := f_getResourceAddress(-1, e_nonHierarchical, p_primitiveScope); v_utRequest.from_ := "UNINITIALIZED"; - f_sendUtPrimitive(v_utRequest); + f_sendUtPrimitive(v_utRequest, v_action); tc_ac.start; alt { @@ -152,6 +153,8 @@ module OneM2M_Testcases_AE { var ResponsePrimitive v_responsePrimtive; var template UtTriggerPrimitive v_utRequest := m_utCreateContainer; var UtTriggerAckPrimitive v_trigger_response; + var charstring v_action := "Please, send a valid CREATE Request for container containing To set to " & f_getResourceAddress(-1, e_hierarchical, p_primitiveScope); + //Test Control if(not(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) { @@ -164,7 +167,7 @@ module OneM2M_Testcases_AE { //Send Trigger Message v_utRequest.to_ := f_getResourceAddress(-1, e_hierarchical, p_primitiveScope); v_utRequest.from_ := "UNINITIALIZED"; - f_sendUtPrimitive(v_utRequest); + f_sendUtPrimitive(v_utRequest,v_action); tc_ac.start; @@ -242,6 +245,8 @@ module OneM2M_Testcases_AE { var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer; var UtTriggerAckPrimitive v_trigger_response; var integer v_auxInteger; + var charstring v_action := "Please, send a valid UPDATE Request for container containing To set to " & f_getResourceAddress(-1, e_nonHierarchical, p_primitiveScope); + if(not(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) { setverdict(inconc, __SCOPE__, ": Unstructured-CSE-Relative-Resource-ID format support is required to run this test case"); @@ -254,7 +259,7 @@ module OneM2M_Testcases_AE { v_auxInteger := f_setResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), int3); v_utRequest.to_ := f_getResourceAddress(v_auxInteger, e_nonHierarchical, p_primitiveScope); v_utRequest.from_ := "UNINITIALIZED"; - f_sendUtPrimitive(v_utRequest); + f_sendUtPrimitive(v_utRequest,v_action); tc_ac.start; alt { @@ -326,7 +331,8 @@ module OneM2M_Testcases_AE { var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer; var UtTriggerAckPrimitive v_trigger_response; var integer v_auxInteger; - + var charstring v_action := "Please, send a valid UPDATE Request for container containing To set to " & f_getResourceAddress(-1, e_hierarchical, p_primitiveScope); + if(not(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) { setverdict(inconc, __SCOPE__, ": Structured-CSE-Relative-Resource-ID format support is required to run this test case"); stop; @@ -338,7 +344,7 @@ module OneM2M_Testcases_AE { v_auxInteger := f_setResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), int3); v_utRequest.to_ := f_getResourceAddress(v_auxInteger, e_hierarchical, p_primitiveScope); v_utRequest.from_ := "UNINITIALIZED"; - f_sendUtPrimitive(v_utRequest); + f_sendUtPrimitive(v_utRequest,v_action); tc_ac.start; alt { @@ -416,6 +422,7 @@ module OneM2M_Testcases_AE { var UtTriggerPrimitive v_utRequest; var UtTriggerAckPrimitive v_trigger_response; var integer v_auxInteger; + var charstring v_action := "Please, send a valid RETRIEVE Request for container containing To set to " & f_getResourceAddress(-1, e_nonHierarchical, p_primitiveScope); if(not(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) { setverdict(inconc, __SCOPE__, ": Unstructured-CSE-Relative-Resource-ID format support is required to run this test case"); @@ -427,7 +434,7 @@ module OneM2M_Testcases_AE { //Send Trigger Message v_auxInteger := f_setResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), int3); v_utRequestTemplate := m_utRetrieveResource(f_getResourceAddress(v_auxInteger, e_nonHierarchical, p_primitiveScope),"UNINITIALIZED"); - f_sendUtPrimitive(v_utRequestTemplate); + f_sendUtPrimitive(v_utRequestTemplate,v_action); v_utRequest := valueof(v_utRequestTemplate); tc_ac.start; @@ -501,6 +508,7 @@ module OneM2M_Testcases_AE { var UtTriggerPrimitive v_utRequest; var UtTriggerAckPrimitive v_trigger_response; var integer v_auxInteger; + var charstring v_action := "Please, send a valid RETRIEVE Request for container containing To set to " & f_getResourceAddress(-1, e_hierarchical, p_primitiveScope); if(not(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) { setverdict(inconc, __SCOPE__, ": Structured-CSE-Relative-Resource-ID format support is required to run this test case"); @@ -513,7 +521,7 @@ module OneM2M_Testcases_AE { v_auxInteger := f_setResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), int3); v_utRequestTemplate := m_utRetrieveResource(f_getResourceAddress(v_auxInteger, e_hierarchical, p_primitiveScope),"UNINITIALIZED"); v_utRequest := valueof(v_utRequestTemplate); - f_sendUtPrimitive(v_utRequest); + f_sendUtPrimitive(v_utRequest,v_action); tc_ac.start; alt { @@ -590,6 +598,7 @@ module OneM2M_Testcases_AE { var template UtTriggerPrimitive v_utRequest := m_utDeleteRequest; var UtTriggerAckPrimitive v_trigger_response; var integer v_auxInteger; + var charstring v_action := "Please, send a valid DELETE Request for container containing To set to " & f_getResourceAddress(-1, e_nonHierarchical, p_primitiveScope); if(not(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) { setverdict(inconc, __SCOPE__, ": Unstructured-CSE-Relative-Resource-ID format support is required to run this test case"); @@ -602,7 +611,7 @@ module OneM2M_Testcases_AE { v_auxInteger := f_setResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), int3); v_utRequest.to_ := f_getResourceAddress(v_auxInteger, e_nonHierarchical, p_primitiveScope); v_utRequest.from_ := "UNINITIALIZED"; - f_sendUtPrimitive(v_utRequest); + f_sendUtPrimitive(v_utRequest,v_action); tc_ac.start; alt { @@ -674,6 +683,7 @@ module OneM2M_Testcases_AE { var template UtTriggerPrimitive v_utRequest := m_utDeleteRequest; var UtTriggerAckPrimitive v_trigger_response; var integer v_auxInteger; + var charstring v_action := "Please, send a valid DELETE Request for container containing To set to " & f_getResourceAddress(-1, e_hierarchical, p_primitiveScope); if(not(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) { setverdict(inconc, __SCOPE__, ": Structured-CSE-Relative-Resource-ID format support is required to run this test case"); @@ -686,7 +696,7 @@ module OneM2M_Testcases_AE { v_auxInteger := f_setResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), int3); v_utRequest.to_ := f_getResourceAddress(v_auxInteger, e_hierarchical, p_primitiveScope); v_utRequest.from_ := "UNINITIALIZED"; - f_sendUtPrimitive(v_utRequest); + f_sendUtPrimitive(v_utRequest,v_action); tc_ac.start; @@ -735,11 +745,12 @@ module OneM2M_Testcases_AE { //primitives for mcaPort var MsgIn v_request; var ResponsePrimitive v_responsePrimtive; + var charstring v_action := "Please, send a valid AE CREATE Registration Request"; f_cf03Up(); //Send Trigger Message - f_sendUtPrimitive(v_utRequest); + f_sendUtPrimitive(v_utRequest, v_action); //Test behavior tc_ac.start; @@ -776,94 +787,104 @@ module OneM2M_Testcases_AE { testcase TC_AE_REG_CRE_002_RN() runs on CseSimu system AeSystem { //primitives for utPort var template UtTriggerPrimitive v_utRequest := m_createAe("UNINITIALIZED"); - var template RequestPrimitive v_createAe := mw_createAe; + var template RequestPrimitive v_createAe := mw_createAe; + var charstring v_action := "Please, send a valid AE CREATE Registration Request containing attribute ResourceName"; v_utRequest.primitiveContent.aE.resourceName := "UNINITIALIZED"; v_createAe.primitiveContent.aE.resourceName := ?; - f_AE_REG_CRE_002(v_utRequest,v_createAe); + f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action); } testcase TC_AE_REG_CRE_002_ET() runs on CseSimu system AeSystem { //primitives for utPort var template UtTriggerPrimitive v_utRequest := m_createAe("UNINITIALIZED"); - var template RequestPrimitive v_createAe := mw_createAe; + var template RequestPrimitive v_createAe := mw_createAe; + var charstring v_action := "Please, send a valid AE CREATE Registration Request containing attribute ExpirationTime"; v_utRequest.primitiveContent.aE.expirationTime := "20301231T012345"; v_createAe.primitiveContent.aE.expirationTime := ?; - f_AE_REG_CRE_002(v_utRequest,v_createAe); + f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action); } testcase TC_AE_REG_CRE_002_LBL() runs on CseSimu system AeSystem { //primitives for utPort var template UtTriggerPrimitive v_utRequest := m_createAe("UNINITIALIZED"); var template RequestPrimitive v_createAe := mw_createAe; + var charstring v_action := "Please, send a valid AE CREATE Registration Request containing attribute Labels"; v_utRequest.primitiveContent.aE.labels := {"UNINITIALIZED"}; v_createAe.primitiveContent.aE.labels := ?; - f_AE_REG_CRE_002(v_utRequest,v_createAe); + f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action); } testcase TC_AE_REG_CRE_002_APN() runs on CseSimu system AeSystem { //primitives for utPort var template UtTriggerPrimitive v_utRequest := m_createAe("UNINITIALIZED"); - var template RequestPrimitive v_createAe := mw_createAe; + var template RequestPrimitive v_createAe := mw_createAe; + var charstring v_action := "Please, send a valid AE CREATE Registration Request containing attribute AppName"; v_utRequest.primitiveContent.aE.appName := "UNINITIALIZED"; v_createAe.primitiveContent.aE.appName := ?; - f_AE_REG_CRE_002(v_utRequest,v_createAe); + f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action); } testcase TC_AE_REG_CRE_002_API() runs on CseSimu system AeSystem { //primitives for utPort var template UtTriggerPrimitive v_utRequest := m_createAe("UNINITIALIZED"); - var template RequestPrimitive v_createAe := mw_createAe; + var template RequestPrimitive v_createAe := mw_createAe; + var charstring v_action := "Please, send a valid AE CREATE Registration Request containing attribute AppID"; v_utRequest.primitiveContent.aE.app_ID := "UNINITIALIZED"; v_createAe.primitiveContent.aE.app_ID := ?; - f_AE_REG_CRE_002(v_utRequest,v_createAe); + f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action); } testcase TC_AE_REG_CRE_002_POA() runs on CseSimu system AeSystem { //primitives for utPort var template UtTriggerPrimitive v_utRequest := m_createAe("UNINITIALIZED"); var template RequestPrimitive v_createAe := mw_createAe; + var charstring v_action := "Please, send a valid AE CREATE Registration Request containing attribute PointOfAccess"; v_utRequest.primitiveContent.aE.pointOfAccess := {"UNINITIALIZED"}; v_createAe.primitiveContent.aE.pointOfAccess := ?; - f_AE_REG_CRE_002(v_utRequest,v_createAe); + f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action); } testcase TC_AE_REG_CRE_002_OR() runs on CseSimu system AeSystem { //primitives for utPort var template UtTriggerPrimitive v_utRequest := m_createAe("UNINITIALIZED"); var template RequestPrimitive v_createAe := mw_createAe; + var charstring v_action := "Please, send a valid AE CREATE Registration Request containing attribute OntologyRef"; v_utRequest.primitiveContent.aE.ontologyRef := "UNINITIALIZED"; v_createAe.primitiveContent.aE.ontologyRef := ?; - f_AE_REG_CRE_002(v_utRequest,v_createAe); + f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action); } testcase TC_AE_REG_CRE_002_NL() runs on CseSimu system AeSystem { //primitives for utPort var template UtTriggerPrimitive v_utRequest := m_createAe("UNINITIALIZED"); var template RequestPrimitive v_createAe := mw_createAe; + var charstring v_action := "Please, send a valid AE CREATE Registration Request containing attribute NodeLink"; v_utRequest.primitiveContent.aE.nodeLink := "UNINITIALIZED"; v_createAe.primitiveContent.aE.nodeLink := ?; - f_AE_REG_CRE_002(v_utRequest,v_createAe); + f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action); } testcase TC_AE_REG_CRE_002_RR() runs on CseSimu system AeSystem { //primitives for utPort var template UtTriggerPrimitive v_utRequest := m_createAe("UNINITIALIZED"); var template RequestPrimitive v_createAe := mw_createAe; + var charstring v_action := "Please, send a valid AE CREATE Registration Request containing attribute RequestReachability"; v_utRequest.primitiveContent.aE.requestReachability := true; v_createAe.primitiveContent.aE.requestReachability := ?; - f_AE_REG_CRE_002(v_utRequest,v_createAe); + f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action); } testcase TC_AE_REG_CRE_002_CSZ() runs on CseSimu system AeSystem { //primitives for utPort var template UtTriggerPrimitive v_utRequest := m_createAe("UNINITIALIZED"); var template RequestPrimitive v_createAe := mw_createAe; + var charstring v_action := "Please, send a valid AE CREATE Registration Request containing attribute ContentSerialization"; v_utRequest.primitiveContent.aE.contentSerialization := {applicationxml}; v_createAe.primitiveContent.aE.contentSerialization := ?; - f_AE_REG_CRE_002(v_utRequest,v_createAe); + f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action); } - function f_AE_REG_CRE_002(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_response) runs on CseSimu { + function f_AE_REG_CRE_002(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_response, in charstring p_action) runs on CseSimu { //primitives for mcaPort var MsgIn v_request; @@ -872,7 +893,7 @@ module OneM2M_Testcases_AE { f_cf03Up(); //Send Trigger Message - f_sendUtPrimitive(p_utRequest); + f_sendUtPrimitive(p_utRequest,p_action); //Test behavior tc_ac.start; @@ -916,13 +937,14 @@ module OneM2M_Testcases_AE { //variables var MsgIn v_request; var ResponsePrimitive v_responsePrimtive; + var charstring v_action := "Please, send a valid AE DELETE Registration Request"; //primitives for utPort var template UtTriggerPrimitive v_utRequest := mw_deleteRequest; f_cf03Up(); - f_sendUtPrimitive(v_utRequest); + f_sendUtPrimitive(v_utRequest,v_action); //Test behavior tc_ac.start; @@ -968,11 +990,12 @@ module OneM2M_Testcases_AE { var template UtTriggerPrimitive v_utRequest := m_utCreateContainer; var MsgIn v_request; var ResponsePrimitive v_responsePrimtive; + var charstring v_action := "Please, send a valid CREATE Request for container"; f_cf03Up(); //send triggering primtive to SUT - f_sendUtPrimitive(v_utRequest); + f_sendUtPrimitive(v_utRequest,v_action); //Test behavior tc_ac.start; @@ -1009,12 +1032,13 @@ module OneM2M_Testcases_AE { var template UtTriggerPrimitive v_utRequest := m_utCreateContentInstance; var MsgIn v_request; var ResponsePrimitive v_responsePrimtive; + var charstring v_action := "Please, send a valid CREATE Request for ContentInstance"; //Test component configuration f_cf03Up(); //send triggering primtive to SUT - f_sendUtPrimitive(v_utRequest); + f_sendUtPrimitive(v_utRequest,v_action); //Test behavior tc_ac.start; @@ -1055,44 +1079,49 @@ module OneM2M_Testcases_AE { testcase TC_AE_DMR_CRE_003_CNF() runs on CseSimu system AeSystem { var template UtTriggerPrimitive v_utRequest := m_utCreateContentInstance; var template RequestPrimitive v_request := mw_createContentInstance; + var charstring v_action := "Please, send a valid CREATE Request for ContentInstance containing attribute ContentInfo"; v_utRequest.primitiveContent.contentInstance.contentInfo := "UNINITIALIZED"; v_request.primitiveContent.contentInstance.contentInfo := ?; - f_AE_DMR_CRE_003(v_utRequest,v_request); + f_AE_DMR_CRE_003(v_utRequest,v_request,v_action); } testcase TC_AE_DMR_CRE_003_RN() runs on CseSimu system AeSystem { var template UtTriggerPrimitive v_utRequest := m_utCreateContentInstance; var template RequestPrimitive v_request := mw_createContentInstance; + var charstring v_action := "Please, send a valid CREATE Request for ContentInstance containing attribute ResourceName"; v_utRequest.primitiveContent.contentInstance.resourceName := "UNINITIALIZED"; v_request.primitiveContent.contentInstance.resourceName := ?; - f_AE_DMR_CRE_003(v_utRequest,v_request); + f_AE_DMR_CRE_003(v_utRequest,v_request,v_action); } testcase TC_AE_DMR_CRE_003_ET() runs on CseSimu system AeSystem { var template UtTriggerPrimitive v_utRequest := m_utCreateContentInstance; var template RequestPrimitive v_request := mw_createContentInstance; + var charstring v_action := "Please, send a valid CREATE Request for ContentInstance containing attribute ExpirationTime"; v_utRequest.primitiveContent.contentInstance.expirationTime := "20301231T012345"; v_request.primitiveContent.contentInstance.expirationTime := ?; - f_AE_DMR_CRE_003(v_utRequest,v_request); + f_AE_DMR_CRE_003(v_utRequest,v_request,v_action); } testcase TC_AE_DMR_CRE_003_LBL() runs on CseSimu system AeSystem { var template UtTriggerPrimitive v_utRequest := m_utCreateContentInstance; var template RequestPrimitive v_request := mw_createContentInstance; + var charstring v_action := "Please, send a valid CREATE Request for ContentInstance containing attribute Labels"; v_utRequest.primitiveContent.contentInstance.labels := {"UNINITIALIZED"}; v_request.primitiveContent.contentInstance.labels := ?; - f_AE_DMR_CRE_003(v_utRequest,v_request); + f_AE_DMR_CRE_003(v_utRequest,v_request,v_action); } testcase TC_AE_DMR_CRE_003_CR() runs on CseSimu system AeSystem { var template UtTriggerPrimitive v_utRequest := m_utCreateContentInstance; var template RequestPrimitive v_request := mw_createContentInstance; + var charstring v_action := "Please, send a valid CREATE Request for ContentInstance containing attribute Creator"; v_utRequest.primitiveContent.contentInstance.creator := "UNINITIALIZED"; v_request.primitiveContent.contentInstance.creator := ?; - f_AE_DMR_CRE_003(v_utRequest,v_request); + f_AE_DMR_CRE_003(v_utRequest,v_request,v_action); } - function f_AE_DMR_CRE_003(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_request) runs on CseSimu { + function f_AE_DMR_CRE_003(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_request, in charstring p_action) runs on CseSimu { var ResponsePrimitive v_responsePrimtive; @@ -1100,7 +1129,7 @@ module OneM2M_Testcases_AE { f_cf03Up(); //send triggering primtive to SUT - f_sendUtPrimitive(p_utRequest); + f_sendUtPrimitive(p_utRequest,p_action); //Test behavior tc_ac.start; @@ -1145,76 +1174,85 @@ module OneM2M_Testcases_AE { testcase TC_AE_DMR_CRE_004_ACPI() runs on CseSimu system AeSystem { var template UtTriggerPrimitive v_utRequest := m_utCreateContainer; var template RequestPrimitive v_request := mw_createContainer; + var charstring v_action := "Please, send a valid CREATE Request for Container containing attribute AccessControlPolicyIDs"; v_utRequest.primitiveContent.container.accessControlPolicyIDs := {"UNINITIALIZED"}; v_request.primitiveContent.container.accessControlPolicyIDs := ?; - f_AE_DMR_CRE_004(v_utRequest,v_request); + f_AE_DMR_CRE_004(v_utRequest,v_request,v_action); } testcase TC_AE_DMR_CRE_004_MNI() runs on CseSimu system AeSystem { var template UtTriggerPrimitive v_utRequest := m_utCreateContainer; var template RequestPrimitive v_request := mw_createContainer; + var charstring v_action := "Please, send a valid CREATE Request for Container containing attribute MaxNrOfInstances"; v_utRequest.primitiveContent.container.maxNrOfInstances := 1; v_request.primitiveContent.container.maxNrOfInstances := ?; - f_AE_DMR_CRE_004(v_utRequest,v_request); + f_AE_DMR_CRE_004(v_utRequest,v_request,v_action); } testcase TC_AE_DMR_CRE_004_MBS() runs on CseSimu system AeSystem { var template UtTriggerPrimitive v_utRequest := m_utCreateContainer; var template RequestPrimitive v_request := mw_createContainer; + var charstring v_action := "Please, send a valid CREATE Request for Container containing attribute MaxByteSize"; v_utRequest.primitiveContent.container.maxByteSize := 1; v_request.primitiveContent.container.maxByteSize := ?; - f_AE_DMR_CRE_004(v_utRequest,v_request); + f_AE_DMR_CRE_004(v_utRequest,v_request,v_action); } testcase TC_AE_DMR_CRE_004_MIA() runs on CseSimu system AeSystem { var template UtTriggerPrimitive v_utRequest := m_utCreateContainer; var template RequestPrimitive v_request := mw_createContainer; + var charstring v_action := "Please, send a valid CREATE Request for Container containing attribute MaxInstanceAge"; v_utRequest.primitiveContent.container.maxInstanceAge := 1; v_request.primitiveContent.container.maxInstanceAge := ?; - f_AE_DMR_CRE_004(v_utRequest,v_request); + f_AE_DMR_CRE_004(v_utRequest,v_request,v_action); } testcase TC_AE_DMR_CRE_004_OR() runs on CseSimu system AeSystem { var template UtTriggerPrimitive v_utRequest := m_utCreateContainer; var template RequestPrimitive v_request := mw_createContainer; + var charstring v_action := "Please, send a valid CREATE Request for Container containing attribute OntologyRef"; v_utRequest.primitiveContent.container.ontologyRef := "UNINITIALIZED"; v_request.primitiveContent.container.ontologyRef := ?; - f_AE_DMR_CRE_004(v_utRequest,v_request); + f_AE_DMR_CRE_004(v_utRequest,v_request,v_action); } testcase TC_AE_DMR_CRE_004_RN() runs on CseSimu system AeSystem { var template UtTriggerPrimitive v_utRequest := m_utCreateContainer; var template RequestPrimitive v_request := mw_createContainer; + var charstring v_action := "Please, send a valid CREATE Request for Container containing attribute ResourceName"; v_utRequest.primitiveContent.container.resourceName := "UNINITIALIZED"; v_request.primitiveContent.container.resourceName := ?; - f_AE_DMR_CRE_004(v_utRequest,v_request); + f_AE_DMR_CRE_004(v_utRequest,v_request,v_action); } testcase TC_AE_DMR_CRE_004_ET() runs on CseSimu system AeSystem { var template UtTriggerPrimitive v_utRequest := m_utCreateContainer; var template RequestPrimitive v_request := mw_createContainer; + var charstring v_action := "Please, send a valid CREATE Request for Container containing attribute ExpirationTime"; v_utRequest.primitiveContent.container.expirationTime := "20301231T012345"; v_request.primitiveContent.container.expirationTime := ?; - f_AE_DMR_CRE_004(v_utRequest,v_request); + f_AE_DMR_CRE_004(v_utRequest,v_request,v_action); } testcase TC_AE_DMR_CRE_004_LBL() runs on CseSimu system AeSystem { var template UtTriggerPrimitive v_utRequest := m_utCreateContainer; var template RequestPrimitive v_request := mw_createContainer; + var charstring v_action := "Please, send a valid CREATE Request for Container containing attribute Labels"; v_utRequest.primitiveContent.container.labels := {"UNINITIALIZED"}; v_request.primitiveContent.container.labels := ?; - f_AE_DMR_CRE_004(v_utRequest,v_request); + f_AE_DMR_CRE_004(v_utRequest,v_request,v_action); } testcase TC_AE_DMR_CRE_004_CR() runs on CseSimu system AeSystem { var template UtTriggerPrimitive v_utRequest := m_utCreateContainer; var template RequestPrimitive v_request := mw_createContainer; + var charstring v_action := "Please, send a valid CREATE Request for Container containing attribute Creator"; v_utRequest.primitiveContent.container.creator := "UNINITIALIZED"; v_request.primitiveContent.container.creator := ?; - f_AE_DMR_CRE_004(v_utRequest,v_request); + f_AE_DMR_CRE_004(v_utRequest,v_request,v_action); } - function f_AE_DMR_CRE_004(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_request) runs on CseSimu { + function f_AE_DMR_CRE_004(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_request, in charstring p_action) runs on CseSimu { var ResponsePrimitive v_responsePrimtive; @@ -1222,7 +1260,7 @@ module OneM2M_Testcases_AE { f_cf03Up(); //send triggering primtive to SUT - f_sendUtPrimitive(p_utRequest); + f_sendUtPrimitive(p_utRequest,p_action); //Test behavior tc_ac.start; @@ -1269,11 +1307,12 @@ module OneM2M_Testcases_AE { testcase TC_AE_DMR_UPD_001_LBL() runs on CseSimu system AeSystem { var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer; var template RequestPrimitive v_request := mw_createContainer; + var charstring v_action := "Please, send a valid UPDATE Request for Container updating attribute labels"; v_utRequest.primitiveContent.container.labels := {"UNINITIALIZED"}; - f_AE_DMR_UPD_001(v_utRequest,v_request); + f_AE_DMR_UPD_001(v_utRequest,v_request,v_action); } - function f_AE_DMR_UPD_001(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_request) runs on CseSimu { + function f_AE_DMR_UPD_001(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_request, in charstring p_action) runs on CseSimu { var ResponsePrimitive v_responsePrimtive; var MsgIn v_request; @@ -1282,7 +1321,7 @@ module OneM2M_Testcases_AE { f_cf03Up(); //send triggering primtive to SUT - f_sendUtPrimitive(p_utRequest); + f_sendUtPrimitive(p_utRequest,p_action); //Test behavior tc_ac.start; @@ -1329,65 +1368,72 @@ module OneM2M_Testcases_AE { testcase TC_AE_DMR_UPD_002_ET() runs on CseSimu system AeSystem { var template UtTriggerPrimitive v_utRequest := m_updateAeBase; + var charstring v_action := "Please, send a valid UPDATE Request for AE updating attribute expirationTime"; v_utRequest.primitiveContent.aE.expirationTime := "20301231T012345"; - f_AE_DMR_UPD_002(v_utRequest); + f_AE_DMR_UPD_002(v_utRequest,v_action); } testcase TC_AE_DMR_UPD_002_APN() runs on CseSimu system AeSystem { var template UtTriggerPrimitive v_utRequest := m_updateAeBase; + var charstring v_action := "Please, send a valid UPDATE Request for AE updating attribute appName"; v_utRequest.primitiveContent.aE.appName := "UNINITIALIZED"; - f_AE_DMR_UPD_002(v_utRequest); + f_AE_DMR_UPD_002(v_utRequest,v_action); } testcase TC_AE_DMR_UPD_002_POA() runs on CseSimu system AeSystem { var template UtTriggerPrimitive v_utRequest := m_updateAeBase; + var charstring v_action := "Please, send a valid UPDATE Request for AE updating attribute pointOfAccess"; v_utRequest.primitiveContent.aE.pointOfAccess := {"http://127.0.0.1:1400/monitor"}; - f_AE_DMR_UPD_002(v_utRequest); + f_AE_DMR_UPD_002(v_utRequest,v_action); } testcase TC_AE_DMR_UPD_002_OR() runs on CseSimu system AeSystem { var template UtTriggerPrimitive v_utRequest := m_updateAeBase; + var charstring v_action := "Please, send a valid UPDATE Request for AE updating attribute ontologyRef"; v_utRequest.primitiveContent.aE.ontologyRef := "MyOntologyRef"; - f_AE_DMR_UPD_002(v_utRequest); + f_AE_DMR_UPD_002(v_utRequest,v_action); } testcase TC_AE_DMR_UPD_002_NL() runs on CseSimu system AeSystem { var template UtTriggerPrimitive v_utRequest := m_updateAeBase; + var charstring v_action := "Please, send a valid UPDATE Request for AE updating attribute nodeLink"; v_utRequest.primitiveContent.aE.nodeLink := "/CSE_ID/S-AE-ID-STEM"; - f_AE_DMR_UPD_002(v_utRequest); + f_AE_DMR_UPD_002(v_utRequest,v_action); } testcase TC_AE_DMR_UPD_002_RR() runs on CseSimu system AeSystem { var template UtTriggerPrimitive v_utRequest := m_updateAeBase; + var charstring v_action := "Please, send a valid UPDATE Request for AE updating attribute requestReachability"; v_utRequest.primitiveContent.aE.requestReachability := true; - f_AE_DMR_UPD_002(v_utRequest); + f_AE_DMR_UPD_002(v_utRequest,v_action); } testcase TC_AE_DMR_UPD_002_CSZ() runs on CseSimu system AeSystem { var template UtTriggerPrimitive v_utRequestTestBody := m_updateAeBase; + var charstring v_action := "Please, send a valid UPDATE Request for AE updating attribute contentSerialization"; v_utRequestTestBody.primitiveContent.aE.contentSerialization := {applicationxml}; - f_AE_DMR_UPD_002(v_utRequestTestBody); + f_AE_DMR_UPD_002(v_utRequestTestBody,v_action); } - function f_AE_DMR_UPD_002(template UtTriggerPrimitive p_utRequestTestBody) runs on CseSimu { + function f_AE_DMR_UPD_002(template UtTriggerPrimitive p_utRequestTestBody, in charstring p_action) runs on CseSimu { //primitives for mcaPort var MsgIn v_request; @@ -1403,7 +1449,7 @@ module OneM2M_Testcases_AE { //Send Trigger Message p_utRequestTestBody.to_ := f_getResourceAddress(v_aeIndex); - f_sendUtPrimitive(p_utRequestTestBody); + f_sendUtPrimitive(p_utRequestTestBody,p_action); //Test behavior @@ -1447,10 +1493,11 @@ module OneM2M_Testcases_AE { var template RequestPrimitive v_request := mw_updateContainer; var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer; + var charstring v_action := "Please, send a valid UPDATE Request for Container updating attribute expirationTime"; v_utRequest.to_ := f_getResourceAddress(v_auxInteger); v_utRequest.primitiveContent.container.expirationTime := "20301231T012345"; v_request.primitiveContent.container.expirationTime := ?; - f_AE_DMR_UPD_003(v_utRequest,v_request); + f_AE_DMR_UPD_003(v_utRequest,v_request,v_action); } testcase TC_AE_DMR_UPD_003_LBL() runs on CseSimu system AeSystem { @@ -1458,10 +1505,11 @@ module OneM2M_Testcases_AE { var template RequestPrimitive v_request := mw_updateContainer; var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer; + var charstring v_action := "Please, send a valid UPDATE Request for Container updating attribute labels"; v_utRequest.to_ := f_getResourceAddress(v_auxInteger); v_utRequest.primitiveContent.container.labels := {"UNINITIALIZED"}; v_request.primitiveContent.container.labels := ?; - f_AE_DMR_UPD_003(v_utRequest,v_request); + f_AE_DMR_UPD_003(v_utRequest,v_request,v_action); } testcase TC_AE_DMR_UPD_003_MNI() runs on CseSimu system AeSystem { @@ -1469,10 +1517,11 @@ module OneM2M_Testcases_AE { var template RequestPrimitive v_request := mw_updateContainer; var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer; + var charstring v_action := "Please, send a valid UPDATE Request for Container updating attribute maxNrOfInstances"; v_utRequest.to_ := f_getResourceAddress(v_auxInteger); v_utRequest.primitiveContent.container.maxNrOfInstances := 1; v_request.primitiveContent.container.maxNrOfInstances := ?; - f_AE_DMR_UPD_003(v_utRequest,v_request); + f_AE_DMR_UPD_003(v_utRequest,v_request,v_action); } testcase TC_AE_DMR_UPD_003_MBS() runs on CseSimu system AeSystem { @@ -1480,24 +1529,26 @@ module OneM2M_Testcases_AE { var template RequestPrimitive v_request := mw_updateContainer; var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer; + var charstring v_action := "Please, send a valid UPDATE Request for Container updating attribute maxByteSize"; v_utRequest.to_ := f_getResourceAddress(v_auxInteger); v_utRequest.primitiveContent.container.maxByteSize := 1; v_request.primitiveContent.container.maxByteSize := ?; - f_AE_DMR_UPD_003(v_utRequest,v_request); + f_AE_DMR_UPD_003(v_utRequest,v_request,v_action); } testcase TC_AE_DMR_UPD_003_MIA() runs on CseSimu system AeSystem { var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2); var template RequestPrimitive v_request := mw_updateContainer; var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer; + var charstring v_action := "Please, send a valid UPDATE Request for Container updating attribute maxInstanceAge"; v_utRequest.to_ := f_getResourceAddress(v_auxInteger); v_utRequest.primitiveContent.container.maxInstanceAge := 1; v_request.primitiveContent.container.maxInstanceAge := ?; - f_AE_DMR_UPD_003(v_utRequest,v_request); + f_AE_DMR_UPD_003(v_utRequest,v_request,v_action); } - function f_AE_DMR_UPD_003(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_request) runs on CseSimu { + function f_AE_DMR_UPD_003(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_request, in charstring p_action) runs on CseSimu { var ResponsePrimitive v_responsePrimtive; @@ -1505,7 +1556,7 @@ module OneM2M_Testcases_AE { f_cf03Up(); //send triggering primtive to SUT - f_sendUtPrimitive(p_utRequest); + f_sendUtPrimitive(p_utRequest,p_action); //Test behavior tc_ac.start; @@ -1551,15 +1602,17 @@ module OneM2M_Testcases_AE { testcase TC_AE_DMR_RET_001_CB() runs on CseSimu system AeSystem { var integer v_auxInteger := f_setResource(valueof(m_primitiveContentCSEBase(m_contentCreateCSEBase)), int5); - f_AE_DMR_RET_001(int5, f_getResourceAddress(v_auxInteger)); + var charstring v_action := "Please, send a valid RETRIEVE Request for CSEBase"; + f_AE_DMR_RET_001(int5, f_getResourceAddress(v_auxInteger),v_action); } testcase TC_AE_DMR_RET_001_AE() runs on CseSimu system AeSystem { var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2); - f_AE_DMR_RET_001(int2, f_getResourceAddress(v_auxInteger)); + var charstring v_action := "Please, send a valid RETRIEVE Request for AE"; + f_AE_DMR_RET_001(int2, f_getResourceAddress(v_auxInteger),v_action); } - function f_AE_DMR_RET_001(ResourceType p_resourceType, XSD.AnyURI p_address) runs on CseSimu { + function f_AE_DMR_RET_001(ResourceType p_resourceType, XSD.AnyURI p_address, in charstring p_action) runs on CseSimu { //variables var template UtTriggerPrimitive v_utRequest := m_utRetrieveResource (p_address, "UNINITIALIZED"); @@ -1571,7 +1624,7 @@ module OneM2M_Testcases_AE { //send triggering primtive to SUT v_utRequest.resourceType := p_resourceType; - f_sendUtPrimitive(v_utRequest); + f_sendUtPrimitive(v_utRequest,p_action); //Test behavior tc_ac.start; @@ -1615,12 +1668,13 @@ module OneM2M_Testcases_AE { var template UtTriggerPrimitive v_utRequest := m_utRetrieveResource (v_address & "/" & c_resourceShortNameOldest, "UNINITIALIZED"); var MsgIn v_request; var ResponsePrimitive v_responsePrimtive; + var charstring v_action := "Please, send a valid RETRIEVE Request for retrieving the 'oldest' attribute from Container"; //Test component configuration f_cf03Up(); //send triggering primtive to SUT - f_sendUtPrimitive(v_utRequest); + f_sendUtPrimitive(v_utRequest,v_action); //Test behavior tc_ac.start; @@ -1662,12 +1716,13 @@ module OneM2M_Testcases_AE { var template UtTriggerPrimitive v_utRequest := m_utRetrieveResource (v_address & "/" & c_resourceShortNameLatest, "UNINITIALIZED"); var MsgIn v_request; var ResponsePrimitive v_responsePrimtive; + var charstring v_action := "Please, send a valid RETRIEVE Request for retrieving the 'latest' attribute from Container"; //Test component configuration f_cf03Up(); //send triggering primtive to SUT - f_sendUtPrimitive(v_utRequest); + f_sendUtPrimitive(v_utRequest,v_action); //Test behavior tc_ac.start; @@ -1709,13 +1764,14 @@ module OneM2M_Testcases_AE { var template UtTriggerPrimitive v_utRequest := m_utRetrieveResource (v_address, "UNINITIALIZED"); var MsgIn v_request; var ResponsePrimitive v_responsePrimtive; + var charstring v_action := "Please, send a valid RETRIEVE Request for retrieving the Container"; //Test component configuration f_cf03Up(); //send triggering primtive to SUT v_utRequest.resourceType := int3; - f_sendUtPrimitive(v_utRequest); + f_sendUtPrimitive(v_utRequest,v_action); //Test behavior tc_ac.start; @@ -1757,13 +1813,14 @@ module OneM2M_Testcases_AE { var template UtTriggerPrimitive v_utRequest := m_utRetrieveResource (v_address, "UNINITIALIZED"); var MsgIn v_request; var ResponsePrimitive v_responsePrimtive; + var charstring v_action := "Please, send a valid RETRIEVE Request for retrieving the contentInstance"; //Test component configuration f_cf03Up(); //send triggering primtive to SUT v_utRequest.resourceType := int4; - f_sendUtPrimitive(v_utRequest); + f_sendUtPrimitive(v_utRequest,v_action); //Test behavior tc_ac.start; @@ -1809,12 +1866,13 @@ module OneM2M_Testcases_AE { var template UtTriggerPrimitive v_utRequest := m_utDeleteResource (v_address & "/" & c_resourceShortNameOldest, "UNINITIALIZED"); var MsgIn v_request; var ResponsePrimitive v_responsePrimtive; + var charstring v_action := "Please, send a valid DELETE Request for deleting the 'oldest' attribute from contentInstance"; //Test component configuration f_cf03Up(); //send triggering primtive to SUT - f_sendUtPrimitive(v_utRequest); + f_sendUtPrimitive(v_utRequest,v_action); //Test behavior tc_ac.start; @@ -1856,12 +1914,13 @@ module OneM2M_Testcases_AE { var template UtTriggerPrimitive v_utRequest := m_utDeleteResource (v_address & "/" & c_resourceShortNameLatest, "UNINITIALIZED"); var MsgIn v_request; var ResponsePrimitive v_responsePrimtive; + var charstring v_action := "Please, send a valid DELETE Request for deleting the 'latest' attribute from contentInstance"; //Test component configuration f_cf03Up(); //send triggering primtive to SUT - f_sendUtPrimitive(v_utRequest); + f_sendUtPrimitive(v_utRequest,v_action); //Test behavior tc_ac.start; @@ -1903,13 +1962,14 @@ module OneM2M_Testcases_AE { var template UtTriggerPrimitive v_utRequest := m_utDeleteResource (v_address, "UNINITIALIZED"); var MsgIn v_request; var ResponsePrimitive v_responsePrimtive; + var charstring v_action := "Please, send a valid DELETE Request for deleting the container resource"; //Test component configuration f_cf03Up(); //send triggering primtive to SUT v_utRequest.resourceType := int3; - f_sendUtPrimitive(v_utRequest); + f_sendUtPrimitive(v_utRequest,v_action); //Test behavior tc_ac.start; @@ -1939,7 +1999,7 @@ module OneM2M_Testcases_AE { } /** - * @desc Check that the IUT sends a <contentInstance> resource RETRIEVE Request to CSE + * @desc Check that the IUT sends a <contentInstance> resource DELETE Request to CSE */ testcase TC_AE_DMR_DEL_004 () runs on CseSimu system AeSystem { @@ -1951,13 +2011,14 @@ module OneM2M_Testcases_AE { var template UtTriggerPrimitive v_utRequest := m_utDeleteResource (v_address, "UNINITIALIZED"); var MsgIn v_request; var ResponsePrimitive v_responsePrimtive; + var charstring v_action := "Please, send a valid DELETE Request for deleting the contentInstance resource"; //Test component configuration f_cf03Up(); //send triggering primtive to SUT v_utRequest.resourceType := int4; - f_sendUtPrimitive(v_utRequest); + f_sendUtPrimitive(v_utRequest,v_action); //Test behavior tc_ac.start; @@ -2005,6 +2066,7 @@ module OneM2M_Testcases_AE { var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription; var MsgIn v_request; var ResponsePrimitive v_responsePrimtive; + var charstring v_action := "Please, send a valid subscription creation request"; var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2); v_utRequest.to_ := f_getResourceAddress(v_auxInteger); @@ -2012,7 +2074,7 @@ module OneM2M_Testcases_AE { f_cf03Up(); //send triggering primtive to SUT - f_sendUtPrimitive(v_utRequest); + f_sendUtPrimitive(v_utRequest,v_action); //Test behavior tc_ac.start; @@ -2049,6 +2111,7 @@ module OneM2M_Testcases_AE { testcase TC_AE_SUB_CRE_002_ACPI() runs on CseSimu system AeSystem { var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription; var template RequestPrimitive v_requestT := mw_createSubscription; + var charstring v_action := "Please, send a valid subscription creation request with optional attribute accessControlPolicyIDs"; var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2); v_utRequest.to_ := f_getResourceAddress(v_auxInteger); @@ -2059,12 +2122,13 @@ module OneM2M_Testcases_AE { v_requestT.primitiveContent.subscription.notificationURI := ?; v_requestT.primitiveContent.subscription.accessControlPolicyIDs := ?; - f_AE_SUB_CRE_002(v_utRequest, v_requestT); + f_AE_SUB_CRE_002(v_utRequest, v_requestT, v_action); } testcase TC_AE_SUB_CRE_002_ENC() runs on CseSimu system AeSystem { var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription; var template RequestPrimitive v_requestT := mw_createSubscription; + var charstring v_action := "Please, send a valid subscription creation request with optional attribute createdBefore"; var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2); v_utRequest.to_ := f_getResourceAddress(v_auxInteger); v_utRequest.primitiveContent.subscription.notificationURI := {"UNINITIALIZED"}; @@ -2075,12 +2139,13 @@ module OneM2M_Testcases_AE { v_requestT.primitiveContent.subscription.notificationURI := ?; v_requestT.primitiveContent.subscription.eventNotificationCriteria.createdBefore := ?; - f_AE_SUB_CRE_002(v_utRequest, v_requestT); + f_AE_SUB_CRE_002(v_utRequest, v_requestT, v_action); } testcase TC_AE_SUB_CRE_002_EXC() runs on CseSimu system AeSystem { var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription; var template RequestPrimitive v_requestT := mw_createSubscription; + var charstring v_action := "Please, send a valid subscription creation request with optional attribute expirationCounter"; var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2); v_utRequest.to_ := f_getResourceAddress(v_auxInteger); @@ -2091,12 +2156,13 @@ module OneM2M_Testcases_AE { v_requestT.primitiveContent.subscription.notificationURI := ?; v_requestT.primitiveContent.subscription.expirationCounter := ?; - f_AE_SUB_CRE_002(v_utRequest, v_requestT); + f_AE_SUB_CRE_002(v_utRequest, v_requestT, v_action); } testcase TC_AE_SUB_CRE_002_NFU() runs on CseSimu system AeSystem { var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription; var template RequestPrimitive v_requestT := mw_createSubscription; + var charstring v_action := "Please, send a valid subscription creation request with optional attribute notificationForwardingURI"; var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2); v_utRequest.to_ := f_getResourceAddress(v_auxInteger); @@ -2107,12 +2173,13 @@ module OneM2M_Testcases_AE { v_requestT.primitiveContent.subscription.notificationURI := ?; v_requestT.primitiveContent.subscription.notificationForwardingURI := ?; - f_AE_SUB_CRE_002(v_utRequest, v_requestT); + f_AE_SUB_CRE_002(v_utRequest, v_requestT, v_action); } testcase TC_AE_SUB_CRE_002_NCT() runs on CseSimu system AeSystem { var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription; var template RequestPrimitive v_requestT := mw_createSubscription; + var charstring v_action := "Please, send a valid subscription creation request with optional attribute notificationContentType"; var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2); v_utRequest.to_ := f_getResourceAddress(v_auxInteger); @@ -2123,12 +2190,13 @@ module OneM2M_Testcases_AE { v_requestT.primitiveContent.subscription.notificationURI := ?; v_requestT.primitiveContent.subscription.notificationContentType := ?; - f_AE_SUB_CRE_002(v_utRequest, v_requestT); + f_AE_SUB_CRE_002(v_utRequest, v_requestT, v_action); } testcase TC_AE_SUB_CRE_002_NEC() runs on CseSimu system AeSystem { var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription; var template RequestPrimitive v_requestT := mw_createSubscription; + var charstring v_action := "Please, send a valid subscription creation request with optional attribute notificationEventCat"; var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2); v_utRequest.to_ := f_getResourceAddress(v_auxInteger); @@ -2139,12 +2207,13 @@ module OneM2M_Testcases_AE { v_requestT.primitiveContent.subscription.notificationURI := ?; v_requestT.primitiveContent.subscription.notificationEventCat.alt_ := ?; - f_AE_SUB_CRE_002(v_utRequest, v_requestT); + f_AE_SUB_CRE_002(v_utRequest, v_requestT, v_action); } testcase TC_AE_SUB_CRE_002_SU() runs on CseSimu system AeSystem { var template UtTriggerPrimitive v_utRequest := m_utCreateSubscription; var template RequestPrimitive v_requestT := mw_createSubscription; + var charstring v_action := "Please, send a valid subscription creation request with optional attribute subscriberURI"; var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2); v_utRequest.to_ := f_getResourceAddress(v_auxInteger); @@ -2155,10 +2224,10 @@ module OneM2M_Testcases_AE { v_requestT.primitiveContent.subscription.notificationURI := ?; v_requestT.primitiveContent.subscription.subscriberURI := ?; - f_AE_SUB_CRE_002(v_utRequest, v_requestT); + f_AE_SUB_CRE_002(v_utRequest, v_requestT, v_action); } - function f_AE_SUB_CRE_002(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_request) runs on CseSimu { + function f_AE_SUB_CRE_002(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_request, in charstring p_action) runs on CseSimu { var MsgIn v_request; var ResponsePrimitive v_responsePrimtive; @@ -2166,7 +2235,7 @@ module OneM2M_Testcases_AE { f_cf03Up(); //send triggering primtive to SUT - f_sendUtPrimitive(p_utRequest); + f_sendUtPrimitive(p_utRequest,p_action); //Test behavior tc_ac.start; @@ -2211,6 +2280,7 @@ module OneM2M_Testcases_AE { var template UtTriggerPrimitive v_utRequest := m_createAe("UNINITIALIZED"); var MsgIn v_request; var ResponsePrimitive v_responsePrimtive; + var charstring v_action := "Please, send a valid AE Registration CREATE Request"; var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2); v_utRequest.to_ := f_getResourceAddress(v_auxInteger); @@ -2218,7 +2288,7 @@ module OneM2M_Testcases_AE { f_cf03Up(); //create Ae - f_sendUtPrimitive(v_utRequest); + f_sendUtPrimitive(v_utRequest,v_action); tc_ac.start; alt{ [] mcaPort.receive(mw_request(mw_createAe)) -> value v_request { @@ -2244,7 +2314,8 @@ module OneM2M_Testcases_AE { //create Subscription v_utRequest := m_utCreateSubscription; v_utRequest.to_ := f_getResourceAddress(-1); - f_sendUtPrimitive(v_utRequest); + v_action := "Please, send a valid CREATE request for Subscription"; + f_sendUtPrimitive(v_utRequest,v_action); tc_ac.start; alt{ @@ -2300,6 +2371,7 @@ module OneM2M_Testcases_AE { var template UtTriggerPrimitive v_utRequest := m_createAe("UNINITIALIZED"); var MsgIn v_request; var ResponsePrimitive v_responsePrimtive; + var charstring v_action := "Please, send a valid AE Registration CREATE Request"; var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2); v_utRequest.to_ := f_getResourceAddress(v_auxInteger); @@ -2307,7 +2379,7 @@ module OneM2M_Testcases_AE { f_cf03Up(); //create Ae - f_sendUtPrimitive(v_utRequest); + f_sendUtPrimitive(v_utRequest,v_action); tc_ac.start; alt{ [] mcaPort.receive(mw_request(mw_createAe)) -> value v_request { @@ -2333,7 +2405,8 @@ module OneM2M_Testcases_AE { //create Subscription v_utRequest := m_utCreateSubscription; v_utRequest.to_ := f_getResourceAddress(-1); - f_sendUtPrimitive(v_utRequest); + v_action := "Please, send a valid CREATE request for Subscription"; + f_sendUtPrimitive(v_utRequest,v_action); tc_ac.start; alt{