Skip to content
Snippets Groups Projects
Commit de41d290 authored by Miguel Angel Reina Ortega's avatar Miguel Angel Reina Ortega
Browse files

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

+
Some adjustments

Signed-off-by: Miguel Angel Reina Ortega's avatarMiguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org>
parents e69bb9c9 e4718e92
No related branches found
No related tags found
2 merge requests!25Ae fixes,!20Stf531 check tpreq ttcn
This commit is part of merge request !20. Comments created here will be created in the context of that merge request.
......@@ -7,7 +7,7 @@
*
* @author oneM2M
* @version $URL: https://oldforge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Functions.ttcn $
* $Id: OneM2M_Functions.ttcn 330 2017-07-26 10:02:53Z reinaortega $
* $Id: OneM2M_Functions.ttcn 333 2017-07-28 08:17:47Z reinaortega $
* @desc Module containing functions for oneM2M
*
*/
......@@ -620,37 +620,47 @@ module OneM2M_Functions {
}// end f_cse_deleteResource
function f_isResourceCreated (integer p_resourceIndex) runs on CseTester return boolean {
/**
* @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 has been created or not
//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 created: " & f_getResourceAddress(p_resourceIndex));
setverdict(pass, testcasename() & ": Resource present: " & f_getResourceAddress(p_resourceIndex));
return true;
}
[] mcaPort.receive(mw_response(mw_responsePrimitive(?))) {
[] mcaPort.receive(mw_response(mw_responsePrimitive(?, -))) {
tc_ac.stop;
setverdict(fail, testcasename() & ": Wrong response status code in the response");
setverdict(inconc, testcasename() & ": Wrong response status code in the response");
return false;
}
[] tc_ac.timeout {
setverdict(fail, testcasename() & ": No answer while creating resource");
setverdict(inconc, testcasename() & ": No answer while retrieving resource");
return false;
}
}
}
function f_isResourceNotCreated (integer p_parentIndex, XSD.String p_resourceName) runs on CseTester return boolean {
/**
* @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 creation of the resource");
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))));
......@@ -658,23 +668,22 @@ module OneM2M_Functions {
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitive(int4004))) {
tc_ac.stop;
setverdict(pass, testcasename() & ": Resource not created");
setverdict(pass, testcasename() & ": Resource not present");
vc_addressingMethod := PX_ADDRESSING_METHOD;
return true;
}
[] mcaPort.receive(mw_response(mw_responsePrimitive(?))) {
tc_ac.stop;
setverdict(fail, testcasename() & ": Wrong response status code in the response");
setverdict(inconc, testcasename() & ": Wrong response status code in the response");
vc_addressingMethod := PX_ADDRESSING_METHOD;
return false;
}
[] tc_ac.timeout {
setverdict(fail, testcasename() & ": No answer while creating resource");
setverdict(inconc, testcasename() & ": No answer while retrieving resource");
vc_addressingMethod := PX_ADDRESSING_METHOD;
return false;
}
}
}
/**
......@@ -1033,7 +1042,6 @@ module OneM2M_Functions {
} //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
* @param p_resourceAddress
......
......@@ -7,7 +7,7 @@
*
* @author oneM2M
* @version $URL: https://oldforge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Templates.ttcn $
* $Id: OneM2M_Templates.ttcn 317 2017-07-12 18:07:15Z reinaortega $
* $Id: OneM2M_Templates.ttcn 331 2017-07-27 15:41:51Z reinaortega $
* @desc Module containing templates for oneM2M
*
*/
......@@ -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,14 +3139,14 @@ 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(template ResponseStatusCode p_statusCode) := {
template ResponsePrimitive mw_responsePrimitive(in template ResponseStatusCode p_statusCode, in template PrimitiveContent p_content := *) := {
responseStatusCode := p_statusCode,
requestIdentifier := ?,
primitiveContent := *,
primitiveContent := p_content,
to_ := *,
from_ := *,
originatingTimestamp := *,
......
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment