diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index 80e5c8ec0a3fe6837c2f5e42f91c215cff9c1600..7c1808c961a6915a438f957e0216f112fed503fa 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -7,7 +7,7 @@
*
* @author oneM2M
* @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Functions.ttcn $
- * $Id: OneM2M_Functions.ttcn 240 2017-03-23 17:46:28Z reinaortega $
+ * $Id: OneM2M_Functions.ttcn 241 2017-03-23 17:59:00Z reinaortega $
* @desc Module containing functions for oneM2M
*
*/
@@ -174,7 +174,7 @@ module OneM2M_Functions {
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
tc_ac.stop;
- log(__SCOPE__&":INFO: Application registered successfuly");
+ setverdict(pass,__SCOPE__&":INFO: Application registered successfuly");
if(ischosen(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].AE_optional)) {
vc_aeAux := v_response.primitive.responsePrimitive.primitiveContent.any_1[0].AE_optional;
@@ -192,16 +192,16 @@ module OneM2M_Functions {
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
tc_ac.stop;
- setverdict(inconc, "Preamble: Error while registering application");
+ setverdict(inconc, __SCOPE__&":INFO: Error while registering application");
stop;
}
[] mcaPort.receive {
tc_ac.stop;
- setverdict(inconc, "Preamble: Unexpected message received");
+ setverdict(inconc, __SCOPE__&":INFO: Unexpected message received");
stop;
};
[] tc_ac.timeout {
- setverdict(inconc, "Preamble: No answer while registering resource");
+ setverdict(inconc, __SCOPE__&":INFO: No answer while registering resource");
stop;
}
}
@@ -245,7 +245,7 @@ module OneM2M_Functions {
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
tc_ac.stop;
- log(__SCOPE__&": INFO: Application registered successfuly");
+ setverdict(pass, __SCOPE__&": INFO: Application registered successfuly");
if(ischosen(v_response.primitive.responsePrimitive.primitiveContent.any_1[0].AE_optional)) {
vc_aeAux := v_response.primitive.responsePrimitive.primitiveContent.any_1[0].AE_optional;
@@ -262,16 +262,16 @@ module OneM2M_Functions {
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO))
{
tc_ac.stop;
- setverdict(inconc, "Preamble: Error while registering application");
+ setverdict(inconc, __SCOPE__&":INFO: Error while registering application");
stop;
}
[] mcaPort.receive {
tc_ac.stop;
- setverdict(inconc, "Preamble: Unexpected message received");
+ setverdict(inconc, __SCOPE__&":INFO: Unexpected message received");
stop;
}
[] tc_ac.timeout {
- setverdict(inconc, "Preamble: No answer while registering resource");
+ setverdict(inconc, __SCOPE__&":INFO: No answer while registering resource");
stop;
}
}
@@ -385,7 +385,7 @@ module OneM2M_Functions {
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
tc_ac.stop;
- setverdict(pass, "f_createResource: Resource type " & int2str(enum2int(p_resourceType)) & " created successfuly");
+ setverdict(pass, __SCOPE__&":INFO: Resource type " & int2str(enum2int(p_resourceType)) & " created successfuly");
f_checkAttributesToBeSaved(p_resourceType, v_request, v_response.primitive.responsePrimitive);
v_resourceIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, p_parentIndex);
if(match(int2, p_resourceType) or match(-1, p_parentIndex)) {//If created resource is an AE or created under CSEBase, it needs to be added to the resourceToBeDeleted list
@@ -394,14 +394,14 @@ module OneM2M_Functions {
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
tc_ac.stop;
- setverdict(inconc, "f_createResource: Error while creating resource type " & int2str(enum2int(p_resourceType)));
+ setverdict(inconc, __SCOPE__&":INFO: Error while creating resource type " & int2str(enum2int(p_resourceType)));
}
[] mcaPort.receive {
tc_ac.stop;
- setverdict(inconc, "f_createResource: Unexpected message received");
+ setverdict(inconc, __SCOPE__&":INFO: Unexpected message received");
}
[] tc_ac.timeout {
- setverdict(inconc, "f_createResource: No answer while creating resource type " & int2str(enum2int(p_resourceType)));
+ setverdict(inconc, __SCOPE__&":INFO: No answer while creating resource type " & int2str(enum2int(p_resourceType)));
}
}
@@ -432,7 +432,7 @@ module OneM2M_Functions {
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
tc_ac.stop;
- setverdict(pass, "f_createAccessControlPolicy: Resource type " & int2str(1) & " created successfuly");
+ setverdict(pass, __SCOPE__&":INFO: Resource type " & int2str(1) & " created successfuly");
f_checkAttributesToBeSaved(int1, v_request, v_response.primitive.responsePrimitive);
v_acpAuxIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent);
vc_acpAuxIndex := v_acpAuxIndex;
@@ -440,14 +440,14 @@ module OneM2M_Functions {
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
tc_ac.stop;
- setverdict(inconc, "f_createAccessControlPolicy: Error while creating resource type " & int2str(1));
+ setverdict(inconc, __SCOPE__&":INFO: Error while creating resource type " & int2str(1));
}
[] mcaPort.receive {
tc_ac.stop;
- setverdict(inconc, "f_createAccessControlPolicy: Unexpected message received");
+ setverdict(inconc, __SCOPE__&":INFO: Unexpected message received");
}
[] tc_ac.timeout {
- setverdict(inconc, "f_createAccessControlPolicy: No answer while creating resource type " & int2str(1));
+ setverdict(inconc, __SCOPE__&":INFO: No answer while creating resource type " & int2str(1));
}
}
@@ -495,18 +495,18 @@ module OneM2M_Functions {
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
tc_ac.stop;
- setverdict(pass, testcasename() & ": Attribute of resource updated successfuly");
+ setverdict(pass, __SCOPE__&":INFO: Attribute of resource updated successfuly");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
tc_ac.stop;
- setverdict(fail, testcasename() & ": Error while updating resource");
+ setverdict(fail, __SCOPE__&":ERROR: Error while updating resource");
}
[] mcaPort.receive{
tc_ac.stop;
- setverdict(fail, testcasename() & ": Error, unexpected message received");
+ setverdict(fail, __SCOPE__&":ERROR: Unexpected message received");
}
[] tc_ac.timeout {
- setverdict(inconc, testcasename() & ": No answer while updating resource");
+ setverdict(inconc, __SCOPE__&":INFO: No answer while updating resource");
}
}
@@ -568,14 +568,14 @@ module OneM2M_Functions {
alt {
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
tc_ac.stop;
- setverdict(pass, "f_updateAcpAuxResource: " & v_request.to_ & " resource updated successfuly");
+ setverdict(pass, __SCOPE__&":INFO: " & v_request.to_ & " resource updated successfuly");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
tc_ac.stop;
- setverdict(fail, "f_updateAcpAuxResource: Error while updating " & v_request.to_ & " resource");
+ setverdict(fail, __SCOPE__&":ERROR: Error while updating " & v_request.to_ & " resource");
}
[] tc_ac.timeout {
- setverdict(inconc, "f_updateAcpAuxResource: No answer while updating " & v_request.to_ & " resource" );
+ setverdict(inconc, __SCOPE__&":INFO: No answer while updating " & v_request.to_ & " resource" );
}
}
@@ -866,16 +866,16 @@ module OneM2M_Functions {
v_resourceIndex := f_ae_createResource(v_rp.primitiveContent, v_parentIndex, v_rp.resourceType, v_modifiedResource);
if(v_resourceIndex != -1) {
mcaPort.send(m_response(m_responsePrimitive_content(int2001, v_rp.requestIdentifier, {any_1 := {v_modifiedResource}})));
- log("Preamble: Application registered successfuly");
+ setverdict(pass, __SCOPE__&":INFO: Application registered successfuly");
}
else {
mcaPort.send(m_response(m_responsePrimitive(int5000, v_request.primitive.requestPrimitive.requestIdentifier)));
- setverdict(inconc, testcasename() & ": AE registration failed");
+ setverdict(inconc, __SCOPE__&":INFO: AE registration failed");
}
}
[] tc_ac.timeout {
- setverdict(inconc, testcasename() & ": AE registration request not received");
+ setverdict(inconc, __SCOPE__&":INFO: AE registration request not received");
stop;
}
}