Ae fixes

This branch contains fixes (based on master) for the AE tests using the UpperTester. Minor issues and changed all tests to use setLocalResource and getLocalResourceAddress.

OneM2M_Testcases.ttcn

@@ -1130,6 +1130,7 @@ module OneM2M_Testcases {
 					var RequestPrimitive v_request;
 					var integer v_cseBaseIndex := -1;
 					var ResourceType v_resourceType := int2;
+					var PrimitiveContent v_primitiveContentRetrieveResource;
 	                
 	                // Test component configuration
 					f_cf02Up();
@@ -1159,7 +1160,9 @@ module OneM2M_Testcases {
 						[] tc_ac.timeout {
 							setverdict(fail, __SCOPE__ & ": No answer while creating AE");
 						}
-					}	
+					}
+					
+					//v_primitiveContentRetrievedResource := f_cse_retrieveResource(v_resourceIndex);	
 									
 					// Postamble
 					f_cse_postamble_deleteResources();
@@ -7327,6 +7330,7 @@ module OneM2M_Testcases {
 						var Labels v_labels_1 := {"VALUE_1"};
                         var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var ResponsePrimitive v_responsePrimitive;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
 
 						v_updateRequest.primitiveContent.container.labels := v_labels_1;
                         
@@ -7341,6 +7345,13 @@ module OneM2M_Testcases {
         							}
 								}
 							}
+							
+							//Check that the resource has been udpated correctly
+							  if(ischosen(v_primitiveContentRetrieveResource.container)) {
+								  if(v_primitiveContentRetrieveResource.container.labels != v_labels_1){
+									  setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
+								  }
+							  }
 						}
 					}
 
@@ -7349,6 +7360,7 @@ module OneM2M_Testcases {
 						var Labels v_labels_1 := {"VALUE_1"};
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
 						var ResponsePrimitive v_responsePrimitive;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
 
 						v_updateRequest.primitiveContent.group_.labels := v_labels_1;
 						
@@ -7363,6 +7375,13 @@ module OneM2M_Testcases {
         							}
 								}
 							}
+							
+							//Check that the resource has been udpated correctly
+							if(ischosen(v_primitiveContentRetrieveResource.group_)) {
+								if(v_primitiveContentRetrieveResource.group_.labels != v_labels_1){
+									setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
+								}
+							}
 						}
 					}
 					
@@ -7371,6 +7390,7 @@ module OneM2M_Testcases {
 						var Labels v_labels_1 := {"VALUE_1"};
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
 						var ResponsePrimitive v_responsePrimitive;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
 
 						v_updateRequest.primitiveContent.accessControlPolicy.labels := v_labels_1;
 							
@@ -7385,6 +7405,13 @@ module OneM2M_Testcases {
         							}
 								}
 							}
+							
+							//Check that the resource has been udpated correctly
+						  if(ischosen(v_primitiveContentRetrieveResource.accessControlPolicy)) {
+							  if(v_primitiveContentRetrieveResource.accessControlPolicy.labels != v_labels_1){
+								  setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
+							  }
+						  }
 						}
 					}
 				
@@ -7393,6 +7420,7 @@ module OneM2M_Testcases {
 						var Labels v_labels_1 := {"VALUE_1"};
 						var template RequestPrimitive v_updateRequest := m_updateScheduleBase;
 						var ResponsePrimitive v_responsePrimitive;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
 
 						v_updateRequest.primitiveContent.schedule.labels := v_labels_1;
 						
@@ -7407,6 +7435,13 @@ module OneM2M_Testcases {
         							}
 								}
 							}
+							
+							//Check that the resource has been udpated correctly
+							if(ischosen(v_primitiveContentRetrieveResource.schedule)) {
+								if(v_primitiveContentRetrieveResource.schedule.labels != v_labels_1){
+									setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
+								}
+							}
 						}
 					}
 					
@@ -7415,6 +7450,7 @@ module OneM2M_Testcases {
 						var Labels v_labels_1 := {"VALUE_1"};
 						var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase;
 						var ResponsePrimitive v_responsePrimitive;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
 
 						v_updateRequest.primitiveContent.pollingChannel.labels := v_labels_1;
 						
@@ -7429,6 +7465,13 @@ module OneM2M_Testcases {
         							}
 								}
 							}
+							
+							//Check that the resource has been udpated correctly
+						  if(ischosen(v_primitiveContentRetrieveResource.pollingChannel)) {
+							  if(v_primitiveContentRetrieveResource.pollingChannel.labels != v_labels_1){
+								  setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
+							  }
+						  }
 						}
 					}
 					
@@ -7437,6 +7480,7 @@ module OneM2M_Testcases {
 						var Labels v_labels_1 := {"VALUE_1"};
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
 
 						v_updateRequest.primitiveContent.subscription.labels := v_labels_1;
 						
@@ -7451,10 +7495,17 @@ module OneM2M_Testcases {
         							}
 								}
 							}
+							
+							//Check that the resource has been udpated correctly
+							if(ischosen(v_primitiveContentRetrieveResource.subscription)) {
+								if(v_primitiveContentRetrieveResource.subscription.labels != v_labels_1){
+									setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
+								}
+							}
 						}
 					}
 					
-					function f_CSE_DMR_UPD_002(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive) runs on CseTester return ResponsePrimitive {
+					function f_CSE_DMR_UPD_002(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive, out PrimitiveContent p_primitiveContentRetrievedResource) runs on CseTester return ResponsePrimitive {
     				
 						// Local variables
 						var MsgIn v_response;
@@ -7496,7 +7547,10 @@ module OneM2M_Testcases {
 								setverdict(fail, __SCOPE__ & ": No answer while updating resource type " & int2str(enum2int(p_resourceType)));
 							}
 						}	
-    								
+    					
+						//Used to check that the resource has been updated
+						p_primitiveContentRetrievedResource := f_cse_retrieveResource(v_resourceIndex);
+									
 						// Postamble
 						f_cse_postamble_deleteResources();
 						
@@ -7523,6 +7577,7 @@ module OneM2M_Testcases {
 						var ResponsePrimitive v_responsePrimitive;
                         var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
 						
 						v_createRequest.primitiveContent.container.labels := v_labels_1;
 						v_updateRequest.primitiveContent.container.labels := v_labels_2;
@@ -7542,6 +7597,15 @@ module OneM2M_Testcases {
         							}
 								}
 							}
+							
+							//Check that the resource has been udpated correctly
+							  if(ischosen(v_primitiveContentRetrieveResource.container)) {
+								  if(ispresent(v_primitiveContentRetrieveResource.container.labels)) {
+									if(not(match(v_primitiveContentRetrieveResource.container.labels,{""}))){
+									  setverdict(fail, __SCOPE__ & ": Error: Labels attribute not deleted correctly")
+									}
+								  }
+							  }
 						}
 					}
 
@@ -7553,6 +7617,7 @@ module OneM2M_Testcases {
 						var ResponsePrimitive v_responsePrimitive;
 						var template RequestPrimitive v_createRequest := m_createGroupBase;
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
 
 						v_createRequest.primitiveContent.group_.labels := v_labels_1;
 						v_updateRequest.primitiveContent.group_.labels := v_labels_2;
@@ -7570,6 +7635,15 @@ module OneM2M_Testcases {
         							}
 								}
 							}
+							
+							//Check that the resource has been udpated correctly
+							if(ischosen(v_primitiveContentRetrieveResource.group_)) {
+								if(ispresent(v_primitiveContentRetrieveResource.group_.labels)) {
+								  if(not(match(v_primitiveContentRetrieveResource.group_.labels,{""}))){
+									setverdict(fail, __SCOPE__ & ": Error: Labels attribute not deleted correctly")
+								  }
+								}
+							}
 						}
 					}
 					
@@ -7581,6 +7655,7 @@ module OneM2M_Testcases {
 						var ResponsePrimitive v_responsePrimitive;
 						var template RequestPrimitive v_createRequest := m_createAcpBase;
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
 
 						v_createRequest.primitiveContent.accessControlPolicy.labels := v_labels_1;
 						v_updateRequest.primitiveContent.accessControlPolicy.labels := v_labels_2;
@@ -7598,6 +7673,15 @@ module OneM2M_Testcases {
         							}
 								}
 							}
+							
+  						 //Check that the resource has been udpated correctly
+						  if(ischosen(v_primitiveContentRetrieveResource.accessControlPolicy)) {
+							  if(ispresent(v_primitiveContentRetrieveResource.accessControlPolicy.labels)) {
+								if(not(match(v_primitiveContentRetrieveResource.accessControlPolicy.labels,{""}))){
+								  setverdict(fail, __SCOPE__ & ": Error: Labels attribute not deleted correctly")
+								}
+							  }
+						  }
 						}
 					}
 				
@@ -7609,6 +7693,7 @@ module OneM2M_Testcases {
 						var ResponsePrimitive v_responsePrimitive;
 						var template RequestPrimitive v_createRequest := m_createScheduleBase;
 						var template RequestPrimitive v_updateRequest := m_updateScheduleBase;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
 
 						v_createRequest.primitiveContent.schedule.labels := v_labels_1;
 						v_updateRequest.primitiveContent.schedule.labels := v_labels_2;
@@ -7626,6 +7711,15 @@ module OneM2M_Testcases {
         							}
 								}
 							}
+							
+							//Check that the resource has been udpated correctly
+							if(ischosen(v_primitiveContentRetrieveResource.schedule)) {
+								if(ispresent(v_primitiveContentRetrieveResource.schedule.labels)) {
+								  if(not(match(v_primitiveContentRetrieveResource.schedule.labels,{""}))){
+									setverdict(fail, __SCOPE__ & ": Error: Labels attribute not deleted correctly")
+								  }
+								}
+							}
 						}
 					}
 					
@@ -7637,6 +7731,7 @@ module OneM2M_Testcases {
 						var ResponsePrimitive v_responsePrimitive;
 						var template RequestPrimitive v_createRequest := m_createPollingChannelBase;
 						var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
 
 						v_createRequest.primitiveContent.pollingChannel.labels := v_labels_1;
 						v_updateRequest.primitiveContent.pollingChannel.labels := v_labels_2;
@@ -7654,6 +7749,15 @@ module OneM2M_Testcases {
         							}
 								}
 							}
+							
+							//Check that the resource has been udpated correctly
+						  if(ischosen(v_primitiveContentRetrieveResource.pollingChannel)) {
+							  if(ispresent(v_primitiveContentRetrieveResource.pollingChannel.labels)) {
+								if(not(match(v_primitiveContentRetrieveResource.pollingChannel.labels,{""}))){
+								  setverdict(fail, __SCOPE__ & ": Error: Labels attribute not deleted correctly")
+								}
+							  }
+						  }
 						}
 					}
 					
@@ -7665,6 +7769,7 @@ module OneM2M_Testcases {
 						var ResponsePrimitive v_responsePrimitive;
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
 
 						v_createRequest.primitiveContent.subscription.labels := v_labels_1;
 						v_updateRequest.primitiveContent.subscription.labels := v_labels_2;
@@ -7682,10 +7787,19 @@ module OneM2M_Testcases {
         							}
 								}
 							}
+							
+							//Check that the resource has been udpated correctly
+							if(ischosen(v_primitiveContentRetrieveResource.subscription)) {
+								if(ispresent(v_primitiveContentRetrieveResource.subscription.labels)) {
+								  if(not(match(v_primitiveContentRetrieveResource.subscription.labels,{""}))){
+									setverdict(fail, __SCOPE__ & ": Error: Labels attribute not deleted correctly")
+								  }
+								}
+							}
 						}
 					}
 					
-					function f_CSE_DMR_UPD_003(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive, template (omit) AttributeAux_list p_nullFields := omit) runs on CseTester return ResponsePrimitive {
+					function f_CSE_DMR_UPD_003(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 return ResponsePrimitive {
     				
 						// Local variables
 						var MsgIn v_response;
@@ -7729,7 +7843,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();
 						
@@ -7756,6 +7872,7 @@ module OneM2M_Testcases {
 						var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 						var ResponsePrimitive v_responsePrimitive;
 						var AttributeAux_list v_nullFields;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
 
 						v_createRequest.primitiveContent.container.labels := v_labels_1;//Attribute 3
 						v_updateRequest.primitiveContent.container.expirationTime := "20301231T012345";//Attribute 1
@@ -7783,6 +7900,22 @@ module OneM2M_Testcases {
         							}
 								}
 							}
+							
+							//Check that the resource has been udpated correctly
+							  if(ischosen(v_primitiveContentRetrieveResource.container)) {
+								  //Check attribute 1
+								  if(v_primitiveContentRetrieveResource.container.expirationTime != valueof(v_updateRequest.primitiveContent.container.expirationTime)){
+									  setverdict(fail, __SCOPE__ & ": Error: Expiration Time attribute not updated correctly")
+								  }
+								  //Check attribute 2
+								  if(v_primitiveContentRetrieveResource.container.maxNrOfInstances != valueof(v_updateRequest.primitiveContent.container.maxNrOfInstances)){
+									  setverdict(fail, __SCOPE__ & ": Error: MaxNrOfInstances attribute not updated correctly")
+								  }
+								  //Check attribute 3
+								  if(ispresent(v_primitiveContentRetrieveResource.container.labels)){
+									  setverdict(fail, __SCOPE__ & ": Error: Labels attribute not deleted correctly")
+								  }
+							  }
 						}
 					}
 
@@ -7796,6 +7929,7 @@ module OneM2M_Testcases {
 						var template RequestPrimitive v_createRequest := m_createGroupBase;
 						var template RequestPrimitive v_updateRequest := m_updateGroupBase;
 						var ResponsePrimitive v_responsePrimitive;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
 												
 						v_createRequest.primitiveContent.group_.labels := v_labels_1;//Attribute 3
 						v_updateRequest.primitiveContent.group_.expirationTime := "20301231T012345";//Attribute 1
@@ -7823,6 +7957,22 @@ module OneM2M_Testcases {
         							}
 								}
 							}
+							
+							//Check that the resource has been udpated correctly
+							if(ischosen(v_primitiveContentRetrieveResource.group_)) {
+								//Check attribute 1
+								if(v_primitiveContentRetrieveResource.group_.groupName != valueof(v_updateRequest.primitiveContent.group_.groupName)){
+									setverdict(fail, __SCOPE__ & ": Error: groupName attribute not updated correctly")
+								}
+								//Check attribute 2
+								if(v_primitiveContentRetrieveResource.group_.expirationTime != valueof(v_updateRequest.primitiveContent.group_.expirationTime)){
+									setverdict(fail, __SCOPE__ & ": Error: expirationTime attribute not updated correctly")
+								}
+								//Check attribute 3
+								if(ispresent(v_primitiveContentRetrieveResource.group_.labels)){
+									setverdict(fail, __SCOPE__ & ": Error: Labels attribute not deleted correctly")
+								}
+							}
 						}
 					}
 					
@@ -7845,6 +7995,7 @@ module OneM2M_Testcases {
 						var template RequestPrimitive v_createRequest := m_createAcpBase;// privileges set by default to 63 for *
 						var template RequestPrimitive v_updateRequest := m_updateAcpBase;
 						var ResponsePrimitive v_responsePrimitive;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
 						
 						v_createRequest.primitiveContent.accessControlPolicy.labels := v_labels_1;//Attribute 3
 						v_updateRequest.primitiveContent.accessControlPolicy.privileges := v_privileges_2; //Attribute 1
@@ -7872,6 +8023,22 @@ module OneM2M_Testcases {
         							}
 								}
 							}
+							
+							//Check that the resource has been udpated correctly
+						  if(ischosen(v_primitiveContentRetrieveResource.accessControlPolicy)) {
+							  //Check attribute 1
+							  if(not match (v_primitiveContentRetrieveResource.accessControlPolicy.privileges.accessControlRule_list[0].accessControlOperations, v_privileges_2.accessControlRule_list[0].accessControlOperations)){
+								  setverdict(fail, __SCOPE__ & ": Error: Privileges attribute not updated correctly")
+							  }
+							  //Check attribute 2
+							  if(not match (v_primitiveContentRetrieveResource.accessControlPolicy.announceTo, valueof(v_updateRequest.primitiveContent.accessControlPolicy.announceTo))){
+								  setverdict(fail, __SCOPE__ & ": Error: Announce_to attribute not updated correctly")
+							  }
+							  //Check attribute 3
+							  if(ispresent(v_primitiveContentRetrieveResource.accessControlPolicy.labels)){
+								  setverdict(fail, __SCOPE__ & ": Error: Labels attribute not deleted correctly")
+							  }
+						  }
 						}
 					}
 				
@@ -7883,6 +8050,7 @@ module OneM2M_Testcases {
 						var template RequestPrimitive v_createRequest := m_createScheduleBase;
 						var template RequestPrimitive v_updateRequest := m_updateScheduleBase;
 						var ResponsePrimitive v_responsePrimitive;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
 						
 						v_createRequest.primitiveContent.schedule.scheduleElement := {{"0,0,0 1 2,1,1,*"}};//Attribute 1
 						v_updateRequest.primitiveContent.schedule.scheduleElement := {{"1,1,1 1 2,1,1,*"}}; //Attribute 1
@@ -7898,11 +8066,11 @@ module OneM2M_Testcases {
 								if(ischosen(v_responsePrimitive.primitiveContent.schedule)) {
         							//Check attribute 1
         							if(v_responsePrimitive.primitiveContent.schedule.scheduleElement != valueof(v_updateRequest.primitiveContent.schedule.scheduleElement)){
-        								setverdict(fail, __SCOPE__ & ": Error: Expiration Time attribute not updated correctly")
+        								setverdict(fail, __SCOPE__ & ": Error: Schedule Element attribute not updated correctly")
         							}
         							//Check attribute 2
         							if(v_responsePrimitive.primitiveContent.schedule.announceTo != valueof(v_updateRequest.primitiveContent.schedule.announceTo)){
-        								setverdict(fail, __SCOPE__ & ": Error: MaxNrOfInstances attribute not updated correctly")
+        								setverdict(fail, __SCOPE__ & ": Error: Announce_To attribute not updated correctly")
         							}
         							//Check attribute 3
         							if(ispresent(v_responsePrimitive.primitiveContent.schedule.labels)){
@@ -7910,6 +8078,22 @@ module OneM2M_Testcases {
         							}
 								}
 							}
+							
+							//Check that the resource has been udpated correctly
+							if(ischosen(v_primitiveContentRetrieveResource.schedule)) {
+								//Check attribute 1
+								if(v_primitiveContentRetrieveResource.schedule.scheduleElement != valueof(v_updateRequest.primitiveContent.schedule.scheduleElement)){
+									setverdict(fail, __SCOPE__ & ": Error: Schedule Element attribute not updated correctly")
+								}
+								//Check attribute 2
+								if(v_primitiveContentRetrieveResource.schedule.announceTo != valueof(v_updateRequest.primitiveContent.schedule.announceTo)){
+									setverdict(fail, __SCOPE__ & ": Error: Announce_To attribute not updated correctly")
+								}
+								//Check attribute 3
+								if(ispresent(v_primitiveContentRetrieveResource.schedule.labels)){
+									setverdict(fail, __SCOPE__ & ": Error: Labels attribute not deleted correctly")
+								}
+							}
 						}
 					}
 					
@@ -7922,6 +8106,7 @@ module OneM2M_Testcases {
 						var template RequestPrimitive v_createRequest := m_createPollingChannelBase;
 						var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase;
 						var ResponsePrimitive v_responsePrimitive;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
 						
 						v_createRequest.primitiveContent.pollingChannel.labels := v_labels_1;//Attribute 3
 						//No Attribute 1
@@ -7947,6 +8132,13 @@ module OneM2M_Testcases {
         							}
 								}
 							}
+							
+							//Check that the resource has been udpated correctly
+							  if(ischosen(v_primitiveContentRetrieveResource.pollingChannel)) {
+							   if(ispresent (v_primitiveContentRetrieveResource.pollingChannel.labels)){
+								setverdict(fail, __SCOPE__ & ": Error: Labels attribute not deleted correctly")
+							  }
+							}
 						}
 					}
 					
@@ -7957,6 +8149,7 @@ module OneM2M_Testcases {
 						var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
 						var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
 						var ResponsePrimitive v_responsePrimitive;
+						var PrimitiveContent v_primitiveContentRetrieveResource;
 						
 						v_createRequest.primitiveContent.subscription.expirationCounter := 10;//Attribute 3
 						v_updateRequest.primitiveContent.subscription.expirationTime := "20301231T012345";//Attribute 1
@@ -7984,10 +8177,26 @@ module OneM2M_Testcases {
             						}
 								}
 							}
+							
+						  //Check that the resource has been udpated correctly
+						  if(ischosen(v_primitiveContentRetrieveResource.subscription)) {
+							  //Check attribute 1
+							  if(not match (v_primitiveContentRetrieveResource.subscription.labels, valueof(v_updateRequest.primitiveContent.subscription.labels))){
+								  setverdict(fail, __SCOPE__ & ": Error: Label attribute not updated correctly")
+							  }
+							  //Check attribute 2
+							  if(not match (v_primitiveContentRetrieveResource.subscription.expirationTime, valueof(v_updateRequest.primitiveContent.subscription.expirationTime))){
+								  setverdict(fail, __SCOPE__ & ": Error: expirationTime attribute not updated correctly")
+							  }
+							  //Check attribute 3
+							  if(ispresent(v_primitiveContentRetrieveResource.subscription.expirationCounter)){
+								  setverdict(fail, __SCOPE__ & ": Error: expirationCounter attribute not deleted correctly")
+							  }
+						  }
     					}
 					}
 					
-					function f_CSE_DMR_UPD_004(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive, template (omit) AttributeAux_list p_nullFields := omit) runs on CseTester return ResponsePrimitive {
+					function f_CSE_DMR_UPD_004(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 return ResponsePrimitive {
     				
 						// Local variables
 						var MsgIn v_response;
@@ -8029,7 +8238,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();
 						
@@ -11080,6 +11291,7 @@ module OneM2M_Testcases {
 					var RequestPrimitive v_updateRequest := valueof(m_updateGroupBase);
 					var XSD.AnyURI v_memberId_1;
 					var XSD.AnyURI v_memberId_2;
+				    var PrimitiveContent v_primitiveContentRetrievedResource;
 					
 					// Test control
                     
@@ -11132,6 +11344,15 @@ module OneM2M_Testcases {
 							 setverdict(fail, __SCOPE__ & ": No answer while updating resource");
 						 }
 					 }
+					 
+				     v_primitiveContentRetrievedResource := f_cse_retrieveResource(v_groupIndex);
+				     if(getverdict == pass){
+					     if(ischosen(v_primitiveContentRetrievedResource.group_)){
+					     	if(v_primitiveContentRetrievedResource.group_.memberIDs[0] != v_memberId_2){
+								setverdict(fail, __SCOPE__, ": Error, memberIDs attribute not updated");
+					     	}
+					      }
+				     }
                     
 					//Postamble
 					f_cse_postamble_deleteResources();
@@ -11155,6 +11376,7 @@ module OneM2M_Testcases {
 					var integer v_containerIndex_2 := -1;
 					var integer v_groupIndex := -1;
 					var RequestPrimitive v_updateRequest := valueof(m_updateGroupBase);
+					var PrimitiveContent v_primitiveContentRetrievedResource;
 					
 					// Test control
                     
@@ -11201,6 +11423,15 @@ module OneM2M_Testcases {
                             setverdict(fail, __SCOPE__ & ": No answer while updating resource");
                          }
                      }
+                     
+					v_primitiveContentRetrievedResource := f_cse_retrieveResource(v_groupIndex);
+					if(getverdict == pass){
+						 if(ischosen(v_primitiveContentRetrievedResource.group_)){
+							if(v_primitiveContentRetrievedResource.group_.memberTypeValidated == false){
+								setverdict(fail, __SCOPE__, ": Error,  memberTypeValidated attribute not updated");
+							}
+						  }
+					 } 
         
                     //Postamble
                     f_cse_postamble_deleteResources();
@@ -11226,6 +11457,7 @@ module OneM2M_Testcases {
 					var integer v_subGroupIndex := -1;
 					var XSD.AnyURI v_memberId_1;
 					var XSD.AnyURI v_memberId_2;
+					var PrimitiveContent v_primitiveContentRetrievedResource;
                 
                     // Test control
         
@@ -11286,6 +11518,19 @@ module OneM2M_Testcases {
 							setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
 						}
 					}
+					
+					v_primitiveContentRetrievedResource := f_cse_retrieveResource(v_groupIndex);
+					if(getverdict == pass){
+						 if(ischosen(v_primitiveContentRetrievedResource.group_)){
+							if(v_primitiveContentRetrievedResource.group_.memberTypeValidated == false){
+								setverdict(fail, __SCOPE__, ": Error,  memberTypeValidated attribute not updated");
+							}
+							
+							if(v_primitiveContentRetrievedResource.group_.memberType != int0){
+								setverdict(fail, __SCOPE__, ": Error,  memberType attribute not set to MIXED");
+							}
+						  }
+					 }
         
                     //Postamble
                     f_cse_postamble_deleteResources();
@@ -11311,6 +11556,7 @@ module OneM2M_Testcases {
 					var integer v_subGroupIndex := -1;
 					var XSD.AnyURI v_memberId_1;
 					var XSD.AnyURI v_memberId_2;
+					var PrimitiveContent v_primitiveContentRetrievedResource;
                 
 					// Test control
         
@@ -11374,6 +11620,19 @@ module OneM2M_Testcases {
                             setverdict(fail, __SCOPE__ & ": No answer while updating resource");
                          }
                      }
+                     
+					v_primitiveContentRetrievedResource := f_cse_retrieveResource(v_groupIndex);
+					if(getverdict == pass){
+						 if(ischosen(v_primitiveContentRetrievedResource.group_)){
+							if(v_primitiveContentRetrievedResource.group_.memberTypeValidated == false){
+								setverdict(fail, __SCOPE__, ": Error,  memberTypeValidated attribute not updated");
+							}
+		
+							if(v_primitiveContentRetrievedResource.group_.memberIDs[0] != v_memberId_1){
+								setverdict(fail, __SCOPE__, ": Error,  memberIDs attribute not correct");
+							}
+						  }
+					 }
         
                     //Postamble
                     f_cse_postamble_deleteResources();
@@ -11613,6 +11872,7 @@ module OneM2M_Testcases {
                     var template RequestPrimitive v_createRequest := m_createGroupBase;
                     var template RequestPrimitive v_updateRequest := m_updateGroupBase;
                     var template RequestPrimitive v_createMember;
+					var PrimitiveContent v_primitiveContentRetrievedResource;
          
                     // Test control
         
@@ -11678,6 +11938,19 @@ module OneM2M_Testcases {
                              setverdict(fail, __SCOPE__ & ": No answer while retrieving resource");
                          }
                      }
+                     
+					v_primitiveContentRetrievedResource := f_cse_retrieveResource(v_groupIndex);
+					if(getverdict == pass){
+						 if(ischosen(v_primitiveContentRetrievedResource.group_)){
+							if(v_primitiveContentRetrievedResource.group_.memberTypeValidated != false){
+								setverdict(fail, __SCOPE__, ": Error,  memberTypeValidated attribute not updated");
+							}
+
+							if((v_primitiveContentRetrievedResource.group_.memberIDs[0] != c_memberResourceAddress1) and (v_primitiveContentRetrievedResource.group_.memberIDs[1] != c_memberResourceAddress2)){
+								setverdict(fail, __SCOPE__, ": Error,  memberIDs attribute not correct");
+							}
+						  }
+					 }
         
                     //Postamble
                     f_cse_postamble_deleteResources();
@@ -15187,6 +15460,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
 
@@ -15233,6 +15507,15 @@ module OneM2M_Testcases {
 								setverdict(fail, __SCOPE__ & ": No answer while executing update operation on resource type int2 (Ae)");
 							}
 						}
+						
+						v_primitiveContentRetrievedResource := f_cse_retrieveResource(v_aeIndex);
+						if(getverdict == pass){
+							if(ischosen(v_primitiveContentRetrievedResource.aE)) {
+								 if(not match (v_primitiveContentRetrievedResource.aE.accessControlPolicyIDs, valueof(v_updateRequest.primitiveContent.aE.accessControlPolicyIDs))){
+									  setverdict(fail, __SCOPE__ & ": Error: Access Control policy ID attribute not updated correctly")
+							}
+						  }
+						}
 
 						//Postamble
 						f_cse_postamble_deleteResources();