New DEL and SUB (notification) test cases

LibOneM2M/OneM2M_Templates.ttcn

@@ -1007,6 +1007,31 @@ module OneM2M_Templates {
 			notificationContentType := p_notificationContentType, //TODO Set to omit once xsd is fixed,//O
 			subscriberURI := p_subscriberURI//O
 		}; 
+		
+		template (value) EventNotificationCriteria m_eventNotificationCriteria ( in NotificationEventType p_notificationEventType, in EventNotificationCriteria.attribute_list p_attribute_list := {}) := { //the parameter should be a list of NotificationEventTypeEventType
+			createdBefore := omit,
+			createdAfter := omit,
+			modifiedSince := omit,
+			unmodifiedSince := omit,
+			stateTagSmaller := omit,
+			stateTagBigger := omit,
+			expireBefore := omit,
+			expireAfter := omit,
+			sizeAbove := omit,
+			sizeBelow := omit,
+			operationMonitor_list := {},
+			attribute_list := p_attribute_list, // TODO this list should be able to be omited see 9.6.8 
+			notificationEventType_list := {p_notificationEventType},// TODO this list should be able to be omited see 9.6.8 (TS0001)
+			missingData := omit
+		};
+        
+		template (value) BatchNotify m_batchNotifyNumber3Duration1 (in XSD.NonNegativeInteger p_number) := {
+			number := p_number,
+			duration := "PT1S" //TODO duration has to be set to 1s and match to the Duration regex 
+		};
+		//normaly duration can be omited
+		
+		
          	
     	
     	/**
@@ -2069,35 +2094,5 @@ module OneM2M_Templates {
 		return v_address;
 	
 	}
-	
-	group sylvain {
-	
-    	template (value) EventNotificationCriteria m_eventNotificationCriteria ( in NotificationEventType p_notificationEventType, in EventNotificationCriteria.attribute_list p_attribute_list := {}) := { //the parameter should be a list of NotificationEventTypeEventType
-        	createdBefore := omit,
-        	createdAfter := omit,
-        	modifiedSince := omit,
-        	unmodifiedSince := omit,
-        	stateTagSmaller := omit,
-        	stateTagBigger := omit,
-        	expireBefore := omit,
-        	expireAfter := omit,
-        	sizeAbove := omit,
-        	sizeBelow := omit,
-        	operationMonitor_list := {},
-        	attribute_list := p_attribute_list, // TODO this list should be able to be omited see 9.6.8 
-        	notificationEventType_list := {p_notificationEventType},// TODO this list should be able to be omited see 9.6.8 (TS0001)
-        	missingData := omit
-        };
-        
-        template (value) BatchNotify m_batchNotifyNumber3Duration1 (in XSD.NonNegativeInteger p_number) := {
-        	number := p_number,
-        	duration := "PT1S" //TODO duration has to be set to 1s and match to the Duration regex 
-        };
-        //normaly duration can be omited
-
-	}
-    
-    	
-
 
 }  // end of module