Commit 32ce6a64 authored by Miguel Angel Reina Ortega's avatar Miguel Angel Reina Ortega
Browse files

Harmonising use of __SCOPE__ in log statements


Signed-off-by: Miguel Angel Reina Ortega's avatarreinaortega <miguelangel.reinaortega@etsi.org>
parent 68f0d148
......@@ -3311,7 +3311,7 @@ module OneM2M_Functions {
else if (ischosen(p_requestPrimitive.primitiveContent.statsConfig)){
p_requestPrimitive.primitiveContent.statsConfig.accessControlPolicyIDs := p_accessControlPolicyIDs;
} else {
log( __SCOPE__, ":INFO: Resource not having acpi attribute. Not possible to set acpi")
log( __SCOPE__ & ":INFO: Resource not having acpi attribute. Not possible to set acpi")
}
return valueof(p_requestPrimitive);
}
......@@ -3636,14 +3636,14 @@ module OneM2M_Functions {
alt{
[] utPort.receive(mw_utResponseOK) {
tc_wait.stop;
setverdict(pass, __SCOPE__, " : Triggering message is successfully received!");
setverdict(pass, __SCOPE__ & " : Triggering message is successfully received!");
}
[] utPort.receive(mw_utResponseKO) {
tc_wait.stop;
setverdict(inconc, __SCOPE__, " : Error while receiving Triggering message!");
setverdict(inconc, __SCOPE__ & " : Error while receiving Triggering message!");
}
[] tc_wait.timeout{
setverdict(inconc, __SCOPE__, " : Timeout due to no response received from requested SUT!");
setverdict(inconc, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
}
}
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -400,7 +400,7 @@ module OneM2M_Testcases_CSE_Release_2 {
if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.schedule.resourceName)){
setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
}
}
......@@ -422,7 +422,7 @@ module OneM2M_Testcases_CSE_Release_2 {
if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.schedule.resourceName)){
setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
}
}
......@@ -444,7 +444,7 @@ module OneM2M_Testcases_CSE_Release_2 {
if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.schedule.resourceName)){
setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
}
}
......@@ -468,7 +468,7 @@ module OneM2M_Testcases_CSE_Release_2 {
if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.pollingChannel.resourceName)){
setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
}
}
......@@ -490,7 +490,7 @@ module OneM2M_Testcases_CSE_Release_2 {
if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.subscription.resourceName)){
setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
}
}
}
......@@ -511,7 +511,7 @@ module OneM2M_Testcases_CSE_Release_2 {
if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.subscription.resourceName)){
setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
}
}
}
......@@ -533,7 +533,7 @@ module OneM2M_Testcases_CSE_Release_2 {
if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.node.resourceName)){
setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
}
}
......@@ -555,7 +555,7 @@ module OneM2M_Testcases_CSE_Release_2 {
if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.mgmtCmd.resourceName)){
setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
}
}
......@@ -577,7 +577,7 @@ module OneM2M_Testcases_CSE_Release_2 {
if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.locationPolicy.resourceName)){
setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
}
}
......@@ -599,7 +599,7 @@ module OneM2M_Testcases_CSE_Release_2 {
if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.statsConfig.resourceName)){
setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
}
}
}
......@@ -621,7 +621,7 @@ module OneM2M_Testcases_CSE_Release_2 {
if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.statsCollect.resourceName)){
setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
}
}
......@@ -643,7 +643,7 @@ module OneM2M_Testcases_CSE_Release_2 {
if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.m2mServiceSubscriptionProfile.resourceName)){
setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
}
}
......@@ -665,7 +665,7 @@ module OneM2M_Testcases_CSE_Release_2 {
if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.serviceSubscribedAppRule.resourceName)){
setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
}
}
......@@ -693,10 +693,10 @@ module OneM2M_Testcases_CSE_Release_2 {
if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.schedule.resourceName)){
setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
} else {
if(v_responsePrimitive.primitiveContent.schedule.resourceName != c_defaultScheduleResourceName){
setverdict(fail, __SCOPE__, ": Error, resourceName attribute not correct");
setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not correct");
}
}
}
......@@ -715,10 +715,10 @@ module OneM2M_Testcases_CSE_Release_2 {
if(getverdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
if(not ispresent(v_responsePrimitive.primitiveContent.pollingChannel.resourceName)){
setverdict(fail, __SCOPE__, ": Error, resourceName attribute not provided");
setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not provided");
} else {
if(v_responsePrimitive.primitiveContent.pollingChannel.resourceName != c_defaultPollingChannelResourceName){
setverdict(fail, __SCOPE__, ": Error, resourceName attribute not correct");
setverdict(fail, __SCOPE__ & ": Error, resourceName attribute not correct");
}
}
}
......@@ -4542,7 +4542,7 @@ module OneM2M_Testcases_CSE_Release_2 {
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.node)) {
if(v_responsePrimitive.primitiveContent.node.labels != v_labels){
setverdict(fail, __SCOPE__, ": Error: Labels attribute not updated correctly")
setverdict(fail, __SCOPE__ & ": Error: Labels attribute not updated correctly")
}
}
}
......@@ -4580,7 +4580,7 @@ module OneM2M_Testcases_CSE_Release_2 {
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.node)) {
if(v_responsePrimitive.primitiveContent.node.accessControlPolicyIDs != valueof(v_updateRequestPrimitive.primitiveContent.node.accessControlPolicyIDs)){
setverdict(fail, __SCOPE__, ": Error: Access Control Policy attribute not updated correctly")
setverdict(fail, __SCOPE__ & ": Error: Access Control Policy attribute not updated correctly")
}
}
}
......@@ -4619,7 +4619,7 @@ module OneM2M_Testcases_CSE_Release_2 {
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.aE)) {
if(v_responsePrimitive.primitiveContent.aE.ontologyRef != v_ontoLogyRef){
setverdict(fail, __SCOPE__, ": Error: Ontology Ref attribute not updated correctly")
setverdict(fail, __SCOPE__ & ": Error: Ontology Ref attribute not updated correctly")
}
}
}
......@@ -4655,7 +4655,7 @@ module OneM2M_Testcases_CSE_Release_2 {
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.container)) {
if(v_responsePrimitive.primitiveContent.container.ontologyRef != v_ontoLogyRef){
setverdict(fail, __SCOPE__, ": Error: Ontology Ref attribute not updated correctly")
setverdict(fail, __SCOPE__ & ": Error: Ontology Ref attribute not updated correctly")
}
}
}
......@@ -4691,7 +4691,7 @@ module OneM2M_Testcases_CSE_Release_2 {
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.container)) {
if(v_responsePrimitive.primitiveContent.container.locationID != v_locationID){
setverdict(fail, __SCOPE__, ": Error: Location ID attribute not updated correctly")
setverdict(fail, __SCOPE__ & ": Error: Location ID attribute not updated correctly")
}
}
}
......@@ -4726,7 +4726,7 @@ module OneM2M_Testcases_CSE_Release_2 {
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
if(v_responsePrimitive.primitiveContent.subscription.eventNotificationCriteria != v_eventNotificationCriteria){
setverdict(fail, __SCOPE__, ": Error: Event Notification Criteria attribute not updated correctly")
setverdict(fail, __SCOPE__ & ": Error: Event Notification Criteria attribute not updated correctly")
}
}
}
......@@ -4761,7 +4761,7 @@ module OneM2M_Testcases_CSE_Release_2 {
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
if(v_responsePrimitive.primitiveContent.subscription.expirationCounter != v_expirationCounter){
setverdict(fail, __SCOPE__, ": Error: Expiration Counter attribute not updated correctly")
setverdict(fail, __SCOPE__ & ": Error: Expiration Counter attribute not updated correctly")
}
}
}
......@@ -4796,7 +4796,7 @@ module OneM2M_Testcases_CSE_Release_2 {
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
if(v_responsePrimitive.primitiveContent.subscription.groupID != v_groupID){
setverdict(fail, __SCOPE__, ": Error: Group ID attribute not updated correctly")
setverdict(fail, __SCOPE__ & ": Error: Group ID attribute not updated correctly")
}
}
}
......@@ -4831,7 +4831,7 @@ module OneM2M_Testcases_CSE_Release_2 {
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
if(v_responsePrimitive.primitiveContent.subscription.notificationForwardingURI != v_notificationForwardingURI){
setverdict(fail, __SCOPE__, ": Error: Notification Forwarding URI attribute not updated correctly")
setverdict(fail, __SCOPE__ & ": Error: Notification Forwarding URI attribute not updated correctly")
}
}
}
......@@ -4866,7 +4866,7 @@ module OneM2M_Testcases_CSE_Release_2 {
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
if(v_responsePrimitive.primitiveContent.subscription.batchNotify != v_batchNotify){
setverdict(fail, __SCOPE__, ": Error: Batch Notify attribute not updated correctly")
setverdict(fail, __SCOPE__ & ": Error: Batch Notify attribute not updated correctly")
}
}
}
......@@ -4901,7 +4901,7 @@ module OneM2M_Testcases_CSE_Release_2 {
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
if(v_responsePrimitive.primitiveContent.subscription.rateLimit != v_rateLimit){
setverdict(fail, __SCOPE__, ": Error: Rate Limit attribute not updated correctly")
setverdict(fail, __SCOPE__ & ": Error: Rate Limit attribute not updated correctly")
}
}
}
......@@ -4936,7 +4936,7 @@ module OneM2M_Testcases_CSE_Release_2 {
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
if(v_responsePrimitive.primitiveContent.subscription.pendingNotification != v_pendingNotification){
setverdict(fail, __SCOPE__, ": Error: Pending Notification attribute not updated correctly")
setverdict(fail, __SCOPE__ & ": Error: Pending Notification attribute not updated correctly")
}
}
}
......@@ -4971,7 +4971,7 @@ module OneM2M_Testcases_CSE_Release_2 {
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
if(v_responsePrimitive.primitiveContent.subscription.notificationStoragePriority != v_notificationStoragePriority){
setverdict(fail, __SCOPE__, ": Error: Notification Storage priority attribute not updated correctly")
setverdict(fail, __SCOPE__ & ": Error: Notification Storage priority attribute not updated correctly")
}
}
}
......@@ -5006,7 +5006,7 @@ module OneM2M_Testcases_CSE_Release_2 {
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
if(v_responsePrimitive.primitiveContent.subscription.latestNotify != v_latestNotify){
setverdict(fail, __SCOPE__, ": Error: Latest Notify priority attribute not updated correctly")
setverdict(fail, __SCOPE__ & ": Error: Latest Notify priority attribute not updated correctly")
}
}
}
......@@ -5040,7 +5040,7 @@ module OneM2M_Testcases_CSE_Release_2 {
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
if(v_responsePrimitive.primitiveContent.subscription.notificationEventCat != v_eventCat){
setverdict(fail, __SCOPE__, ": Error: Notification Event Cat attribute not updated correctly")
setverdict(fail, __SCOPE__ & ": Error: Notification Event Cat attribute not updated correctly")
}
}
}
......@@ -5083,7 +5083,7 @@ module OneM2M_Testcases_CSE_Release_2 {
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.node)) {
if(v_responsePrimitive.primitiveContent.node.expirationTime != v_expirationTime){
setverdict(fail, __SCOPE__, ": Error: Expiration time attribute not updated correctly")
setverdict(fail, __SCOPE__ & ": Error: Expiration time attribute not updated correctly")
}
}
}
......@@ -5119,7 +5119,7 @@ module OneM2M_Testcases_CSE_Release_2 {
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.node)) {
if(v_responsePrimitive.primitiveContent.node.nodeID != v_targetId){
setverdict(fail, __SCOPE__, ": Error: NodeID attribute not updated correctly")
setverdict(fail, __SCOPE__ & ": Error: NodeID attribute not updated correctly")
}
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment