diff --git a/OneM2M_TestControl_IN_profile.ttcn b/OneM2M_TestControl_IN_profile.ttcn index c5292b26940271b962312c4d0c4c9ef04fcd0048..28c5485b8bf40c758eb3a51edf3aaa63e389f925 100644 --- a/OneM2M_TestControl_IN_profile.ttcn +++ b/OneM2M_TestControl_IN_profile.ttcn @@ -81,8 +81,10 @@ module OneM2M_TestControl_IN_profile { if(PICS_AE_POA) {execute (TC_CSE_REG_CRE_012_AE_POA());} if(PICS_AE_POA) {execute (TC_CSE_REG_RET_004_POA());} if(PICS_AE_POA) {execute (TC_CSE_DMR_UPD_015_AE_POA());} - if(PICS_IN_CSE) {execute (TC_CSE_REG_CRE_001());} - if(true) {execute (TC_CSE_REG_CRE_002());} + if(PICS_IN_CSE) {execute (TC_CSE_REG_CRE_001_CAE());} + if(PICS_IN_CSE) {execute (TC_CSE_REG_CRE_001_SAE());} + if(PICS_IN_CSE) {execute (TC_CSE_REG_CRE_002_CAE());} + if(PICS_IN_CSE) {execute (TC_CSE_REG_CRE_002_SAE());} //CE_REG_00004 if(true) {execute (TC_CSE_REG_CRE_018());} diff --git a/OneM2M_TestControl_MN_profile.ttcn b/OneM2M_TestControl_MN_profile.ttcn index f2f34abb281ab1407c7af6e34125a523ec481b3b..ad748670b7a9b87f5c36d5e394eef2f8ef246847 100644 --- a/OneM2M_TestControl_MN_profile.ttcn +++ b/OneM2M_TestControl_MN_profile.ttcn @@ -85,10 +85,10 @@ module OneM2M_TestControl_MN_profile { if(PICS_AE_POA) {execute (TC_CSE_REG_CRE_012_AE_POA());} if(PICS_AE_POA) {execute (TC_CSE_REG_RET_004_POA());} if(PICS_AE_POA) {execute (TC_CSE_DMR_UPD_015_AE_POA());} - if(true) {execute (TC_CSE_REG_CRE_002());} - //if(true) {execute (TC_CSE_REG_CRE_003());} //TO BE IMPLEMENTED - if(PICS_MN_CSE or PICS_ASN_CSE) {execute (TC_CSE_REG_CRE_020());} - + if(true) {execute (TC_CSE_REG_CRE_001_CAE());} + if(true) {execute (TC_CSE_REG_CRE_002_CAE());} + if(true) {execute (TC_CSE_REG_CRE_003());} //TO BE IMPLEMENTED + //CE_REG_00004 if(true) {execute (TC_CSE_REG_CRE_018());} if(true) {execute (TC_CSE_REG_CRE_019());} diff --git a/OneM2M_Testcases_CSE_Release_1.ttcn b/OneM2M_Testcases_CSE_Release_1.ttcn index 01430ff04c0d87ceb09a67763d6d164d2d5d1278..764d21e8bb147fcefb9671d5f0fd7260edfafad7 100644 --- a/OneM2M_Testcases_CSE_Release_1.ttcn +++ b/OneM2M_Testcases_CSE_Release_1.ttcn @@ -439,53 +439,61 @@ module OneM2M_Testcases_CSE_Release_1 { * @desc Check that the IUT accepts a create request of <AE> resource with attributes multiplicity equals to 1 and provided preprovisioned SP_RELATIVE_ AE_ID. * */ - testcase TC_CSE_REG_CRE_001_CAE() runs on Tester system CseSystem { + group g_CSE_REG_CRE_001 { - var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; + testcase TC_CSE_REG_CRE_001_CAE() runs on Tester system CseSystem { - v_ae1.start(f_CSE_REG_CRE_001(PX_ALLOWED_C_AE_IDS[0])); - v_ae1.done; - - } - - testcase TC_CSE_REG_CRE_001_SAE() runs on Tester system CseSystem { + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); + v_ae1.done; + + v_ae1.start(f_CSE_REG_CRE_001(PX_ALLOWED_C_AE_IDS[0])); + v_ae1.done; + + } - var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; + testcase TC_CSE_REG_CRE_001_SAE() runs on Tester system CseSystem { + + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); + v_ae1.done; + + v_ae1.start(f_CSE_REG_CRE_001(PX_ALLOWED_S_AE_IDS[0])); + v_ae1.done; + + } - v_ae1.start(f_CSE_REG_CRE_001(PX_ALLOWED_S_AE_IDS[0])); - v_ae1.done; - - } + }//end group g_CSE_REG_CRE_001 /** * @desc Check that the IUT accepts a create request of <AE> resource with attributes multiplicity equals to 1 and provided preprovisioned AE_ID_STEM of AE-ID-Stem format. * */ - testcase TC_CSE_REG_CRE_002_CAE() runs on Tester system CseSystem { - - var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; + group g_CSE_REG_CRE_002 { + + testcase TC_CSE_REG_CRE_002_CAE() runs on Tester system CseSystem { - v_ae1.start(f_CSE_REG_CRE_002(PX_ALLOWED_C_AE_IDS[0])); - v_ae1.done; - - } - - testcase TC_CSE_REG_CRE_002_SAE() runs on Tester system CseSystem { - - var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); + v_ae1.done; + + v_ae1.start(f_CSE_REG_CRE_002(PX_ALLOWED_C_AE_IDS[0])); + v_ae1.done; + + } - v_ae1.start(f_CSE_REG_CRE_002(PX_ALLOWED_S_AE_IDS[0])); - v_ae1.done; - - } + testcase TC_CSE_REG_CRE_002_SAE() runs on Tester system CseSystem { + + var AeSimu v_ae1 := AeSimu.create("AE1") alive; + v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); + v_ae1.done; + + v_ae1.start(f_CSE_REG_CRE_002(PX_ALLOWED_S_AE_IDS[0])); + v_ae1.done; + + } + + }//end group g_CSE_REG_CRE_002 /** * @desc Check that the IUT accepts a create request of <AE> resource with attributes multiplicity equals to 1 and provided preprovisioned S-AE-ID-STEM. @@ -1486,103 +1494,6 @@ module OneM2M_Testcases_CSE_Release_1 { }//end TC_CSE_REG_CRE_019 - /** - * @desc Check that the IUT accepts a response from IN_CSE on the success update of AEAnnc during AE registration with preprovisioned SP_relative_AE_ID - * - */ - //TODO TO BE FINALIZED - testcase TC_CSE_REG_CRE_020() runs on Tester system CseSystem { - - var AeSimu v_ae1 := AeSimu.create("AE1") alive; - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1)); - v_ae1.done; - - v_ae1.start(f_CSE_REG_CRE_020()); - - v_ae1.done; - - } - - function f_CSE_REG_CRE_020() runs on AeSimu { - - var MsgIn v_response; - var RequestPrimitive v_request; - var integer v_aeIndex := -1; - var ResourceType v_resourceType := int2; - - //Test control - if(not(PICS_MN_CSE or PICS_ASN_CSE)) { - setverdict(inconc, __SCOPE__ & ": IUT shall be MN-CSE or ASN-CSE to run this test case"); - stop; - } - - // Test component configuration - f_cf02Up(); - - //Preamble - vc_cse1.start(f_cse_registrationRemoteCse(mw_createRemoteCSE)); - vc_cse1.done; - - v_request := valueof(m_createAe(PX_APP_ID, -, PX_AE1_ID_STEM)); - - v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, -1); - - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request))); - tc_ac.start; - alt { - [] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response{ - tc_ac.stop; - - f_checkAttributesToBeSaved(int2, v_request, v_response.primitive.responsePrimitive); - vc_aeAuxIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int2); - setverdict(pass, __SCOPE__ & ": AE successfully created."); - } - [] mcaPort.receive(mw_response(mw_responsePrimitiveInverse(int2001))) -> value v_response{ - tc_ac.stop; - setverdict(fail, __SCOPE__ & ": Error while creating AE with status code " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode))); - } - [] tc_ac.timeout { - setverdict(fail, __SCOPE__ & ": No answer while creating AE"); - } - } - - vc_cse1.start(f_cse_announcementProcedure_updateHandler()); - vc_cse1.done; - - //Test body - tc_ac.start; - - alt { - [] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response { - tc_ac.stop; - //continue to test the content - if (ischosen(v_response.primitive.responsePrimitive.primitiveContent.aE)){ - if (v_response.primitive.responsePrimitive.primitiveContent.aE.app_ID == PX_APP_ID){ - setverdict(pass, __SCOPE__ & ": AE creation success."); - }else{ - setverdict(fail, __SCOPE__ & ": Error in AE content."); - } - }else{ - setverdict(fail, __SCOPE__ & ": primitiveContent doesn't exist"); - } - } - [] mcaPort.receive { - tc_ac.stop; - setverdict(fail, __SCOPE__ & ": Error while creating AE"); - } - [] tc_ac.timeout { - setverdict(fail, __SCOPE__ & ": No answer while creating AE"); - } - } - - // Postamble - f_cse_postamble_deleteResources(); - - // Tear down - f_cf02Down(); - - }; //end TC_CSE_REG_CRE_020 - /** * @desc Check that the IUT rejects the create request of <CSEBase> resource. *