diff --git a/OneM2M_TestControl_IN_profile.ttcn b/OneM2M_TestControl_IN_profile.ttcn
index 90433b9bf2c50c97ac6713d203ef485ce355cd32..f611c26d6a64de2f79a8da11a51aa6b2740b47c3 100644
--- a/OneM2M_TestControl_IN_profile.ttcn
+++ b/OneM2M_TestControl_IN_profile.ttcn
@@ -115,7 +115,7 @@ module OneM2M_TestControl_IN_profile {
if(true) {execute (TC_CSE_DMR_CRE_001_CNT_CNT());}
if(true) {execute (TC_CSE_DMR_CRE_002_CNT());}
if(true) {execute (TC_CSE_DMR_CRE_003_CNT());}
- if(true) {execute (TC_CSE_DMR_CRE_007 ());}
+ if(true) {execute (TC_CSE_DMR_CRE_007_CNT_CIN ());}
if(true) {execute (TC_CSE_DMR_CRE_008 ());}
if(true) {execute (TC_CSE_DMR_CRE_009 ());}
if(true) {execute (TC_CSE_DMR_CRE_010 ());}
@@ -130,7 +130,7 @@ module OneM2M_TestControl_IN_profile {
if(true) {execute (TC_CSE_DMR_UPD_005());}
if(true) {execute (TC_CSE_DMR_UPD_007_CNT_CT());}
if(true) {execute (TC_CSE_DMR_UPD_009_CNT_EXC());}
- if(true) {execute (TC_CSE_DMR_UPD_010 ());}
+ if(true) {execute (TC_CSE_DMR_UPD_010_CNT ());}
if(true) {execute (TC_CSE_DMR_UPD_016_CNT_ET());}
if(true) {execute (TC_CSE_DMR_DEL_001_CNT());}
if(true) {execute (TC_CSE_DMR_DEL_005 ());}
@@ -147,7 +147,7 @@ module OneM2M_TestControl_IN_profile {
if(true) {execute (TC_CSE_DMR_CRE_005_MBS());}
if(true) {execute (TC_CSE_DMR_CRE_006_MBS());}
if(PICS_CNT_MBS) {execute (TC_CSE_DMR_CRE_012_CNT_MBS());}
- if(true) {execute (TC_CSE_DMR_CRE_013());}
+ if(true) {execute (TC_CSE_DMR_CRE_013_CNT_CIN());}
if(PICS_CNT_MBS) {execute (TC_CSE_DMR_UPD_014_CNT_MBS());}
if(PICS_CNT_MBS) {execute (TC_CSE_DMR_UPD_015_CNT_MBS());}
if(true) {execute (TC_CSE_DMR_CRE_005_MIA());}
@@ -159,7 +159,7 @@ module OneM2M_TestControl_IN_profile {
//CE_DMR_00002
if(true) {execute (TC_CSE_DMR_CRE_001_CIN_CNT());}
if(true) {execute (TC_CSE_DMR_RET_001_CIN());}
- if(true) {execute (TC_CSE_DMR_UPD_011());}
+ if(true) {execute (TC_CSE_DMR_UPD_011_CNT_CIN());}
if(true) {execute (TC_CSE_DMR_DEL_001_CIN());}
if(PICS_CIN_LBL) {execute (TC_CSE_DMR_CRE_012_CIN_LBL());}
if(PICS_CIN_CR) {execute (TC_CSE_DMR_CRE_012_CIN_CR());}
diff --git a/OneM2M_TestControl_MN_profile.ttcn b/OneM2M_TestControl_MN_profile.ttcn
index 4b59fa6cc97f266f346f7113ed4ede6f6b9839b0..7ea593c7b53dde80d13b084b3c08444e14818ddf 100644
--- a/OneM2M_TestControl_MN_profile.ttcn
+++ b/OneM2M_TestControl_MN_profile.ttcn
@@ -138,7 +138,7 @@ module OneM2M_TestControl_MN_profile {
if(true) {execute (TC_CSE_DMR_CRE_001_CNT_CNT());}
if(true) {execute (TC_CSE_DMR_CRE_002_CNT());}
if(true) {execute (TC_CSE_DMR_CRE_003_CNT());}
- if(true) {execute (TC_CSE_DMR_CRE_007 ());}
+ if(true) {execute (TC_CSE_DMR_CRE_007_CNT_CIN ());}
if(true) {execute (TC_CSE_DMR_CRE_008 ());}
if(true) {execute (TC_CSE_DMR_CRE_009 ());}
if(true) {execute (TC_CSE_DMR_CRE_010 ());}
@@ -153,7 +153,7 @@ module OneM2M_TestControl_MN_profile {
if(true) {execute (TC_CSE_DMR_UPD_005());}
if(true) {execute (TC_CSE_DMR_UPD_007_CNT_CT());}
if(true) {execute (TC_CSE_DMR_UPD_009_CNT_EXC());}
- if(true) {execute (TC_CSE_DMR_UPD_010());}
+ if(true) {execute (TC_CSE_DMR_UPD_010_CNT());}
if(true) {execute (TC_CSE_DMR_UPD_016_CNT_ET());}
if(true) {execute (TC_CSE_DMR_DEL_001_CNT());}
if(true) {execute (TC_CSE_DMR_DEL_005 ());}
@@ -170,7 +170,7 @@ module OneM2M_TestControl_MN_profile {
if(true) {execute (TC_CSE_DMR_CRE_005_MBS());}
if(true) {execute (TC_CSE_DMR_CRE_006_MBS());}
if(PICS_CNT_MBS) {execute (TC_CSE_DMR_CRE_012_CNT_MBS());}
- if(true) {execute (TC_CSE_DMR_CRE_013());}
+ if(true) {execute (TC_CSE_DMR_CRE_013_CNT_CIN());}
if(PICS_CNT_MBS) {execute (TC_CSE_DMR_UPD_014_CNT_MBS());}
if(PICS_CNT_MBS) {execute (TC_CSE_DMR_UPD_015_CNT_MBS());}
if(true) {execute (TC_CSE_DMR_CRE_005_MIA());}
@@ -182,7 +182,7 @@ module OneM2M_TestControl_MN_profile {
//CE_DMR_00002
if(true) {execute (TC_CSE_DMR_CRE_001_CIN_CNT());}
if(true) {execute (TC_CSE_DMR_RET_001_CIN());}
- if(true) {execute (TC_CSE_DMR_UPD_011());}
+ if(true) {execute (TC_CSE_DMR_UPD_011_CNT_CIN());}
if(true) {execute (TC_CSE_DMR_DEL_001_CIN());}
if(PICS_CIN_LBL) {execute (TC_CSE_DMR_CRE_012_CIN_LBL());}
if(PICS_CIN_CR) {execute (TC_CSE_DMR_CRE_012_CIN_CR());}
diff --git a/OneM2M_Testcases_CSE_Release_1.ttcn b/OneM2M_Testcases_CSE_Release_1.ttcn
index 31df47ff55b36460195ff76075dbfefaf784989b..c4b94f1a8d39225a5dc290df30783f8e23078832 100644
--- a/OneM2M_Testcases_CSE_Release_1.ttcn
+++ b/OneM2M_Testcases_CSE_Release_1.ttcn
@@ -4130,90 +4130,30 @@ module OneM2M_Testcases_CSE_Release_1 {
}
}// end group g_CSE_DMR_CRE_006
-
- /**
- * @desc Check that the IUT responds with error when the newly created <contentInstance> results in that the field value of attribute currentNrOfInstances exceeds the field value of maxNrOfInstances in the parent container resource.
- *
- */
- testcase TC_CSE_DMR_CRE_007() runs on Tester system CseSystem {
-
- var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-
- v_ae1.start(f_CSE_DMR_CRE_007());
-
- v_ae1.done;
-
- }
-
- function f_CSE_DMR_CRE_007() runs on AeSimu {
- // Local variables
- var template RequestPrimitive v_createRequestContainer := m_createContainerBase;
- var template RequestPrimitive v_createRequestContentInstance := m_createContentInstanceBase;
- var MsgIn v_response;
- var RequestPrimitive v_request;
- var integer v_aeIndex := -1;
- var integer v_containerIndex := -1;
- var integer v_contentInstanceIndex := -1;
- const integer c_maxNumberOfInstances := 1;
- // Test control
-
- // Test component configuration
- f_cf01Up();
-
- // Test adapter configuration
-
- // Preamble
- v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
-
- v_createRequestContainer.primitiveContent.container.maxNrOfInstances := c_maxNumberOfInstances;
-
- v_containerIndex := f_cse_createResource(int3, v_createRequestContainer, v_aeIndex); //Container
-
- v_contentInstanceIndex := f_cse_createResource(int4, m_createContentInstanceBase, v_containerIndex); //ContentInstance
-
- // Test Body
-
- v_createRequestContentInstance.primitiveContent.contentInstance.resourceName := c_defaultContentInstanceResourceName & "2"; //ContentInstance 2
- v_request := f_getCreateRequestPrimitive(int4, v_createRequestContentInstance, v_containerIndex);
-
- f_send(e_mca_port, m_request(v_request));
- tc_ac.start;
- alt {
- [] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
- tc_ac.stop;
- setverdict(pass, __SCOPE__ & ": ContentInstance created");
- }
- [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
- tc_ac.stop;
- setverdict(fail, __SCOPE__ & ": Wrong response status code in the response");
- }
- [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
- tc_ac.stop;
- setverdict(fail, __SCOPE__ & ": Error while creating resource type contentInstance");
-
- }
- [] tc_ac.timeout {
- setverdict(fail, __SCOPE__ & ": No answer while creating resource type contentInstance");
- }
- }
-
- f_checkAeSimuStatus();
-
- //Check to see if the resource is NOT present
- if(f_cse_isResourceNotPresent(v_containerIndex, c_defaultContentInstanceResourceName)){
- setverdict(pass, __SCOPE__ & ":INFO: Oldest contentInstance has been removed to allow the creation of the new contentInstance");
- } else {
- setverdict(fail, __SCOPE__ & ":ERROR: Oldest contentInstance has not been removed to allow the creation of the new contentInstance");
- }
-
- // Postamble
- f_cse_postamble_deleteResources();
+
+ group g_CSE_DMR_CRE_007 {
- // Tear down
- f_cf01Down();
-
- }//end f_CSE_DMR_CRE_007
+ /**
+ * @desc Checks that the IUT accepts a newly created RESOURCE_TYPE when the currentNrOfInstances exceeds the field value set in maxNrOfInstances in the PARENT_RESOURCE_TYPE resource by removing enough of the oldest RESOURCE_TYPE resources to allow the creation of the new RESOURCE_TYPE resource
+ *
+ */
+ testcase TC_CSE_DMR_CRE_007_CNT_CIN() runs on Tester system CseSystem {
+ // Local variables
+ var template RequestPrimitive v_createRequestContainer := m_createContainerBase;
+ var template RequestPrimitive v_createRequestContentInstance1 := m_createContentInstanceBase;
+ var template RequestPrimitive v_createRequestContentInstance2 := m_createContentInstanceBase;
+ const integer c_maxNumberOfInstances := 1;
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+ v_createRequestContainer.primitiveContent.container.maxNrOfInstances := c_maxNumberOfInstances;
+ v_createRequestContentInstance2.primitiveContent.contentInstance.resourceName := c_defaultContentInstanceResourceName & "2"; //Resource 2
+
+ v_ae1.start(f_CSE_DMR_CRE_007(int3, v_createRequestContainer, int4, v_createRequestContentInstance1, v_createRequestContentInstance2, c_defaultContentInstanceResourceName));//ContentInstance under Container
+ v_ae1.done;
+ }
+
+ }// end group g_CSE_DMR_CRE_007
+
/**
* @desc Checks that the IUT accepts a newly created contentInstance when the currentByteSize exceeds the field value set in maxByteSize in the parent container resource by removing enough of the oldest <contentInstance> resources to allow the creation of the new <contentInstance> resource.
*
@@ -4694,75 +4634,28 @@ module OneM2M_Testcases_CSE_Release_1 {
}
}// end group g_CSE_DMR_CRE_012
+
+ group g_CSE_DMR_CRE_013 {
+
+ /**
+ * @desc Check that the IUT rejects the CREATE Request of a RESOURCE_TYPE resource with error “NOT_ACCEPTABLE†when contentSize exceeds maxByteSize of the PARENT_RESOURCE_TYPE
+ *
+ */
+ testcase TC_CSE_DMR_CRE_013_CNT_CIN() runs on Tester system CseSystem {
+ // Local variables
+ var template RequestPrimitive v_createRequestContainer := m_createContainerBase;
+ var template RequestPrimitive v_createRequestContentInstance := m_createContentInstanceBase;
+ const integer c_maxByteSize := 1;
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+
+ v_createRequestContainer.primitiveContent.container.maxByteSize := c_maxByteSize;
- /**
- * @desc Check that the IUT rejects the CREATE Request of a contentInstance resource with error “NOT_ACCEPTABLE†when contentSize exceeds maxByteSize
- *
- */
- testcase TC_CSE_DMR_CRE_013() runs on Tester system CseSystem {
-
- var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-
- v_ae1.start(f_CSE_DMR_CRE_013());
-
- v_ae1.done;
-
- }
-
- function f_CSE_DMR_CRE_013() runs on AeSimu {
- // Local variables
- var template RequestPrimitive v_createRequest := m_createContainerBase;
- var MsgIn v_response;
- var RequestPrimitive v_request;
- var integer v_aeIndex := -1;
- var integer v_containerIndex := -1;
- const integer c_maxByteSize := 1;
- // Test control
-
- // Test component configuration
- f_cf01Up();
-
- // Test adapter configuration
-
- // Preamble
- v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
-
- v_createRequest.primitiveContent.container.maxByteSize := c_maxByteSize;
-
- v_containerIndex := f_cse_createResource(int3, v_createRequest, v_aeIndex);
+ v_ae1.start(f_CSE_DMR_CRE_013(int3, v_createRequestContainer, int4, v_createRequestContentInstance));//ContentInstance under Container
+ v_ae1.done;
+ }
- // Test Body
- v_request := f_getCreateRequestPrimitive(int4, m_createContentInstanceBase, v_containerIndex);
+ }// end group g_CSE_DMR_CRE_013
- f_send(e_mca_port, m_request(v_request));
- tc_ac.start;
- alt {
- [] mcaPort.receive(mw_response(mw_responsePrimitive(int5207))) -> value v_response {
- tc_ac.stop;
- setverdict(pass, __SCOPE__ & ": Maximum byte size exceeded");
- }
- [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
- tc_ac.stop;
- setverdict(fail, __SCOPE__ & ": Bad responseStatusCode in response");
- }
-
- [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
- tc_ac.stop;
- setverdict(fail, __SCOPE__ & ": Accepted creation of contentInstance exceding maximum byte size");
- }
- [] tc_ac.timeout {
- setverdict(fail, __SCOPE__ & ": No answer while creating resource type 4");
- }
- }
-
- // Postamble
- f_cse_postamble_deleteResources();
-
- // Tear down
- f_cf01Down();
-
- }//end f_CSE_DMR_CRE_013
-
group g_CSE_DMR_CRE_014 {
/**
@@ -6428,159 +6321,73 @@ module OneM2M_Testcases_CSE_Release_1 {
} // end g_CSE_DMR_UPD_009
- /**
- * @desc Check that the stateTag attribute of a container resource is increased when an update operation has been performed on its child resource
- *
- */
- testcase TC_CSE_DMR_UPD_010() runs on Tester system CseSystem {
-
- var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-
- v_ae1.start(f_CSE_DMR_UPD_010());
-
- v_ae1.done;
-
- }
- function f_CSE_DMR_UPD_010() runs on AeSimu {
- var MsgIn v_response;
- var integer v_aeIndex := -1;
- var integer v_containerIndex := -1;
- var RequestPrimitive v_updateRequest := valueof(m_updateContainerBase);
- var Labels v_labels_1:= {"VALUE_1"};
- v_updateRequest.primitiveContent.container.labels := v_labels_1;
-
- // 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
- if(ispresent(vc_resourcesList[v_containerIndex].resource.container.stateTag)) {
+ group g_CSE_DMR_UPD_010{
+
+ /**
+ * @desc Check that the stateTag attribute of a RESOURCE_TYPE resource is increased when an update operation has been performed on its child resource
+ *
+ */
+ testcase TC_CSE_DMR_UPD_010_CNT() runs on Tester system CseSystem {
+ // Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+ var RequestPrimitive v_updateRequest := valueof(m_updateContainerBase);
+ var template RequestPrimitive v_createRequest := m_createContainerBase;
+ var Labels v_labels_1:= {"VALUE_1"};
+ var PrimitiveContent v_primitiveContentRetrieveResource;
+
+
+ v_updateRequest.primitiveContent.container.labels := v_labels_1;
+
+ v_ae1.start(f_CSE_DMR_UPD_010(int3, v_createRequest, v_updateRequest));//Container
+ v_ae1.done;
- f_cse_updateResource(int3, v_containerIndex, v_updateRequest);
-
- f_send(e_mca_port, m_request(m_retrieve(f_getResourceAddress(v_containerIndex), f_getOriginator(v_containerIndex))));
-
- tc_ac.start;
- alt {
- [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
- tc_ac.stop;
- if(v_response.primitive.responsePrimitive.primitiveContent.container.stateTag == 1) { //(Create and Delete)
+ if(getverdict == pass){
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+ //Check that stateTag has been incremented
+ if(ischosen(v_primitiveContentRetrieveResource.container)) {
+ if(v_primitiveContentRetrieveResource.container.stateTag == 1){
setverdict(pass, __SCOPE__ & ": The stateTag attribute is incremented");
- }
- else{
+ }else{
setverdict(fail, __SCOPE__ & ": Error the stateTag attribute is not incremented");
- }
- }
- [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
- tc_ac.stop;
- setverdict(fail, __SCOPE__ & ": Error while retrieving resource attributes");
- }
- [] tc_ac.timeout {
- setverdict(fail, __SCOPE__ & ": No answer while retrieving resource attributes");
+ }
}
- }
-
- }//end if
- else{
- setverdict(fail, __SCOPE__ & ": Error the stateTag attribute is empty");
+ }
}
- // Postamble
- f_cse_postamble_deleteResources();
-
- // Tear down
- f_cf01Down();
-
- }//end f_CSE_DMR_UPD_010
-
- /**
- * @desc Check that the IUT rejects the UPDATE Request of an existing contentInstance resource with error “OPERATION_NOT_ALLOWEDâ€
- *
- */
- testcase TC_CSE_DMR_UPD_011() runs on Tester system CseSystem {
-
- var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-
- v_ae1.start(f_CSE_DMR_UPD_011());
-
- v_ae1.done;
-
- }
- function f_CSE_DMR_UPD_011() runs on AeSimu {
- // 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 template RequestPrimitive v_updateRequest := m_updateContentInstanceBase;
- var Labels v_labels:= {"LABEL"};
- var PrimitiveContent v_primitiveContentRetrieveResource;
-
- v_updateRequest.primitiveContent.contentInstance.labels := v_labels;
-
- // 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);
+ } // end g_CSE_DMR_UPD_010
+
+ group g_CSE_DMR_UPD_011{
- //Test Body
- v_request := f_getUpdateRequestPrimitive(int4, v_contentInstanceIndex, v_updateRequest);
+ /**
+ * @desc Check that the IUT rejects the UPDATE Request of an existing RESOURCE_TYPE resource with error “OPERATION_NOT_ALLOWEDâ€
+ *
+ */
+ testcase TC_CSE_DMR_UPD_011_CNT_CIN() runs on Tester system CseSystem {
+ // Local variables
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+ var template RequestPrimitive v_updateRequest := m_updateContentInstanceBase;
+ var Labels v_labels:= {"LABEL"};
+ var template RequestPrimitive v_createParentRequest := m_createContainerBase;
+ var template RequestPrimitive v_createChildRequest := m_createContentInstanceBase;
+ var PrimitiveContent v_primitiveContentRetrieveResource;
+
+ v_updateRequest.primitiveContent.contentInstance.labels := v_labels;
- f_send(e_mca_port, m_request(v_request));
- tc_ac.start;
- alt {
- [] mcaPort.receive(mw_response(mw_responsePrimitive(int4005))) -> value v_response {
- tc_ac.stop;
- setverdict(pass, __SCOPE__ & ": Not allowed to update a contentInstance with error OPERATION_NOT_ALLOWED");
- }
- [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
- tc_ac.stop;
- setverdict(fail, __SCOPE__ & ": Wrong response status code");
- }
- [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
- tc_ac.stop;
- setverdict(fail, __SCOPE__ & ": Accepted update of contentInstance");
- }
- [] tc_ac.timeout {
- setverdict(fail, __SCOPE__ & ": No answer while updating contentInstance");
- }
- }
-
- v_primitiveContentRetrieveResource:=f_cse_retrieveResource(v_contentInstanceIndex);
- if(getverdict == pass){
- //Check that the resource has NOT been udpated
+ v_ae1.start(f_CSE_DMR_UPD_011(int3, v_createParentRequest, int4, v_createChildRequest, v_updateRequest));//ContentInstance under Container
+ v_ae1.done;
+
+ if(getverdict == pass){
+ v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
+ //Check that the resource has NOT been udpated
if(ischosen(v_primitiveContentRetrieveResource.contentInstance)) {
- if(v_primitiveContentRetrieveResource.contentInstance.labels == v_labels){
- setverdict(fail, __SCOPE__ & ": Error: Labels attribute updated")
- }
- }
+ if(v_primitiveContentRetrieveResource.contentInstance.labels == v_labels){
+ setverdict(fail, __SCOPE__ & ": Error: Labels attribute updated")
+ }
+ }
+ }
}
-
- // Postamble
- f_cse_postamble_deleteResources();
-
- // Tear down
- f_cf01Down();
- }//end f_CSE_DMR_UPD_011
+ } // end g_CSE_DMR_UPD_011
/**
* @desc Check that the IUT rejects the UPDATE Request of a latest resource as a direct child of a <container> resource with error “OPERATION_NOT_ALLOWEDâ€
diff --git a/OneM2M_Testcases_CSE_Release_2.ttcn b/OneM2M_Testcases_CSE_Release_2.ttcn
index b7d8fa814994de21377686e809a0da78e2feca37..093d321b918b00599d8c5572d2fc8c6c485e1da9 100644
--- a/OneM2M_Testcases_CSE_Release_2.ttcn
+++ b/OneM2M_Testcases_CSE_Release_2.ttcn
@@ -754,29 +754,6 @@ module OneM2M_Testcases_CSE_Release_2 {
}// end group g_CSE_DMR_CRE_006
- group g_CSE_DMR_CRE_007 {
-
- /**
- * @desc Checks that the IUT accepts a newly created RESOURCE_TYPE when the currentNrOfInstances exceeds the field value set in maxNrOfInstances in the PARENT_RESOURCE_TYPE resource by removing enough of the oldest RESOURCE_TYPE resources to allow the creation of the new RESOURCE_TYPE resource
- *
- */
- testcase TC_CSE_DMR_CRE_007_CNT_CIN() runs on Tester system CseSystem {
- // Local variables
- var template RequestPrimitive v_createRequestContainer := m_createContainerBase;
- var template RequestPrimitive v_createRequestContentInstance1 := m_createContentInstanceBase;
- var template RequestPrimitive v_createRequestContentInstance2 := m_createContentInstanceBase;
- const integer c_maxNumberOfInstances := 1;
- var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-
- v_createRequestContainer.primitiveContent.container.maxNrOfInstances := c_maxNumberOfInstances;
- v_createRequestContentInstance2.primitiveContent.contentInstance.resourceName := c_defaultContentInstanceResourceName & "2"; //Resource 2
-
- v_ae1.start(f_CSE_DMR_CRE_007(int3, v_createRequestContainer, int4, v_createRequestContentInstance1, v_createRequestContentInstance2, c_defaultContentInstanceResourceName));//ContentInstance under Container
- v_ae1.done;
- }
-
- }// end group g_CSE_DMR_CRE_007
-
group g_CSE_DMR_CRE_008 {
/**
@@ -803,29 +780,7 @@ module OneM2M_Testcases_CSE_Release_2 {
}
}// end group g_CSE_DMR_CRE_008
-
-
- group g_CSE_DMR_CRE_013 {
-
- /**
- * @desc Check that the IUT rejects the CREATE Request of a RESOURCE_TYPE resource with error “NOT_ACCEPTABLE†when contentSize exceeds maxByteSize of the PARENT_RESOURCE_TYPE
- *
- */
- testcase TC_CSE_DMR_CRE_013_CNT_CIN() runs on Tester system CseSystem {
- // Local variables
- var template RequestPrimitive v_createRequestContainer := m_createContainerBase;
- var template RequestPrimitive v_createRequestContentInstance := m_createContentInstanceBase;
- const integer c_maxByteSize := 1;
- var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-
- v_createRequestContainer.primitiveContent.container.maxByteSize := c_maxByteSize;
-
- v_ae1.start(f_CSE_DMR_CRE_013(int3, v_createRequestContainer, int4, v_createRequestContentInstance));//ContentInstance under Container
- v_ae1.done;
- }
-
- }// end group g_CSE_DMR_CRE_013
-
+
group g_CSE_DMR_CRE_015 {
/**
@@ -1757,74 +1712,6 @@ module OneM2M_Testcases_CSE_Release_2 {
} // end g_CSE_DMR_UPD_009
- group g_CSE_DMR_UPD_010{
-
- /**
- * @desc Check that the stateTag attribute of a RESOURCE_TYPE resource is increased when an update operation has been performed on its child resource
- *
- */
- testcase TC_CSE_DMR_UPD_010_CNT() runs on Tester system CseSystem {
- // Local variables
- var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var RequestPrimitive v_updateRequest := valueof(m_updateContainerBase);
- var template RequestPrimitive v_createRequest := m_createContainerBase;
- var Labels v_labels_1:= {"VALUE_1"};
- var PrimitiveContent v_primitiveContentRetrieveResource;
-
-
- v_updateRequest.primitiveContent.container.labels := v_labels_1;
-
- v_ae1.start(f_CSE_DMR_UPD_010(int3, v_createRequest, v_updateRequest));//Container
- v_ae1.done;
-
- if(getverdict == pass){
- v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
- //Check that stateTag has been incremented
- if(ischosen(v_primitiveContentRetrieveResource.container)) {
- if(v_primitiveContentRetrieveResource.container.stateTag == 1){
- setverdict(pass, __SCOPE__ & ": The stateTag attribute is incremented");
- }else{
- setverdict(fail, __SCOPE__ & ": Error the stateTag attribute is not incremented");
- }
- }
- }
- }
-
- } // end g_CSE_DMR_UPD_010
-
- group g_CSE_DMR_UPD_011{
-
- /**
- * @desc Check that the IUT rejects the UPDATE Request of an existing RESOURCE_TYPE resource with error “OPERATION_NOT_ALLOWEDâ€
- *
- */
- testcase TC_CSE_DMR_UPD_011_CNT_CNI() runs on Tester system CseSystem {
- // Local variables
- var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var template RequestPrimitive v_updateRequest := m_updateContentInstanceBase;
- var Labels v_labels:= {"LABEL"};
- var template RequestPrimitive v_createParentRequest := m_createContainerBase;
- var template RequestPrimitive v_createChildRequest := m_createContentInstanceBase;
- var PrimitiveContent v_primitiveContentRetrieveResource;
-
- v_updateRequest.primitiveContent.contentInstance.labels := v_labels;
-
- v_ae1.start(f_CSE_DMR_UPD_011(int3, v_createParentRequest, int4, v_createChildRequest, v_updateRequest));//ContentInstance under Container
- v_ae1.done;
-
- if(getverdict == pass){
- v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
- //Check that the resource has NOT been udpated
- if(ischosen(v_primitiveContentRetrieveResource.contentInstance)) {
- if(v_primitiveContentRetrieveResource.contentInstance.labels == v_labels){
- setverdict(fail, __SCOPE__ & ": Error: Labels attribute updated")
- }
- }
- }
- }
-
- } // end g_CSE_DMR_UPD_011
-
group g_CSE_DMR_UPD_014 {
/**