diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index 34c8c531fb9eabce5fb63c6282768c85b656b23e..05386ab5ff773740cdba9b3d6897c6149491709a 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -1802,12 +1802,13 @@ module OneM2M_Functions {
var PrimitiveContent v_modifiedResource;
var integer v_resourceIndex, v_parentIndex;
var RequestPrimitive v_rp;
+ var charstring v_action := "Please, register the AE on the Tester";
if(not(ispresent(p_utRequest.primitiveContent))) {
p_utRequest.primitiveContent.aE := m_contentCreateAe(omit, omit, omit, omit);
}
- f_sendUtPrimitive(p_utRequest);
+ f_sendUtPrimitive(p_utRequest, v_action);
tc_ac.start;
alt {
@@ -1851,12 +1852,13 @@ module OneM2M_Functions {
var PrimitiveContent v_modifiedResource;
var integer v_resourceIndex, v_parentIndex;
var RequestPrimitive v_rp;
+ var charstring v_action := "Please, create a Container resource on the Tester";
if(not(ispresent(p_utRequest.primitiveContent))) {
p_utRequest.primitiveContent.container := m_contentCreateContainer;
}
- f_sendUtPrimitive(p_utRequest);
+ f_sendUtPrimitive(p_utRequest, v_action);
tc_ac.start;
alt {
@@ -2718,6 +2720,23 @@ module OneM2M_Functions {
group CommonFunctions {
+ /**
+ * @desc Sending of an Adapter Control primitive
+ * @param event Action to be performed by TA
+ * @param data Corresponding information for the correct execution of the given action
+ * @verdict
+ */
+ function f_bool2str(in boolean p_bool) runs on Tester return charstring {
+
+ var charstring v_bool;
+ if (p_bool){
+ v_bool := "true";
+ }else{
+ v_bool := "false";
+ }
+ return v_bool;
+ }
+
/**
* @desc Sending of an Adapter Control primitive
* @param event Action to be performed by TA
@@ -2806,27 +2825,37 @@ module OneM2M_Functions {
}
- function f_sendUtPrimitive(template UtTriggerPrimitive p_utRequest) runs on Tester {
+ function f_sendUtPrimitive(template UtTriggerPrimitive p_utRequest, in charstring p_action) runs on Tester {
- p_utRequest.from_ := "UNINITIALIZED";
- p_utRequest.requestIdentifier := "m_uttriggerPrimitive" & f_rnd(1, 1000000);
-
- utPort.send(valueof(p_utRequest));
-
- tc_wait.start;
- alt{
- [] utPort.receive(mw_utResponseOK) {
- tc_wait.stop;
- setverdict(pass, __SCOPE__, " : Triggering message is successfully received!");
- }
- [] utPort.receive(mw_utResponseKO) {
- tc_wait.stop;
- setverdict(inconc, __SCOPE__, " : Error while receiving Triggering message!");
- }
- [] tc_wait.timeout{
- setverdict(inconc, __SCOPE__, " : Timeout due to no response received from requested SUT!");
+ if (PX_UT_IMPLEMENTED){
+
+ p_utRequest.from_ := "UNINITIALIZED";
+ p_utRequest.requestIdentifier := "m_uttriggerPrimitive" & f_rnd(1, 1000000);
+
+ utPort.send(valueof(p_utRequest));
+
+ tc_wait.start;
+ alt{
+ [] utPort.receive(mw_utResponseOK) {
+ tc_wait.stop;
+ setverdict(pass, __SCOPE__, " : Triggering message is successfully received!");
+ }
+ [] utPort.receive(mw_utResponseKO) {
+ tc_wait.stop;
+ setverdict(inconc, __SCOPE__, " : Error while receiving Triggering message!");
+ }
+ [] tc_wait.timeout{
+ setverdict(inconc, __SCOPE__, " : Timeout due to no response received from requested SUT!");
+ }
}
+
+ }else{
+
+ action(__SCOPE__ & ":" & p_action);
+
}
+
+
}
diff --git a/LibOneM2M/OneM2M_Pixits.ttcn b/LibOneM2M/OneM2M_Pixits.ttcn
index 08646ae159b5936714289274d870889da0eb84c0..bc046b783d70ee46c07d37fffd73f7d5e91c5644 100644
--- a/LibOneM2M/OneM2M_Pixits.ttcn
+++ b/LibOneM2M/OneM2M_Pixits.ttcn
@@ -27,6 +27,8 @@ module OneM2M_Pixits {
modulepar charstring PX_SUT_ADDRESS := "127.0.0.1:8080";
+ modulepar boolean PX_UT_IMPLEMENTED := false;
+
/**
* @desc IUT CSE Name
*/
@@ -57,6 +59,14 @@ module OneM2M_Pixits {
*/
modulepar XSD.ID PX_SUPER_CSE_ID := "/admin:admin";
+ modulepar XSD.IDREFS PX_ALLOWED_C_AE_IDS := {"C"};
+
+ modulepar XSD.IDREFS PX_NOT_ALLOWED_C_AE_IDS := {"MyAe"};
+
+ modulepar XSD.IDREFS PX_ALLOWED_S_AE_IDS := {"S"};
+
+ modulepar XSD.IDREFS PX_NOT_ALLOWED_S_AE_IDS := {"MyAe"};
+
modulepar AddressingMethod PX_ADDRESSING_METHOD := e_hierarchical;
modulepar PrimitiveScope PX_PRIMITIVE_SCOPE := e_cseRelative;
@@ -67,7 +77,8 @@ module OneM2M_Pixits {
modulepar charstring PX_XML_NAMESPACE := "m2m=""http://www.onem2m.org/xml/protocols""";
- modulepar ListOfURIs PX_ACOR := {"*"};
+ modulepar ListOfURIs PX_ACOR := {"*"};
+
}
group TesterParameters {
diff --git a/OneM2M_Testcases_AE.ttcn b/OneM2M_Testcases_AE.ttcn
index b5bfa7b257c66a3c5a06f95b7ead089a9b4cd369..0c92a548c2bb00e05770cab66d82ca4a7e1fb9e4 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,6 +331,7 @@ 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");
@@ -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;
@@ -1268,75 +1306,83 @@ module OneM2M_Testcases_AE {
testcase TC_AE_DMR_UPD_001_ET() runs on CseSimu system AeSystem {
+ var charstring v_action := "Please, send a valid UPDATE Request for AE updating attribute expirationTime";
var template UtTriggerPrimitive v_utRequest := m_updateAeBase;
v_utRequest.primitiveContent.aE.expirationTime := "20301231T012345";
- f_AE_DMR_UPD_001(v_utRequest);
+ f_AE_DMR_UPD_001(v_utRequest, v_action);
}
testcase TC_AE_DMR_UPD_001_LBL() 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 labels";
v_utRequest.primitiveContent.aE.labels := {"UNINITIALIZED"};
- f_AE_DMR_UPD_001(v_utRequest);
+ f_AE_DMR_UPD_001(v_utRequest,v_action);
}
testcase TC_AE_DMR_UPD_001_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_001(v_utRequest);
+ f_AE_DMR_UPD_001(v_utRequest,v_action);
}
testcase TC_AE_DMR_UPD_001_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_001(v_utRequest);
+ f_AE_DMR_UPD_001(v_utRequest,v_action);
}
testcase TC_AE_DMR_UPD_001_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_001(v_utRequest);
+ f_AE_DMR_UPD_001(v_utRequest,v_action);
}
testcase TC_AE_DMR_UPD_001_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_001(v_utRequest);
+ f_AE_DMR_UPD_001(v_utRequest,v_action);
}
testcase TC_AE_DMR_UPD_001_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_001(v_utRequest);
+ f_AE_DMR_UPD_001(v_utRequest,v_action);
}
testcase TC_AE_DMR_UPD_001_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_001(v_utRequestTestBody);
+ f_AE_DMR_UPD_001(v_utRequestTestBody,v_action);
}
- function f_AE_DMR_UPD_001(template UtTriggerPrimitive p_utRequestTestBody) runs on CseSimu {
+ function f_AE_DMR_UPD_001(template UtTriggerPrimitive p_utRequestTestBody, in charstring p_action) runs on CseSimu {
//primitives for mcaPort
var MsgIn v_request;
@@ -1352,7 +1398,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
@@ -1396,10 +1442,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_002(v_utRequest,v_request);
+ f_AE_DMR_UPD_002(v_utRequest,v_request,v_action);
}
testcase TC_AE_DMR_UPD_002_LBL() runs on CseSimu system AeSystem {
@@ -1407,10 +1454,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_002(v_utRequest,v_request);
+ f_AE_DMR_UPD_002(v_utRequest,v_request,v_action);
}
testcase TC_AE_DMR_UPD_002_MNI() runs on CseSimu system AeSystem {
@@ -1418,10 +1466,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_002(v_utRequest,v_request);
+ f_AE_DMR_UPD_002(v_utRequest,v_request,v_action);
}
testcase TC_AE_DMR_UPD_002_MBS() runs on CseSimu system AeSystem {
@@ -1429,24 +1478,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_002(v_utRequest,v_request);
+ f_AE_DMR_UPD_002(v_utRequest,v_request,v_action);
}
testcase TC_AE_DMR_UPD_002_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_002(v_utRequest,v_request);
+ f_AE_DMR_UPD_002(v_utRequest,v_request,v_action);
}
- function f_AE_DMR_UPD_002(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_request) runs on CseSimu {
+ function f_AE_DMR_UPD_002(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_request, in charstring p_action) runs on CseSimu {
var ResponsePrimitive v_responsePrimtive;
@@ -1454,7 +1505,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;
@@ -1500,15 +1551,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");
@@ -1520,7 +1573,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;
@@ -1564,12 +1617,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;
@@ -1611,12 +1665,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;
@@ -1658,13 +1713,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;
@@ -1706,13 +1762,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;
@@ -1758,12 +1815,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;
@@ -1805,12 +1863,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;
@@ -1852,13 +1911,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;
@@ -1888,7 +1948,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 {
@@ -1900,13 +1960,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;
@@ -1954,6 +2015,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);
@@ -1961,7 +2023,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;
@@ -1998,6 +2060,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);
@@ -2008,12 +2071,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"};
@@ -2024,12 +2088,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);
@@ -2040,12 +2105,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);
@@ -2056,12 +2122,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);
@@ -2072,12 +2139,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);
@@ -2088,12 +2156,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);
@@ -2104,10 +2173,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;
@@ -2115,7 +2184,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;
@@ -2160,6 +2229,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);
@@ -2167,7 +2237,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 {
@@ -2193,7 +2263,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{
@@ -2249,6 +2320,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);
@@ -2256,7 +2328,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 {
@@ -2282,7 +2354,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{
diff --git a/OneM2M_Testcases_CSE.ttcn b/OneM2M_Testcases_CSE.ttcn
index d70e98be1f81e07294e1b3fc43ad11fd13bfa807..b93bf2ffd9e048519dbd764995920298a41c627b 100644
--- a/OneM2M_Testcases_CSE.ttcn
+++ b/OneM2M_Testcases_CSE.ttcn
@@ -870,13 +870,19 @@ module OneM2M_Testcases_CSE {
var integer v_cseBaseIndex := -1;
var ResourceType v_resourceType := int2;
+ //Test control
+ if(not(PICS_IN_CSE)) {
+ setverdict(inconc, __SCOPE__ & ": IUT shall be IN-CSE to run this test case");
+ stop;
+ }
+
// Test component configuration
f_cf01Up();
//Preamble
//Test Body
- v_request := valueof(m_createAe(PX_APP_ID, omit, "SAE-ID-STEM"));
+ v_request := valueof(m_createAe(PX_APP_ID, omit, "S-AE-ID-STEM"));
v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, -1);
@@ -970,7 +976,7 @@ module OneM2M_Testcases_CSE {
//Preamble
v_remoteCseIndex := f_cse_registrationRemoteCse();
vc_ae1 := AeSimu.create("AE1") alive;
- //vc_ae1.start(f_a);
+ vc_ae1.start(f_cse_preamble_registerAe());
}
@@ -997,8 +1003,9 @@ module OneM2M_Testcases_CSE {
//Test Body
//v_request := valueof(m_createAe(PX_APP_ID, omit, "C-AE-ID-STEM"));
- f_cse_createResource(int2, m_createAe(PX_APP_ID, omit, "C"));
+ v_request := f_getCreateRequestPrimitive(int2, m_createAe(PX_APP_ID, omit, PX_NOT_ALLOWED_C_AE_IDS[0]), -1);
+ mcaPort.send(m_request(v_request));
tc_ac.start;
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4005))) {
@@ -2742,9 +2749,10 @@ module OneM2M_Testcases_CSE {
var ResourceType v_resourceType := int16; //remoteCSE
var template PrimitiveContent v_contentResponse;
var template UtTriggerPrimitive v_utRequest;
+ var charstring v_action := "Please, send a valid RETRIEVE Request containing To set to " & PX_CSE1_ADDRESS;
// Test control
- if(not(PICS_MN_CSE)) {
+ if(not(PICS_MN_CSE)) {
setverdict(inconc, __SCOPE__ & ": IUT shall be MN-CSE to run this test case");
stop;
}
@@ -2760,7 +2768,7 @@ module OneM2M_Testcases_CSE {
//Send Trigger Message
v_utRequest := m_utRetrieveResource(f_getLocalResourceAddress(vc_remoteCseIndex), PX_CSE_ID);
v_utRequest.from_ := "UNINITIALIZED";
- f_sendUtPrimitive(v_utRequest);
+ f_sendUtPrimitive(v_utRequest, v_action);
tc_ac.start;
alt {
@@ -3020,10 +3028,11 @@ module OneM2M_Testcases_CSE {
testcase TC_CSE_REG_UPD_003_ET() runs on Tester system CseSystem {
// Local variables
var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;
- const AttributeAux c_optionalAttribute := {"expirationTime", omit};
+ var AttributeAux c_optionalAttribute;
var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
v_updateRequest.primitiveContent.remoteCSE.expirationTime := "20301231T012345";
+ c_optionalAttribute := {"expirationTime", valueof(v_updateRequest).primitiveContent.remoteCSE.expirationTime};
v_cse1.start(f_CSE_REG_UPD_003(v_updateRequest, c_optionalAttribute));
v_cse1.done;
@@ -3033,10 +3042,11 @@ module OneM2M_Testcases_CSE {
testcase TC_CSE_REG_UPD_003_LBL() runs on Tester system CseSystem {
// Local variables
var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;
- const AttributeAux c_optionalAttribute := {"labels", omit};
+ var AttributeAux c_optionalAttribute;
var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
v_updateRequest.primitiveContent.remoteCSE.labels := {"MyLabel"};
+ c_optionalAttribute := {"labels", valueof(v_updateRequest).primitiveContent.remoteCSE.labels[0]};
v_cse1.start(f_CSE_REG_UPD_003(v_updateRequest, c_optionalAttribute));
v_cse1.done;
@@ -3046,10 +3056,11 @@ module OneM2M_Testcases_CSE {
testcase TC_CSE_REG_UPD_003_POA() runs on Tester system CseSystem {
// Local variables
var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;
- const AttributeAux c_optionalAttribute := {"pointofAccess", omit};
+ var AttributeAux c_optionalAttribute;
var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
v_updateRequest.primitiveContent.remoteCSE.pointOfAccess := {"http://" & PX_CSE1_ADDRESS & "/"};
+ c_optionalAttribute := {"pointofAccess", valueof(v_updateRequest).primitiveContent.remoteCSE.pointOfAccess[0]};
v_cse1.start(f_CSE_REG_UPD_003(v_updateRequest, c_optionalAttribute));
v_cse1.done;
@@ -3059,10 +3070,11 @@ module OneM2M_Testcases_CSE {
testcase TC_CSE_REG_UPD_003_NL() runs on Tester system CseSystem {
// Local variables
var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;
- const AttributeAux c_optionalAttribute := {"nodeLink", omit};
+ var AttributeAux c_optionalAttribute;
var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
v_updateRequest.primitiveContent.remoteCSE.nodeLink := c_defaultNodeID;
+ c_optionalAttribute := {"nodeLink", valueof(v_updateRequest).primitiveContent.remoteCSE.nodeLink};
v_cse1.start(f_CSE_REG_UPD_003(v_updateRequest, c_optionalAttribute));
v_cse1.done;
@@ -3072,10 +3084,11 @@ module OneM2M_Testcases_CSE {
testcase TC_CSE_REG_UPD_003_RR() runs on Tester system CseSystem {
// Local variables
var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;
- const AttributeAux c_optionalAttribute := {"requestReachability", omit};
+ var AttributeAux c_optionalAttribute;
var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
v_updateRequest.primitiveContent.remoteCSE.requestReachability := true;
+ c_optionalAttribute := {"requestReachability", f_bool2str(valueof(v_updateRequest).primitiveContent.remoteCSE.requestReachability)};
v_cse1.start(f_CSE_REG_UPD_003(v_updateRequest, c_optionalAttribute));
v_cse1.done;
@@ -3089,6 +3102,7 @@ module OneM2M_Testcases_CSE {
var RequestPrimitive v_request;
var ResourceType v_resourceType := int16; //remoteCSE
var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE;
+ var charstring v_action := "Please, send a valid RETRIEVE Request containing To set to " & PX_CSE1_ADDRESS & " and Content containing remoteCSE resource containing attribute " & p_Attribute.name & " set to " & p_Attribute.value_;
// Test control
if(not(PICS_MN_CSE)) {
@@ -3107,7 +3121,7 @@ module OneM2M_Testcases_CSE {
//Send Trigger Message
v_utRequest.to_ := f_getResourceAddress();
v_utRequest.from_ := "UNINITIALIZED";
- f_sendUtPrimitive(v_utRequest);
+ f_sendUtPrimitive(v_utRequest, v_action);
// Test Body
v_request := f_getUpdateRequestPrimitive(int16, vc_remoteCseIndex, p_requestPrimitive);
@@ -3312,6 +3326,7 @@ module OneM2M_Testcases_CSE {
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 containing To set to " & PX_CSE1_ADDRESS;
// Test control
// Test component configuration
@@ -3326,7 +3341,7 @@ module OneM2M_Testcases_CSE {
v_auxInteger := f_setResource(valueof(m_primitiveContentRemoteCSE(m_contentCreateRemoteCSE(omit,omit,omit,omit))), int16);
v_utRequest.to_ := f_getResourceAddress(v_auxInteger);
v_utRequest.from_ := "UNINITIALIZED";
- f_sendUtPrimitive(v_utRequest);
+ f_sendUtPrimitive(v_utRequest, v_action);
// Test Body
tc_ac.start;
@@ -7789,7 +7804,12 @@ module OneM2M_Testcases_CSE {
// Test adapter configuration
// Preamble
- v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+
+ if(p_resourceType != int2) { //ResourceType != AE
+
+ v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+
+ }
if(p_resourceType != int1) {
@@ -8096,7 +8116,9 @@ module OneM2M_Testcases_CSE {
// Test adapter configuration
// Preamble
- v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+ if(p_resourceType != int2) { //ResourceType != AE
+ v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+ }
if(p_resourceType != int1) {
@@ -8265,7 +8287,9 @@ module OneM2M_Testcases_CSE {
// Test adapter configuration
// Preamble
- v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+ if(p_resourceType != int2) { //ResourceType != AE
+ v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+ }
if(p_resourceType != int1) {
@@ -8275,9 +8299,9 @@ module OneM2M_Testcases_CSE {
}
if (p_resourceType!=int16){ //ResourceType != RemoteCSE
- f_cse_preamble_subscriptionVerification(v_ae2Index, p_requestPrimitive, p_resourceType);
-
- v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive);//under the CSEBase resource
+ f_cse_preamble_subscriptionVerification(v_ae2Index, p_requestPrimitive, p_resourceType);
+
+ v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive);//under the CSEBase resource
}else{
vc_cse1.start(f_cse_registerRemoteCse(p_requestPrimitive));
@@ -8518,7 +8542,9 @@ module OneM2M_Testcases_CSE {
// Test adapter configuration
// Preamble
- v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+ if(p_resourceType != int2) { //ResourceType != AE
+ v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+ }
if(p_resourceType != int1) {
@@ -8528,9 +8554,9 @@ module OneM2M_Testcases_CSE {
}
if (p_resourceType!=int16){ //ResourceType != RemoteCSE
- f_cse_preamble_subscriptionVerification(v_ae2Index, p_requestPrimitive, p_resourceType);
-
- v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive);//under the CSEBase resource
+ f_cse_preamble_subscriptionVerification(v_ae2Index, p_requestPrimitive, p_resourceType);
+
+ v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive);//under the CSEBase resource
}else{
vc_cse1.start(f_cse_registerRemoteCse(p_requestPrimitive));
@@ -8659,7 +8685,9 @@ module OneM2M_Testcases_CSE {
// Test adapter configuration
// Preamble
- v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+ if(p_resourceType != int2) { //ResourceType != AE
+ v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+ }
if(p_resourceType != int1) {
@@ -8669,9 +8697,9 @@ module OneM2M_Testcases_CSE {
}
if (p_resourceType!=int16){ //ResourceType != RemoteCSE
- f_cse_preamble_subscriptionVerification(v_ae2Index, p_requestPrimitive, p_resourceType);
-
- v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive);//under the CSEBase resource
+ f_cse_preamble_subscriptionVerification(v_ae2Index, p_requestPrimitive, p_resourceType);
+
+ v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive);//under the CSEBase resource
}else{
vc_cse1.start(f_cse_registerRemoteCse(p_requestPrimitive));
@@ -8796,7 +8824,9 @@ module OneM2M_Testcases_CSE {
// Test adapter configuration
// Preamble
- v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+ if(p_resourceType != int2) { //ResourceType != AE
+ v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+ }
if(p_resourceType != int1) {
@@ -8806,9 +8836,9 @@ module OneM2M_Testcases_CSE {
}
if (p_resourceType!=int16){ //ResourceType != RemoteCSE
- f_cse_preamble_subscriptionVerification(v_ae2Index, p_requestPrimitive, p_resourceType);
-
- v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive);//under the CSEBase resource
+ f_cse_preamble_subscriptionVerification(v_ae2Index, p_requestPrimitive, p_resourceType);
+
+ v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive);//under the CSEBase resource
}else{
vc_cse1.start(f_cse_registerRemoteCse(p_requestPrimitive));
@@ -14074,7 +14104,9 @@ module OneM2M_Testcases_CSE {
// Test adapter configuration
// Preamble
- v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+ if(p_resourceType != int2) {
+ v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+ }
if(p_resourceType != int1) {
@@ -14707,7 +14739,9 @@ module OneM2M_Testcases_CSE {
// Test adapter configuration
// Preamble
- v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+ if(p_resourceType != int2) {
+ v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+ }
if(p_resourceType != int1) {