Stf531 check tpreq ttcn

OneM2M_Testcases.ttcn

@@ -8393,20 +8393,38 @@ module OneM2M_Testcases {
 						// Local variables
 						var Labels v_labels_1 := {"VALUE_1"};
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
 
 						v_updateRequest.primitiveContent.container.labels := v_labels_1;
 						
 						f_CSE_DMR_UPD_006(int3, m_createContainerBase, v_updateRequest);//Container
+						if(getverdict == pass){
+							//Check that the resource has NOT been udpated
+							  if(ischosen(v_primitiveContentRetrieveResource.container)) {
+							   if(v_primitiveContentRetrieveResource.container.labels == v_labels_1){
+								setverdict(fail, __SCOPE__ & ": Error: Labels attribute updated")
+							  }
+							}
+						}
 					}
 
 					testcase TC_CSE_DMR_UPD_006_GRP_LBL() runs on CseTester system CseSystem {
 						// Local variables
 						var Labels v_labels_1 := {"VALUE_1"};
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
 
 						v_updateRequest.primitiveContent.group_.labels := v_labels_1;
 						
 						f_CSE_DMR_UPD_006(int9, m_createGroupBase, v_updateRequest);//Group
+						if(getverdict == pass){
+							//Check that the resource has NOT been udpated
+							  if(ischosen(v_primitiveContentRetrieveResource.group_)) {
+							   if(v_primitiveContentRetrieveResource.group_.labels == v_labels_1){
+								setverdict(fail, __SCOPE__ & ": Error: Labels attribute updated")
+							  }
+							}
+						}
 					}
 					
 					testcase TC_CSE_DMR_UPD_006_ACP_LBL() runs on CseTester system CseSystem {
@@ -8414,45 +8432,81 @@ module OneM2M_Testcases {
 						var Labels v_labels_1 := {"VALUE_1"};
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
 						var template RequestPrimitive v_requestPrimitive := m_createAcpBase;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
 						
 						v_requestPrimitive.primitiveContent.accessControlPolicy.selfPrivileges.accessControlRule_list[0].accessControlOperations := int59;
 
 						v_updateRequest.primitiveContent.accessControlPolicy.labels := v_labels_1;
 								
 						f_CSE_DMR_UPD_006(int1, v_requestPrimitive, v_updateRequest);//AccessControlPolicy
+						if(getverdict == pass){
+							//Check that the resource has NOT been udpated
+							  if(ischosen(v_primitiveContentRetrieveResource.accessControlPolicy)) {
+							   if(v_primitiveContentRetrieveResource.accessControlPolicy.labels == v_labels_1){
+								 setverdict(fail, __SCOPE__ & ": Error: Labels attribute updated")
+							  }
+							}
+						}
 					}
 				
 					testcase TC_CSE_DMR_UPD_006_SCH_LBL() runs on CseTester system CseSystem {
 						// Local variables
 						var Labels v_labels_1 := {"VALUE_1"};
 						var template RequestPrimitive v_updateRequest := m_updateScheduleBase;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
 
 						v_updateRequest.primitiveContent.schedule.labels := v_labels_1;
 										
 						f_CSE_DMR_UPD_006(int18, m_createScheduleBase, v_updateRequest);//Schedule
+						if(getverdict == pass){
+							//Check that the resource has NOT been udpated
+							  if(ischosen(v_primitiveContentRetrieveResource.schedule)) {
+							   if(v_primitiveContentRetrieveResource.schedule.labels == v_labels_1){
+								 setverdict(fail, __SCOPE__ & ": Error: Labels attribute updated")
+							  }
+							}
+						}
 					}
 					
 					testcase TC_CSE_DMR_UPD_006_PCH_LBL() runs on CseTester system CseSystem {
 						// Local variable
 						var Labels v_labels_1 := {"VALUE_1"};
 						var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
 
 						v_updateRequest.primitiveContent.pollingChannel.labels := v_labels_1;
 							
 						f_CSE_DMR_UPD_006(int15, m_createPollingChannelBase, v_updateRequest);//PollingChannel
+						if(getverdict == pass){
+							//Check that the resource has NOT been udpated
+							  if(ischosen(v_primitiveContentRetrieveResource.pollingChannel)) {
+							   if(v_primitiveContentRetrieveResource.pollingChannel.labels == v_labels_1){
+								 setverdict(fail, __SCOPE__ & ": Error: Labels attribute updated")
+							  }
+							}
+						}
 					}
 					
 					testcase TC_CSE_DMR_UPD_006_SUB_LBL() runs on CseTester system CseSystem {
 						// Local variables
 						var Labels v_labels_1 := {"VALUE_1"};
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
 
 						v_updateRequest.primitiveContent.subscription.labels := v_labels_1;
 								
 						f_CSE_DMR_UPD_006(int23, m_createSubscriptionBase, v_updateRequest);//Subscription
+						if(getverdict == pass){
+							//Check that the resource has NOT been udpated
+							  if(ischosen(v_primitiveContentRetrieveResource.subscription)) {
+							   if(v_primitiveContentRetrieveResource.subscription.labels == v_labels_1){
+								 setverdict(fail, __SCOPE__ & ": Error: Labels attribute updated")
+							  }
+							}
 						}
+					}
 					
-					function f_CSE_DMR_UPD_006(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive) runs on CseTester {
+					function f_CSE_DMR_UPD_006(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive, out PrimitiveContent p_primitiveContentRetrievedResource) runs on CseTester {
     				
 						// Local variables
 						var MsgIn v_response;
@@ -8504,7 +8558,9 @@ module OneM2M_Testcases {
 							[] tc_ac.timeout {
 								setverdict(fail, __SCOPE__ & ": No answer while updating resource type " & int2str(enum2int(p_resourceType)));
 							}
-						}	
+						}
+						
+						p_primitiveContentRetrievedResource := f_cse_retrieveResource(v_resourceIndex);	
     								
 						// Postamble
 						f_cse_postamble_deleteResources();
@@ -8527,69 +8583,123 @@ module OneM2M_Testcases {
 						// Local variables
 						var Timestamp v_creationTime := "20001231T012345";
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
 
 						v_updateRequest.primitiveContent := {container_update_invalid := m_contentUpdateContainer_invalid};
 						v_updateRequest.primitiveContent.container_update_invalid.creationTime := v_creationTime;
 						
 						f_CSE_DMR_UPD_007(int3, m_createContainerBase, v_updateRequest);//Container
+						if(getverdict == pass){
+							//Check that the resource has NOT been udpated
+							  if(ischosen(v_primitiveContentRetrieveResource.container_update_invalid)) {
+							   if(v_primitiveContentRetrieveResource.container_update_invalid.creationTime == v_creationTime){
+								 setverdict(fail, __SCOPE__ & ": Error: Creation Time attribute updated")
+							  }
+							}
+						}
 					}
 
 					testcase TC_CSE_DMR_UPD_007_GRP_CT() runs on CseTester system CseSystem {
 						// Local variables
 						var Timestamp v_creationTime := "20001231T012345";
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
 
 						v_updateRequest.primitiveContent := {group_update_invalid := m_contentUpdateGroup_invalid};
 						v_updateRequest.primitiveContent.group_update_invalid.creationTime := v_creationTime;
 						
 						f_CSE_DMR_UPD_007(int9, m_createGroupBase, v_updateRequest);//Group
+						if(getverdict == pass){
+							//Check that the resource has NOT been udpated
+							  if(ischosen(v_primitiveContentRetrieveResource.group_update_invalid)) {
+							   if(v_primitiveContentRetrieveResource.group_update_invalid.creationTime == v_creationTime){
+								 setverdict(fail, __SCOPE__ & ": Error: Creation Time attribute updated")
+							  }
+							}
+						}
 					}
 					
 					testcase TC_CSE_DMR_UPD_007_ACP_CT() runs on CseTester system CseSystem {
 						// Local variables
 						var Timestamp v_creationTime := "20001231T012345";
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
 
 						v_updateRequest.primitiveContent := {aCP_update_invalid := m_contentUpdateAcp_invalid};
 						v_updateRequest.primitiveContent.aCP_update_invalid.creationTime := v_creationTime;
 								
 						f_CSE_DMR_UPD_007(int1, m_createAcpBase, v_updateRequest);//AccessControlPolicy
+						if(getverdict == pass){
+							//Check that the resource has NOT been udpated
+							  if(ischosen(v_primitiveContentRetrieveResource.aCP_update_invalid)) {
+							   if(v_primitiveContentRetrieveResource.aCP_update_invalid.creationTime == v_creationTime){
+								 setverdict(fail, __SCOPE__ & ": Error: Creation Time attribute updated")
+							  }
+							}
+						}
 					}
 				
 					testcase TC_CSE_DMR_UPD_007_SCH_CT() runs on CseTester system CseSystem {
 						// Local variables
 						var Timestamp v_creationTime := "20001231T012345";
 						var template RequestPrimitive v_updateRequest := m_updateScheduleBase;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
 
 						v_updateRequest.primitiveContent := {schedule_update_invalid := m_contentUpdateSchedule_invalid};
 						v_updateRequest.primitiveContent.schedule_update_invalid.creationTime := v_creationTime;
 										
 						f_CSE_DMR_UPD_007(int18, m_createScheduleBase, v_updateRequest);//Schedule
+						if(getverdict == pass){
+							//Check that the resource has NOT been udpated
+							  if(ischosen(v_primitiveContentRetrieveResource.schedule_update_invalid)) {
+							   if(v_primitiveContentRetrieveResource.schedule_update_invalid.creationTime == v_creationTime){
+								 setverdict(fail, __SCOPE__ & ": Error: Creation Time attribute updated")
+							  }
+							}
+						}
 					}
 					
 					testcase TC_CSE_DMR_UPD_007_PCH_CT() runs on CseTester system CseSystem {
 						// Local variables
 						var Timestamp v_creationTime := "20001231T012345";
 						var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
 
 						v_updateRequest.primitiveContent := {pollingChannel_update_invalid := m_contentUpdatePollingChannel_invalid};
 						v_updateRequest.primitiveContent.pollingChannel_update_invalid.creationTime := v_creationTime;
 							
 						f_CSE_DMR_UPD_007(int15, m_createPollingChannelBase, v_updateRequest);//PollingChannel
+						if(getverdict == pass){
+							//Check that the resource has NOT been udpated
+							  if(ischosen(v_primitiveContentRetrieveResource.pollingChannel_update_invalid)) {
+							   if(v_primitiveContentRetrieveResource.pollingChannel_update_invalid.creationTime == v_creationTime){
+								 setverdict(fail, __SCOPE__ & ": Error: Creation Time attribute updated")
+							  }
+							}
+						}
 					}
 					
 					testcase TC_CSE_DMR_UPD_007_SUB_CT() runs on CseTester system CseSystem {
 						// Local variables
 						var Timestamp v_creationTime := "20001231T012345";
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
 
 						v_updateRequest.primitiveContent := {subscription_update_invalid := m_contentUpdateSubscription_invalid};
 						v_updateRequest.primitiveContent.subscription_update_invalid.creationTime := v_creationTime;
 								
 						f_CSE_DMR_UPD_007(int23, m_createSubscriptionBase, v_updateRequest);//Subscription
+						if(getverdict == pass){
+							//Check that the resource has NOT been udpated
+							  if(ischosen(v_primitiveContentRetrieveResource.subscription_update_invalid)) {
+							   if(v_primitiveContentRetrieveResource.subscription_update_invalid.creationTime == v_creationTime){
+								 setverdict(fail, __SCOPE__ & ": Error: Creation Time attribute updated")
+							  }
+							}
 						}
+					}
 					
-					function f_CSE_DMR_UPD_007(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive) runs on CseTester {
+					function f_CSE_DMR_UPD_007(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive, out PrimitiveContent p_primitiveContentRetrievedResource) runs on CseTester {
     				
 						// Local variables
 						var MsgIn v_response;
@@ -8635,7 +8745,9 @@ module OneM2M_Testcases {
 								setverdict(fail, __SCOPE__ & ": No answer while updating resource type " & int2str(enum2int(p_resourceType)));
 							}
 						}	
-    								
+    					
+						p_primitiveContentRetrievedResource := f_cse_retrieveResource(v_resourceIndex);
+									
 						// Postamble
 						f_cse_postamble_deleteResources();
 						
@@ -8657,12 +8769,21 @@ module OneM2M_Testcases {
 						var Timestamp v_expirationTime := "20001231T012345";
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var AttributeAux_list v_nullFields;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
 						
 						v_nullFields := {{"expirationTime", omit}};
 
 						v_updateRequest.primitiveContent.container.expirationTime := v_expirationTime;
 						
 						f_CSE_DMR_UPD_008(int3, m_createContainerBase, v_updateRequest, v_nullFields);//Container
+						if(getverdict == pass){
+							  //Check that the resource has NOT been udpated
+							  if(ischosen(v_primitiveContentRetrieveResource.container)) {
+							   if(v_primitiveContentRetrieveResource.container.expirationTime == v_expirationTime){
+								 setverdict(fail, __SCOPE__ & ": Error: Expiration time attribute updated")
+							  }
+							}
+						}
 					}
 
 					testcase TC_CSE_DMR_UPD_008_GRP_ET() runs on CseTester system CseSystem {
@@ -8670,12 +8791,21 @@ module OneM2M_Testcases {
 						var Timestamp v_expirationTime := "20001231T012345";
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
 						var AttributeAux_list v_nullFields;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
 
 						v_nullFields := {{"expirationTime", omit}};
 						
 						v_updateRequest.primitiveContent.group_.expirationTime := v_expirationTime;
 						
 						f_CSE_DMR_UPD_008(int9, m_createGroupBase, v_updateRequest, v_nullFields);//Group
+						if(getverdict == pass){
+							  //Check that the resource has NOT been udpated
+							  if(ischosen(v_primitiveContentRetrieveResource.group_)) {
+							   if(v_primitiveContentRetrieveResource.group_.expirationTime == v_expirationTime){
+								 setverdict(fail, __SCOPE__ & ": Error: Expiration time attribute updated")
+							  }
+							}
+						}
 					}
 					
 					testcase TC_CSE_DMR_UPD_008_ACP_ET() runs on CseTester system CseSystem {
@@ -8683,12 +8813,21 @@ module OneM2M_Testcases {
 						var Timestamp v_expirationTime := "20001231T012345";
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
 						var AttributeAux_list v_nullFields;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
 
 						v_nullFields := {{"expirationTime", omit}};
 						
 						v_updateRequest.primitiveContent.accessControlPolicy.expirationTime := v_expirationTime;
 								
 						f_CSE_DMR_UPD_008(int1, m_createAcpBase, v_updateRequest, v_nullFields);//AccessControlPolicy
+						if(getverdict == pass){
+							  //Check that the resource has NOT been udpated
+							  if(ischosen(v_primitiveContentRetrieveResource.accessControlPolicy)) {
+							   if(v_primitiveContentRetrieveResource.accessControlPolicy.expirationTime == v_expirationTime){
+								 setverdict(fail, __SCOPE__ & ": Error: Expiration time attribute updated")
+							  }
+							}
+						}
 					}
 				
 					testcase TC_CSE_DMR_UPD_008_SCH_ET() runs on CseTester system CseSystem {
@@ -8696,12 +8835,21 @@ module OneM2M_Testcases {
 						var Timestamp v_expirationTime := "20001231T012345";
 						var template RequestPrimitive v_updateRequest := m_updateScheduleBase;
 						var AttributeAux_list v_nullFields;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
 
 						v_nullFields := {{"expirationTime", omit}};
 						
 						v_updateRequest.primitiveContent.schedule.expirationTime := v_expirationTime;
 										
 						f_CSE_DMR_UPD_008(int18, m_createScheduleBase, v_updateRequest, v_nullFields);//Schedule
+						if(getverdict == pass){
+							  //Check that the resource has NOT been udpated
+							  if(ischosen(v_primitiveContentRetrieveResource.schedule)) {
+							   if(v_primitiveContentRetrieveResource.schedule.expirationTime == v_expirationTime){
+								 setverdict(fail, __SCOPE__ & ": Error: Expiration time attribute updated")
+							  }
+							}
+						}
 					}
 					
 					testcase TC_CSE_DMR_UPD_008_PCH_ET() runs on CseTester system CseSystem {
@@ -8709,12 +8857,21 @@ module OneM2M_Testcases {
 						var Timestamp v_expirationTime := "20001231T012345";
 						var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase;
 						var AttributeAux_list v_nullFields;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
 
 						v_nullFields := {{"expirationTime", omit}};
 						
 						v_updateRequest.primitiveContent.pollingChannel.expirationTime := v_expirationTime;
 							
 						f_CSE_DMR_UPD_008(int15, m_createPollingChannelBase, v_updateRequest, v_nullFields);//PollingChannel
+						if(getverdict == pass){
+							  //Check that the resource has NOT been udpated
+							  if(ischosen(v_primitiveContentRetrieveResource.pollingChannel)) {
+							   if(v_primitiveContentRetrieveResource.pollingChannel.expirationTime == v_expirationTime){
+								 setverdict(fail, __SCOPE__ & ": Error: Expiration time attribute updated")
+							  }
+							}
+						}
 					}
 					
 					testcase TC_CSE_DMR_UPD_008_SUB_ET() runs on CseTester system CseSystem {
@@ -8722,15 +8879,24 @@ module OneM2M_Testcases {
 						var Timestamp v_expirationTime := "20001231T012345";
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var AttributeAux_list v_nullFields;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
 
 						v_nullFields := {{"expirationTime", omit}};
 						
 						v_updateRequest.primitiveContent.subscription.expirationTime := v_expirationTime;
 								
 						f_CSE_DMR_UPD_008(int23, m_createSubscriptionBase, v_updateRequest, v_nullFields);//Subscription
+						if(getverdict == pass){
+							  //Check that the resource has NOT been udpated
+							  if(ischosen(v_primitiveContentRetrieveResource.subscription)) {
+							   if(v_primitiveContentRetrieveResource.subscription.expirationTime == v_expirationTime){
+								 setverdict(fail, __SCOPE__ & ": Error: Expiration time attribute updated")
+							  }
+						   }
 						}
+					}
 					
-					function f_CSE_DMR_UPD_008(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive, template (omit) AttributeAux_list p_nullFields := omit) runs on CseTester {
+					function f_CSE_DMR_UPD_008(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive, template (omit) AttributeAux_list p_nullFields := omit, out PrimitiveContent p_primitiveContentRetrievedResource) runs on CseTester {
     				
 						// Local variables
 						var MsgIn v_response;
@@ -8776,7 +8942,9 @@ module OneM2M_Testcases {
 								setverdict(fail, __SCOPE__ & ": No answer while updating resource type " & int2str(enum2int(p_resourceType)));
 							}
 						}	
-    								
+    					
+						p_primitiveContentRetrievedResource := f_cse_retrieveResource(v_resourceIndex);
+									
 						// Postamble
 						f_cse_postamble_deleteResources();
 						
@@ -8871,6 +9039,7 @@ module OneM2M_Testcases {
 						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;
 								   
@@ -8909,7 +9078,17 @@ module OneM2M_Testcases {
 						   [] 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
+								if(ischosen(v_primitiveContentRetrieveResource.contentInstance)) {
+								 if(v_primitiveContentRetrieveResource.contentInstance.labels == v_labels){
+								   setverdict(fail, __SCOPE__ & ": Error: Labels attribute updated")
+							  }
+						   }
+						}
 				
 						// Postamble
 						f_cse_postamble_deleteResources();
@@ -8935,7 +9114,8 @@ module OneM2M_Testcases {
 					  	var integer v_containerIndex := -1;
 					  	var integer v_contentInstanceIndex := -1; 
 					  	var template RequestPrimitive v_updateRequest := m_updateContentInstanceBase;
-					  	var Labels v_labels := {"LABEL"};					  	
+					  	var Labels v_labels := {"LABEL"};
+						var PrimitiveContent v_primitiveContentRetrieveResource;					  	
 		
 					  	v_updateRequest.primitiveContent.contentInstance.labels := v_labels;
 				   
@@ -8976,7 +9156,17 @@ module OneM2M_Testcases {
 						 	[] tc_ac.timeout {
 							 	setverdict(fail, __SCOPE__ & ": No answer while updating a latest resource");
 						 	}
-					  	}	
+					  	}
+					  	
+						v_primitiveContentRetrieveResource:=f_cse_retrieveResource(v_contentInstanceIndex);
+						if(getverdict == pass){
+							//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")
+							  }
+						   }
+						}	
 
 					  	// Postamble
 					  	f_cse_postamble_deleteResources();
@@ -9003,6 +9193,7 @@ module OneM2M_Testcases {
 					  	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;
    
@@ -9043,8 +9234,17 @@ module OneM2M_Testcases {
 						  	[] tc_ac.timeout {
 							  	setverdict(fail, __SCOPE__ & ": No answer while updating an oldest resource");
 						  	}
-					  	}	
-
+					  	}
+					  	
+						v_primitiveContentRetrieveResource:=f_cse_retrieveResource(v_contentInstanceIndex);
+						if(getverdict == pass){
+							//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")
+							  }
+						   }
+						}	
 					  	// Postamble
 					  	f_cse_postamble_deleteResources();
 
@@ -11724,6 +11924,7 @@ module OneM2M_Testcases {
                     var integer v_groupIndex, v_containerIndex_1, v_containerIndex_2, v_containerIndex_3 := -1;
                     var ListOfURIs v_memberIDs;
                     var template RequestPrimitive v_createRequest;
+					var PrimitiveContent v_primitiveContentRetrievedResource;
                     
                     var template RequestPrimitive v_updateRequest := m_updateGroupBase;
                     var template RequestPrimitive v_createMember;
@@ -11772,6 +11973,16 @@ module OneM2M_Testcases {
                             setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
                          }
                      }
+                     
+					v_primitiveContentRetrievedResource := f_cse_retrieveResource(v_groupIndex);
+					if(getverdict == pass){
+						//Check that the resource has NOT been udpated
+						  if(ischosen(v_primitiveContentRetrievedResource.group_)) {
+						   if(v_primitiveContentRetrievedResource.group_.memberIDs == v_memberIDs){
+							setverdict(fail, __SCOPE__ & ": Error: MemberIDs attribute updated")
+						  }
+						}
+					}
         
                     //Postamble
                     f_cse_postamble_deleteResources();
@@ -11797,6 +12008,7 @@ module OneM2M_Testcases {
 					var integer v_groupIndex := -1;
 					var ListOfURIs v_memberIDs;
 					var XSD.PositiveInteger v_maxNrOfMembers:= 1;
+					var PrimitiveContent v_primitiveContentRetrievedResource;
 					
 					v_updateRequest.primitiveContent.group_.maxNrOfMembers := v_maxNrOfMembers;
 					
@@ -11836,6 +12048,16 @@ module OneM2M_Testcases {
                              setverdict(fail, __SCOPE__ & ": No answer while updating resource");
                          }
                      }
+                     
+					v_primitiveContentRetrievedResource := f_cse_retrieveResource(v_groupIndex);
+					if(getverdict == pass){
+						//Check that the resource has NOT been udpated
+						  if(ischosen(v_primitiveContentRetrievedResource.group_)) {
+						   if(v_primitiveContentRetrievedResource.group_.maxNrOfMembers == v_maxNrOfMembers){
+							setverdict(fail, __SCOPE__ & ": Error: maxNrOfMembers attribute updated")
+						  }
+						}
+					}
         
                     //Postamble
                     f_cse_postamble_deleteResources();
@@ -15545,6 +15767,7 @@ module OneM2M_Testcases {
 						var AccessControlRule v_accessControlRule_2;
 						var SetOfAcrs v_setOfArcs_1;
 						var SetOfAcrs v_setOfArcs_2;
+						var PrimitiveContent v_primitiveContentRetrievedResource;
 
 						// Test control
 
@@ -15595,6 +15818,15 @@ module OneM2M_Testcases {
 								setverdict(fail, __SCOPE__ & ": No answer while executing operation on resource type int3 (Container)");
 							}
 						}
+						
+						v_primitiveContentRetrievedResource := f_cse_retrieveResource(v_aeIndex);
+						if(getverdict == pass){
+							if(ischosen(v_primitiveContentRetrievedResource.aE)) {
+								 if(match(v_primitiveContentRetrievedResource.aE.accessControlPolicyIDs, valueof(v_updateRequest.primitiveContent.aE.accessControlPolicyIDs))){
+									  setverdict(fail, __SCOPE__ & ": Error: Access Control policy ID attribute updated")
+							}
+						  }
+						}
 
 						//Postamble
 						f_cse_postamble_deleteResources();