From 5b008fda1b8d5d8bd558b088e1c509a453e8e35a Mon Sep 17 00:00:00 2001
From: Miguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org>
Date: Mon, 27 Mar 2017 19:11:41 +0200
Subject: [PATCH] Various minor changes on g_CSE_DMR_DEL_BV_005
Signed-off-by: Miguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org>
---
OneM2M_TestControl.ttcn | 4 +-
OneM2M_Testcases.ttcn | 86 ++++++++++++++++++++++++++++++++++-------
2 files changed, 73 insertions(+), 17 deletions(-)
diff --git a/OneM2M_TestControl.ttcn b/OneM2M_TestControl.ttcn
index bce95c4..0213720 100644
--- a/OneM2M_TestControl.ttcn
+++ b/OneM2M_TestControl.ttcn
@@ -7,7 +7,7 @@
*
* @author oneM2M
* @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/OneM2M_TestControl.ttcn $
- * $Id: OneM2M_TestControl.ttcn 234 2017-03-20 16:37:29Z reinaortega $
+ * $Id: OneM2M_TestControl.ttcn 246 2017-03-27 17:07:30Z reinaortega $
* @desc Test control module for oneM2M
*
*/
@@ -186,7 +186,7 @@ module OneM2M_TestControl {
execute(TC_CSE_DMR_DEL_BV_004_04());
execute(TC_CSE_DMR_DEL_BV_004_05());
execute(TC_CSE_DMR_DEL_BV_004_06());
- execute(TC_CSE_DMR_DEL_BV_005_01());
+ execute(TC_CSE_DMR_DEL_BV_005());
execute(TC_CSE_LOC_BV_001());
execute(TC_CSE_LOC_BV_002());
execute(TC_CSE_LOC_BO_001());
diff --git a/OneM2M_Testcases.ttcn b/OneM2M_Testcases.ttcn
index fa8e90a..9b032c3 100644
--- a/OneM2M_Testcases.ttcn
+++ b/OneM2M_Testcases.ttcn
@@ -7,7 +7,7 @@
*
* @author oneM2M
* @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/OneM2M_Testcases.ttcn $
- * $Id: OneM2M_Testcases.ttcn 239 2017-03-23 17:40:22Z reinaortega $
+ * $Id: OneM2M_Testcases.ttcn 246 2017-03-27 17:07:30Z reinaortega $
* @desc Module containing test cases for oneM2M
*
*/
@@ -1263,6 +1263,8 @@ module OneM2M_Testcases {
setverdict(inconc, testcasename() & ": No answer while creating resource type " & int2str(enum2int(p_resourceType)));
}
}
+
+ f_checkCseTesterStatus();
// Postamble
f_cse_postamble_deleteResources();
@@ -1657,7 +1659,7 @@ module OneM2M_Testcases {
var AttributeAux v_invalidAttribute;
v_createRequest.primitiveContent.any_1[0].Container_optional.maxByteSize := 0;
- v_invalidAttribute := {name := "maxNrOfInstances", value_ := "-1"};
+ v_invalidAttribute := {name := "maxByteSize", value_ := "-1"};
v_responsePrimitive := f_CSE_DMR_CRE_BV_005(int3, v_createRequest, v_invalidAttribute);
@@ -1670,7 +1672,7 @@ module OneM2M_Testcases {
var AttributeAux v_invalidAttribute;
v_createRequest.primitiveContent.any_1[0].Container_optional.maxInstanceAge := 0;
- v_invalidAttribute := {name := "maxNrOfInstances", value_ := "-1"};
+ v_invalidAttribute := {name := "maxInstanceAge", value_ := "-1"};
v_responsePrimitive := f_CSE_DMR_CRE_BV_005(int3, v_createRequest, v_invalidAttribute);
@@ -6546,18 +6548,14 @@ module OneM2M_Testcases {
group g_CSE_DMR_DEL_BV_005{
- testcase TC_CSE_DMR_DEL_BV_005_01() runs on CseTester system CseSystem {
- // Local variables
- f_CSE_DMR_DEL_BV_005(int3, m_createContainerBase, int3, m_createContainerBase);//Container
- }
-
- function f_CSE_DMR_DEL_BV_005(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, ResourceType p_childResourceType, template RequestPrimitive p_createRequestPrimitiveChildResource) runs on CseTester {
+ testcase TC_CSE_DMR_DEL_BV_005() runs on CseTester system CseSystem {
// Local variables
var MsgIn v_response;
var RequestPrimitive v_request;
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
- var integer v_childResourceIndex := -1;
+ var integer v_childResourceIndex := -1;
+ const ResourceType c_containerResourceType := int3;
// Test control
@@ -6569,11 +6567,11 @@ module OneM2M_Testcases {
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
- v_resourceIndex := f_cse_createResource(p_resourceType, p_createRequestPrimitive, v_aeIndex);
+ v_resourceIndex := f_cse_createResource(c_containerResourceType, m_createContainerBase, v_aeIndex);
if(ispresent(vc_resourcesList[v_resourceIndex].resource.any_1[0].Container_optional.stateTag)) {
- v_childResourceIndex := f_cse_createResource(p_childResourceType, p_createRequestPrimitiveChildResource, v_resourceIndex);
+ v_childResourceIndex := f_cse_createResource(c_containerResourceType, m_createContainerBase, v_resourceIndex);
// Test Body
v_request := valueof(m_deleteRequest(f_getResourceAddress(v_childResourceIndex)));
@@ -6583,14 +6581,14 @@ module OneM2M_Testcases {
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
tc_ac.stop;
- setverdict(pass, testcasename() & ": Resource type " & int2str(enum2int(p_resourceType)) & " delete successfuly");
+ setverdict(pass, testcasename() & ": Resource type " & int2str(enum2int(c_containerResourceType)) & " delete successfuly");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
tc_ac.stop;
- setverdict(fail, testcasename() & ": Error while deleting resource type " & int2str(enum2int(p_resourceType)));
+ setverdict(fail, testcasename() & ": Error while deleting resource type " & int2str(enum2int(c_containerResourceType)));
}
[] tc_ac.timeout {
- setverdict(inconc, testcasename() & ": No answer while deleting resource type " & int2str(enum2int(p_resourceType)));
+ setverdict(inconc, testcasename() & ": No answer while deleting resource type " & int2str(enum2int(c_containerResourceType)));
}
}
@@ -6631,6 +6629,64 @@ module OneM2M_Testcases {
}//end f_CSE_DMR_DEL_BV_005
} // end group g_CSE_DMR_DEL_BV_005
+
+ group g_CSE_DMR_DEL_BV_006{
+
+ testcase TC_CSE_DMR_DEL_BV_006() runs on CseTester system CseSystem {
+ // Local variables
+ var MsgIn v_response;
+ var RequestPrimitive v_request;
+ var integer v_aeIndex := -1;
+ var integer v_containerIndex := -1;
+ var integer v_contentInstanceIndex := -1;
+ var PrimitiveContent v_attributesContainer, v_attributesContainer_afterDeletion;
+
+ // Test control
+
+ // Test component configuration
+ f_cf01Up();
+
+ // Test adapter configuration
+
+ // Preamble
+ v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+
+ v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex);
+
+ v_contentInstanceIndex := f_cse_createResource(int4, m_createContentInstanceBase, v_containerIndex);
+
+ v_attributesContainer := f_cse_retrieveResource(v_containerIndex);
+
+ if(not(ispresent(v_attributesContainer.any_1[0].Container_optional.currentNrOfInstances))) {
+ setverdict(fail, testcasename() & ": Error the currentNrOfInstances attribute is empty");
+ f_checkCseTesterStatus();
+ }
+
+ // Test Body
+ f_cse_deleteResource(valueof(m_deleteRequest(f_getResourceAddress(v_contentInstanceIndex))));
+
+ v_attributesContainer_afterDeletion := f_cse_retrieveResource(v_containerIndex);
+
+ if(not(ispresent(v_attributesContainer.any_1[0].Container_optional.currentNrOfInstances))) {
+ setverdict(fail, testcasename() & ": Error the currentNrOfInstances attribute is empty");
+ f_checkCseTesterStatus();
+ }
+
+ if((v_attributesContainer.any_1[0].Container_optional.currentNrOfInstances > v_attributesContainer_afterDeletion.any_1[0].Container_optional.currentNrOfInstances) and
+ (v_attributesContainer.any_1[0].Container_optional.currentByteSize > v_attributesContainer_afterDeletion.any_1[0].Container_optional.currentByteSize)) {
+ setverdict(pass, testcasename() & ": The currentNrOfInstances and currentByteSize attributes are decreased");
+ } else {
+ setverdict(fail, testcasename() & ": currentNrOfInstances and/or currentByteSize attributes are not decreased");
+ }
+
+ // Postamble
+ f_cse_postamble_deleteResources();
+
+ // Tear down
+ f_cf01Down();
+
+ }//end f_CSE_DMR_DEL_BV_006
+ } // end group g_CSE_DMR_DEL_BV_006
}//end group Delete
--
GitLab