From 16962d129f9b913c5b76d6327791ace2181abc03 Mon Sep 17 00:00:00 2001
From: reinaortega <miguelangel.reinaortega@etsi.org>
Date: Wed, 17 Jun 2020 09:49:32 +0200
Subject: [PATCH] Small fix for TC_CSE_DMR_UPD_020, TC_CSE_DMR_UPD_021 and
TC_CSE_DMR_UPD_022
Signed-off-by: reinaortega <miguelangel.reinaortega@etsi.org>
---
OneM2M_PermutationFunctions.ttcn | 18 ++++++++++++++++++
OneM2M_Testcases_CSE_Release_2.ttcn | 16 ++++++++++------
2 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index ca92d0f..4ccf7b5 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -6272,6 +6272,12 @@ module OneM2M_PermutationFunctions {
// Test Body
v_request := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_updateRequestPrimitive);
v_request.resultContent := int0;//Nothing
+ if(valueof(p_childResourceType) == int23) {
+ if (vc_ae2.running) {
+ vc_ae2.stop;
+ }
+ vc_ae2.start(f_cse_notifyProcedure_defaultHandler());
+ }
f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
@@ -6341,6 +6347,12 @@ module OneM2M_PermutationFunctions {
// Test Body
v_request := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_updateRequestPrimitive);
v_request.resultContent := int1;//Attributes
+ if(valueof(p_childResourceType) == int23) {
+ if (vc_ae2.running) {
+ vc_ae2.stop;
+ }
+ vc_ae2.start(f_cse_notifyProcedure_defaultHandler());
+ }
f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
@@ -6410,6 +6422,12 @@ module OneM2M_PermutationFunctions {
// Test Body
v_request := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_updateRequestPrimitive);
v_request.resultContent := int9;//Modified Attributes
+ if(valueof(p_childResourceType) == int23) {
+ if (vc_ae2.running) {
+ vc_ae2.stop;
+ }
+ vc_ae2.start(f_cse_notifyProcedure_defaultHandler());
+ }
f_send(e_mca_port, m_request(v_request));
tc_ac.start;
alt {
diff --git a/OneM2M_Testcases_CSE_Release_2.ttcn b/OneM2M_Testcases_CSE_Release_2.ttcn
index 45e5e0c..7ecb008 100644
--- a/OneM2M_Testcases_CSE_Release_2.ttcn
+++ b/OneM2M_Testcases_CSE_Release_2.ttcn
@@ -1999,27 +1999,30 @@ module OneM2M_Testcases_CSE_Release_2 {
var RequestPrimitive v_updateRequest := valueof(m_updateContainerBase);
var template PrimitiveContent v_contentResponse;
- v_contentResponse.container := mw_contentContainer_allOmit;
+ v_contentResponse.container := mw_contentContainer_allOmit;
v_contentResponse.container.lastModifiedTime := ?;
v_contentResponse.container.stateTag := ?;
+ v_contentResponse.container.labels := ?;
v_updateRequest.primitiveContent.container.labels := {"VALUE_1"};
v_ae1.start(f_CSE_DMR_UPD_022(int3, m_createContainerBase, v_contentResponse, int3, m_createContainerBase, v_updateRequest));//Container
v_ae1.done;
- }
+ }
testcase TC_CSE_DMR_UPD_022_GRP() runs on Tester system CseSystem {
// Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var RequestPrimitive v_updateRequest := valueof(m_updateGroupBase);
var template PrimitiveContent v_contentResponse;
- v_contentResponse.group_ := mw_contentGroup_allOmit;
+
+ v_contentResponse.group_ := mw_contentGroup_allOmit;
v_contentResponse.group_.lastModifiedTime := ?;
+ v_contentResponse.group_.labels := ?;
v_updateRequest.primitiveContent.group_.labels := {"VALUE_1"};
v_ae1.start(f_CSE_DMR_UPD_022(int9, m_createGroupBase, v_contentResponse, int23, m_createSubscriptionBase, v_updateRequest));//Group
v_ae1.done;
- }
+ }
testcase TC_CSE_DMR_UPD_022_ACP() runs on Tester system CseSystem {
// Local variables
@@ -2027,13 +2030,14 @@ module OneM2M_Testcases_CSE_Release_2 {
var RequestPrimitive v_updateRequest := valueof(m_updateAcpBase);
var template PrimitiveContent v_contentResponse;
- v_contentResponse.accessControlPolicy := mw_contentAcp_allOmit;
+ v_contentResponse.accessControlPolicy := mw_contentAcp_allOmit;
v_contentResponse.accessControlPolicy.lastModifiedTime := ?;
+ v_contentResponse.accessControlPolicy.labels := ?;
v_updateRequest.primitiveContent.accessControlPolicy.labels := {"VALUE_1"};
v_ae1.start(f_CSE_DMR_UPD_022(int1, m_createAcpBase,v_contentResponse, int23, m_createSubscriptionBase, v_updateRequest));//AccessControlPolicy
v_ae1.done;
- }
+ }
} // end g_CSE_DMR_UPD_022
--
GitLab