diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index 3b00af2c10b570d9439129ec9485e666eee02da2..dc5f292b3c442245694f706d71d9d061213dc7f1 100644
--- a/LibOneM2M/OneM2M_Templates.ttcn
+++ b/LibOneM2M/OneM2M_Templates.ttcn
@@ -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
};
diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index 9bf7e828e55c6b2bbf255831fa74b09b74a09acb..5f479536bca76401bd7361c68fbe6f54120c993e 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -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
diff --git a/OneM2M_Testcases_AE_Release_1.ttcn b/OneM2M_Testcases_AE_Release_1.ttcn
index cd59ea2866471c9b50edba1142ea4cdcd891fc76..72fe9806e3634b6f8e9a430b25347c7faa305a29 100644
--- a/OneM2M_Testcases_AE_Release_1.ttcn
+++ b/OneM2M_Testcases_AE_Release_1.ttcn
@@ -382,7 +382,7 @@ module OneM2M_Testcases_AE_Release_1 {
testcase TC_AE_REG_CRE_001() runs on CseSimu system AeSystem {
//primitives for utPort
- var template UtTriggerPrimitive v_utRequest := m_createAe("UNINITIALIZED");
+ var template UtTriggerPrimitive v_utRequest := m_utCreateAe;
//primitives for mcaPortIn
@@ -432,101 +432,101 @@ module OneM2M_Testcases_AE_Release_1 {
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 UtTriggerPrimitive v_utRequest := m_utCreateAe;
var template RequestPrimitive v_createAe := mw_createAe;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute ResourceName";
v_utRequest.primitiveContent.aE.resourceName := "UNINITIALIZED";
- v_createAe.primitiveContent.aE.resourceName := ?;
+ v_createAe.primitiveContent.aE.resourceName := complement("UNINITIALIZED");
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 UtTriggerPrimitive v_utRequest := m_utCreateAe;
var template RequestPrimitive v_createAe := mw_createAe;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute ExpirationTime";
- v_utRequest.primitiveContent.aE.expirationTime := "20301231T012345";
- v_createAe.primitiveContent.aE.expirationTime := ?;
+ v_utRequest.primitiveContent.aE.expirationTime := "20301231T012345";//TODO It should be sent "UNINITIALIZED"
+ v_createAe.primitiveContent.aE.expirationTime := ?;//TODO Check value other than "UNINITIALIZED"
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 UtTriggerPrimitive v_utRequest := m_utCreateAe;
var template RequestPrimitive v_createAe := mw_createAe;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute Labels";
v_utRequest.primitiveContent.aE.labels := {"UNINITIALIZED"};
- v_createAe.primitiveContent.aE.labels := ?;
+ v_createAe.primitiveContent.aE.labels := complement({*,"UNINITIALIZED",*});
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 UtTriggerPrimitive v_utRequest := m_utCreateAe;
var template RequestPrimitive v_createAe := mw_createAe;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute AppName";
v_utRequest.primitiveContent.aE.appName := "UNINITIALIZED";
- v_createAe.primitiveContent.aE.appName := ?;
+ v_createAe.primitiveContent.aE.appName := complement("UNINITIALIZED");
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 UtTriggerPrimitive v_utRequest := m_utCreateAe;
var template RequestPrimitive v_createAe := mw_createAe;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute AppID";
v_utRequest.primitiveContent.aE.app_ID := "UNINITIALIZED";
- v_createAe.primitiveContent.aE.app_ID := ?;
+ v_createAe.primitiveContent.aE.app_ID := complement("UNINITIALIZED");
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 UtTriggerPrimitive v_utRequest := m_utCreateAe;
var template RequestPrimitive v_createAe := mw_createAe;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute PointOfAccess";
v_utRequest.primitiveContent.aE.pointOfAccess := {"UNINITIALIZED"};
- v_createAe.primitiveContent.aE.pointOfAccess := ?;
+ v_createAe.primitiveContent.aE.pointOfAccess := complement({*,"UNINITIALIZED",*});
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 UtTriggerPrimitive v_utRequest := m_utCreateAe;
var template RequestPrimitive v_createAe := mw_createAe;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute OntologyRef";
v_utRequest.primitiveContent.aE.ontologyRef := "UNINITIALIZED";
- v_createAe.primitiveContent.aE.ontologyRef := ?;
+ v_createAe.primitiveContent.aE.ontologyRef := complement("UNINITIALIZED");
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 UtTriggerPrimitive v_utRequest := m_utCreateAe;
var template RequestPrimitive v_createAe := mw_createAe;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute NodeLink";
v_utRequest.primitiveContent.aE.nodeLink := "UNINITIALIZED";
- v_createAe.primitiveContent.aE.nodeLink := ?;
+ v_createAe.primitiveContent.aE.nodeLink := complement("UNINITIALIZED");
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 UtTriggerPrimitive v_utRequest := m_utCreateAe;
var template RequestPrimitive v_createAe := mw_createAe;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute RequestReachability";
- v_utRequest.primitiveContent.aE.requestReachability := true;
- v_createAe.primitiveContent.aE.requestReachability := ?;
+ v_utRequest.primitiveContent.aE.requestReachability := true;//TODO It should be sent "UNINITIALIZED"
+ v_createAe.primitiveContent.aE.requestReachability := ?;//TODO Match correct value
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 UtTriggerPrimitive v_utRequest := m_utCreateAe;
var template RequestPrimitive v_createAe := mw_createAe;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid AE CREATE Registration Request containing attribute ContentSerialization";
- v_utRequest.primitiveContent.aE.contentSerialization := {applicationxml};
- v_createAe.primitiveContent.aE.contentSerialization := ?;
+ v_utRequest.primitiveContent.aE.contentSerialization := {applicationxml};//TODO It should be sent "UNINITIALIZED"
+ v_createAe.primitiveContent.aE.contentSerialization := ?;//TODO Match correct value
f_AE_REG_CRE_002(v_utRequest,v_createAe,v_action);
}
@@ -548,7 +548,7 @@ module OneM2M_Testcases_AE_Release_1 {
var universal charstring v_action := __SCOPE__ & ": Please, send a valid AE DELETE Registration Request";
//primitives for utPort
- var template UtTriggerPrimitive v_utRequest := m_delete("UNINITIALIZED");
+ var template UtTriggerPrimitive v_utRequest := m_utDelete;
f_cf03Up();
@@ -637,7 +637,6 @@ module OneM2M_Testcases_AE_Release_1 {
/**
* @desc Check that the IUT sends a ContentInstance creation request when it is triggered
*/
-
testcase TC_AE_DMR_CRE_002() runs on CseSimu system AeSystem {
var template UtTriggerPrimitive v_utRequest := m_utCreateContentInstance;
@@ -699,7 +698,7 @@ module OneM2M_Testcases_AE_Release_1 {
var template RequestPrimitive v_request := mw_createContentInstance;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance containing attribute ContentInfo";
v_utRequest.primitiveContent.contentInstance.contentInfo := "UNINITIALIZED";
- v_request.primitiveContent.contentInstance.contentInfo := ?;
+ v_request.primitiveContent.contentInstance.contentInfo := complement("UNINITIALIZED");
f_AE_DMR_CRE_003(v_utRequest,v_request,v_action);
}
@@ -708,7 +707,7 @@ module OneM2M_Testcases_AE_Release_1 {
var template RequestPrimitive v_request := mw_createContentInstance;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance containing attribute ResourceName";
v_utRequest.primitiveContent.contentInstance.resourceName := "UNINITIALIZED";
- v_request.primitiveContent.contentInstance.resourceName := ?;
+ v_request.primitiveContent.contentInstance.resourceName := complement("UNINITIALIZED");
f_AE_DMR_CRE_003(v_utRequest,v_request,v_action);
}
@@ -716,8 +715,8 @@ module OneM2M_Testcases_AE_Release_1 {
var template UtTriggerPrimitive v_utRequest := m_utCreateContentInstance;
var template RequestPrimitive v_request := mw_createContentInstance;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance containing attribute ExpirationTime";
- v_utRequest.primitiveContent.contentInstance.expirationTime := "20301231T012345";
- v_request.primitiveContent.contentInstance.expirationTime := ?;
+ v_utRequest.primitiveContent.contentInstance.expirationTime := "20301231T012345";//TODO It should be sent "UNINITIALIZED"
+ v_request.primitiveContent.contentInstance.expirationTime := ?;//TODO Check value other than "UNINITIALIZED"
f_AE_DMR_CRE_003(v_utRequest,v_request,v_action);
}
@@ -726,7 +725,7 @@ module OneM2M_Testcases_AE_Release_1 {
var template RequestPrimitive v_request := mw_createContentInstance;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance containing attribute Labels";
v_utRequest.primitiveContent.contentInstance.labels := {"UNINITIALIZED"};
- v_request.primitiveContent.contentInstance.labels := ?;
+ v_request.primitiveContent.contentInstance.labels := complement({*,"UNINITIALIZED",*});
f_AE_DMR_CRE_003(v_utRequest,v_request,v_action);
}
@@ -735,7 +734,7 @@ module OneM2M_Testcases_AE_Release_1 {
var template RequestPrimitive v_request := mw_createContentInstance;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance containing attribute Creator";
v_utRequest.primitiveContent.contentInstance.creator := "UNINITIALIZED";
- v_request.primitiveContent.contentInstance.creator := ?;
+ v_request.primitiveContent.contentInstance.creator := complement("UNINITIALIZED");
f_AE_DMR_CRE_003(v_utRequest,v_request,v_action);
}
@@ -754,7 +753,7 @@ module OneM2M_Testcases_AE_Release_1 {
var template RequestPrimitive v_request := mw_createContainer;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute AccessControlPolicyIDs";
v_utRequest.primitiveContent.container.accessControlPolicyIDs := {"UNINITIALIZED"};
- v_request.primitiveContent.container.accessControlPolicyIDs := ?;
+ v_request.primitiveContent.container.accessControlPolicyIDs := complement({*,"UNINITIALIZED",*});
f_AE_DMR_CRE_004(v_utRequest,v_request,v_action);
}
@@ -762,8 +761,8 @@ module OneM2M_Testcases_AE_Release_1 {
var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
var template RequestPrimitive v_request := mw_createContainer;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute MaxNrOfInstances";
- v_utRequest.primitiveContent.container.maxNrOfInstances := 1;
- v_request.primitiveContent.container.maxNrOfInstances := ?;
+ v_utRequest.primitiveContent.container.maxNrOfInstances := 1;//TODO It should be "UNINITIALIZED"
+ v_request.primitiveContent.container.maxNrOfInstances := ?;//TODO It should be "UNINITIALIZED"
f_AE_DMR_CRE_004(v_utRequest,v_request,v_action);
}
@@ -771,8 +770,8 @@ module OneM2M_Testcases_AE_Release_1 {
var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
var template RequestPrimitive v_request := mw_createContainer;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute MaxByteSize";
- v_utRequest.primitiveContent.container.maxByteSize := 1;
- v_request.primitiveContent.container.maxByteSize := ?;
+ v_utRequest.primitiveContent.container.maxByteSize := 1;//TODO It should be "UNINITIALIZED"
+ v_request.primitiveContent.container.maxByteSize := ?;//TODO It should be "UNINITIALIZED"
f_AE_DMR_CRE_004(v_utRequest,v_request,v_action);
}
@@ -780,8 +779,8 @@ module OneM2M_Testcases_AE_Release_1 {
var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
var template RequestPrimitive v_request := mw_createContainer;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute MaxInstanceAge";
- v_utRequest.primitiveContent.container.maxInstanceAge := 1;
- v_request.primitiveContent.container.maxInstanceAge := ?;
+ v_utRequest.primitiveContent.container.maxInstanceAge := 1;//TODO It should be "UNINITIALIZED"
+ v_request.primitiveContent.container.maxInstanceAge := ?;//TODO It should be "UNINITIALIZED"
f_AE_DMR_CRE_004(v_utRequest,v_request,v_action);
}
@@ -790,7 +789,7 @@ module OneM2M_Testcases_AE_Release_1 {
var template RequestPrimitive v_request := mw_createContainer;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute OntologyRef";
v_utRequest.primitiveContent.container.ontologyRef := "UNINITIALIZED";
- v_request.primitiveContent.container.ontologyRef := ?;
+ v_request.primitiveContent.container.ontologyRef := complement("UNINITIALIZED");
f_AE_DMR_CRE_004(v_utRequest,v_request,v_action);
}
@@ -799,7 +798,7 @@ module OneM2M_Testcases_AE_Release_1 {
var template RequestPrimitive v_request := mw_createContainer;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute ResourceName";
v_utRequest.primitiveContent.container.resourceName := "UNINITIALIZED";
- v_request.primitiveContent.container.resourceName := ?;
+ v_request.primitiveContent.container.resourceName := complement("UNINITIALIZED");
f_AE_DMR_CRE_004(v_utRequest,v_request,v_action);
}
@@ -807,8 +806,8 @@ module OneM2M_Testcases_AE_Release_1 {
var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
var template RequestPrimitive v_request := mw_createContainer;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute ExpirationTime";
- v_utRequest.primitiveContent.container.expirationTime := "20301231T012345";
- v_request.primitiveContent.container.expirationTime := ?;
+ v_utRequest.primitiveContent.container.expirationTime := "20301231T012345";//TODO It should be sent "UNINITIALIZED";
+ v_request.primitiveContent.container.expirationTime := ?;//TODO Check value other than "UNINITIALIZED"
f_AE_DMR_CRE_004(v_utRequest,v_request,v_action);
}
@@ -817,7 +816,7 @@ module OneM2M_Testcases_AE_Release_1 {
var template RequestPrimitive v_request := mw_createContainer;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute Labels";
v_utRequest.primitiveContent.container.labels := {"UNINITIALIZED"};
- v_request.primitiveContent.container.labels := ?;
+ v_request.primitiveContent.container.labels := complement({*,"UNINITIALIZED",*});
f_AE_DMR_CRE_004(v_utRequest,v_request,v_action);
}
@@ -826,7 +825,7 @@ module OneM2M_Testcases_AE_Release_1 {
var template RequestPrimitive v_request := mw_createContainer;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute Creator";
v_utRequest.primitiveContent.container.creator := "UNINITIALIZED";
- v_request.primitiveContent.container.creator := ?;
+ v_request.primitiveContent.container.creator := complement("UNINITIALIZED");
f_AE_DMR_CRE_004(v_utRequest,v_request,v_action);
}
@@ -864,7 +863,7 @@ module OneM2M_Testcases_AE_Release_1 {
v_utRequest.primitiveContent.aE.labels := {"UNINITIALIZED"};
v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentAeUpdateRequest;
- v_expectedUpdateRequestAe.primitiveContent.aE.labels := ?;
+ v_expectedUpdateRequestAe.primitiveContent.aE.labels := complement({*,"UNINITIALIZED",*});
f_AE_DMR_UPD_001(v_utRequest,v_action, v_expectedUpdateRequestAe);
@@ -879,7 +878,7 @@ module OneM2M_Testcases_AE_Release_1 {
v_utRequest.primitiveContent.aE.appName := "UNINITIALIZED";
v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentAeUpdateRequest;
- v_expectedUpdateRequestAe.primitiveContent.aE.appName := ?;
+ v_expectedUpdateRequestAe.primitiveContent.aE.appName := complement("UNINITIALIZED");
f_AE_DMR_UPD_001(v_utRequest,v_action, v_expectedUpdateRequestAe);
}
@@ -890,10 +889,10 @@ module OneM2M_Testcases_AE_Release_1 {
var template UtTriggerPrimitive v_utRequest := m_updateAeBase;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute pointOfAccess";
- v_utRequest.primitiveContent.aE.pointOfAccess := {"http://127.0.0.1:1400/monitor"};
+ v_utRequest.primitiveContent.aE.pointOfAccess := {"UNINITIALIZED"};
v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentAeUpdateRequest;
- v_expectedUpdateRequestAe.primitiveContent.aE.pointOfAccess := ?;
+ v_expectedUpdateRequestAe.primitiveContent.aE.pointOfAccess := ?;//TODO Check value other than "UNINITIALIZED"
f_AE_DMR_UPD_001(v_utRequest,v_action, v_expectedUpdateRequestAe);
}
@@ -904,10 +903,10 @@ module OneM2M_Testcases_AE_Release_1 {
var template UtTriggerPrimitive v_utRequest := m_updateAeBase;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute ontologyRef";
- v_utRequest.primitiveContent.aE.ontologyRef := "MyOntologyRef";
+ v_utRequest.primitiveContent.aE.ontologyRef := "UNINITIALIZED";
v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentAeUpdateRequest;
- v_expectedUpdateRequestAe.primitiveContent.aE.ontologyRef := ?;
+ v_expectedUpdateRequestAe.primitiveContent.aE.ontologyRef := complement("UNINITIALIZED");
f_AE_DMR_UPD_001(v_utRequest,v_action, v_expectedUpdateRequestAe);
}
@@ -918,10 +917,10 @@ module OneM2M_Testcases_AE_Release_1 {
var template UtTriggerPrimitive v_utRequest := m_updateAeBase;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute nodeLink";
- v_utRequest.primitiveContent.aE.nodeLink := "/CSE_ID/S-AE-ID-STEM";
+ v_utRequest.primitiveContent.aE.nodeLink := "UNINITIALIZED";
v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentAeUpdateRequest;
- v_expectedUpdateRequestAe.primitiveContent.aE.nodeLink := ?;
+ v_expectedUpdateRequestAe.primitiveContent.aE.nodeLink := complement("UNINITIALIZED");
f_AE_DMR_UPD_001(v_utRequest,v_action, v_expectedUpdateRequestAe);
}
@@ -931,10 +930,10 @@ module OneM2M_Testcases_AE_Release_1 {
var template UtTriggerPrimitive v_utRequest := m_updateAeBase;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute requestReachability";
- v_utRequest.primitiveContent.aE.requestReachability := true;
+ v_utRequest.primitiveContent.aE.requestReachability := true;//It should sent "UNINITIALIZED"
v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentAeUpdateRequest;
- v_expectedUpdateRequestAe.primitiveContent.aE.requestReachability := ?;
+ v_expectedUpdateRequestAe.primitiveContent.aE.requestReachability := ?;//TODO Check value other than "UNINITIALIZED"
f_AE_DMR_UPD_001(v_utRequest,v_action, v_expectedUpdateRequestAe);
}
@@ -944,10 +943,10 @@ module OneM2M_Testcases_AE_Release_1 {
var template UtTriggerPrimitive v_utRequestTestBody := m_updateAeBase;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute contentSerialization";
- v_utRequestTestBody.primitiveContent.aE.contentSerialization := {applicationxml};
+ v_utRequestTestBody.primitiveContent.aE.contentSerialization := {applicationxml};//It should sent "UNINITIALIZED"
v_expectedUpdateRequestAe.primitiveContent.aE := mw_contentAeUpdateRequest;
- v_expectedUpdateRequestAe.primitiveContent.aE.contentSerialization := ?;
+ v_expectedUpdateRequestAe.primitiveContent.aE.contentSerialization := ?;//TODO Check value other than "UNINITIALIZED"
f_AE_DMR_UPD_001(v_utRequestTestBody,v_action, v_expectedUpdateRequestAe);
}
@@ -980,7 +979,7 @@ module OneM2M_Testcases_AE_Release_1 {
var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute labels";
v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger);
v_utRequest.primitiveContent.container.labels := {"UNINITIALIZED"};
- v_request.primitiveContent.container.labels := ?;
+ v_request.primitiveContent.container.labels := complement({*,"UNINITIALIZED",*});
f_AE_DMR_UPD_002(v_utRequest,v_request,v_action);
}
@@ -991,8 +990,8 @@ module OneM2M_Testcases_AE_Release_1 {
var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute maxNrOfInstances";
v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger);
- v_utRequest.primitiveContent.container.maxNrOfInstances := 1;
- v_request.primitiveContent.container.maxNrOfInstances := ?;
+ v_utRequest.primitiveContent.container.maxNrOfInstances := 1;//TODO It should be sent "UNINITIALIZED"
+ v_request.primitiveContent.container.maxNrOfInstances := ?;//TODO Check value other than "UNINITIALIZED"
f_AE_DMR_UPD_002(v_utRequest,v_request,v_action);
}
@@ -1003,8 +1002,8 @@ module OneM2M_Testcases_AE_Release_1 {
var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute maxByteSize";
v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger);
- v_utRequest.primitiveContent.container.maxByteSize := 1;
- v_request.primitiveContent.container.maxByteSize := ?;
+ v_utRequest.primitiveContent.container.maxByteSize := 1;//TODO It should be sent "UNINITIALIZED"
+ v_request.primitiveContent.container.maxByteSize := ?;//TODO Check value other than "UNINITIALIZED"
f_AE_DMR_UPD_002(v_utRequest,v_request,v_action);
}
@@ -1015,8 +1014,8 @@ module OneM2M_Testcases_AE_Release_1 {
var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute maxInstanceAge";
v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger);
- v_utRequest.primitiveContent.container.maxInstanceAge := 1;
- v_request.primitiveContent.container.maxInstanceAge := ?;
+ v_utRequest.primitiveContent.container.maxInstanceAge := 1;//TODO It should be sent "UNINITIALIZED"
+ v_request.primitiveContent.container.maxInstanceAge := ?;//TODO Check value other than "UNINITIALIZED"
f_AE_DMR_UPD_002(v_utRequest,v_request,v_action);
}
@@ -1058,11 +1057,11 @@ module OneM2M_Testcases_AE_Release_1 {
testcase TC_AE_DMR_RET_002() runs on CseSimu system AeSystem {
- var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), int3);
- var XSD.AnyURI v_address := f_getLocalResourceAddress(v_auxInteger);
+ var integer v_auxInteger := -1;
+ var PrimitiveContent v_localResource;
//variables
- var template UtTriggerPrimitive v_utRequest := m_utRetrieveResource (v_address & "/" & c_resourceShortNameOldest, "UNINITIALIZED");
+ var template UtTriggerPrimitive v_utRequest := m_utRetrieve("NotInitialized");
var MsgIn v_request;
var ResponsePrimitive v_responsePrimitive;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid RETRIEVE Request for retrieving the 'oldest' attribute from Container";
@@ -1071,12 +1070,15 @@ module OneM2M_Testcases_AE_Release_1 {
f_cf03Up();
//send triggering primitive to SUT
+ 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) & "/" & c_resourceShortNameOldest;
f_sendUtPrimitive(v_utRequest,v_action);
//Test behavior
tc_ac.start;
alt{
- [] mcaPortIn.receive(mw_request(mw_retrieve(v_address & "/" & c_resourceShortNameOldest))) -> value v_request {
+ [] mcaPortIn.receive(mw_request(mw_retrieve(v_utRequest.to_ ))) -> value v_request {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : retrieve attribute oldest request is accepted!");
@@ -1106,11 +1108,11 @@ module OneM2M_Testcases_AE_Release_1 {
testcase TC_AE_DMR_RET_003() runs on CseSimu system AeSystem {
- var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), int3);
- var XSD.AnyURI v_address := f_getLocalResourceAddress(v_auxInteger);
+ var integer v_auxInteger := -1;
+ var PrimitiveContent v_localResource;
//variables
- var template UtTriggerPrimitive v_utRequest := m_utRetrieveResource (v_address & "/" & c_resourceShortNameLatest, "UNINITIALIZED");
+ var template UtTriggerPrimitive v_utRequest := m_utRetrieve("NotInitialized");
var MsgIn v_request;
var ResponsePrimitive v_responsePrimitive;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid RETRIEVE Request for retrieving the 'latest' attribute from Container";
@@ -1119,12 +1121,15 @@ module OneM2M_Testcases_AE_Release_1 {
f_cf03Up();
//send triggering primitive to SUT
+ 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) & "/" & c_resourceShortNameLatest;
f_sendUtPrimitive(v_utRequest,v_action);
//Test behavior
tc_ac.start;
alt{
- [] mcaPortIn.receive(mw_request(mw_retrieve(v_address & "/" & c_resourceShortNameLatest))) -> value v_request {
+ [] mcaPortIn.receive(mw_request(mw_retrieve(v_utRequest.to_))) -> value v_request {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : retrieve attribute latest request is accepted!!");
@@ -1154,11 +1159,11 @@ module OneM2M_Testcases_AE_Release_1 {
testcase TC_AE_DMR_RET_004() runs on CseSimu system AeSystem {
- var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), int3);
- var XSD.AnyURI v_address := f_getLocalResourceAddress(v_auxInteger);
+ var integer v_auxInteger := -1;
+ var PrimitiveContent v_localResource;
//variables
- var template UtTriggerPrimitive v_utRequest := m_utRetrieveResource (v_address, "UNINITIALIZED");
+ var template UtTriggerPrimitive v_utRequest := m_utRetrieve("NotInitialized");
var MsgIn v_request;
var ResponsePrimitive v_responsePrimitive;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid RETRIEVE Request for retrieving the Container";
@@ -1167,13 +1172,15 @@ module OneM2M_Testcases_AE_Release_1 {
f_cf03Up();
//send triggering primitive to SUT
- v_utRequest.resourceType := int3;
+ 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);
f_sendUtPrimitive(v_utRequest,v_action);
//Test behavior
tc_ac.start;
alt{
- [] mcaPortIn.receive(mw_request(mw_retrieve(v_address))) -> value v_request {
+ [] mcaPortIn.receive(mw_request(mw_retrieve(v_utRequest.to_))) -> value v_request {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : retrieve resource type request is accepted!!");
@@ -1203,11 +1210,11 @@ module OneM2M_Testcases_AE_Release_1 {
testcase TC_AE_DMR_RET_005 () runs on CseSimu system AeSystem {
- var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentContentInstance(m_contentCreateContentInstance)), int4);
- var XSD.AnyURI v_address := f_getLocalResourceAddress(v_auxInteger);
+ var integer v_auxInteger := -1;
+ var PrimitiveContent v_localResource;
//variables
- var template UtTriggerPrimitive v_utRequest := m_utRetrieveResource (v_address, "UNINITIALIZED");
+ var template UtTriggerPrimitive v_utRequest := m_utRetrieve("NotInitialized");
var MsgIn v_request;
var ResponsePrimitive v_responsePrimitive;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid RETRIEVE Request for retrieving the contentInstance";
@@ -1216,13 +1223,15 @@ module OneM2M_Testcases_AE_Release_1 {
f_cf03Up();
//send triggering primitive to SUT
- v_utRequest.resourceType := int4;
+ v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentContentInstance(m_contentCreateContentInstance)), vc_cSEBaseIndex, int4);
+ v_auxInteger := f_setLocalResource(v_localResource, int4);
+ v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger);
f_sendUtPrimitive(v_utRequest,v_action);
//Test behavior
tc_ac.start;
alt{
- [] mcaPortIn.receive(mw_request(mw_retrieve(v_address))) -> value v_request {
+ [] mcaPortIn.receive(mw_request(mw_retrieve(v_utRequest.to_))) -> value v_request {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : retrieve resource type request is accepted!!");
@@ -1256,11 +1265,11 @@ module OneM2M_Testcases_AE_Release_1 {
testcase TC_AE_DMR_DEL_001() runs on CseSimu system AeSystem {
- var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), int3);
- var XSD.AnyURI v_address := f_getLocalResourceAddress(v_auxInteger);
-
+ var integer v_auxInteger := -1;
+ var PrimitiveContent v_localResource;
+
//variables
- var template UtTriggerPrimitive v_utRequest := m_utDeleteResource (v_address & "/" & c_resourceShortNameOldest, "UNINITIALIZED");
+ var template UtTriggerPrimitive v_utRequest := m_utDelete;
var MsgIn v_request;
var ResponsePrimitive v_responsePrimitive;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid DELETE Request for deleting the 'oldest' attribute from contentInstance";
@@ -1269,12 +1278,15 @@ module OneM2M_Testcases_AE_Release_1 {
f_cf03Up();
//send triggering primitive to SUT
+ 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) & "/" & c_resourceShortNameOldest;
f_sendUtPrimitive(v_utRequest,v_action);
//Test behavior
tc_ac.start;
alt{
- [] mcaPortIn.receive(mw_request(mw_delete(v_address & "/" & c_resourceShortNameOldest))) -> value v_request {
+ [] mcaPortIn.receive(mw_request(mw_delete(v_utRequest.to_))) -> value v_request {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : delete attribute oldest request is accepted!!");
@@ -1304,11 +1316,11 @@ module OneM2M_Testcases_AE_Release_1 {
testcase TC_AE_DMR_DEL_002() runs on CseSimu system AeSystem {
- var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), int3);
- var XSD.AnyURI v_address := f_getLocalResourceAddress(v_auxInteger);
+ var integer v_auxInteger := -1;
+ var PrimitiveContent v_localResource;
//variables
- var template UtTriggerPrimitive v_utRequest := m_utDeleteResource (v_address & "/" & c_resourceShortNameLatest, "UNINITIALIZED");
+ var template UtTriggerPrimitive v_utRequest := m_utDelete;
var MsgIn v_request;
var ResponsePrimitive v_responsePrimitive;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid DELETE Request for deleting the 'latest' attribute from contentInstance";
@@ -1317,12 +1329,15 @@ module OneM2M_Testcases_AE_Release_1 {
f_cf03Up();
//send triggering primitive to SUT
+ 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) & "/" & c_resourceShortNameLatest;
f_sendUtPrimitive(v_utRequest,v_action);
//Test behavior
tc_ac.start;
alt{
- [] mcaPortIn.receive(mw_request(mw_delete(v_address & "/" & c_resourceShortNameLatest))) -> value v_request {
+ [] mcaPortIn.receive(mw_request(mw_delete(v_utRequest.to_))) -> value v_request {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : delete attribute latest request is accepted!!");
@@ -1352,11 +1367,11 @@ module OneM2M_Testcases_AE_Release_1 {
testcase TC_AE_DMR_DEL_003() runs on CseSimu system AeSystem {
- var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), int3);
- var XSD.AnyURI v_address := f_getLocalResourceAddress(v_auxInteger);
+ var integer v_auxInteger := -1;
+ var PrimitiveContent v_localResource;
//variables
- var template UtTriggerPrimitive v_utRequest := m_utDeleteResource (v_address, "UNINITIALIZED");
+ var template UtTriggerPrimitive v_utRequest := m_utDelete;
var MsgIn v_request;
var ResponsePrimitive v_responsePrimitive;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid DELETE Request for deleting the container resource";
@@ -1365,13 +1380,15 @@ module OneM2M_Testcases_AE_Release_1 {
f_cf03Up();
//send triggering primitive to SUT
- v_utRequest.resourceType := int3;
+ 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);
f_sendUtPrimitive(v_utRequest,v_action);
//Test behavior
tc_ac.start;
alt{
- [] mcaPortIn.receive(mw_request(mw_delete(v_address))) -> value v_request {
+ [] mcaPortIn.receive(mw_request(mw_delete(v_utRequest.to_))) -> value v_request {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : delete resource type request is accepted!!");
@@ -1401,11 +1418,11 @@ module OneM2M_Testcases_AE_Release_1 {
testcase TC_AE_DMR_DEL_004 () runs on CseSimu system AeSystem {
- var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentContentInstance(m_contentCreateContentInstance)),int4);
- var XSD.AnyURI v_address := f_getLocalResourceAddress(v_auxInteger);
+ var integer v_auxInteger := -1;
+ var PrimitiveContent v_localResource;
//variables
- var template UtTriggerPrimitive v_utRequest := m_utDeleteResource (v_address, "UNINITIALIZED");
+ var template UtTriggerPrimitive v_utRequest := m_utDelete;
var MsgIn v_request;
var ResponsePrimitive v_responsePrimitive;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid DELETE Request for deleting the contentInstance resource";
@@ -1414,13 +1431,15 @@ module OneM2M_Testcases_AE_Release_1 {
f_cf03Up();
//send triggering primitive to SUT
- v_utRequest.resourceType := int4;
+ v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentContentInstance(m_contentCreateContentInstance)), vc_cSEBaseIndex, int4);
+ v_auxInteger := f_setLocalResource(v_localResource, int4);
+ v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger);
f_sendUtPrimitive(v_utRequest,v_action);
//Test behavior
tc_ac.start;
alt{
- [] mcaPortIn.receive(mw_request(mw_delete(v_address))) -> value v_request {
+ [] mcaPortIn.receive(mw_request(mw_delete(v_utRequest.to_ ))) -> value v_request {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : delete resource type request is accepted!!");
@@ -1516,7 +1535,7 @@ module OneM2M_Testcases_AE_Release_1 {
v_utRequest.primitiveContent.subscription.accessControlPolicyIDs := {"UNINITIALIZED"};
v_requestT.to_ := f_getLocalResourceAddress(v_auxInteger);
- v_requestT.primitiveContent.subscription.notificationURI := ?;
+ v_requestT.primitiveContent.subscription.notificationURI := complement({*,"UNINITIALIZED",*});
v_requestT.primitiveContent.subscription.accessControlPolicyIDs := ?;
f_AE_SUB_CRE_002(v_utRequest, v_requestT, v_action);
@@ -1529,12 +1548,12 @@ module OneM2M_Testcases_AE_Release_1 {
var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger);
v_utRequest.primitiveContent.subscription.notificationURI := {"UNINITIALIZED"};
- v_utRequest.primitiveContent.subscription.eventNotificationCriteria.createdBefore := "20301231T012345";
+ v_utRequest.primitiveContent.subscription.eventNotificationCriteria.createdBefore := "20301231T012345";//TODO It should be sent "UNINITIALIZED";
v_requestT.to_ := f_getLocalResourceAddress(v_auxInteger);
- v_requestT.primitiveContent.subscription.notificationURI := ?;
- v_requestT.primitiveContent.subscription.eventNotificationCriteria.createdBefore := ?;
+ v_requestT.primitiveContent.subscription.notificationURI := complement({*,"UNINITIALIZED",*});
+ v_requestT.primitiveContent.subscription.eventNotificationCriteria.createdBefore := ?;//TODO Check value other than "UNINITIALIZED"
f_AE_SUB_CRE_002(v_utRequest, v_requestT, v_action);
}
@@ -1547,11 +1566,11 @@ module OneM2M_Testcases_AE_Release_1 {
var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger);
v_utRequest.primitiveContent.subscription.notificationURI := {"UNINITIALIZED"};
- v_utRequest.primitiveContent.subscription.expirationCounter := 1;
+ v_utRequest.primitiveContent.subscription.expirationCounter := 1;//TODO It should be sent "UNINITIALIZED"
v_requestT.to_ := f_getLocalResourceAddress(v_auxInteger);
- v_requestT.primitiveContent.subscription.notificationURI := ?;
- v_requestT.primitiveContent.subscription.expirationCounter := ?;
+ v_requestT.primitiveContent.subscription.notificationURI := complement({*,"UNINITIALIZED",*});
+ v_requestT.primitiveContent.subscription.expirationCounter := ?;//TODO Check value other than "UNINITIALIZED"
f_AE_SUB_CRE_002(v_utRequest, v_requestT, v_action);
}
@@ -1567,8 +1586,8 @@ module OneM2M_Testcases_AE_Release_1 {
v_utRequest.primitiveContent.subscription.notificationForwardingURI := "UNINITIALIZED";
v_requestT.to_ := f_getLocalResourceAddress(v_auxInteger);
- v_requestT.primitiveContent.subscription.notificationURI := ?;
- v_requestT.primitiveContent.subscription.notificationForwardingURI := ?;
+ v_requestT.primitiveContent.subscription.notificationURI := complement({*,"UNINITIALIZED",*});
+ v_requestT.primitiveContent.subscription.notificationForwardingURI := complement("UNINITIALIZED");
f_AE_SUB_CRE_002(v_utRequest, v_requestT, v_action);
}
@@ -1581,11 +1600,11 @@ module OneM2M_Testcases_AE_Release_1 {
var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger);
v_utRequest.primitiveContent.subscription.notificationURI := {"UNINITIALIZED"};
- v_utRequest.primitiveContent.subscription.notificationContentType := int1;
+ v_utRequest.primitiveContent.subscription.notificationContentType := int1;//TODO It should be "UNINITIALIZED"
v_requestT.to_ := f_getLocalResourceAddress(v_auxInteger);
- v_requestT.primitiveContent.subscription.notificationURI := ?;
- v_requestT.primitiveContent.subscription.notificationContentType := ?;
+ v_requestT.primitiveContent.subscription.notificationURI := complement({*,"UNINITIALIZED",*});
+ v_requestT.primitiveContent.subscription.notificationContentType := ?;//TODO Check value other than "UNINITIALIZED"
f_AE_SUB_CRE_002(v_utRequest, v_requestT, v_action);
}
@@ -1598,11 +1617,11 @@ module OneM2M_Testcases_AE_Release_1 {
var integer v_auxInteger := f_setLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger);
v_utRequest.primitiveContent.subscription.notificationURI := {"UNINITIALIZED"};
- v_utRequest.primitiveContent.subscription.notificationEventCat.alt_1 := 100;
+ v_utRequest.primitiveContent.subscription.notificationEventCat.alt_1 := 100;//TODO It should be sent "UNINITIALIZE"
v_requestT.to_ := f_getLocalResourceAddress(v_auxInteger);
- v_requestT.primitiveContent.subscription.notificationURI := ?;
- v_requestT.primitiveContent.subscription.notificationEventCat.alt_1 := 100;
+ v_requestT.primitiveContent.subscription.notificationURI := complement({*,"UNINITIALIZED",*});
+ v_requestT.primitiveContent.subscription.notificationEventCat.alt_1 := 100;//TODO Check value other than "UNINITIALIZED"
f_AE_SUB_CRE_002(v_utRequest, v_requestT, v_action);
}
@@ -1618,8 +1637,8 @@ module OneM2M_Testcases_AE_Release_1 {
v_utRequest.primitiveContent.subscription.subscriberURI := "UNINITIALIZED";
v_requestT.to_ := f_getLocalResourceAddress(v_auxInteger);
- v_requestT.primitiveContent.subscription.notificationURI := ?;
- v_requestT.primitiveContent.subscription.subscriberURI := ?;
+ v_requestT.primitiveContent.subscription.notificationURI := complement({*,"UNINITIALIZED",*});
+ v_requestT.primitiveContent.subscription.subscriberURI := complement("UNINITIALIZED");
f_AE_SUB_CRE_002(v_utRequest, v_requestT, v_action);
}
@@ -1637,7 +1656,7 @@ module OneM2M_Testcases_AE_Release_1 {
testcase TC_AE_SUB_NTF_001() runs on CseSimu system AeSystem {
//variables
- var template UtTriggerPrimitive v_utRequest := m_createAe("UNINITIALIZED");
+ var template UtTriggerPrimitive v_utRequest := m_utCreateAe;
var MsgIn v_request;
var ResponsePrimitive v_responsePrimitive;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid AE Registration CREATE Request";
@@ -1728,7 +1747,7 @@ module OneM2M_Testcases_AE_Release_1 {
testcase TC_AE_SUB_NTF_002() runs on CseSimu system AeSystem {
//variables
- var template UtTriggerPrimitive v_utRequest := m_createAe("UNINITIALIZED");
+ var template UtTriggerPrimitive v_utRequest := m_utCreateAe;
var MsgIn v_request;
var ResponsePrimitive v_responsePrimitive;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid AE Registration CREATE Request";
diff --git a/OneM2M_Testcases_CSE_Release_1.ttcn b/OneM2M_Testcases_CSE_Release_1.ttcn
index 9b008dce9cd26fdc42968ad5ac811869cdfe5848..df44da6f1c50e68716b6f44bfd9dea2f59b6a570 100644
--- a/OneM2M_Testcases_CSE_Release_1.ttcn
+++ b/OneM2M_Testcases_CSE_Release_1.ttcn
@@ -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;