Skip to content
Snippets Groups Projects
Commit 29a2eaf9 authored by Miguel Angel Reina Ortega's avatar Miguel Angel Reina Ortega
Browse files

Improving AE_GEN group to make clearer action message 


Signed-off-by: Miguel Angel Reina Ortega's avatarreinaortega <miguelangel.reinaortega@etsi.org>
parent ceccf664
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
OneM2M_PermutationFunctions.ttcn
+ 18
− 18
View file @ 29a2eaf9
...@@ -38,7 +38,7 @@ module OneM2M_PermutationFunctions { ...@@ -38,7 +38,7 @@ module OneM2M_PermutationFunctions {
var integer v_resourceIndex := -1; var integer v_resourceIndex := -1;
var MsgIn v_request; var MsgIn v_request;
var PrimitiveContent v_resource; var PrimitiveContent v_resource;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for container containing To set to " & f_getLocalResourceAddress(0, e_nonHierarchical, p_primitiveScope); var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for container to ";
if(not(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) { 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"); setverdict(inconc, __SCOPE__, ": Unstructured-CSE-Relative-Resource-ID format support is required to run this test case");
...@@ -49,7 +49,7 @@ module OneM2M_PermutationFunctions { ...@@ -49,7 +49,7 @@ module OneM2M_PermutationFunctions {
//Send Trigger Message //Send Trigger Message
v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(-, e_nonHierarchical, p_primitiveScope); v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(-, e_nonHierarchical, p_primitiveScope);
f_sendUtPrimitive(v_utRequest, v_action); f_sendUtPrimitive(v_utRequest, v_action & f_getLocalResourceAddress(-, e_nonHierarchical, p_primitiveScope));
tc_ac.start; tc_ac.start;
alt { alt {
...@@ -85,7 +85,7 @@ module OneM2M_PermutationFunctions { ...@@ -85,7 +85,7 @@ module OneM2M_PermutationFunctions {
var template UtTriggerPrimitive v_utRequest := m_utCreateContainer; var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
var UtTriggerAckPrimitive v_trigger_response; var UtTriggerAckPrimitive v_trigger_response;
var PrimitiveContent v_resource; var PrimitiveContent v_resource;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for container containing To set to " & f_getLocalResourceAddress(-, e_hierarchical, p_primitiveScope); var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for container to ";
//Test Control //Test Control
if(not(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) { if(not(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
...@@ -97,7 +97,7 @@ module OneM2M_PermutationFunctions { ...@@ -97,7 +97,7 @@ module OneM2M_PermutationFunctions {
//Send Trigger Message //Send Trigger Message
v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(-, e_hierarchical, p_primitiveScope); v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(-, e_hierarchical, p_primitiveScope);
f_sendUtPrimitive(v_utRequest,v_action); f_sendUtPrimitive(v_utRequest,v_action & f_getLocalResourceAddress(-, e_hierarchical, p_primitiveScope));
tc_ac.start; tc_ac.start;
...@@ -138,7 +138,7 @@ module OneM2M_PermutationFunctions { ...@@ -138,7 +138,7 @@ module OneM2M_PermutationFunctions {
var UtTriggerAckPrimitive v_trigger_response; var UtTriggerAckPrimitive v_trigger_response;
var integer v_resourceIndex; var integer v_resourceIndex;
var PrimitiveContent v_localResource; var PrimitiveContent v_localResource;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for container containing To set to " & f_getLocalResourceAddress(-, e_nonHierarchical, p_primitiveScope); var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for container to ";
if(not(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) { if(not(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) {
...@@ -152,7 +152,7 @@ module OneM2M_PermutationFunctions { ...@@ -152,7 +152,7 @@ module OneM2M_PermutationFunctions {
v_localResource := f_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3); v_localResource := f_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
v_resourceIndex := f_setLocalResource(v_localResource, int3, vc_cSEBaseIndex); v_resourceIndex := f_setLocalResource(v_localResource, int3, vc_cSEBaseIndex);
v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_resourceIndex, e_nonHierarchical, p_primitiveScope); v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_resourceIndex, e_nonHierarchical, p_primitiveScope);
f_sendUtPrimitive(v_utRequest,v_action); f_sendUtPrimitive(v_utRequest,v_action & f_getLocalResourceAddress(v_resourceIndex, e_nonHierarchical, p_primitiveScope));
tc_ac.start; tc_ac.start;
alt { alt {
...@@ -186,7 +186,7 @@ module OneM2M_PermutationFunctions { ...@@ -186,7 +186,7 @@ module OneM2M_PermutationFunctions {
var UtTriggerAckPrimitive v_trigger_response; var UtTriggerAckPrimitive v_trigger_response;
var integer v_resourceIndex := -1; var integer v_resourceIndex := -1;
var PrimitiveContent v_localResource; var PrimitiveContent v_localResource;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for container containing To set to " & f_getLocalResourceAddress(-, e_hierarchical, p_primitiveScope); var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for container to ";
if(not(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) { 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"); setverdict(inconc, __SCOPE__, ": Structured-CSE-Relative-Resource-ID format support is required to run this test case");
...@@ -199,7 +199,7 @@ module OneM2M_PermutationFunctions { ...@@ -199,7 +199,7 @@ module OneM2M_PermutationFunctions {
v_localResource := f_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3); v_localResource := f_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
v_resourceIndex := f_setLocalResource(v_localResource, int3, vc_cSEBaseIndex); v_resourceIndex := f_setLocalResource(v_localResource, int3, vc_cSEBaseIndex);
v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_resourceIndex, e_hierarchical, p_primitiveScope); v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_resourceIndex, e_hierarchical, p_primitiveScope);
f_sendUtPrimitive(v_utRequest,v_action); f_sendUtPrimitive(v_utRequest,v_action & f_getLocalResourceAddress(v_resourceIndex, e_hierarchical, p_primitiveScope));
tc_ac.start; tc_ac.start;
alt { alt {
...@@ -239,7 +239,7 @@ module OneM2M_PermutationFunctions { ...@@ -239,7 +239,7 @@ module OneM2M_PermutationFunctions {
var UtTriggerAckPrimitive v_trigger_response; var UtTriggerAckPrimitive v_trigger_response;
var integer v_resourceIndex := -1; var integer v_resourceIndex := -1;
var PrimitiveContent v_localResource; var PrimitiveContent v_localResource;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid RETRIEVE Request for container containing To set to " & f_getLocalResourceAddress(-, e_nonHierarchical, p_primitiveScope); var universal charstring v_action := __SCOPE__ & ": Please, send a valid RETRIEVE Request for container to ";
if(not(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) { 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"); setverdict(inconc, __SCOPE__, ": Unstructured-CSE-Relative-Resource-ID format support is required to run this test case");
...@@ -252,7 +252,7 @@ module OneM2M_PermutationFunctions { ...@@ -252,7 +252,7 @@ module OneM2M_PermutationFunctions {
v_localResource := f_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3); v_localResource := f_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
v_resourceIndex := f_setLocalResource(v_localResource, int3, vc_cSEBaseIndex); v_resourceIndex := f_setLocalResource(v_localResource, int3, vc_cSEBaseIndex);
v_utRequestTemplate := m_utRetrieve(f_getLocalResourceAddress(v_resourceIndex, e_nonHierarchical, p_primitiveScope)); v_utRequestTemplate := m_utRetrieve(f_getLocalResourceAddress(v_resourceIndex, e_nonHierarchical, p_primitiveScope));
f_sendUtPrimitive(v_utRequestTemplate,v_action); f_sendUtPrimitive(v_utRequestTemplate,v_action & f_getLocalResourceAddress(v_resourceIndex, e_nonHierarchical, p_primitiveScope));
v_utRequest := valueof(v_utRequestTemplate); v_utRequest := valueof(v_utRequestTemplate);
tc_ac.start; tc_ac.start;
...@@ -287,7 +287,7 @@ module OneM2M_PermutationFunctions { ...@@ -287,7 +287,7 @@ module OneM2M_PermutationFunctions {
var UtTriggerAckPrimitive v_trigger_response; var UtTriggerAckPrimitive v_trigger_response;
var integer v_resourceIndex := -1; var integer v_resourceIndex := -1;
var PrimitiveContent v_localResource; var PrimitiveContent v_localResource;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid RETRIEVE Request for container containing To set to " & f_getLocalResourceAddress(-, e_hierarchical, p_primitiveScope); var universal charstring v_action := __SCOPE__ & ": Please, send a valid RETRIEVE Request for container to ";
if(not(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) { 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"); setverdict(inconc, __SCOPE__, ": Structured-CSE-Relative-Resource-ID format support is required to run this test case");
...@@ -300,9 +300,9 @@ module OneM2M_PermutationFunctions { ...@@ -300,9 +300,9 @@ module OneM2M_PermutationFunctions {
v_localResource := f_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3); v_localResource := f_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
v_resourceIndex := f_setLocalResource(v_localResource, int3, vc_cSEBaseIndex); v_resourceIndex := f_setLocalResource(v_localResource, int3, vc_cSEBaseIndex);
v_utRequestTemplate := m_utRetrieve(f_getLocalResourceAddress(v_resourceIndex, e_hierarchical, p_primitiveScope)); v_utRequestTemplate := m_utRetrieve(f_getLocalResourceAddress(v_resourceIndex, e_hierarchical, p_primitiveScope));
v_utRequest := valueof(v_utRequestTemplate); f_sendUtPrimitive(v_utRequest,v_action & f_getLocalResourceAddress(v_resourceIndex, e_hierarchical, p_primitiveScope));
f_sendUtPrimitive(v_utRequest,v_action); v_utRequest := valueof(v_utRequestTemplate);
tc_ac.start; tc_ac.start;
alt { alt {
[] mcaPortIn.receive(mw_request(mw_retrieve(v_utRequest.requestPrimitive.to_))) -> value (v_request) { [] mcaPortIn.receive(mw_request(mw_retrieve(v_utRequest.requestPrimitive.to_))) -> value (v_request) {
...@@ -339,7 +339,7 @@ module OneM2M_PermutationFunctions { ...@@ -339,7 +339,7 @@ module OneM2M_PermutationFunctions {
var UtTriggerAckPrimitive v_trigger_response; var UtTriggerAckPrimitive v_trigger_response;
var integer v_auxInteger; var integer v_auxInteger;
var PrimitiveContent v_localResource; var PrimitiveContent v_localResource;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid DELETE Request for container containing To set to " & f_getLocalResourceAddress(-, e_nonHierarchical, p_primitiveScope); var universal charstring v_action := __SCOPE__ & ": Please, send a valid DELETE Request for container to ";
if(not(PICS_UNSTRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) { 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"); setverdict(inconc, __SCOPE__, ": Unstructured-CSE-Relative-Resource-ID format support is required to run this test case");
...@@ -352,7 +352,7 @@ module OneM2M_PermutationFunctions { ...@@ -352,7 +352,7 @@ module OneM2M_PermutationFunctions {
v_localResource := f_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3); v_localResource := f_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
v_auxInteger := f_setLocalResource(v_localResource, int3, vc_cSEBaseIndex); v_auxInteger := f_setLocalResource(v_localResource, int3, vc_cSEBaseIndex);
v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_auxInteger, e_nonHierarchical, p_primitiveScope); v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_auxInteger, e_nonHierarchical, p_primitiveScope);
f_sendUtPrimitive(v_utRequest,v_action); f_sendUtPrimitive(v_utRequest,v_action & f_getLocalResourceAddress(v_auxInteger, e_nonHierarchical, p_primitiveScope));
tc_ac.start; tc_ac.start;
alt { alt {
...@@ -384,7 +384,7 @@ module OneM2M_PermutationFunctions { ...@@ -384,7 +384,7 @@ module OneM2M_PermutationFunctions {
var UtTriggerAckPrimitive v_trigger_response; var UtTriggerAckPrimitive v_trigger_response;
var integer v_auxInteger; var integer v_auxInteger;
var PrimitiveContent v_localResource; var PrimitiveContent v_localResource;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid DELETE Request for container containing To set to " & f_getLocalResourceAddress(-, e_hierarchical, p_primitiveScope); var universal charstring v_action := __SCOPE__ & ": Please, send a valid DELETE Request for container to ";
if(not(PICS_STRUCTURED_CSE_RELATIVE_RESOURCE_ID_FORMAT)) { 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"); setverdict(inconc, __SCOPE__, ": Structured-CSE-Relative-Resource-ID format support is required to run this test case");
...@@ -397,7 +397,7 @@ module OneM2M_PermutationFunctions { ...@@ -397,7 +397,7 @@ module OneM2M_PermutationFunctions {
v_localResource := f_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3); v_localResource := f_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
v_auxInteger := f_setLocalResource(v_localResource, int3, vc_cSEBaseIndex); v_auxInteger := f_setLocalResource(v_localResource, int3, vc_cSEBaseIndex);
v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_auxInteger, e_hierarchical, p_primitiveScope); v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_auxInteger, e_hierarchical, p_primitiveScope);
f_sendUtPrimitive(v_utRequest,v_action); f_sendUtPrimitive(v_utRequest,v_action & f_getLocalResourceAddress(v_auxInteger, e_hierarchical, p_primitiveScope));
tc_ac.start; tc_ac.start;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment