diff --git a/OneM2M_Testcases.ttcn b/OneM2M_Testcases.ttcn
index c13563adcbf0a74f84c0c857f13c4948e962e8e9..65fcae6f6b5c9e7bd4d31212bc6bcdf2e8e29266 100644
--- a/OneM2M_Testcases.ttcn
+++ b/OneM2M_Testcases.ttcn
@@ -7,7 +7,7 @@
*
* @author oneM2M
* @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/OneM2M_Testcases.ttcn $
- * $Id: OneM2M_Testcases.ttcn 254 2017-05-02 15:55:08Z reinaortega $
+ * $Id: OneM2M_Testcases.ttcn 256 2017-05-16 05:24:01Z reinaortega $
* @desc Module containing test cases for oneM2M
*
*/
@@ -587,7 +587,7 @@ module OneM2M_Testcases {
v_contentResponse.any_1[0].Container_optional := mw_contentContainer_rc1;
- f_CSE_DMR_BV_002(int3, m_createContainerBase, v_contentResponse);//Container
+ f_CSE_DMR_BV_002(int3, m_createContainerBase, v_contentResponse, int3, m_createContainerBase);//Container
}
testcase TC_CSE_DMR_BV_002_02() runs on CseTester system CseSystem {
@@ -596,7 +596,7 @@ module OneM2M_Testcases {
v_contentResponse.any_1[0].Group_optional := mw_contentGroup_rc1;
- f_CSE_DMR_BV_002(int9, m_createGroupBase, v_contentResponse);//Group
+ f_CSE_DMR_BV_002(int9, m_createGroupBase, v_contentResponse, int23, m_createSubscriptionBase);//Group
}
testcase TC_CSE_DMR_BV_002_03() runs on CseTester system CseSystem {
@@ -605,7 +605,7 @@ module OneM2M_Testcases {
v_contentResponse.any_1[0].AccessControlPolicy_optional := mw_contentAcp_rc1;
- f_CSE_DMR_BV_002(int1, m_createAcpBase,v_contentResponse);//AccessControlPolicy
+ f_CSE_DMR_BV_002(int1, m_createAcpBase,v_contentResponse, int23, m_createSubscriptionBase);//AccessControlPolicy
}
testcase TC_CSE_DMR_BV_002_04() runs on CseTester system CseSystem {
@@ -614,7 +614,7 @@ module OneM2M_Testcases {
v_contentResponse.any_1[0].Schedule_optional := mw_contentSchedule_rc1;
- f_CSE_DMR_BV_002(int18, m_createScheduleBase, v_contentResponse);//Schedule
+ f_CSE_DMR_BV_002(int18, m_createScheduleBase, v_contentResponse, int23, m_createSubscriptionBase);//Schedule FIXME
}
testcase TC_CSE_DMR_BV_002_05() runs on CseTester system CseSystem {
@@ -623,7 +623,7 @@ module OneM2M_Testcases {
v_contentResponse.any_1[0].PollingChannel_optional := mw_contentPollingChannelBase;//FIXME
- f_CSE_DMR_BV_002(int15, m_createPollingChannelBase, v_contentResponse);//PollingChannel
+ f_CSE_DMR_BV_002(int15, m_createPollingChannelBase, v_contentResponse, int23, m_createSubscriptionBase);//PollingChannel
}
testcase TC_CSE_DMR_BV_002_06() runs on CseTester system CseSystem {
@@ -632,10 +632,10 @@ module OneM2M_Testcases {
v_contentResponse.any_1[0].Subscription_optional := mw_contentSubscription_rc1;
- f_CSE_DMR_BV_002(int23, m_createSubscriptionBase, v_contentResponse);//Subscription
+ f_CSE_DMR_BV_002(int23, m_createSubscriptionBase, v_contentResponse, int18, m_createScheduleBase);//Subscription
}
- function f_CSE_DMR_BV_002(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on CseTester {
+ function f_CSE_DMR_BV_002(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse, ResourceType p_childResourceType, template RequestPrimitive p_childRequestPrimitive) runs on CseTester {
// Local variables
var MsgIn v_response;
@@ -657,7 +657,7 @@ module OneM2M_Testcases {
v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex);
- v_childResourceIndex := f_cse_createResource(int3, m_createContainerBase, v_resourceIndex);
+ v_childResourceIndex := f_cse_createResource(p_childResourceType, p_childRequestPrimitive, v_resourceIndex);
// Test Body
v_request := valueof(m_retrieveResource(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
@@ -701,7 +701,7 @@ module OneM2M_Testcases {
v_contentResponse.any_1[0].Container_optional := mw_contentContainer_rc4;
- f_CSE_DMR_BV_003(int3, m_createContainerBase, v_contentResponse);//Container
+ f_CSE_DMR_BV_003(int3, m_createContainerBase, v_contentResponse, int3, m_createContainerBase);//Container
}
testcase TC_CSE_DMR_BV_003_02() runs on CseTester system CseSystem {
@@ -710,7 +710,7 @@ module OneM2M_Testcases {
v_contentResponse.any_1[0].Group_optional := mw_contentGroup_rc4;
- f_CSE_DMR_BV_003(int9, m_createGroupBase, v_contentResponse);//Group
+ f_CSE_DMR_BV_003(int9, m_createGroupBase, v_contentResponse, int23, m_createSubscriptionBase);//Group
}
testcase TC_CSE_DMR_BV_003_03() runs on CseTester system CseSystem {
@@ -719,7 +719,7 @@ module OneM2M_Testcases {
v_contentResponse.any_1[0].AccessControlPolicy_optional := mw_contentAcp_rc4;
- f_CSE_DMR_BV_003(int1, m_createAcpBase,v_contentResponse);//AccessControlPolicy
+ f_CSE_DMR_BV_003(int1, m_createAcpBase,v_contentResponse, int23, m_createSubscriptionBase);//AccessControlPolicy
}
testcase TC_CSE_DMR_BV_003_04() runs on CseTester system CseSystem {
@@ -728,7 +728,7 @@ module OneM2M_Testcases {
v_contentResponse.any_1[0].Schedule_optional := mw_contentSchedule_rc4;
- f_CSE_DMR_BV_003(int18, m_createScheduleBase, v_contentResponse);//Schedule
+ f_CSE_DMR_BV_003(int18, m_createScheduleBase, v_contentResponse, int23, m_createSubscriptionBase);//Schedule FIXME
}
testcase TC_CSE_DMR_BV_003_05() runs on CseTester system CseSystem {
@@ -737,7 +737,7 @@ module OneM2M_Testcases {
v_contentResponse.any_1[0].PollingChannel_optional := mw_contentPollingChannelBase;//FIXME
- f_CSE_DMR_BV_003(int15, m_createPollingChannelBase, v_contentResponse);//PollingChannel
+ f_CSE_DMR_BV_003(int15, m_createPollingChannelBase, v_contentResponse, int23, m_createSubscriptionBase);//PollingChannel
}
testcase TC_CSE_DMR_BV_003_06() runs on CseTester system CseSystem {
@@ -746,10 +746,10 @@ module OneM2M_Testcases {
v_contentResponse.any_1[0].Subscription_optional := mw_contentSubscription_rc4;
- f_CSE_DMR_BV_003(int23, m_createSubscriptionBase, v_contentResponse);//Subscription
+ f_CSE_DMR_BV_003(int23, m_createSubscriptionBase, v_contentResponse, int18, m_createScheduleBase);//Subscription
}
- function f_CSE_DMR_BV_003(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on CseTester {
+ function f_CSE_DMR_BV_003(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse, ResourceType p_childResourceType, template RequestPrimitive p_childRequestPrimitive) runs on CseTester {
// Local variables
var MsgIn v_response;
@@ -771,7 +771,7 @@ module OneM2M_Testcases {
v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex);
- v_childResourceIndex := f_cse_createResource(int3, m_createContainerBase, v_resourceIndex);
+ v_childResourceIndex := f_cse_createResource(p_childResourceType, p_childRequestPrimitive, v_resourceIndex);
// Test Body
v_request := valueof(m_retrieveResource(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
@@ -814,7 +814,7 @@ module OneM2M_Testcases {
v_contentResponse.any_1[0].Container_optional := mw_contentContainer_rc5;
- f_CSE_DMR_BV_004(int3, m_createContainerBase, v_contentResponse);//Container
+ f_CSE_DMR_BV_004(int3, m_createContainerBase, v_contentResponse, int3, m_createContainerBase);//Container
}
testcase TC_CSE_DMR_BV_004_02() runs on CseTester system CseSystem {
@@ -823,7 +823,7 @@ module OneM2M_Testcases {
v_contentResponse.any_1[0].Group_optional := mw_contentGroup_rc5;
- f_CSE_DMR_BV_004(int9, m_createGroupBase, v_contentResponse);//Group
+ f_CSE_DMR_BV_004(int9, m_createGroupBase, v_contentResponse, int23, m_createSubscriptionBase);//Group
}
testcase TC_CSE_DMR_BV_004_03() runs on CseTester system CseSystem {
@@ -832,7 +832,7 @@ module OneM2M_Testcases {
v_contentResponse.any_1[0].AccessControlPolicy_optional := mw_contentAcp_rc5;
- f_CSE_DMR_BV_004(int1, m_createAcpBase,v_contentResponse);//AccessControlPolicy
+ f_CSE_DMR_BV_004(int1, m_createAcpBase,v_contentResponse, int23, m_createSubscriptionBase);//AccessControlPolicy
}
testcase TC_CSE_DMR_BV_004_04() runs on CseTester system CseSystem {
@@ -841,7 +841,7 @@ module OneM2M_Testcases {
v_contentResponse.any_1[0].Schedule_optional := mw_contentSchedule_rc5;
- f_CSE_DMR_BV_004(int18, m_createScheduleBase, v_contentResponse);//Schedule
+ f_CSE_DMR_BV_004(int18, m_createScheduleBase, v_contentResponse, int23, m_createSubscriptionBase);//Schedule FIXME
}
testcase TC_CSE_DMR_BV_004_05() runs on CseTester system CseSystem {
@@ -850,7 +850,7 @@ module OneM2M_Testcases {
v_contentResponse.any_1[0].PollingChannel_optional := mw_contentPollingChannelBase;//FIXME
- f_CSE_DMR_BV_004(int15, m_createPollingChannelBase, v_contentResponse);//PollingChannel
+ f_CSE_DMR_BV_004(int15, m_createPollingChannelBase, v_contentResponse, int23, m_createSubscriptionBase);//PollingChannel
}
testcase TC_CSE_DMR_BV_004_06() runs on CseTester system CseSystem {
@@ -859,10 +859,10 @@ module OneM2M_Testcases {
v_contentResponse.any_1[0].Subscription_optional := mw_contentSubscription_rc5;
- f_CSE_DMR_BV_004(int23, m_createSubscriptionBase, v_contentResponse);//Subscription
+ f_CSE_DMR_BV_004(int23, m_createSubscriptionBase, v_contentResponse, int18, m_createScheduleBase);//Subscription
}
- function f_CSE_DMR_BV_004(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on CseTester {
+ function f_CSE_DMR_BV_004(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse, ResourceType p_childResourceType, template RequestPrimitive p_childRequestPrimitive) runs on CseTester {
// Local variables
var MsgIn v_response;
@@ -884,7 +884,7 @@ module OneM2M_Testcases {
v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex);
- v_childResourceIndex := f_cse_createResource(int3, m_createContainerBase, v_resourceIndex);
+ v_childResourceIndex := f_cse_createResource(p_childResourceType, p_childRequestPrimitive, v_resourceIndex);
// Test Body
v_request := valueof(m_retrieveResource(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
@@ -927,7 +927,7 @@ module OneM2M_Testcases {
v_contentResponse.any_1[0].Container_optional := mw_contentContainer_rc6;
- f_CSE_DMR_BV_005(int3, m_createContainerBase, v_contentResponse);//Container
+ f_CSE_DMR_BV_005(int3, m_createContainerBase, v_contentResponse, int3, m_createContainerBase);//Container
}
testcase TC_CSE_DMR_BV_005_02() runs on CseTester system CseSystem {
@@ -936,7 +936,7 @@ module OneM2M_Testcases {
v_contentResponse.any_1[0].Group_optional := mw_contentGroup_rc6;
- f_CSE_DMR_BV_005(int9, m_createGroupBase, v_contentResponse);//Group
+ f_CSE_DMR_BV_005(int9, m_createGroupBase, v_contentResponse, int23, m_createSubscriptionBase);//Group
}
testcase TC_CSE_DMR_BV_005_03() runs on CseTester system CseSystem {
@@ -945,7 +945,7 @@ module OneM2M_Testcases {
v_contentResponse.any_1[0].AccessControlPolicy_optional := mw_contentAcp_rc6;
- f_CSE_DMR_BV_005(int1, m_createAcpBase,v_contentResponse);//AccessControlPolicy
+ f_CSE_DMR_BV_005(int1, m_createAcpBase,v_contentResponse, int23, m_createSubscriptionBase);//AccessControlPolicy
}
testcase TC_CSE_DMR_BV_005_04() runs on CseTester system CseSystem {
@@ -954,7 +954,7 @@ module OneM2M_Testcases {
v_contentResponse.any_1[0].Schedule_optional := mw_contentSchedule_rc6;
- f_CSE_DMR_BV_005(int18, m_createScheduleBase, v_contentResponse);//Schedule
+ f_CSE_DMR_BV_005(int18, m_createScheduleBase, v_contentResponse, int23, m_createSubscriptionBase);//Schedule FIXME
}
testcase TC_CSE_DMR_BV_005_05() runs on CseTester system CseSystem {
@@ -963,7 +963,7 @@ module OneM2M_Testcases {
v_contentResponse.any_1[0].PollingChannel_optional := mw_contentPollingChannelBase;//FIXME
- f_CSE_DMR_BV_005(int15, m_createPollingChannelBase, v_contentResponse);//PollingChannel
+ f_CSE_DMR_BV_005(int15, m_createPollingChannelBase, v_contentResponse, int23, m_createSubscriptionBase);//PollingChannel
}
testcase TC_CSE_DMR_BV_005_06() runs on CseTester system CseSystem {
@@ -972,10 +972,10 @@ module OneM2M_Testcases {
v_contentResponse.any_1[0].Subscription_optional := mw_contentSubscription_rc6;
- f_CSE_DMR_BV_005(int23, m_createSubscriptionBase, v_contentResponse);//Subscription
+ f_CSE_DMR_BV_005(int23, m_createSubscriptionBase, v_contentResponse, int18, m_createScheduleBase);//Subscription
}
- function f_CSE_DMR_BV_005(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on CseTester {
+ function f_CSE_DMR_BV_005(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse, ResourceType p_childResourceType, template RequestPrimitive p_childRequestPrimitive) runs on CseTester {
// Local variables
var MsgIn v_response;
@@ -997,7 +997,7 @@ module OneM2M_Testcases {
v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex);
- v_childResourceIndex := f_cse_createResource(int3, m_createContainerBase, v_resourceIndex);
+ v_childResourceIndex := f_cse_createResource(p_childResourceType, p_childRequestPrimitive, v_resourceIndex);
// Test Body
v_request := valueof(m_retrieveResource(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
@@ -1040,7 +1040,7 @@ module OneM2M_Testcases {
v_contentResponse.any_1[0].Container_optional := mw_contentContainer_rc8;
- f_CSE_DMR_BV_006(int3, m_createContainerBase, v_contentResponse);//Container
+ f_CSE_DMR_BV_006(int3, m_createContainerBase, v_contentResponse, int3, m_createContainerBase);//Container
}
testcase TC_CSE_DMR_BV_006_02() runs on CseTester system CseSystem {
@@ -1049,7 +1049,7 @@ module OneM2M_Testcases {
v_contentResponse.any_1[0].Group_optional := mw_contentGroup_rc8;
- f_CSE_DMR_BV_006(int9, m_createGroupBase, v_contentResponse);//Group
+ f_CSE_DMR_BV_006(int9, m_createGroupBase, v_contentResponse, int23, m_createSubscriptionBase);//Group
}
testcase TC_CSE_DMR_BV_006_03() runs on CseTester system CseSystem {
@@ -1058,7 +1058,7 @@ module OneM2M_Testcases {
v_contentResponse.any_1[0].AccessControlPolicy_optional := mw_contentAcp_rc8;
- f_CSE_DMR_BV_006(int1, m_createAcpBase,v_contentResponse);//AccessControlPolicy
+ f_CSE_DMR_BV_006(int1, m_createAcpBase,v_contentResponse, int23, m_createSubscriptionBase);//AccessControlPolicy
}
testcase TC_CSE_DMR_BV_006_04() runs on CseTester system CseSystem {
@@ -1067,7 +1067,7 @@ module OneM2M_Testcases {
v_contentResponse.any_1[0].Schedule_optional := mw_contentSchedule_rc8;
- f_CSE_DMR_BV_006(int18, m_createScheduleBase, v_contentResponse);//Schedule
+ f_CSE_DMR_BV_006(int18, m_createScheduleBase, v_contentResponse, int23, m_createSubscriptionBase);//Schedule FIXME
}
testcase TC_CSE_DMR_BV_006_05() runs on CseTester system CseSystem {
@@ -1076,7 +1076,7 @@ module OneM2M_Testcases {
v_contentResponse.any_1[0].PollingChannel_optional := mw_contentPollingChannelBase;//FIXME
- f_CSE_DMR_BV_006(int15, m_createPollingChannelBase, v_contentResponse);//PollingChannel
+ f_CSE_DMR_BV_006(int15, m_createPollingChannelBase, v_contentResponse, int23, m_createSubscriptionBase);//PollingChannel
}
testcase TC_CSE_DMR_BV_006_06() runs on CseTester system CseSystem {
@@ -1085,10 +1085,10 @@ module OneM2M_Testcases {
v_contentResponse.any_1[0].Subscription_optional := mw_contentSubscription_rc8;
- f_CSE_DMR_BV_006(int23, m_createSubscriptionBase, v_contentResponse);//Subscription
+ f_CSE_DMR_BV_006(int23, m_createSubscriptionBase, v_contentResponse, int18, m_createScheduleBase);//Subscription
}
- function f_CSE_DMR_BV_006(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on CseTester {
+ function f_CSE_DMR_BV_006(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse, ResourceType p_childResourceType, template RequestPrimitive p_childRequestPrimitive) runs on CseTester {
// Local variables
var MsgIn v_response;
@@ -1110,7 +1110,7 @@ module OneM2M_Testcases {
v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex);
- v_childResourceIndex := f_cse_createResource(int3, m_createContainerBase, v_resourceIndex);
+ v_childResourceIndex := f_cse_createResource(p_childResourceType, p_childRequestPrimitive, v_resourceIndex);
// Test Body
v_request := valueof(m_retrieveResource(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));