From 3a58d6ee2ac15318f88d02ba98720887cf134f76 Mon Sep 17 00:00:00 2001
From: reinaortega <miguelangel.reinaortega@etsi.org>
Date: Wed, 11 Mar 2020 16:22:51 +0100
Subject: [PATCH] TC_CSE_DIS_007 and TC_CSE_DIS_008_XXX fixed according to
TDE-2020-0019R01 contribution
Signed-off-by: reinaortega <miguelangel.reinaortega@etsi.org>
---
OneM2M_PermutationFunctions.ttcn | 4 ++--
OneM2M_Testcases_CSE_Release_1.ttcn | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index 407a564..a7af3e8 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -7508,9 +7508,9 @@ module OneM2M_PermutationFunctions {
tc_ac.start;
alt {
- [] mcaPort.receive(mw_response(mw_responsePrimitive(int4102))) -> value v_response {
+ [] mcaPort.receive(mw_response(mw_responseDiscovery({}))) -> value v_response {
tc_ac.stop;
- setverdict(pass, __SCOPE__ & ": Contents Unacceptable");
+ setverdict(pass, __SCOPE__ & ": Expected no match due to conflicting filter criteria ");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
tc_ac.stop;
diff --git a/OneM2M_Testcases_CSE_Release_1.ttcn b/OneM2M_Testcases_CSE_Release_1.ttcn
index 0f8f932..f4f3630 100644
--- a/OneM2M_Testcases_CSE_Release_1.ttcn
+++ b/OneM2M_Testcases_CSE_Release_1.ttcn
@@ -10152,9 +10152,9 @@ module OneM2M_Testcases_CSE_Release_1 {
tc_ac.start;
alt {
- [] mcaPort.receive(mw_response(mw_responsePrimitive(int4102))) -> value v_response {
+ [] mcaPort.receive(mw_response(mw_responsePrimitive(int4000))) -> value v_response {
tc_ac.stop;
- setverdict(pass, __SCOPE__ & ": Contents Unacceptable");
+ setverdict(pass, __SCOPE__ & ": Discovery properly rejected due to invalid filter criteria format");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
tc_ac.stop;
@@ -10179,7 +10179,7 @@ module OneM2M_Testcases_CSE_Release_1 {
group g_CSE_DIS_008{
/**
- * @desc Check that the IUT responds the originator with an error when the originator sends a request to discover the resource TARGET_RESOURCE_ADDRESS including two conflicted filter criteria of different type FILTER_CRITERIA_CONDITION_1 and FILTER_CRITERIA_CONDITION_2 (E.G. createBefore < createdAfter)
+ * @desc Check that the IUT responds the originator with a success response when the originator sends a request to discover the resource TARGET_RESOURCE_ADDRESS including two conflicted filter criteria of different type FILTER_CRITERIA_CONDITION_1 and FILTER_CRITERIA_CONDITION_2 (E.G. createBefore < createdAfter)
*
*/
testcase TC_CSE_DIS_008_CRB_CRA() runs on Tester system CseSystem {
--
GitLab