Merge branch 'STF531-CHECK-TPREQ-TTCN' into 'master'

Stf531 check tpreq ttcn



See merge request !20

LibOneM2M/OneM2M_Functions.ttcn

@@ -620,6 +620,72 @@ module OneM2M_Functions {
 				
 			}// end f_cse_deleteResource
 			
+			/**
+			 * @desc Check that a resource is present in the IUT (resourceId is known)
+			 * @param p_resourceIndex Resource index 
+			 * @return boolean
+			 */
+			function f_isResourcePresent (integer p_resourceIndex) runs on CseTester return boolean {
+			
+				var ResponseStatusCode v_responseStatusCode;
+			  
+			  	//Check to see if the resource is present or not
+			  	mcaPort.send(m_request(m_retrieveResource(f_getResourceAddress(p_resourceIndex), f_getOriginator(p_resourceIndex))));
+			  	tc_ac.start;
+			  	alt {
+					[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) {
+						tc_ac.stop;
+					  	setverdict(pass, testcasename() & ": Resource present: " & f_getResourceAddress(p_resourceIndex));
+					  	return true;
+				  	}
+				  	[] mcaPort.receive(mw_response(mw_responsePrimitive(?, -))) {
+						tc_ac.stop;
+						setverdict(inconc, testcasename() & ": Wrong response status code in the response");
+						return false;
+					}
+					[] tc_ac.timeout {
+						setverdict(inconc, testcasename() & ": No answer while retrieving resource");
+						return false;
+					}
+			  	}	
+			}
+			
+			/**
+			 * @desc Check that a resource is not present in the IUT (resourceId is NOT known)
+			 * @param p_parentIndex Index of the parent resource
+			 * @param p_resourceName Resource name (Hierarchical method is used)
+			 * @return boolean
+			 */
+			function f_isResourceNotPresent (integer p_parentIndex, XSD.String p_resourceName) runs on CseTester return boolean {
+			
+				var ResponseStatusCode v_responseStatusCode;
+			  
+			  	log(testcasename() & "Hierarchical method is required to check the non presence of the resource");
+			  	vc_addressingMethod := e_hierarchical;
+			  	//Check to see if the resource has NOT been created
+			  	mcaPort.send(m_request(m_retrieveResource(f_getResourceAddress(p_parentIndex) & "/" & p_resourceName, f_getOriginator(p_parentIndex))));
+			  	tc_ac.start;
+			  	alt {
+					[] mcaPort.receive(mw_response(mw_responsePrimitive(int4004))) {
+						tc_ac.stop;
+						setverdict(pass, testcasename() & ": Resource not present");
+						vc_addressingMethod := PX_ADDRESSING_METHOD;
+						return true;
+					}
+					[] mcaPort.receive(mw_response(mw_responsePrimitive(?))) {
+						tc_ac.stop;
+						setverdict(inconc, testcasename() & ": Wrong response status code in the response");
+						vc_addressingMethod := PX_ADDRESSING_METHOD;
+						return false;
+					}
+					[] tc_ac.timeout {
+						setverdict(inconc, testcasename() & ": No answer while retrieving resource");
+						vc_addressingMethod := PX_ADDRESSING_METHOD;
+						return false;
+					}
+			  	}	
+			}
+			
 			/**
 			 * @desc Update of the auxiliar ACP resource
 			 * @param p_allowedOperations New allowed operations
@@ -974,14 +1040,7 @@ module OneM2M_Functions {
 					unmap(self:mcaPort, system:mcaPort);
 					unmap(self:acPort, system:acPort);  
 
-				} //end f_cse_notifyProcedure_subscriptionDeletion
-				
-			function f_isResourceNotDeleted(in integer p_resourceIndex) runs on Tester return boolean {
-			
-				//TODO Call f_isResourcePresent
-				return false;
-			}
-    		
+				} //end f_cse_notifyProcedure_subscriptionDeletion    		
     		
     		/**
     		 * @desc It determines whether the addressing method of the given address is non-hierarchical. Not valid for CSE-Base as target

LibOneM2M/OneM2M_Templates.ttcn

@@ -3119,7 +3119,7 @@ module OneM2M_Templates {
 		 * @param p_statusCode	Status code
 		 * @param p_requestId	Request ID of the corresponding request
 		 */
-		template (value) ResponsePrimitive m_responsePrimitive(in ResponseStatusCode p_statusCode, in RequestID p_requestId, in template (omit) PrimitiveContent p_content := omit) := {
+		template (value) ResponsePrimitive m_responsePrimitive(in template ResponseStatusCode p_statusCode, in RequestID p_requestId, in template (omit) PrimitiveContent p_content := omit) := {
 			responseStatusCode := p_statusCode,
 			requestIdentifier := p_requestId,
 			primitiveContent := p_content,
@@ -3139,11 +3139,11 @@ module OneM2M_Templates {
 		 * @param p_statusCode	Status code
 		 * @param p_requestId	Request ID of the corresponding request
 		 */
-		template (value) ResponsePrimitive m_responsePrimitive_content(in ResponseStatusCode p_statusCode, in RequestID p_requestId, in template (value) PrimitiveContent p_content) modifies m_responsePrimitive := {
+		template (value) ResponsePrimitive m_responsePrimitive_content(in template ResponseStatusCode p_statusCode, in RequestID p_requestId, in template (value) PrimitiveContent p_content) modifies m_responsePrimitive := {
 			primitiveContent := p_content			
 		}
 		
-		template ResponsePrimitive mw_responsePrimitive(ResponseStatusCode p_statusCode, in template PrimitiveContent p_content := *) := {
+		template ResponsePrimitive mw_responsePrimitive(in template ResponseStatusCode p_statusCode, in template PrimitiveContent p_content := *) := {
 			responseStatusCode := p_statusCode,
 			requestIdentifier := ?,
 			primitiveContent := p_content,