Commit e0079783d70e707ef9ed43374ab75f5a1d5d0638

Authored by Miguel Angel Reina Ortega
1 parent b8404c32

Adaptation of test cases transformed into permutations

Signed-off-by: reinaortega <miguelangel.reinaortega@etsi.org>
... ... @@ -115,7 +115,7 @@ module OneM2M_TestControl_IN_profile {
115 115 if(true) {execute (TC_CSE_DMR_CRE_001_CNT_CNT());}
116 116 if(true) {execute (TC_CSE_DMR_CRE_002_CNT());}
117 117 if(true) {execute (TC_CSE_DMR_CRE_003_CNT());}
118   - if(true) {execute (TC_CSE_DMR_CRE_007 ());}
  118 + if(true) {execute (TC_CSE_DMR_CRE_007_CNT_CIN ());}
119 119 if(true) {execute (TC_CSE_DMR_CRE_008 ());}
120 120 if(true) {execute (TC_CSE_DMR_CRE_009 ());}
121 121 if(true) {execute (TC_CSE_DMR_CRE_010 ());}
... ... @@ -130,7 +130,7 @@ module OneM2M_TestControl_IN_profile {
130 130 if(true) {execute (TC_CSE_DMR_UPD_005());}
131 131 if(true) {execute (TC_CSE_DMR_UPD_007_CNT_CT());}
132 132 if(true) {execute (TC_CSE_DMR_UPD_009_CNT_EXC());}
133   - if(true) {execute (TC_CSE_DMR_UPD_010 ());}
  133 + if(true) {execute (TC_CSE_DMR_UPD_010_CNT ());}
134 134 if(true) {execute (TC_CSE_DMR_UPD_016_CNT_ET());}
135 135 if(true) {execute (TC_CSE_DMR_DEL_001_CNT());}
136 136 if(true) {execute (TC_CSE_DMR_DEL_005 ());}
... ... @@ -147,7 +147,7 @@ module OneM2M_TestControl_IN_profile {
147 147 if(true) {execute (TC_CSE_DMR_CRE_005_MBS());}
148 148 if(true) {execute (TC_CSE_DMR_CRE_006_MBS());}
149 149 if(PICS_CNT_MBS) {execute (TC_CSE_DMR_CRE_012_CNT_MBS());}
150   - if(true) {execute (TC_CSE_DMR_CRE_013());}
  150 + if(true) {execute (TC_CSE_DMR_CRE_013_CNT_CIN());}
151 151 if(PICS_CNT_MBS) {execute (TC_CSE_DMR_UPD_014_CNT_MBS());}
152 152 if(PICS_CNT_MBS) {execute (TC_CSE_DMR_UPD_015_CNT_MBS());}
153 153 if(true) {execute (TC_CSE_DMR_CRE_005_MIA());}
... ... @@ -159,7 +159,7 @@ module OneM2M_TestControl_IN_profile {
159 159 //CE_DMR_00002
160 160 if(true) {execute (TC_CSE_DMR_CRE_001_CIN_CNT());}
161 161 if(true) {execute (TC_CSE_DMR_RET_001_CIN());}
162   - if(true) {execute (TC_CSE_DMR_UPD_011());}
  162 + if(true) {execute (TC_CSE_DMR_UPD_011_CNT_CIN());}
163 163 if(true) {execute (TC_CSE_DMR_DEL_001_CIN());}
164 164 if(PICS_CIN_LBL) {execute (TC_CSE_DMR_CRE_012_CIN_LBL());}
165 165 if(PICS_CIN_CR) {execute (TC_CSE_DMR_CRE_012_CIN_CR());}
... ...
... ... @@ -138,7 +138,7 @@ module OneM2M_TestControl_MN_profile {
138 138 if(true) {execute (TC_CSE_DMR_CRE_001_CNT_CNT());}
139 139 if(true) {execute (TC_CSE_DMR_CRE_002_CNT());}
140 140 if(true) {execute (TC_CSE_DMR_CRE_003_CNT());}
141   - if(true) {execute (TC_CSE_DMR_CRE_007 ());}
  141 + if(true) {execute (TC_CSE_DMR_CRE_007_CNT_CIN ());}
142 142 if(true) {execute (TC_CSE_DMR_CRE_008 ());}
143 143 if(true) {execute (TC_CSE_DMR_CRE_009 ());}
144 144 if(true) {execute (TC_CSE_DMR_CRE_010 ());}
... ... @@ -153,7 +153,7 @@ module OneM2M_TestControl_MN_profile {
153 153 if(true) {execute (TC_CSE_DMR_UPD_005());}
154 154 if(true) {execute (TC_CSE_DMR_UPD_007_CNT_CT());}
155 155 if(true) {execute (TC_CSE_DMR_UPD_009_CNT_EXC());}
156   - if(true) {execute (TC_CSE_DMR_UPD_010());}
  156 + if(true) {execute (TC_CSE_DMR_UPD_010_CNT());}
157 157 if(true) {execute (TC_CSE_DMR_UPD_016_CNT_ET());}
158 158 if(true) {execute (TC_CSE_DMR_DEL_001_CNT());}
159 159 if(true) {execute (TC_CSE_DMR_DEL_005 ());}
... ... @@ -170,7 +170,7 @@ module OneM2M_TestControl_MN_profile {
170 170 if(true) {execute (TC_CSE_DMR_CRE_005_MBS());}
171 171 if(true) {execute (TC_CSE_DMR_CRE_006_MBS());}
172 172 if(PICS_CNT_MBS) {execute (TC_CSE_DMR_CRE_012_CNT_MBS());}
173   - if(true) {execute (TC_CSE_DMR_CRE_013());}
  173 + if(true) {execute (TC_CSE_DMR_CRE_013_CNT_CIN());}
174 174 if(PICS_CNT_MBS) {execute (TC_CSE_DMR_UPD_014_CNT_MBS());}
175 175 if(PICS_CNT_MBS) {execute (TC_CSE_DMR_UPD_015_CNT_MBS());}
176 176 if(true) {execute (TC_CSE_DMR_CRE_005_MIA());}
... ... @@ -182,7 +182,7 @@ module OneM2M_TestControl_MN_profile {
182 182 //CE_DMR_00002
183 183 if(true) {execute (TC_CSE_DMR_CRE_001_CIN_CNT());}
184 184 if(true) {execute (TC_CSE_DMR_RET_001_CIN());}
185   - if(true) {execute (TC_CSE_DMR_UPD_011());}
  185 + if(true) {execute (TC_CSE_DMR_UPD_011_CNT_CIN());}
186 186 if(true) {execute (TC_CSE_DMR_DEL_001_CIN());}
187 187 if(PICS_CIN_LBL) {execute (TC_CSE_DMR_CRE_012_CIN_LBL());}
188 188 if(PICS_CIN_CR) {execute (TC_CSE_DMR_CRE_012_CIN_CR());}
... ...
... ... @@ -4130,90 +4130,30 @@ module OneM2M_Testcases_CSE_Release_1 {
4130 4130 }
4131 4131  
4132 4132 }// end group g_CSE_DMR_CRE_006
4133   -
4134   - /**
4135   - * @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.
4136   - *
4137   - */
4138   - testcase TC_CSE_DMR_CRE_007() runs on Tester system CseSystem {
4139   -
4140   - var AeSimu v_ae1 := AeSimu.create("AE1") alive;
4141   -
4142   - v_ae1.start(f_CSE_DMR_CRE_007());
4143   -
4144   - v_ae1.done;
4145   -
4146   - }
4147   -
4148   - function f_CSE_DMR_CRE_007() runs on AeSimu {
4149   - // Local variables
4150   - var template RequestPrimitive v_createRequestContainer := m_createContainerBase;
4151   - var template RequestPrimitive v_createRequestContentInstance := m_createContentInstanceBase;
4152   - var MsgIn v_response;
4153   - var RequestPrimitive v_request;
4154   - var integer v_aeIndex := -1;
4155   - var integer v_containerIndex := -1;
4156   - var integer v_contentInstanceIndex := -1;
4157   - const integer c_maxNumberOfInstances := 1;
4158   - // Test control
4159   -
4160   - // Test component configuration
4161   - f_cf01Up();
4162   -
4163   - // Test adapter configuration
4164   -
4165   - // Preamble
4166   - v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
4167   -
4168   - v_createRequestContainer.primitiveContent.container.maxNrOfInstances := c_maxNumberOfInstances;
4169   -
4170   - v_containerIndex := f_cse_createResource(int3, v_createRequestContainer, v_aeIndex); //Container
4171   -
4172   - v_contentInstanceIndex := f_cse_createResource(int4, m_createContentInstanceBase, v_containerIndex); //ContentInstance
4173   -
4174   - // Test Body
4175   -
4176   - v_createRequestContentInstance.primitiveContent.contentInstance.resourceName := c_defaultContentInstanceResourceName & "2"; //ContentInstance 2
4177   - v_request := f_getCreateRequestPrimitive(int4, v_createRequestContentInstance, v_containerIndex);
4178   -
4179   - f_send(e_mca_port, m_request(v_request));
4180   - tc_ac.start;
4181   - alt {
4182   - [] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
4183   - tc_ac.stop;
4184   - setverdict(pass, __SCOPE__ & ": ContentInstance created");
4185   - }
4186   - [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
4187   - tc_ac.stop;
4188   - setverdict(fail, __SCOPE__ & ": Wrong response status code in the response");
4189   - }
4190   - [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
4191   - tc_ac.stop;
4192   - setverdict(fail, __SCOPE__ & ": Error while creating resource type contentInstance");
4193   -
4194   - }
4195   - [] tc_ac.timeout {
4196   - setverdict(fail, __SCOPE__ & ": No answer while creating resource type contentInstance");
4197   - }
4198   - }
4199   -
4200   - f_checkAeSimuStatus();
4201   -
4202   - //Check to see if the resource is NOT present
4203   - if(f_cse_isResourceNotPresent(v_containerIndex, c_defaultContentInstanceResourceName)){
4204   - setverdict(pass, __SCOPE__ & ":INFO: Oldest contentInstance has been removed to allow the creation of the new contentInstance");
4205   - } else {
4206   - setverdict(fail, __SCOPE__ & ":ERROR: Oldest contentInstance has not been removed to allow the creation of the new contentInstance");
4207   - }
4208   -
4209   - // Postamble
4210   - f_cse_postamble_deleteResources();
  4133 +
  4134 + group g_CSE_DMR_CRE_007 {
4211 4135  
4212   - // Tear down
4213   - f_cf01Down();
4214   -
4215   - }//end f_CSE_DMR_CRE_007
  4136 + /**
  4137 + * @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
  4138 + *
  4139 + */
  4140 + testcase TC_CSE_DMR_CRE_007_CNT_CIN() runs on Tester system CseSystem {
  4141 + // Local variables
  4142 + var template RequestPrimitive v_createRequestContainer := m_createContainerBase;
  4143 + var template RequestPrimitive v_createRequestContentInstance1 := m_createContentInstanceBase;
  4144 + var template RequestPrimitive v_createRequestContentInstance2 := m_createContentInstanceBase;
  4145 + const integer c_maxNumberOfInstances := 1;
  4146 + var AeSimu v_ae1 := AeSimu.create("AE1") alive;
4216 4147  
  4148 + v_createRequestContainer.primitiveContent.container.maxNrOfInstances := c_maxNumberOfInstances;
  4149 + v_createRequestContentInstance2.primitiveContent.contentInstance.resourceName := c_defaultContentInstanceResourceName & "2"; //Resource 2
  4150 +
  4151 + v_ae1.start(f_CSE_DMR_CRE_007(int3, v_createRequestContainer, int4, v_createRequestContentInstance1, v_createRequestContentInstance2, c_defaultContentInstanceResourceName));//ContentInstance under Container
  4152 + v_ae1.done;
  4153 + }
  4154 +
  4155 + }// end group g_CSE_DMR_CRE_007
  4156 +
4217 4157 /**
4218 4158 * @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.
4219 4159 *
... ... @@ -4694,75 +4634,28 @@ module OneM2M_Testcases_CSE_Release_1 {
4694 4634 }
4695 4635  
4696 4636 }// end group g_CSE_DMR_CRE_012
  4637 +
  4638 + group g_CSE_DMR_CRE_013 {
  4639 +
  4640 + /**
  4641 + * @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
  4642 + *
  4643 + */
  4644 + testcase TC_CSE_DMR_CRE_013_CNT_CIN() runs on Tester system CseSystem {
  4645 + // Local variables
  4646 + var template RequestPrimitive v_createRequestContainer := m_createContainerBase;
  4647 + var template RequestPrimitive v_createRequestContentInstance := m_createContentInstanceBase;
  4648 + const integer c_maxByteSize := 1;
  4649 + var AeSimu v_ae1 := AeSimu.create("AE1") alive;
  4650 +
  4651 + v_createRequestContainer.primitiveContent.container.maxByteSize := c_maxByteSize;
4697 4652  
4698   - /**
4699   - * @desc Check that the IUT rejects the CREATE Request of a contentInstance resource with error “NOT_ACCEPTABLE” when contentSize exceeds maxByteSize
4700   - *
4701   - */
4702   - testcase TC_CSE_DMR_CRE_013() runs on Tester system CseSystem {
4703   -
4704   - var AeSimu v_ae1 := AeSimu.create("AE1") alive;
4705   -
4706   - v_ae1.start(f_CSE_DMR_CRE_013());
4707   -
4708   - v_ae1.done;
4709   -
4710   - }
4711   -
4712   - function f_CSE_DMR_CRE_013() runs on AeSimu {
4713   - // Local variables
4714   - var template RequestPrimitive v_createRequest := m_createContainerBase;
4715   - var MsgIn v_response;
4716   - var RequestPrimitive v_request;
4717   - var integer v_aeIndex := -1;
4718   - var integer v_containerIndex := -1;
4719   - const integer c_maxByteSize := 1;
4720   - // Test control
4721   -
4722   - // Test component configuration
4723   - f_cf01Up();
4724   -
4725   - // Test adapter configuration
4726   -
4727   - // Preamble
4728   - v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
4729   -
4730   - v_createRequest.primitiveContent.container.maxByteSize := c_maxByteSize;
4731   -
4732   - v_containerIndex := f_cse_createResource(int3, v_createRequest, v_aeIndex);
  4653 + v_ae1.start(f_CSE_DMR_CRE_013(int3, v_createRequestContainer, int4, v_createRequestContentInstance));//ContentInstance under Container
  4654 + v_ae1.done;
  4655 + }
4733 4656  
4734   - // Test Body
4735   - v_request := f_getCreateRequestPrimitive(int4, m_createContentInstanceBase, v_containerIndex);
  4657 + }// end group g_CSE_DMR_CRE_013
4736 4658  
4737   - f_send(e_mca_port, m_request(v_request));
4738   - tc_ac.start;
4739   - alt {
4740   - [] mcaPort.receive(mw_response(mw_responsePrimitive(int5207))) -> value v_response {
4741   - tc_ac.stop;
4742   - setverdict(pass, __SCOPE__ & ": Maximum byte size exceeded");
4743   - }
4744   - [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
4745   - tc_ac.stop;
4746   - setverdict(fail, __SCOPE__ & ": Bad responseStatusCode in response");
4747   - }
4748   -
4749   - [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
4750   - tc_ac.stop;
4751   - setverdict(fail, __SCOPE__ & ": Accepted creation of contentInstance exceding maximum byte size");
4752   - }
4753   - [] tc_ac.timeout {
4754   - setverdict(fail, __SCOPE__ & ": No answer while creating resource type 4");
4755   - }
4756   - }
4757   -
4758   - // Postamble
4759   - f_cse_postamble_deleteResources();
4760   -
4761   - // Tear down
4762   - f_cf01Down();
4763   -
4764   - }//end f_CSE_DMR_CRE_013
4765   -
4766 4659 group g_CSE_DMR_CRE_014 {
4767 4660  
4768 4661 /**
... ... @@ -6428,159 +6321,73 @@ module OneM2M_Testcases_CSE_Release_1 {
6428 6321  
6429 6322 } // end g_CSE_DMR_UPD_009
6430 6323  
6431   - /**
6432   - * @desc Check that the stateTag attribute of a container resource is increased when an update operation has been performed on its child resource
6433   - *
6434   - */
6435   - testcase TC_CSE_DMR_UPD_010() runs on Tester system CseSystem {
6436   -
6437   - var AeSimu v_ae1 := AeSimu.create("AE1") alive;
6438   -
6439   - v_ae1.start(f_CSE_DMR_UPD_010());
6440   -
6441   - v_ae1.done;
6442   -
6443   - }
6444   - function f_CSE_DMR_UPD_010() runs on AeSimu {
6445   - var MsgIn v_response;
6446   - var integer v_aeIndex := -1;
6447   - var integer v_containerIndex := -1;
6448   - var RequestPrimitive v_updateRequest := valueof(m_updateContainerBase);
6449   - var Labels v_labels_1:= {"VALUE_1"};
6450   - v_updateRequest.primitiveContent.container.labels := v_labels_1;
6451   -
6452   - // Test control
6453   -
6454   - // Test component configuration
6455   - f_cf01Up();
6456   -
6457   - // Test adapter configuration
6458   -
6459   - // Preamble
6460   - v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
6461   -
6462   - v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex);
6463   -
6464   - // Test Body
6465   - if(ispresent(vc_resourcesList[v_containerIndex].resource.container.stateTag)) {
  6324 + group g_CSE_DMR_UPD_010{
  6325 +
  6326 + /**
  6327 + * @desc Check that the stateTag attribute of a RESOURCE_TYPE resource is increased when an update operation has been performed on its child resource
  6328 + *
  6329 + */
  6330 + testcase TC_CSE_DMR_UPD_010_CNT() runs on Tester system CseSystem {
  6331 + // Local variables
  6332 + var AeSimu v_ae1 := AeSimu.create("AE1") alive;
  6333 + var RequestPrimitive v_updateRequest := valueof(m_updateContainerBase);
  6334 + var template RequestPrimitive v_createRequest := m_createContainerBase;
  6335 + var Labels v_labels_1:= {"VALUE_1"};
  6336 + var PrimitiveContent v_primitiveContentRetrieveResource;
  6337 +
  6338 +
  6339 + v_updateRequest.primitiveContent.container.labels := v_labels_1;
  6340 +
  6341 + v_ae1.start(f_CSE_DMR_UPD_010(int3, v_createRequest, v_updateRequest));//Container
  6342 + v_ae1.done;
6466 6343  
6467   - f_cse_updateResource(int3, v_containerIndex, v_updateRequest);
6468   -
6469   - f_send(e_mca_port, m_request(m_retrieve(f_getResourceAddress(v_containerIndex), f_getOriginator(v_containerIndex))));
6470   -
6471   - tc_ac.start;
6472   - alt {
6473   - [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
6474   - tc_ac.stop;
6475   - if(v_response.primitive.responsePrimitive.primitiveContent.container.stateTag == 1) { //(Create and Delete)
  6344 + if(getverdict == pass){
  6345 + v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
  6346 + //Check that stateTag has been incremented
  6347 + if(ischosen(v_primitiveContentRetrieveResource.container)) {
  6348 + if(v_primitiveContentRetrieveResource.container.stateTag == 1){
6476 6349 setverdict(pass, __SCOPE__ & ": The stateTag attribute is incremented");
6477   - }
6478   - else{
  6350 + }else{
6479 6351 setverdict(fail, __SCOPE__ & ": Error the stateTag attribute is not incremented");
6480   - }
6481   - }
6482   - [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
6483   - tc_ac.stop;
6484   - setverdict(fail, __SCOPE__ & ": Error while retrieving resource attributes");
6485   - }
6486   - [] tc_ac.timeout {
6487   - setverdict(fail, __SCOPE__ & ": No answer while retrieving resource attributes");
  6352 + }
6488 6353 }
6489   - }
6490   -
6491   - }//end if
6492   - else{
6493   - setverdict(fail, __SCOPE__ & ": Error the stateTag attribute is empty");
  6354 + }
6494 6355 }
6495 6356  
6496   - // Postamble
6497   - f_cse_postamble_deleteResources();
6498   -
6499   - // Tear down
6500   - f_cf01Down();
6501   -
6502   - }//end f_CSE_DMR_UPD_010
6503   -
6504   - /**
6505   - * @desc Check that the IUT rejects the UPDATE Request of an existing contentInstance resource with error “OPERATION_NOT_ALLOWED”
6506   - *
6507   - */
6508   - testcase TC_CSE_DMR_UPD_011() runs on Tester system CseSystem {
6509   -
6510   - var AeSimu v_ae1 := AeSimu.create("AE1") alive;
6511   -
6512   - v_ae1.start(f_CSE_DMR_UPD_011());
6513   -
6514   - v_ae1.done;
6515   -
6516   - }
6517   - function f_CSE_DMR_UPD_011() runs on AeSimu {
6518   - // Local variables
6519   - var MsgIn v_response;
6520   - var RequestPrimitive v_request;
6521   - var integer v_aeIndex := -1;
6522   - var integer v_containerIndex := -1;
6523   - var integer v_contentInstanceIndex := -1;
6524   - var template RequestPrimitive v_updateRequest := m_updateContentInstanceBase;
6525   - var Labels v_labels:= {"LABEL"};
6526   - var PrimitiveContent v_primitiveContentRetrieveResource;
6527   -
6528   - v_updateRequest.primitiveContent.contentInstance.labels := v_labels;
6529   -
6530   - // Test control
6531   -
6532   - // Test component configuration
6533   - f_cf01Up();
6534   -
6535   - // Test adapter configuration
6536   -
6537   - // Preamble
6538   - v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
6539   -
6540   - v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex);
6541   -
6542   - v_contentInstanceIndex := f_cse_createResource(int4, m_createContentInstanceBase, v_containerIndex);
  6357 + } // end g_CSE_DMR_UPD_010
  6358 +
  6359 + group g_CSE_DMR_UPD_011{
6543 6360  
6544   - //Test Body
6545   - v_request := f_getUpdateRequestPrimitive(int4, v_contentInstanceIndex, v_updateRequest);
  6361 + /**
  6362 + * @desc Check that the IUT rejects the UPDATE Request of an existing RESOURCE_TYPE resource with error “OPERATION_NOT_ALLOWED”
  6363 + *
  6364 + */
  6365 + testcase TC_CSE_DMR_UPD_011_CNT_CIN() runs on Tester system CseSystem {
  6366 + // Local variables
  6367 + var AeSimu v_ae1 := AeSimu.create("AE1") alive;
  6368 + var template RequestPrimitive v_updateRequest := m_updateContentInstanceBase;
  6369 + var Labels v_labels:= {"LABEL"};
  6370 + var template RequestPrimitive v_createParentRequest := m_createContainerBase;
  6371 + var template RequestPrimitive v_createChildRequest := m_createContentInstanceBase;
  6372 + var PrimitiveContent v_primitiveContentRetrieveResource;
  6373 +
  6374 + v_updateRequest.primitiveContent.contentInstance.labels := v_labels;
6546 6375  
6547   - f_send(e_mca_port, m_request(v_request));
6548   - tc_ac.start;
6549   - alt {
6550   - [] mcaPort.receive(mw_response(mw_responsePrimitive(int4005))) -> value v_response {
6551   - tc_ac.stop;
6552   - setverdict(pass, __SCOPE__ & ": Not allowed to update a contentInstance with error OPERATION_NOT_ALLOWED");
6553   - }
6554   - [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
6555   - tc_ac.stop;
6556   - setverdict(fail, __SCOPE__ & ": Wrong response status code");
6557   - }
6558   - [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
6559   - tc_ac.stop;
6560   - setverdict(fail, __SCOPE__ & ": Accepted update of contentInstance");
6561   - }
6562   - [] tc_ac.timeout {
6563   - setverdict(fail, __SCOPE__ & ": No answer while updating contentInstance");
6564   - }
6565   - }
6566   -
6567   - v_primitiveContentRetrieveResource:=f_cse_retrieveResource(v_contentInstanceIndex);
6568   - if(getverdict == pass){
6569   - //Check that the resource has NOT been udpated
  6376 + v_ae1.start(f_CSE_DMR_UPD_011(int3, v_createParentRequest, int4, v_createChildRequest, v_updateRequest));//ContentInstance under Container
  6377 + v_ae1.done;
  6378 +
  6379 + if(getverdict == pass){
  6380 + v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
  6381 + //Check that the resource has NOT been udpated
6570 6382 if(ischosen(v_primitiveContentRetrieveResource.contentInstance)) {
6571   - if(v_primitiveContentRetrieveResource.contentInstance.labels == v_labels){
6572   - setverdict(fail, __SCOPE__ & ": Error: Labels attribute updated")
6573   - }
6574   - }
  6383 + if(v_primitiveContentRetrieveResource.contentInstance.labels == v_labels){
  6384 + setverdict(fail, __SCOPE__ & ": Error: Labels attribute updated")
  6385 + }
  6386 + }
  6387 + }
6575 6388 }
6576   -
6577   - // Postamble
6578   - f_cse_postamble_deleteResources();
6579   -
6580   - // Tear down
6581   - f_cf01Down();
6582 6389  
6583   - }//end f_CSE_DMR_UPD_011
  6390 + } // end g_CSE_DMR_UPD_011
6584 6391  
6585 6392 /**
6586 6393 * @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”
... ...
... ... @@ -754,29 +754,6 @@ module OneM2M_Testcases_CSE_Release_2 {
754 754  
755 755 }// end group g_CSE_DMR_CRE_006
756 756  
757   - group g_CSE_DMR_CRE_007 {
758   -
759   - /**
760   - * @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
761   - *
762   - */
763   - testcase TC_CSE_DMR_CRE_007_CNT_CIN() runs on Tester system CseSystem {
764   - // Local variables
765   - var template RequestPrimitive v_createRequestContainer := m_createContainerBase;
766   - var template RequestPrimitive v_createRequestContentInstance1 := m_createContentInstanceBase;
767   - var template RequestPrimitive v_createRequestContentInstance2 := m_createContentInstanceBase;
768   - const integer c_maxNumberOfInstances := 1;
769   - var AeSimu v_ae1 := AeSimu.create("AE1") alive;
770   -
771   - v_createRequestContainer.primitiveContent.container.maxNrOfInstances := c_maxNumberOfInstances;
772   - v_createRequestContentInstance2.primitiveContent.contentInstance.resourceName := c_defaultContentInstanceResourceName & "2"; //Resource 2
773   -
774   - v_ae1.start(f_CSE_DMR_CRE_007(int3, v_createRequestContainer, int4, v_createRequestContentInstance1, v_createRequestContentInstance2, c_defaultContentInstanceResourceName));//ContentInstance under Container
775   - v_ae1.done;
776   - }
777   -
778   - }// end group g_CSE_DMR_CRE_007
779   -
780 757 group g_CSE_DMR_CRE_008 {
781 758  
782 759 /**
... ... @@ -803,29 +780,7 @@ module OneM2M_Testcases_CSE_Release_2 {
803 780 }
804 781  
805 782 }// end group g_CSE_DMR_CRE_008
806   -
807   -
808   - group g_CSE_DMR_CRE_013 {
809   -
810   - /**
811   - * @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
812   - *
813   - */
814   - testcase TC_CSE_DMR_CRE_013_CNT_CIN() runs on Tester system CseSystem {
815   - // Local variables
816   - var template RequestPrimitive v_createRequestContainer := m_createContainerBase;
817   - var template RequestPrimitive v_createRequestContentInstance := m_createContentInstanceBase;
818   - const integer c_maxByteSize := 1;
819   - var AeSimu v_ae1 := AeSimu.create("AE1") alive;
820   -
821   - v_createRequestContainer.primitiveContent.container.maxByteSize := c_maxByteSize;
822   -
823   - v_ae1.start(f_CSE_DMR_CRE_013(int3, v_createRequestContainer, int4, v_createRequestContentInstance));//ContentInstance under Container
824   - v_ae1.done;
825   - }
826   -
827   - }// end group g_CSE_DMR_CRE_013
828   -
  783 +
829 784 group g_CSE_DMR_CRE_015 {
830 785  
831 786 /**
... ... @@ -1757,74 +1712,6 @@ module OneM2M_Testcases_CSE_Release_2 {
1757 1712  
1758 1713 } // end g_CSE_DMR_UPD_009
1759 1714  
1760   - group g_CSE_DMR_UPD_010{
1761   -
1762   - /**
1763   - * @desc Check that the stateTag attribute of a RESOURCE_TYPE resource is increased when an update operation has been performed on its child resource
1764   - *
1765   - */
1766   - testcase TC_CSE_DMR_UPD_010_CNT() runs on Tester system CseSystem {
1767   - // Local variables
1768   - var AeSimu v_ae1 := AeSimu.create("AE1") alive;
1769   - var RequestPrimitive v_updateRequest := valueof(m_updateContainerBase);
1770   - var template RequestPrimitive v_createRequest := m_createContainerBase;
1771   - var Labels v_labels_1:= {"VALUE_1"};
1772   - var PrimitiveContent v_primitiveContentRetrieveResource;
1773   -
1774   -
1775   - v_updateRequest.primitiveContent.container.labels := v_labels_1;
1776   -
1777   - v_ae1.start(f_CSE_DMR_UPD_010(int3, v_createRequest, v_updateRequest));//Container
1778   - v_ae1.done;
1779   -
1780   - if(getverdict == pass){
1781   - v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
1782   - //Check that stateTag has been incremented
1783   - if(ischosen(v_primitiveContentRetrieveResource.container)) {
1784   - if(v_primitiveContentRetrieveResource.container.stateTag == 1){
1785   - setverdict(pass, __SCOPE__ & ": The stateTag attribute is incremented");
1786   - }else{
1787   - setverdict(fail, __SCOPE__ & ": Error the stateTag attribute is not incremented");
1788   - }
1789   - }
1790   - }
1791   - }
1792   -
1793   - } // end g_CSE_DMR_UPD_010
1794   -
1795   - group g_CSE_DMR_UPD_011{
1796   -
1797   - /**
1798   - * @desc Check that the IUT rejects the UPDATE Request of an existing RESOURCE_TYPE resource with error “OPERATION_NOT_ALLOWED”
1799   - *
1800   - */
1801   - testcase TC_CSE_DMR_UPD_011_CNT_CNI() runs on Tester system CseSystem {
1802   - // Local variables
1803   - var AeSimu v_ae1 := AeSimu.create("AE1") alive;
1804   - var template RequestPrimitive v_updateRequest := m_updateContentInstanceBase;
1805   - var Labels v_labels:= {"LABEL"};
1806   - var template RequestPrimitive v_createParentRequest := m_createContainerBase;
1807   - var template RequestPrimitive v_createChildRequest := m_createContentInstanceBase;
1808   - var PrimitiveContent v_primitiveContentRetrieveResource;
1809   -
1810   - v_updateRequest.primitiveContent.contentInstance.labels := v_labels;
1811   -
1812   - v_ae1.start(f_CSE_DMR_UPD_011(int3, v_createParentRequest, int4, v_createChildRequest, v_updateRequest));//ContentInstance under Container
1813   - v_ae1.done;
1814   -
1815   - if(getverdict == pass){
1816   - v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
1817   - //Check that the resource has NOT been udpated
1818   - if(ischosen(v_primitiveContentRetrieveResource.contentInstance)) {
1819   - if(v_primitiveContentRetrieveResource.contentInstance.labels == v_labels){
1820   - setverdict(fail, __SCOPE__ & ": Error: Labels attribute updated")
1821   - }
1822   - }
1823   - }
1824   - }
1825   -
1826   - } // end g_CSE_DMR_UPD_011
1827   -
1828 1715 group g_CSE_DMR_UPD_014 {
1829 1716  
1830 1717 /**
... ...