diff --git a/OneM2M_TestControl.ttcn b/OneM2M_TestControl.ttcn
index 0213720a6c9aacdc82749c0f4a78271e523782e2..c3bf9679c67f531952b2642502213cb1d01155c9 100644
--- a/OneM2M_TestControl.ttcn
+++ b/OneM2M_TestControl.ttcn
@@ -187,21 +187,25 @@ module OneM2M_TestControl {
execute(TC_CSE_DMR_DEL_BV_004_05());
execute(TC_CSE_DMR_DEL_BV_004_06());
execute(TC_CSE_DMR_DEL_BV_005());
+ execute(TC_CSE_DMR_DEL_BV_007());
+ execute(TC_CSE_DMR_DEL_BO_008());
+ execute(TC_CSE_DMR_DEL_BV_009());
+ execute(TC_CSE_DMR_DEL_BO_010());
execute(TC_CSE_LOC_BV_001());
execute(TC_CSE_LOC_BV_002());
- execute(TC_CSE_LOC_BO_001());
- execute(TC_CSE_LOC_BO_002());
- execute(TC_CSE_LOC_BI_001());
- execute(TC_CSE_LOC_BV_003());
- execute(TC_CSE_LOC_BV_004());
- execute(TC_CSE_LOC_BV_005());
- execute(TC_CSE_LOC_BV_006_01());
- execute(TC_CSE_LOC_BV_006_02());
- execute(TC_CSE_LOC_BV_006_03());
+ execute(TC_CSE_LOC_BO_003());
+ execute(TC_CSE_LOC_BO_004());
+ execute(TC_CSE_LOC_BI_005());
+ execute(TC_CSE_LOC_BV_006());
+ execute(TC_CSE_LOC_BV_007());
+ execute(TC_CSE_LOC_BV_008());
+ execute(TC_CSE_LOC_BV_009_01());
+ execute(TC_CSE_LOC_BV_009_02());
+ execute(TC_CSE_LOC_BV_009_03());
//execute(TC_CSE_LOC_BV_007());
//execute(TC_CSE_LOC_BV_008());
- execute(TC_CSE_LOC_BV_009());
- execute(TC_CSE_LOC_BV_010());
+ execute(TC_CSE_LOC_BV_012());
+ execute(TC_CSE_LOC_BV_013());
execute(TC_CSE_GMG_BV_001());
execute(TC_CSE_GMG_BV_002());
execute(TC_CSE_GMG_BV_003());
diff --git a/OneM2M_Testcases.ttcn b/OneM2M_Testcases.ttcn
index c57e0683f77a651d2e8cb69e1ce84ee1e5b37e3c..0c10512f84cc4092453e17a6f3e01cfe689f7982 100644
--- a/OneM2M_Testcases.ttcn
+++ b/OneM2M_Testcases.ttcn
@@ -6701,6 +6701,255 @@ module OneM2M_Testcases {
}//end f_CSE_DMR_DEL_BV_006
} // end group g_CSE_DMR_DEL_BV_006
+ group g_CSE_DMR_DEL_BV_007{
+
+ testcase TC_CSE_DMR_DEL_BV_007() 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 := -1;
+ var integer v_contentInstanceIndex_2 := -1;
+ const ResourceType c_containerResourceType := int3;
+
+ // 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_1 := f_cse_createResource(int4, m_createContentInstanceBase, v_containerIndex);
+ v_contentInstanceIndex_2 := f_cse_createResource(int4, m_createContentInstanceBase, v_containerIndex);
+
+ // Test Body
+ v_request := valueof(m_deleteRequest(f_getResourceAddress(v_containerIndex) & "/la"));
+
+ mcaPort.send(m_request(v_request));
+ tc_ac.start;
+ alt {
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+ tc_ac.stop;
+ setverdict(pass, testcasename() & ": Resource type " & int2str(enum2int(c_containerResourceType)) & " deleted successfuly");
+ }
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+ tc_ac.stop;
+ 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(c_containerResourceType)));
+ }
+ }
+
+ f_checkCseTesterStatus();
+
+ mcaPort.send(m_request(m_retrieveResource((f_getResourceAddress(v_containerIndex) & "/la"), f_getOriginator(v_containerIndex))));
+
+ tc_ac.start;
+ alt {
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+ tc_ac.stop;
+ setverdict(fail, testcasename() & ": Resource type" & int2str(enum2int(c_containerResourceType)) & " has already been deleted");
+ }
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
+ tc_ac.stop;
+ setverdict(pass, testcasename() & ": Error while retrieving resource attributes as" & int2str(enum2int(c_containerResourceType)) & " has been deleted");
+ }
+ [] tc_ac.timeout {
+ setverdict(fail, testcasename() & ": No answer while retrieving resource attributes");
+ }
+ }
+
+ // Postamble
+ f_cse_postamble_deleteResources();
+
+ // Tear down
+ f_cf01Down();
+
+ }//end f_CSE_DMR_DEL_BV_007
+ } // end group g_CSE_DMR_DEL_BV_007
+
+ group g_CSE_DMR_DEL_BO_008{
+
+ testcase TC_CSE_DMR_DEL_BO_008() 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;
+ const ResourceType c_containerResourceType := int4;
+
+
+ // 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);
+
+ // Test Body
+ v_request := valueof(m_deleteRequest(f_getResourceAddress(v_containerIndex) & "/la"));
+ mcaPort.send(m_request(v_request));
+ tc_ac.start;
+ alt {
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+ tc_ac.stop;
+ setverdict(pass, testcasename() & ": Resource type " & int2str(enum2int(c_containerResourceType)) & " NOT FOUND");
+ }
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+ tc_ac.stop;
+ setverdict(fail, testcasename() & ": Resource type " & int2str(enum2int(c_containerResourceType)) & " has not been created");
+ }
+ [] tc_ac.timeout {
+ setverdict(fail, testcasename() & ": No answer while deleting resource type " & int2str(enum2int(c_containerResourceType)));
+ }
+ }
+
+ // Postamble
+ f_cse_postamble_deleteResources();
+
+ // Tear down
+ f_cf01Down();
+
+ }//end f_CSE_DMR_DEL_BO_008
+ } // end group g_CSE_DMR_DEL_BO_008
+
+ group g_CSE_DMR_DEL_BV_009{
+
+ testcase TC_CSE_DMR_DEL_BV_009() 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 := -1;
+ var integer v_contentInstanceIndex_2 := -1;
+ const ResourceType c_containerResourceType := int3;
+
+ // 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_1 := f_cse_createResource(int4, m_createContentInstanceBase, v_containerIndex);
+ v_contentInstanceIndex_2 := f_cse_createResource(int4, m_createContentInstanceBase, v_containerIndex);
+
+ // Test Body
+ v_request := valueof(m_deleteRequest(f_getResourceAddress(v_containerIndex) & "/ol"));
+
+ mcaPort.send(m_request(v_request));
+ tc_ac.start;
+ alt {
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+ tc_ac.stop;
+ setverdict(pass, testcasename() & ": Resource type " & int2str(enum2int(c_containerResourceType)) & " deleted successfuly");
+ }
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+ tc_ac.stop;
+ 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(c_containerResourceType)));
+ }
+ }
+
+ f_checkCseTesterStatus();
+
+ mcaPort.send(m_request(m_retrieveResource((f_getResourceAddress(v_containerIndex) & "/ol"), f_getOriginator(v_containerIndex))));
+
+ tc_ac.start;
+ alt {
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+ tc_ac.stop;
+ setverdict(fail, testcasename() & ": Resource type" & int2str(enum2int(c_containerResourceType)) & "has already been deleted");
+ }
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
+ tc_ac.stop;
+ setverdict(pass, testcasename() & ": Error while retrieving resource attributes as" & int2str(enum2int(c_containerResourceType)) & " has been deleted");
+ }
+ [] tc_ac.timeout {
+ setverdict(inconc, testcasename() & ": No answer while retrieving resource attributes");
+ }
+ }
+
+ // Postamble
+ f_cse_postamble_deleteResources();
+
+ // Tear down
+ f_cf01Down();
+
+ }//end f_CSE_DMR_DEL_BV_009
+ } // end group g_CSE_DMR_DEL_BV_009
+
+ group g_CSE_DMR_DEL_BO_010{
+
+ testcase TC_CSE_DMR_DEL_BO_010() 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;
+ const ResourceType c_containerResourceType := int4;
+
+
+ // 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);
+
+ // Test Body
+ v_request := valueof(m_deleteRequest(f_getResourceAddress(v_containerIndex) & "/ol"));
+ mcaPort.send(m_request(v_request));
+ tc_ac.start;
+ alt {
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+ tc_ac.stop;
+ setverdict(pass, testcasename() & ": Resource type" & int2str(enum2int(c_containerResourceType)) & " NOT FOUND");
+ }
+ [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
+ tc_ac.stop;
+ setverdict(fail, testcasename() & ": Resource type" & int2str(enum2int(c_containerResourceType)) & " has not been created");
+ }
+ [] tc_ac.timeout {
+ setverdict(fail, testcasename() & ": No answer while deleting resource type " & int2str(enum2int(c_containerResourceType)));
+ }
+ }
+
+ // Postamble
+ f_cse_postamble_deleteResources();
+
+ // Tear down
+ f_cf01Down();
+ }//end f_CSE_DMR_DEL_BO_010
+ } // end group g_CSE_DMR_DEL_BO_010
+
}//end group Delete
}//end group Data_Management_and_Repository
@@ -6805,9 +7054,9 @@ module OneM2M_Testcases {
}//end group g_CSE_LOC_BV_002
- group g_CSE_LOC_BO_001{
+ group g_CSE_LOC_BO_003{
- testcase TC_CSE_LOC_BO_001() runs on CseTester system CseSystem {//the originator has no privileges to create a locationPolicy resource!!
+ testcase TC_CSE_LOC_BO_003() runs on CseTester system CseSystem {//the originator has no privileges to create a locationPolicy resource!!
var integer v_aeAuxIndex := -1;
var integer v_acpAuxIndex := -1;
@@ -6859,12 +7108,12 @@ module OneM2M_Testcases {
f_cf01Down();
- } // end testcase TC_CSE_LOC_BO_001
+ } // end testcase TC_CSE_LOC_BO_003
- }//end group g_CSE_LOC_BO_001
+ }//end group g_CSE_LOC_BO_003
- group g_CSE_LOC_BO_002{
- testcase TC_CSE_LOC_BO_002() runs on CseTester system CseSystem {
+ group g_CSE_LOC_BO_004{
+ testcase TC_CSE_LOC_BO_004() runs on CseTester system CseSystem {
var integer v_aeAuxIndex := -1;
var LocationSource v_locationSource := int1;//Netwok-based
@@ -6906,14 +7155,14 @@ module OneM2M_Testcases {
// Tear down
f_cf01Down();
- }// end testcase TC_CSE_LOC_BO_002
+ }// end testcase TC_CSE_LOC_BO_004
- }//end group g_CSE_LOC_BO_002
+ }//end group g_CSE_LOC_BO_004
- group g_CSE_LOC_BI_001{
+ group g_CSE_LOC_BI_005{
- testcase TC_CSE_LOC_BI_001() runs on CseTester system CseSystem {//reject an invalid update request with invalid attribtue locationUpdatePeriod
+ testcase TC_CSE_LOC_BI_005() runs on CseTester system CseSystem {//reject an invalid update request with invalid attribtue locationUpdatePeriod
var integer v_aeAuxIndex := -1;
var integer v_locPolicyResourceIndex := -1;
@@ -6961,13 +7210,13 @@ module OneM2M_Testcases {
// Tear down
f_cf01Down();
- }//end testcase TC_CSE_LOC_BI_001
+ }//end testcase TC_CSE_LOC_BI_005
- }//end group g_CSE_LOC_BI_001
+ }//end group g_CSE_LOC_BI_005
- group g_CSE_LOC_BV_003 {
+ group g_CSE_LOC_BV_006 {
- testcase TC_CSE_LOC_BV_003() runs on CseTester system CseSystem{
+ testcase TC_CSE_LOC_BV_006() runs on CseTester system CseSystem{
//TO RETRIEVE a <container> resource that has created in cse and linked with a <locationPolicy> resource (network-based case)
var integer v_aeAuxIndex := -1;
@@ -7024,13 +7273,13 @@ module OneM2M_Testcases {
// Tear down
f_cf01Down();
- }//end testcase TC_CSE_LOC_BV_003
+ }//end testcase TC_CSE_LOC_BV_006
- }//end group g_CSE_LOC_BV_003
+ }//end group g_CSE_LOC_BV_006
- group g_CSE_LOC_BV_004 {
+ group g_CSE_LOC_BV_007 {
- testcase TC_CSE_LOC_BV_004() runs on CseTester system CseSystem{
+ testcase TC_CSE_LOC_BV_007() runs on CseTester system CseSystem{
//TO create a <locationPolicy> resource with locationSource set to Device-based
var integer v_aeAuxIndex := -1;
@@ -7073,13 +7322,13 @@ module OneM2M_Testcases {
// Tear down
f_cf01Down();
- }//end testcase TC_CSE_LOC_BV_004
+ }//end testcase TC_CSE_LOC_BV_007
- }//end group g_CSE_LOC_BV_004
+ }//end group g_CSE_LOC_BV_007
- group g_CSE_LOC_BV_005 {
+ group g_CSE_LOC_BV_008 {
- testcase TC_CSE_LOC_BV_005() runs on CseTester system CseSystem{
+ testcase TC_CSE_LOC_BV_008() runs on CseTester system CseSystem{
//TO create a <locationPolicy> resource with locationSource set to Share-based
var integer v_aeAuxIndex := -1;
@@ -7122,13 +7371,13 @@ module OneM2M_Testcases {
// Tear down
f_cf01Down();
- }//end testcase TC_CSE_LOC_BV_005
+ }//end testcase TC_CSE_LOC_BV_008
- }//end group g_CSE_LOC_BV_005
+ }//end group g_CSE_LOC_BV_008
- group g_CSE_LOC_BV_006 {
+ group g_CSE_LOC_BV_009 {
- testcase TC_CSE_LOC_BV_006_01() runs on CseTester system CseSystem{
+ testcase TC_CSE_LOC_BV_009_01() runs on CseTester system CseSystem{
//TO NOTIFY a location information
var integer v_aeAuxIndex := -1;
@@ -7190,9 +7439,9 @@ module OneM2M_Testcases {
// Tear down
f_cf01Down();
- }//end testcase TC_CSE_LOC_BV_006_01
+ }//end testcase TC_CSE_LOC_BV_009_01
- testcase TC_CSE_LOC_BV_006_02() runs on CseTester system CseSystem{
+ testcase TC_CSE_LOC_BV_009_02() runs on CseTester system CseSystem{
//TO NOTIFY a location information
var integer v_aeAuxIndex := -1;
@@ -7253,9 +7502,9 @@ module OneM2M_Testcases {
// Tear down
f_cf01Down();
- }//end testcase TC_CSE_LOC_BV_006_02
+ }//end testcase TC_CSE_LOC_BV_009_02
- testcase TC_CSE_LOC_BV_006_03() runs on CseTester system CseSystem{
+ testcase TC_CSE_LOC_BV_009_03() runs on CseTester system CseSystem{
//TO NOTIFY a location information
var integer v_aeAuxIndex := -1;
@@ -7315,8 +7564,8 @@ module OneM2M_Testcases {
// Tear down
f_cf01Down();
- }//end testcase TC_CSE_LOC_BV_006_03
- }//end group g_CSE_LOC_BV_006
+ }//end testcase TC_CSE_LOC_BV_009_03
+ }//end group g_CSE_LOC_BV_009
/*group g_CSE_LOC_BV_007 {
testcase TC_CSE_LOC_BV_007() runs on CseTester system CseSystem{
@@ -7331,8 +7580,8 @@ module OneM2M_Testcases {
}//end group g_CSE_LOC_BV_008
*/
- group g_CSE_LOC_BV_009 {
- testcase TC_CSE_LOC_BV_009() runs on CseTester system CseSystem{
+ group g_CSE_LOC_BV_012 {
+ testcase TC_CSE_LOC_BV_012() runs on CseTester system CseSystem{
//To CREATE a <subscription> resource as a child resource of the created <container>
var integer v_aeAuxIndex := -1;
@@ -7383,12 +7632,12 @@ module OneM2M_Testcases {
// Tear down
f_cf01Down();
- }//end testcase TC_CSE_LOC_BV_009
- }//end group g_CSE_LOC_BV_009
+ }//end testcase TC_CSE_LOC_BV_012
+ }//end group g_CSE_LOC_BV_012
- group g_CSE_LOC_BV_010 {
+ group g_CSE_LOC_BV_013 {
- testcase TC_CSE_LOC_BV_010() runs on CseTester system CseSystem{
+ testcase TC_CSE_LOC_BV_013() runs on CseTester system CseSystem{
//TO RETRIEVE a <locationPolicy> resource that has created in cse
var integer v_aeAuxIndex := -1;
@@ -7443,9 +7692,9 @@ module OneM2M_Testcases {
// Tear down
f_cf01Down();
- }//end testcase TC_CSE_LOC_BV_010
+ }//end testcase TC_CSE_LOC_BV_013
- }//end group g_CSE_LOC_BV_010
+ }//end group g_CSE_LOC_BV_013
}//end group Location