From f3b2247b7bbd65a20d40a2a47325cd01461c27d8 Mon Sep 17 00:00:00 2001 From: abbas ahmad <abbas.ahmad@eglobalmark.com> Date: Wed, 11 Jul 2018 16:42:03 +0200 Subject: [PATCH] in function f_CSE_NBR_SYN_003 of permutations: Changed some pass criteria to make it simpler. --- OneM2M_PermutationFunctions.ttcn | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn index e4e61b4..a710993 100644 --- a/OneM2M_PermutationFunctions.ttcn +++ b/OneM2M_PermutationFunctions.ttcn @@ -9401,10 +9401,20 @@ module OneM2M_PermutationFunctions { v_requestStatus := v_response.primitive.responsePrimitive.primitiveContent.request.requestStatus; if (v_requestStatus==int1){ //COMPLETED tc_ac.stop; - if (match(v_response, mw_response(mw_responsePrimitive(v_statusCode,v_primitiveContent)))){ - setverdict(pass, testcasename() & ": RequestStatus: COMPLETED and operationResult attribute correctly received"); + if (valueof(p_requestPrimitive.requestIdentifier) == valueof(v_response.primitive.responsePrimitive.primitiveContent.request.operationResult.requestIdentifier) ){ + setverdict(pass, testcasename() & ": RequestStatus: COMPLETED and requestIdentifier attribute correctly received"); }else{ - setverdict(fail, testcasename() & ": RequestStatus: COMPLETED and operationResult attribute not correctly received"); + setverdict(fail, testcasename() & ": RequestStatus: COMPLETED and requestIdentifier attribute not correctly received"); + } + if (valueof(v_statusCode) == valueof(v_response.primitive.responsePrimitive.primitiveContent.request.operationResult.responseStatusCode) ){ + setverdict(pass, testcasename() & ": RequestStatus: COMPLETED and responseStatusCode attribute correctly received"); + }else{ + setverdict(fail, testcasename() & ": RequestStatus: COMPLETED and responseStatusCode attribute not correctly received"); + } + if (match(v_primitiveContent, v_response.primitive.responsePrimitive.primitiveContent.request.operationResult.primitiveContent) ){ + setverdict(pass, testcasename() & ": RequestStatus: COMPLETED and primitiveContent template correctly received"); + }else{ + setverdict(fail, testcasename() & ": RequestStatus: COMPLETED and primitiveContent template not correctly received"); } }else if (v_requestStatus==int2){ //FAILED tc_ac.stop; -- GitLab