Commit cc67c0a7 authored by Miguel Angel Reina Ortega's avatar Miguel Angel Reina Ortega
Browse files

Some compilation errors from merge branch 'STF531-DISCOVERY_TEST_CASES' into...


Some compilation errors from merge branch 'STF531-DISCOVERY_TEST_CASES' into 'master' + update of the OneM2M_TestControl.ttcn
Signed-off-by: Miguel Angel Reina Ortega's avatarMiguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org>
parent 40d09f9b
......@@ -6,8 +6,8 @@
* All rights reserved.
*
* @author oneM2M
* @version $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/OneM2M_TestControl.ttcn $
* $Id: OneM2M_TestControl.ttcn 254 2017-05-02 15:55:08Z reinaortega $
* @version $URL: https://oldforge.etsi.org/svn/oneM2M/trunk/ttcn/OneM2M_TestControl.ttcn $
* $Id: OneM2M_TestControl.ttcn 299 2017-06-20 12:36:36Z reinaortega $
* @desc Test control module for oneM2M
*
*/
......@@ -244,6 +244,11 @@ module OneM2M_TestControl {
execute(TC_CSE_GMG_BV_022_03());
execute(TC_CSE_GMG_BV_022_04());
execute(TC_CSE_DIS_BV_001());
execute(TC_CSE_DIS_BV_003());
execute(TC_CSE_DIS_BV_004());
execute(TC_CSE_DIS_BO_005());
execute(TC_CSE_DIS_BO_006());
execute(TC_CSE_DIS_BI_007());
execute(TC_CSE_SUB_BV_001_01());
execute(TC_CSE_SUB_BV_001_02());
execute(TC_CSE_SUB_BV_002());
......
......@@ -7,7 +7,7 @@
*
* @author oneM2M
* @version $URL: https://oldforge.etsi.org/svn/oneM2M/trunk/ttcn/OneM2M_Testcases.ttcn $
* $Id: OneM2M_Testcases.ttcn 298 2017-06-14 07:11:13Z reinaortega $
* $Id: OneM2M_Testcases.ttcn 299 2017-06-20 12:36:36Z reinaortega $
* @desc Module containing test cases for oneM2M
*
*/
......@@ -10569,7 +10569,7 @@ module OneM2M_Testcases {
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//AE1 is registred;
if(PX_UNSTRUCTURED and (PX_ADDRESSING_FORMAT == e_cseRelative)) {
if(PX_ADDRESSING_METHOD == e_nonHierarchical and (PX_PRIMITIVE_SCOPE == e_cseRelative)) {
v_request := valueof(m_retrieveResourceFilterUsageOption(v_resourceId, f_getOriginator(v_aeIndex), int1));
} else {
v_request := valueof(m_retrieveResourceFilterUsageOption(f_getResourceAddress(v_aeIndex) & "/" & v_resourceId, f_getOriginator(v_resourceIndex), int1));
......
Markdown is supported
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