Checking of UNINITIALIZED values

Signed-off-by: Miguel Angel Reina Ortega's avatarreinaortega <miguelangel.reinaortega@etsi.org>
parent 0aeaa929
......@@ -3775,7 +3775,7 @@ module OneM2M_Templates {
template (value) UtTriggerPrimitive m_utCreate := {
operation := int1,
to_ := "NotInitialized",
from_ := "NotInitialized",
from_ := "UNINITIALIZED",
requestIdentifier := testcasename() & "-m_utCreate" & f_rnd(1, 1000000),
resourceType := omit,
primitiveContent := omit,
......@@ -3794,6 +3794,12 @@ module OneM2M_Templates {
discoveryResultType := omit
};
template (value) UtTriggerPrimitive m_utCreateAe modifies m_utCreate := {
requestIdentifier := testcasename() & "-m_utCreateAe" & f_rnd(1, 1000000),
resourceType := int2,
primitiveContent := {aE := m_contentAe_allOmit}
}
template (value) UtTriggerPrimitive m_utCreateContainer modifies m_utCreate := {
requestIdentifier := testcasename() & "-m_utCreateContainer" & f_rnd(1, 1000000),
resourceType := int3,
......@@ -3818,10 +3824,10 @@ module OneM2M_Templates {
primitiveContent := {remoteCSE := m_contentRemoteCSE_allOmit}
}
template (value) UtTriggerPrimitive m_utRetrieveResource(XSD.ID p_targetResourceAddress, in XSD.ID p_originator) := {
template (value) UtTriggerPrimitive m_utRetrieve(XSD.ID p_targetResourceAddress) := {
operation := int2,
to_ := p_targetResourceAddress,
from_ := p_originator,
from_ := "UNINITIALIZED",
requestIdentifier := "m_utRetrieveResource" & f_rnd(1, 1000000),
resourceType := omit,
primitiveContent := omit,
......@@ -3843,7 +3849,7 @@ module OneM2M_Templates {
template (value) UtTriggerPrimitive m_utUpdate := {
operation := int3,
to_ := "NotInitialized",
from_ := "NotInitialized",
from_ := "UNINITIALIZED",
requestIdentifier := testcasename() & "-m_utUpdate" & f_rnd(1, 1000000),
resourceType := omit,
primitiveContent := omit,
......@@ -3868,10 +3874,10 @@ module OneM2M_Templates {
primitiveContent := {container := m_contentUpdateContainer}
}
template (value) UtTriggerPrimitive m_utDeleteRequest := {
template (value) UtTriggerPrimitive m_utDelete := {
operation := int4,
to_ := "NotInitialized",
from_ := "NotInitialized",
from_ := "UNINITIALIZED",
requestIdentifier := testcasename() & "-m_utDeleteRequest" & f_rnd(1, 1000000),
resourceType := omit,
primitiveContent := omit,
......@@ -3890,9 +3896,8 @@ module OneM2M_Templates {
discoveryResultType := omit
};
template (value) UtTriggerPrimitive m_utDeleteResource(XSD.ID p_targetResourceAddress, in XSD.ID p_originator) modifies m_utDeleteRequest := {
to_ := p_targetResourceAddress,
from_ := p_originator
template (value) UtTriggerPrimitive m_utDeleteResource(XSD.ID p_targetResourceAddress) modifies m_utDelete := {
to_ := p_targetResourceAddress
};
......
......@@ -49,7 +49,6 @@ module OneM2M_PermutationFunctions {
//Send Trigger Message
v_utRequest.to_ := f_getLocalResourceAddress(-, e_nonHierarchical, p_primitiveScope);
v_utRequest.from_ := "UNINITIALIZED";
f_sendUtPrimitive(v_utRequest, v_action);
tc_ac.start;
......@@ -95,7 +94,6 @@ module OneM2M_PermutationFunctions {
//Send Trigger Message
v_utRequest.to_ := f_getLocalResourceAddress(-, e_hierarchical, p_primitiveScope);
v_utRequest.from_ := "UNINITIALIZED";
f_sendUtPrimitive(v_utRequest,v_action);
......@@ -148,7 +146,6 @@ module OneM2M_PermutationFunctions {
v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), -1, int3);
v_auxInteger := f_setLocalResource(v_localResource, int3);
v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger, e_nonHierarchical, p_primitiveScope);
v_utRequest.from_ := "UNINITIALIZED";
f_sendUtPrimitive(v_utRequest,v_action);
tc_ac.start;
......@@ -194,7 +191,6 @@ module OneM2M_PermutationFunctions {
v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
v_auxInteger := f_setLocalResource(v_localResource, int3);
v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger, e_hierarchical, p_primitiveScope);
v_utRequest.from_ := "UNINITIALIZED";
f_sendUtPrimitive(v_utRequest,v_action);
tc_ac.start;
......@@ -245,7 +241,7 @@ module OneM2M_PermutationFunctions {
//Send Trigger Message
v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
v_auxInteger := f_setLocalResource(v_localResource, int3);
v_utRequestTemplate := m_utRetrieveResource(f_getLocalResourceAddress(v_auxInteger, e_nonHierarchical, p_primitiveScope),"UNINITIALIZED");
v_utRequestTemplate := m_utRetrieve(f_getLocalResourceAddress(v_auxInteger, e_nonHierarchical, p_primitiveScope));
f_sendUtPrimitive(v_utRequestTemplate,v_action);
v_utRequest := valueof(v_utRequestTemplate);
......@@ -292,7 +288,7 @@ module OneM2M_PermutationFunctions {
//Send Trigger Message
v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
v_auxInteger := f_setLocalResource(v_localResource, int3);
v_utRequestTemplate := m_utRetrieveResource(f_getLocalResourceAddress(v_auxInteger, e_hierarchical, p_primitiveScope),"UNINITIALIZED");
v_utRequestTemplate := m_utRetrieve(f_getLocalResourceAddress(v_auxInteger, e_hierarchical, p_primitiveScope));
v_utRequest := valueof(v_utRequestTemplate);
f_sendUtPrimitive(v_utRequest,v_action);
......@@ -327,7 +323,7 @@ module OneM2M_PermutationFunctions {
function f_AE_GEN_DEL_001(PrimitiveScope p_primitiveScope) runs on CseSimu {
var MsgIn v_request;
var ResponsePrimitive v_responsePrimitive;
var template UtTriggerPrimitive v_utRequest := m_utDeleteRequest;
var template UtTriggerPrimitive v_utRequest := m_utDelete;
var UtTriggerAckPrimitive v_trigger_response;
var integer v_auxInteger;
var PrimitiveContent v_localResource;
......@@ -344,7 +340,6 @@ module OneM2M_PermutationFunctions {
v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
v_auxInteger := f_setLocalResource(v_localResource, int3);
v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger, e_nonHierarchical, p_primitiveScope);
v_utRequest.from_ := "UNINITIALIZED";
f_sendUtPrimitive(v_utRequest,v_action);
tc_ac.start;
......@@ -373,7 +368,7 @@ module OneM2M_PermutationFunctions {
function f_AE_GEN_DEL_002(PrimitiveScope p_primitiveScope) runs on CseSimu {
var MsgIn v_request;
var ResponsePrimitive v_responsePrimitive;
var template UtTriggerPrimitive v_utRequest := m_utDeleteRequest;
var template UtTriggerPrimitive v_utRequest := m_utDelete;
var UtTriggerAckPrimitive v_trigger_response;
var integer v_auxInteger;
var PrimitiveContent v_localResource;
......@@ -390,7 +385,6 @@ module OneM2M_PermutationFunctions {
v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
v_auxInteger := f_setLocalResource(v_localResource, int3);
v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger, e_hierarchical, p_primitiveScope);
v_utRequest.from_ := "UNINITIALIZED";
f_sendUtPrimitive(v_utRequest,v_action);
......@@ -659,7 +653,7 @@ module OneM2M_PermutationFunctions {
function f_AE_DMR_RET_001(ResourceType p_resourceType, XSD.AnyURI p_address, in universal charstring p_action) runs on CseSimu {
//variables
var template UtTriggerPrimitive v_utRequest := m_utRetrieveResource (p_address, "UNINITIALIZED");
var template UtTriggerPrimitive v_utRequest := m_utRetrieve (p_address);
var MsgIn v_request;
var ResponsePrimitive v_responsePrimitive;
......@@ -1737,7 +1731,6 @@ module OneM2M_PermutationFunctions {
//Send Trigger Message
v_utRequest.to_ := f_getResourceAddress();
v_utRequest.from_ := "UNINITIALIZED";
f_sendUtPrimitive(v_utRequest, v_action);
// Test Body
......
This diff is collapsed.
......@@ -2313,7 +2313,7 @@ module OneM2M_Testcases_CSE_Release_1 {
vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSEBase);
//Send Trigger Message
v_utRequest := m_utRetrieveResource(f_getLocalResourceAddress(vc_localRemoteCseIndex), PX_CSE_ID);
v_utRequest := m_utRetrieve(f_getLocalResourceAddress(vc_localRemoteCseIndex), PX_CSE_ID);
v_utRequest.from_ := "UNINITIALIZED";
f_sendUtPrimitive(v_utRequest, v_action);
......@@ -2746,7 +2746,7 @@ module OneM2M_Testcases_CSE_Release_1 {
*/
testcase TC_CSE_REG_DEL_004() runs on CseSimu system CseSystem {
//Local variables
var template UtTriggerPrimitive v_utRequest := m_utDeleteRequest;
var template UtTriggerPrimitive v_utRequest := m_utDelete;
var UtTriggerAckPrimitive v_trigger_response;
var integer v_auxInteger;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid DELETE Request containing To set to " & PX_CSE1_ADDRESS;
......
Markdown is supported
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