diff --git a/OneM2M_TestControl.ttcn b/OneM2M_TestControl.ttcn
index 4cb438c2f2e75e1751dfdc9f93ac67353fd2bfbb..7aa57307c3067abbcaeb8c6dbe4a17209e367620 100644
--- a/OneM2M_TestControl.ttcn
+++ b/OneM2M_TestControl.ttcn
@@ -7,7 +7,7 @@
*
* @author oneM2M
* @version $URL: https://oldforge.etsi.org/svn/oneM2M/trunk/ttcn/OneM2M_TestControl.ttcn $
- * $Id: OneM2M_TestControl.ttcn 338 2017-08-03 08:36:12Z reinaortega $
+ * $Id: OneM2M_TestControl.ttcn 343 2017-08-07 13:34:49Z reinaortega $
* @desc Test control module for oneM2M
*
*/
@@ -192,9 +192,9 @@ module OneM2M_TestControl {
execute(TC_CSE_DMR_UPD_005_CNT_EXC());
execute(TC_CSE_DMR_UPD_005_GRP_EXC());
execute(TC_CSE_DMR_UPD_005_ACP_EXC());
- execute(TC_CSE_DMR_UPD_005_SCH_EXCLBL());
+ execute(TC_CSE_DMR_UPD_005_SCH_EXC());
execute(TC_CSE_DMR_UPD_005_PCH_EXC());
- execute(TC_CSE_DMR_UPD_005_SUB_LBLMNI());
+ execute(TC_CSE_DMR_UPD_005_SUB_MNI());
execute(TC_CSE_DMR_UPD_006_CNT_LBL());
execute(TC_CSE_DMR_UPD_006_GRP_LBL());
execute(TC_CSE_DMR_UPD_006_ACP_LBL());
diff --git a/OneM2M_Testcases.ttcn b/OneM2M_Testcases.ttcn
index 34d98910eae9cfbb37857933e574c2f530563538..3841687e32cec1f1ab399fbd02d6dae269d03a78 100644
--- a/OneM2M_Testcases.ttcn
+++ b/OneM2M_Testcases.ttcn
@@ -7,7 +7,7 @@
*
* @author oneM2M
* @version $URL: https://oldforge.etsi.org/svn/oneM2M/trunk/ttcn/OneM2M_Testcases.ttcn $
- * $Id: OneM2M_Testcases.ttcn 342 2017-08-07 13:03:50Z reinaortega $
+ * $Id: OneM2M_Testcases.ttcn 343 2017-08-07 13:34:49Z reinaortega $
* @desc Module containing test cases for oneM2M
*
*/
@@ -8594,81 +8594,90 @@ module OneM2M_Testcases {
testcase TC_CSE_DMR_UPD_005_CNT_EXC() runs on CseTester system CseSystem {
// Local variables
var XSD.PositiveInteger v_expirationCounter := 1;
+ var template RequestPrimitive v_createRequest := m_createContainerBase;
var template RequestPrimitive v_updateRequest := m_updateContainerBase;
v_updateRequest.primitiveContent := {container_update_invalid := m_contentUpdateContainer_invalid};
v_updateRequest.primitiveContent.container_update_invalid.expirationCounter := v_expirationCounter;
- f_CSE_DMR_UPD_005(int3, v_updateRequest);//Container
+ f_CSE_DMR_UPD_005(int3, v_createRequest, v_updateRequest);//Container
}
testcase TC_CSE_DMR_UPD_005_GRP_EXC() runs on CseTester system CseSystem {
// Local variables
var XSD.PositiveInteger v_expirationCounter := 1;
+ var template RequestPrimitive v_createRequest := m_createGroupBase;
var template RequestPrimitive v_updateRequest := m_updateGroupBase;
v_updateRequest.primitiveContent := {group_update_invalid := m_contentUpdateGroup_invalid};
v_updateRequest.primitiveContent.group_update_invalid.expirationCounter := v_expirationCounter;
- f_CSE_DMR_UPD_005(int9, v_updateRequest);//Group
+ f_CSE_DMR_UPD_005(int9, v_createRequest, v_updateRequest);//Group
}
testcase TC_CSE_DMR_UPD_005_ACP_EXC() runs on CseTester system CseSystem {
// Local variables
var XSD.PositiveInteger v_expirationCounter := 1;
+ var template RequestPrimitive v_createRequest := m_createAcpBase;
var template RequestPrimitive v_updateRequest := m_updateAcpBase;
v_updateRequest.primitiveContent := {aCP_update_invalid := m_contentUpdateAcp_invalid};
v_updateRequest.primitiveContent.aCP_update_invalid.expirationCounter := v_expirationCounter;
- f_CSE_DMR_UPD_005(int1, v_updateRequest);//AccessControlPolicy
+ f_CSE_DMR_UPD_005(int1, v_createRequest, v_updateRequest);//AccessControlPolicy
}
- testcase TC_CSE_DMR_UPD_005_SCH_EXCLBL() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_005_SCH_EXC() runs on CseTester system CseSystem {
// Local variables
var XSD.PositiveInteger v_expirationCounter := 1;
+ var template RequestPrimitive v_createRequest := m_createScheduleBase;
var template RequestPrimitive v_updateRequest := m_updateScheduleBase;
v_updateRequest.primitiveContent := {schedule_update_invalid := m_contentUpdateSchedule_invalid};
v_updateRequest.primitiveContent.schedule_update_invalid.expirationCounter := v_expirationCounter;
- f_CSE_DMR_UPD_005(int18, v_updateRequest);//Schedule
+ f_CSE_DMR_UPD_005(int18, v_createRequest, v_updateRequest);//Schedule
}
testcase TC_CSE_DMR_UPD_005_PCH_EXC() runs on CseTester system CseSystem {
// Local variables
var XSD.PositiveInteger v_expirationCounter := 1;
+ var template RequestPrimitive v_createRequest := m_createPollingChannelBase;
var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase;
v_updateRequest.primitiveContent := {pollingChannel_update_invalid := m_contentUpdatePollingChannel_invalid};
v_updateRequest.primitiveContent.pollingChannel_update_invalid.expirationCounter := v_expirationCounter;
- f_CSE_DMR_UPD_005(int15, v_updateRequest);//PollingChannel
+ f_CSE_DMR_UPD_005(int15, v_createRequest, v_updateRequest);//PollingChannel
}
- testcase TC_CSE_DMR_UPD_005_SUB_LBLMNI() runs on CseTester system CseSystem {
+ testcase TC_CSE_DMR_UPD_005_SUB_MNI() runs on CseTester system CseSystem {
// Local variables
var XSD.NonNegativeInteger v_maxNrOfInstances := 5;
+ var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
v_updateRequest.primitiveContent := {subscription_update_invalid := m_contentUpdateSubscription_invalid};
v_updateRequest.primitiveContent.subscription_update_invalid.maxNrOfInstances := v_maxNrOfInstances;
- f_CSE_DMR_UPD_005(int23, v_updateRequest);//Subscription
+ f_CSE_DMR_UPD_005(int23, v_createRequest, v_updateRequest);//Subscription
}
- function f_CSE_DMR_UPD_005(ResourceType p_resourceType, template RequestPrimitive p_updateRequestPrimitive) runs on CseTester {
+ function f_CSE_DMR_UPD_005(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive) runs on CseTester {
// Local variables
var MsgIn v_response;
var RequestPrimitive v_request;
+ var CseTester v_notifyHandler;
var integer v_aeIndex := -1;
+ var integer v_ae2Index := -1;
+ var integer v_resourceIndex := -1;
// Test control
@@ -8679,12 +8688,14 @@ module OneM2M_Testcases {
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
-
- // Test Body
- v_request := f_getUpdateRequestPrimitive(p_resourceType, v_aeIndex, p_updateRequestPrimitive);
- v_request.to_ := v_request.to_ & "/" & c_defaultResourceName;
+ f_cse_preamble_subscriptionVerification(v_notifyHandler, v_aeIndex, v_ae2Index, p_createRequestPrimitive, p_resourceType);
+ v_resourceIndex := f_cse_createResource(p_resourceType, p_createRequestPrimitive , v_aeIndex);
+
+ // Test Body
+ v_request := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_updateRequestPrimitive);
+
mcaPort.send(m_request(v_request));
tc_ac.start;
alt {