From d64bfa4197d3401c41f53497adcdb466cf7a7b63 Mon Sep 17 00:00:00 2001 From: oneM2MTester Develop Team <novamartin@keti.re.kr> Date: Mon, 10 Oct 2016 03:42:25 -0700 Subject: [PATCH] remove PX_TS_XYZ parameters from pixit --- LibOneM2M/OneM2M_Pixits.ttcn | 6 ++---- OneM2M_Testcases.ttcn | 9 ++++----- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/LibOneM2M/OneM2M_Pixits.ttcn b/LibOneM2M/OneM2M_Pixits.ttcn index d7fe88e..3da3dfd 100644 --- a/LibOneM2M/OneM2M_Pixits.ttcn +++ b/LibOneM2M/OneM2M_Pixits.ttcn @@ -53,10 +53,8 @@ module OneM2M_Pixits { modulepar boolean PX_FROM_IS_AE_ID := false; //@Martin //for checking whether the locationPolicy creation request is originated from a ASN-AE - //NOTE: Apply to Device-based location request, and this requires Test System (TS) to activate ASN-AE mode to test IUT - modulepar boolean PX_TS_IS_ASN_AE := false; //default - modulepar boolean PX_IUT_IS_ASN_CSE := false; //default //set it to true when running Device-based location testcases - modulepar boolean PX_TS_IS_ADN_AE := true; //default + //NOTE: Apply to Device-based location request, and this requires Test System (TS) to activate ASN-AE mode to test IUT + modulepar boolean PX_IUT_IS_ASN_CSE := false; //default //set it to true when running Device-based location testcases modulepar boolean PX_IUT_IS_MN_CSE := false; //default //set it to true when running Share-based location testcases //@Martin diff --git a/OneM2M_Testcases.ttcn b/OneM2M_Testcases.ttcn index 4839115..6d40e4e 100644 --- a/OneM2M_Testcases.ttcn +++ b/OneM2M_Testcases.ttcn @@ -4161,7 +4161,7 @@ module OneM2M_Testcases { if(PX_IUT_IS_ASN_CSE){ - if(PX_TS_IS_ASN_AE){ + //Preamble v_aeAuxIndex := f_cse_preamble_registerAe(); //Set requestPrimitive @@ -4186,7 +4186,7 @@ module OneM2M_Testcases { // Postamble f_cse_postamble_deleteResources(); - } + } // Tear down f_cf01Down(); @@ -4210,8 +4210,7 @@ module OneM2M_Testcases { if(PX_IUT_IS_MN_CSE){ - if(PX_TS_IS_ADN_AE){ - + //Preamble v_aeAuxIndex := f_cse_preamble_registerAe(); //Set requestPrimitive @@ -4236,7 +4235,7 @@ module OneM2M_Testcases { // Postamble f_cse_postamble_deleteResources(); - } + } // Tear down f_cf01Down(); -- GitLab