From dfb28870fb8a1d486b3e1beed586b97c16b0b1ef Mon Sep 17 00:00:00 2001
From: reinaortega <miguelangel.reinaortega@etsi.org>
Date: Thu, 26 Jul 2018 10:35:12 +0200
Subject: [PATCH] Improvement for AE_REG to make the action message clearer
Signed-off-by: reinaortega <miguelangel.reinaortega@etsi.org>
---
OneM2M_PermutationFunctions.ttcn | 6 +++---
OneM2M_Testcases_AE_Release_1.ttcn | 12 ++++++------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index 515997f..72bbe90 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -446,7 +446,7 @@ module OneM2M_PermutationFunctions {
//Send Trigger Message
p_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(-, -, -);
p_request.to_ := p_utRequest.requestPrimitive.to_;
- f_sendUtPrimitive(p_utRequest,p_action);
+ f_sendUtPrimitive(p_utRequest,p_action & f_getLocalResourceAddress(-, -, -));
//Test behavior
tc_ac.start;
@@ -462,9 +462,9 @@ module OneM2M_PermutationFunctions {
//send back responsePrimitive
mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
}
- [] mcaPortIn.receive(mw_request(mw_createAe(*,?,m_contentCreateAe_Invalid))) -> value v_request {
+ [] mcaPortIn.receive(mw_request(mw_createAe())) -> value v_request {
tc_ac.stop;
- setverdict(fail, __SCOPE__ & " : AE registration request is rejected due to not including the optional attribute!");
+ setverdict(fail, __SCOPE__ & " : Unexpected AE registration request");
mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
}
[] tc_ac.timeout{
diff --git a/OneM2M_Testcases_AE_Release_1.ttcn b/OneM2M_Testcases_AE_Release_1.ttcn
index 035de43..9570871 100644
--- a/OneM2M_Testcases_AE_Release_1.ttcn
+++ b/OneM2M_Testcases_AE_Release_1.ttcn
@@ -528,7 +528,7 @@ module OneM2M_Testcases_AE_Release_1 {
//Send Trigger Message
v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(-, -, -);
v_requestPrimitive.to_ := v_utRequest.requestPrimitive.to_;
- f_sendUtPrimitive(v_utRequest, v_action);
+ f_sendUtPrimitive(v_utRequest, v_action & f_getLocalResourceAddress(-, -, -));
//Test behavior
tc_ac.start;
@@ -544,9 +544,9 @@ module OneM2M_Testcases_AE_Release_1 {
//send back responsePrimitive
mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
}
- [] mcaPortIn.receive(mw_request(mw_createAe(*,?,m_contentCreateAe_Invalid))) -> value v_request {
+ [] mcaPortIn.receive(mw_request(mw_createAe())) -> value v_request {
tc_ac.stop;
- setverdict(fail, __SCOPE__ & " : AE registration request is rejected due to not including mandatory attributes!!");
+ setverdict(fail, __SCOPE__ & " : Unexpected AE registration request");
mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
}
[] tc_ac.timeout{
@@ -757,7 +757,7 @@ module OneM2M_Testcases_AE_Release_1 {
v_localResource := f_generateLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, -, -, omit))), vc_cSEBaseIndex, int2);
v_auxInteger := f_setLocalResource(v_localResource, int2, vc_cSEBaseIndex);
v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_auxInteger, -, -);
- f_sendUtPrimitive(v_utRequest,v_action);
+ f_sendUtPrimitive(v_utRequest,v_action & f_getLocalResourceAddress(v_auxInteger, -, -));
//Test behavior
tc_ac.start;
@@ -770,9 +770,9 @@ module OneM2M_Testcases_AE_Release_1 {
//send back responsePrimitive
mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
}
- [] mcaPortIn.receive {
+ [] mcaPortIn.receive (mw_request(mw_delete(?))) {
tc_ac.stop;
- setverdict(fail, __SCOPE__ & " : Error while AE deregistration");
+ setverdict(fail, __SCOPE__ & " : Unexpected DELETE request");
mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
}
[] tc_ac.timeout{
--
GitLab