From 230f48d657f2b25031865f935f966315310b206d Mon Sep 17 00:00:00 2001
From: acverdugo <acverdugo@at4wireless.com>
Date: Thu, 24 Aug 2017 16:13:55 +0200
Subject: [PATCH] Some fixes in:
TC_CSE_DMR_CRE_001_SUB_GRP
TC_CSE_DMR_CRE_012_SUB
---
LibOneM2M/OneM2M_Templates.ttcn | 3 +--
OneM2M_Testcases.ttcn | 11 ++++++++---
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index c65b712..c8566b0 100644
--- a/LibOneM2M/OneM2M_Templates.ttcn
+++ b/LibOneM2M/OneM2M_Templates.ttcn
@@ -3013,8 +3013,7 @@ module OneM2M_Templates {
template Notification mw_contentNotificationVerification modifies mw_contentNotificationBase := {
verificationRequest := true,
- //creator := ? //Temporal change, do not commit!
- creator := *
+ creator := ?
}
diff --git a/OneM2M_Testcases.ttcn b/OneM2M_Testcases.ttcn
index 7433f27..d5f242b 100644
--- a/OneM2M_Testcases.ttcn
+++ b/OneM2M_Testcases.ttcn
@@ -2218,13 +2218,14 @@ module OneM2M_Testcases {
p_parentRequestPrimitive.primitiveContent.subscription.notificationURI := {f_getResourceAddress(v_ae2Index)};
p_notifyHandler.start(f_cse_notifyProcedure_subscriptionVerificationHandler(v_parentIndex));
}
- v_parentIndex := f_cse_createResource(valueof(p_parentRequestPrimitive.resourceType), p_parentRequestPrimitive, v_parentIndex);
-
if(ischosen(p_parentRequestPrimitive.primitiveContent.group_)){
f_cse_preamble_registerAe();
-
+
}
+ v_parentIndex := f_cse_createResource(valueof(p_parentRequestPrimitive.resourceType), p_parentRequestPrimitive, v_parentIndex);
+
+
} else {//Resource under CSEBase
@@ -3306,6 +3307,8 @@ module OneM2M_Testcases {
var MsgIn v_response;
var RequestPrimitive v_request;
var integer v_aeIndex := -1;
+ var integer v_ae2Index := -1;
+ var CseTester v_notifyHandler;
// Test control
@@ -3316,6 +3319,8 @@ module OneM2M_Testcases {
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+
+ f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_requestPrimitive, p_resourceType);
// Test Body
v_request := f_getCreateRequestPrimitive(p_resourceType, p_requestPrimitive, v_aeIndex);
--
GitLab