Skip to content
Snippets Groups Projects
Commit d325b573 authored by Miguel Angel Reina Ortega's avatar Miguel Angel Reina Ortega
Browse files

Small correction for TC_CSE_DMR_BV_002, TC_CSE_DMR_BV_003, TC_CSE_DMR_BV_004,... 

Small correction for TC_CSE_DMR_BV_002, TC_CSE_DMR_BV_003, TC_CSE_DMR_BV_004, TC_CSE_DMR_BV_005, TC_CSE_DMR_BV_006 for the schedule and pollingChannel permutations

Signed-off-by: Miguel Angel Reina Ortega's avatarreinaortega <miguelangel.reinaortega@etsi.org>
parent ccf73ee9
No related branches found
No related tags found
1 merge request!25Ae fixes
Hide whitespace changes
Inline Side-by-side
Showing
with 39 additions and 29 deletions
OneM2M_Testcases.ttcn
+ 39
− 29
View file @ d325b573
......@@ -7,7 +7,7 @@
*
* @author oneM2M
* @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/OneM2M_Testcases.ttcn $
* $Id: OneM2M_Testcases.ttcn 260 2017-05-16 08:26:03Z reinaortega $
* $Id: OneM2M_Testcases.ttcn 261 2017-05-16 09:02:53Z reinaortega $
* @desc Module containing test cases for oneM2M
*
*/
......@@ -614,16 +614,16 @@ module OneM2M_Testcases {
v_contentResponse.any_1[0].Schedule_optional := mw_contentSchedule_rc1;
f_CSE_DMR_BV_002(int18, m_createScheduleBase, v_contentResponse, int23, m_createSubscriptionBase);//Schedule FIXME
f_CSE_DMR_BV_002(int18, m_createScheduleBase, v_contentResponse, int23, m_createSubscriptionBase);//Schedule
}
testcase TC_CSE_DMR_BV_002_05() runs on CseTester system CseSystem {
// Local variables
var template PrimitiveContent v_contentResponse;
v_contentResponse.any_1[0].PollingChannel_optional := mw_contentPollingChannelBase;//FIXME
v_contentResponse.any_1[0].PollingChannel_optional := mw_contentPollingChannelBase;
f_CSE_DMR_BV_002(int15, m_createPollingChannelBase, v_contentResponse, int23, m_createSubscriptionBase);//PollingChannel
f_CSE_DMR_BV_002(int15, m_createPollingChannelBase, v_contentResponse, omit, omit);//PollingChannel
}
testcase TC_CSE_DMR_BV_002_06() runs on CseTester system CseSystem {
......@@ -635,7 +635,7 @@ module OneM2M_Testcases {
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, ResourceType p_childResourceType, template RequestPrimitive p_childRequestPrimitive) runs on CseTester {
function f_CSE_DMR_BV_002(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse, template ResourceType p_childResourceType, template RequestPrimitive p_childRequestPrimitive) runs on CseTester {
// Local variables
var MsgIn v_response;
......@@ -657,8 +657,10 @@ module OneM2M_Testcases {
v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex);
v_childResourceIndex := f_cse_createResource(p_childResourceType, p_childRequestPrimitive, v_resourceIndex);
if(p_resourceType != int15) {
v_childResourceIndex := f_cse_createResource(valueof(p_childResourceType), p_childRequestPrimitive, v_resourceIndex);
}
// Test Body
v_request := valueof(m_retrieveResource(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
v_request.resultContent := int1;//Attributes
......@@ -728,16 +730,16 @@ module OneM2M_Testcases {
v_contentResponse.any_1[0].Schedule_optional := mw_contentSchedule_rc4;
f_CSE_DMR_BV_003(int18, m_createScheduleBase, v_contentResponse, int23, m_createSubscriptionBase);//Schedule FIXME
f_CSE_DMR_BV_003(int18, m_createScheduleBase, v_contentResponse, int23, m_createSubscriptionBase);//Schedule
}
testcase TC_CSE_DMR_BV_003_05() runs on CseTester system CseSystem {
// Local variables
var template PrimitiveContent v_contentResponse;
v_contentResponse.any_1[0].PollingChannel_optional := mw_contentPollingChannelBase;//FIXME
v_contentResponse.any_1[0].PollingChannel_optional := mw_contentPollingChannelBase;
f_CSE_DMR_BV_003(int15, m_createPollingChannelBase, v_contentResponse, int23, m_createSubscriptionBase);//PollingChannel
f_CSE_DMR_BV_003(int15, m_createPollingChannelBase, v_contentResponse, omit, omit);//PollingChannel
}
testcase TC_CSE_DMR_BV_003_06() runs on CseTester system CseSystem {
......@@ -749,7 +751,7 @@ module OneM2M_Testcases {
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, ResourceType p_childResourceType, template RequestPrimitive p_childRequestPrimitive) runs on CseTester {
function f_CSE_DMR_BV_003(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse, template ResourceType p_childResourceType, template RequestPrimitive p_childRequestPrimitive) runs on CseTester {
// Local variables
var MsgIn v_response;
......@@ -770,9 +772,11 @@ module OneM2M_Testcases {
v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex);
v_childResourceIndex := f_cse_createResource(p_childResourceType, p_childRequestPrimitive, v_resourceIndex);
if(p_resourceType != int15) {
v_childResourceIndex := f_cse_createResource(valueof(p_childResourceType), p_childRequestPrimitive, v_resourceIndex);
}
// Test Body
v_request := valueof(m_retrieveResource(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
v_request.resultContent := int4;//Attributes and child resources
......@@ -841,16 +845,16 @@ module OneM2M_Testcases {
v_contentResponse.any_1[0].Schedule_optional := mw_contentSchedule_rc5;
f_CSE_DMR_BV_004(int18, m_createScheduleBase, v_contentResponse, int23, m_createSubscriptionBase);//Schedule FIXME
f_CSE_DMR_BV_004(int18, m_createScheduleBase, v_contentResponse, int23, m_createSubscriptionBase);//Schedule
}
testcase TC_CSE_DMR_BV_004_05() runs on CseTester system CseSystem {
// Local variables
var template PrimitiveContent v_contentResponse;
v_contentResponse.any_1[0].PollingChannel_optional := mw_contentPollingChannelBase;//FIXME
v_contentResponse.any_1[0].PollingChannel_optional := mw_contentPollingChannelBase;
f_CSE_DMR_BV_004(int15, m_createPollingChannelBase, v_contentResponse, int23, m_createSubscriptionBase);//PollingChannel
f_CSE_DMR_BV_004(int15, m_createPollingChannelBase, v_contentResponse, omit, omit);//PollingChannel
}
testcase TC_CSE_DMR_BV_004_06() runs on CseTester system CseSystem {
......@@ -862,7 +866,7 @@ module OneM2M_Testcases {
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, ResourceType p_childResourceType, template RequestPrimitive p_childRequestPrimitive) runs on CseTester {
function f_CSE_DMR_BV_004(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse, template ResourceType p_childResourceType, template RequestPrimitive p_childRequestPrimitive) runs on CseTester {
// Local variables
var MsgIn v_response;
......@@ -884,7 +888,9 @@ module OneM2M_Testcases {
v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex);
v_childResourceIndex := f_cse_createResource(p_childResourceType, p_childRequestPrimitive, v_resourceIndex);
if(p_resourceType != int15) {
v_childResourceIndex := f_cse_createResource(valueof(p_childResourceType), p_childRequestPrimitive, v_resourceIndex);
}
// Test Body
v_request := valueof(m_retrieveResource(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
......@@ -954,16 +960,16 @@ module OneM2M_Testcases {
v_contentResponse.any_1[0].Schedule_optional := mw_contentSchedule_rc6;
f_CSE_DMR_BV_005(int18, m_createScheduleBase, v_contentResponse, int23, m_createSubscriptionBase);//Schedule FIXME
f_CSE_DMR_BV_005(int18, m_createScheduleBase, v_contentResponse, int23, m_createSubscriptionBase);//Schedule
}
testcase TC_CSE_DMR_BV_005_05() runs on CseTester system CseSystem {
// Local variables
var template PrimitiveContent v_contentResponse;
v_contentResponse.any_1[0].PollingChannel_optional := mw_contentPollingChannelBase;//FIXME
v_contentResponse.any_1[0].PollingChannel_optional := mw_contentPollingChannelBase;
f_CSE_DMR_BV_005(int15, m_createPollingChannelBase, v_contentResponse, int23, m_createSubscriptionBase);//PollingChannel
f_CSE_DMR_BV_005(int15, m_createPollingChannelBase, v_contentResponse, omit, omit);//PollingChannel
}
testcase TC_CSE_DMR_BV_005_06() runs on CseTester system CseSystem {
......@@ -975,7 +981,7 @@ module OneM2M_Testcases {
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, ResourceType p_childResourceType, template RequestPrimitive p_childRequestPrimitive) runs on CseTester {
function f_CSE_DMR_BV_005(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse, template ResourceType p_childResourceType, template RequestPrimitive p_childRequestPrimitive) runs on CseTester {
// Local variables
var MsgIn v_response;
......@@ -997,7 +1003,9 @@ module OneM2M_Testcases {
v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex);
v_childResourceIndex := f_cse_createResource(p_childResourceType, p_childRequestPrimitive, v_resourceIndex);
if(p_resourceType != int15) {
v_childResourceIndex := f_cse_createResource(valueof(p_childResourceType), p_childRequestPrimitive, v_resourceIndex);
}
// Test Body
v_request := valueof(m_retrieveResource(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
......@@ -1067,16 +1075,16 @@ module OneM2M_Testcases {
v_contentResponse.any_1[0].Schedule_optional := mw_contentSchedule_rc8;
f_CSE_DMR_BV_006(int18, m_createScheduleBase, v_contentResponse, int23, m_createSubscriptionBase);//Schedule FIXME
f_CSE_DMR_BV_006(int18, m_createScheduleBase, v_contentResponse, int23, m_createSubscriptionBase);//Schedule
}
testcase TC_CSE_DMR_BV_006_05() runs on CseTester system CseSystem {
// Local variables
var template PrimitiveContent v_contentResponse;
v_contentResponse.any_1[0].PollingChannel_optional := mw_contentPollingChannelBase;//FIXME
v_contentResponse.any_1[0].PollingChannel_optional := mw_contentPollingChannelBase;
f_CSE_DMR_BV_006(int15, m_createPollingChannelBase, v_contentResponse, int23, m_createSubscriptionBase);//PollingChannel
f_CSE_DMR_BV_006(int15, m_createPollingChannelBase, v_contentResponse, omit, omit);//PollingChannel
}
testcase TC_CSE_DMR_BV_006_06() runs on CseTester system CseSystem {
......@@ -1088,7 +1096,7 @@ module OneM2M_Testcases {
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, ResourceType p_childResourceType, template RequestPrimitive p_childRequestPrimitive) runs on CseTester {
function f_CSE_DMR_BV_006(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse, template ResourceType p_childResourceType, template RequestPrimitive p_childRequestPrimitive) runs on CseTester {
// Local variables
var MsgIn v_response;
......@@ -1110,7 +1118,9 @@ module OneM2M_Testcases {
v_resourceIndex := f_cse_createResource(p_resourceType, p_requestPrimitive, v_aeIndex);
v_childResourceIndex := f_cse_createResource(p_childResourceType, p_childRequestPrimitive, v_resourceIndex);
if(p_resourceType != int15) {
v_childResourceIndex := f_cse_createResource(valueof(p_childResourceType), p_childRequestPrimitive, v_resourceIndex);
}
// Test Body
v_request := valueof(m_retrieveResource(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment