From 15cb9c1b3a1053216ccfc094e9d14a8ca251cff3 Mon Sep 17 00:00:00 2001
From: reinaortega <miguelangel.reinaortega@etsi.org>
Date: Thu, 26 Jul 2018 10:29:07 +0200
Subject: [PATCH] Improvement for AE_DMR_CRE and AE_DMR_UPD about logging
Signed-off-by: reinaortega <miguelangel.reinaortega@etsi.org>
---
OneM2M_PermutationFunctions.ttcn | 17 ++++++++---------
OneM2M_Testcases_AE_Release_1.ttcn | 9 ++++-----
2 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index a07db23..515997f 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -525,12 +525,11 @@ module OneM2M_PermutationFunctions {
mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
}
- [] mcaPortIn.receive {
+ [] mcaPortIn.receive(mw_request(mw_create)) {
tc_ac.stop;
- setverdict(fail, __SCOPE__ & " : ContentInstance creation request is rejected due to not including the attribute!");
+ setverdict(fail, __SCOPE__ & " : Unexpected CREATE request ");
mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
}
-
[] tc_ac.timeout{
setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
}
@@ -570,9 +569,9 @@ module OneM2M_PermutationFunctions {
//send back responsePrimitive
mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
}
- [] mcaPortIn.receive {
+ [] mcaPortIn.receive(mw_request(mw_create)) {
tc_ac.stop;
- setverdict(fail, __SCOPE__ & " : Container creation request is rejected due to not including the attribute!");
+ setverdict(fail, __SCOPE__ & " : Unexpected CREATE request ");
mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
}
[] tc_ac.timeout{
@@ -618,9 +617,9 @@ module OneM2M_PermutationFunctions {
v_responsePrimitive := valueof(m_responsePrimitive(int2004, v_request.primitive.requestPrimitive.requestIdentifier, vc_localResourcesList[v_resourceIndex].resource));
mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
}
- [] mcaPortIn.receive(mw_request(?)) -> value v_request {
+ [] mcaPortIn.receive(mw_request(mw_update)) -> value v_request {
tc_ac.stop;
- setverdict(fail, __SCOPE__ & " : AE update request is rejected due to not including the optional attribute!");
+ setverdict(fail, __SCOPE__ & " : Unexpected UPDATE request");
mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
}
[] tc_ac.timeout{
@@ -662,9 +661,9 @@ module OneM2M_PermutationFunctions {
mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
}
- [] mcaPortIn.receive(mw_request(?)) {
+ [] mcaPortIn.receive(mw_request(mw_update)) {
tc_ac.stop;
- setverdict(fail, __SCOPE__ & " : Container update request is rejected due to not including the attribute!");
+ setverdict(fail, __SCOPE__ & " : Unexpected UPDATE request");
mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
}
diff --git a/OneM2M_Testcases_AE_Release_1.ttcn b/OneM2M_Testcases_AE_Release_1.ttcn
index 8ec85f8..035de43 100644
--- a/OneM2M_Testcases_AE_Release_1.ttcn
+++ b/OneM2M_Testcases_AE_Release_1.ttcn
@@ -840,9 +840,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_create)) {
tc_ac.stop;
- setverdict(fail, __SCOPE__ & " : Container creation request is rejected due to not including mandatory attributes!!");
+ setverdict(fail, __SCOPE__ & " : Unexpected CREATE request ");
mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
}
[] tc_ac.timeout{
@@ -907,12 +907,11 @@ module OneM2M_Testcases_AE_Release_1 {
//send back responsePrimitive
mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
}
- [] mcaPortIn.receive {
+ [] mcaPortIn.receive(mw_request(mw_create)) {
tc_ac.stop;
- setverdict(fail, __SCOPE__ & " : ContentInstance creation request is rejected due to not including mandatory attributes!!");
+ setverdict(fail, __SCOPE__ & " : Unexpected CREATE request ");
mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
}
-
[] tc_ac.timeout{
setverdict(fail, __SCOPE__ & " : Timeout due to no response received from requested SUT!");
}
--
GitLab