From d2677b1863366d9412b4216b9f78e8f61bacbec7 Mon Sep 17 00:00:00 2001
From: abbas ahmad <abbas.ahmad@eglobalmark.com>
Date: Thu, 12 Jul 2018 15:21:01 +0200
Subject: [PATCH] TC_CSE_NBR_ASY 2 3 4 permutation minor corrections.
---
OneM2M_PermutationFunctions.ttcn | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index 8d148d2..a91e613 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -9391,7 +9391,8 @@ module OneM2M_PermutationFunctions {
v_primitiveContent := f_getTemplateFromPrimitiveContent(p_requestPrimitive.primitiveContent);
}else if (p_operation == int4){ //delete
v_statusCode := int2002;
- v_primitiveContent := omit;
+ v_primitiveContent.container := mw_contentContainer_rc1;
+ //v_primitiveContent := omit;
}
mcaPort.send(f_getMsgOutPrimitive(m_request(m_retrieve(v_requestResourceURI, f_getOriginator(v_aeIndex)))));
tc_ac.start;
@@ -9406,16 +9407,19 @@ module OneM2M_PermutationFunctions {
}else{
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) ){
+
+ if (match(v_response.primitive.responsePrimitive.primitiveContent.request.operationResult.primitiveContent, v_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;
setverdict(fail, testcasename() & ": RequestStatus: FAIL");
@@ -9481,8 +9485,7 @@ module OneM2M_PermutationFunctions {
p_requestPrimitive.to_ := f_getResourceAddress(v_aeIndex);
}
p_requestPrimitive.from_ := f_getOriginator(v_aeIndex);
- p_requestPrimitive.responseType.responseTypeValue := int2; //nonBlockingRequestAsynch
-
+ p_requestPrimitive.responseType := {int2,omit}; //nonBlockingRequestAsynch
// Test Body
mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive))));
@@ -9560,7 +9563,7 @@ module OneM2M_PermutationFunctions {
p_requestPrimitive.to_ := f_getResourceAddress(v_aeIndex);
}
p_requestPrimitive.from_ := f_getOriginator(v_aeIndex);
- p_requestPrimitive.responseType.responseTypeValue := int2; //nonBlockingRequestAsynch
+ p_requestPrimitive.responseType := {int2,omit}; //nonBlockingRequestAsynch
// Test Body
@@ -9645,8 +9648,8 @@ module OneM2M_PermutationFunctions {
// Preamble
v_contentResponse.uRI := ?;
-
- v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+
+ v_aeIndex := f_cse_createResource(int2, m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM, -, {f_getAnnouncementTargetPoA(PX_PROTOCOL_BINDING_AE1, PX_AE1_ADDRESS, "")}), -1); // AE1 is registred
if(ispresent(p_parentRequestPrimitive)) {
v_resourceIndex := f_cse_createResource(valueof(p_parentRequestPrimitive.resourceType), p_parentRequestPrimitive, v_aeIndex);
--
GitLab