diff --git a/LibOneM2M/OneM2M_Pixits.ttcn b/LibOneM2M/OneM2M_Pixits.ttcn index f4ab4c6ce0f2ccc898efb6bd33506556ad2f14c5..b7eae500624e8ff5c3f29fe5e0f4d54c12b8daf1 100644 --- a/LibOneM2M/OneM2M_Pixits.ttcn +++ b/LibOneM2M/OneM2M_Pixits.ttcn @@ -67,6 +67,8 @@ module OneM2M_Pixits { modulepar XSD.IDREFS PX_NOT_ALLOWED_S_AE_IDS := {"S-NotAllowedAeId"}; + modulepar XSD.ID PX_NOT_ALLOWED_APP_ID := "NotAllowedAppId"; + modulepar AddressingMethod PX_ADDRESSING_METHOD := e_hierarchical; modulepar PrimitiveScope PX_PRIMITIVE_SCOPE := e_cseRelative; @@ -78,6 +80,8 @@ module OneM2M_Pixits { modulepar charstring PX_XML_NAMESPACE := "m2m=""http://www.onem2m.org/xml/protocols"""; modulepar ListOfURIs PX_ACOR := {"all"}; + + modulepar float PX_TCONFIG_IUT := 10.0; } diff --git a/OneM2M_Testcases_CSE_Release_1.ttcn b/OneM2M_Testcases_CSE_Release_1.ttcn index 8afb28f0349a585ea662f1301873805830ec8fd9..8a1a247a6f405dffd8f2d92a472fb4b4aa0a8413 100644 --- a/OneM2M_Testcases_CSE_Release_1.ttcn +++ b/OneM2M_Testcases_CSE_Release_1.ttcn @@ -399,7 +399,7 @@ module OneM2M_Testcases_CSE_Release_1 { //Preamble action(v_action); - f_sleepIgnoreDef(30.0); + f_sleepIgnoreDef(PX_TCONFIG_IUT); //Test Body v_request := valueof(m_createAe(PX_APP_ID, omit, f_getResourceAddress(-1, -, e_spRelative) & "/" & PX_ALLOWED_C_AE_IDS[0])); @@ -525,7 +525,7 @@ module OneM2M_Testcases_CSE_Release_1 { //TODO: create serviceSubscribedProfile, Node, and serviceSubscribedAppRule //v_cseBaseIndex := f_cse_preamble_createServiceSubscribedProfile({"C*"}); //c_CRUDNDi); action(v_action); - f_sleepIgnoreDef(30.0); + f_sleepIgnoreDef(PX_TCONFIG_IUT); //Test Body //v_request := valueof(m_createAe(PX_APP_ID, omit, "C-AE-ID-STEM")); @@ -539,10 +539,16 @@ module OneM2M_Testcases_CSE_Release_1 { tc_ac.stop; setverdict(pass, __SCOPE__ & ": AE creation rejected."); } - [] mcaPort.receive(mw_response(mw_responsePrimitiveInverse(int4107))) -> value v_response{ + [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response{ tc_ac.stop; setverdict(fail, __SCOPE__ & ": Error while creating AE with status code " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode))); } + [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response{ + tc_ac.stop; + setverdict(fail, __SCOPE__ & ": Error, creating AE with not allowed AE-ID "); + f_checkAttributesToBeSaved(int2, v_request, v_response.primitive.responsePrimitive); + vc_aeAuxIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int2); + } [] tc_ac.timeout { setverdict(fail, __SCOPE__ & ": No answer while creating AE"); } @@ -796,7 +802,7 @@ module OneM2M_Testcases_CSE_Release_1 { //Test control if(not(PICS_IN_CSE)) { - setverdict(inconc, __SCOPE__ & ": IUT shall be MN-CSE to run this test case"); + setverdict(inconc, __SCOPE__ & ": IUT shall be IN-CSE to run this test case"); stop; } @@ -1094,10 +1100,10 @@ module OneM2M_Testcases_CSE_Release_1 { //Preamble action(v_action); - f_sleepIgnoreDef(30.0); + f_sleepIgnoreDef(PX_TCONFIG_IUT); // Test Body - v_request := valueof(m_createAe(PX_APP_ID, omit, omit)); + v_request := valueof(m_createAe(PX_NOT_ALLOWED_APP_ID, omit, omit)); v_request := f_getCreateRequestPrimitive(v_resourceType, v_request, v_cseBaseIndex); @@ -1108,10 +1114,16 @@ module OneM2M_Testcases_CSE_Release_1 { tc_ac.stop; setverdict(pass, __SCOPE__ & ": AE creation rejected."); } - [] mcaPort.receive(mw_response(mw_responsePrimitiveInverse(int4107))) -> value v_response{ + [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response{ tc_ac.stop; setverdict(fail, __SCOPE__ & ": Error while creating AE with status code " & int2str(enum2int(v_response.primitive.responsePrimitive.responseStatusCode))); } + [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response{ + tc_ac.stop; + setverdict(fail, __SCOPE__ & ": Error, creating AE with not allowed APP-ID "); + f_checkAttributesToBeSaved(int2, v_request, v_response.primitive.responsePrimitive); + vc_aeAuxIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int2); + } [] tc_ac.timeout { setverdict(fail, __SCOPE__ & ": No answer while creating AE"); }