Commit 93632caac0fa7e189bad274053e0d1c943872373

Authored by Miguel Angel Reina Ortega
1 parent 75c82e3e

Profile files referencing Release 2 test cases files

Signed-off-by: reinaortega <miguelangel.reinaortega@etsi.org>
... ... @@ -15,6 +15,7 @@ module OneM2M_TestControl_IN_profile {
15 15  
16 16  
17 17 import from OneM2M_Testcases_CSE_Release_1 all;
  18 + import from OneM2M_Testcases_CSE_Release_2 all;
18 19 import from OneM2M_Pics all;
19 20  
20 21 control {
... ...
... ... @@ -15,6 +15,7 @@ module OneM2M_TestControl_MN_profile {
15 15  
16 16  
17 17 import from OneM2M_Testcases_CSE_Release_1 all;
  18 + import from OneM2M_Testcases_CSE_Release_2 all;
18 19 import from OneM2M_Pics all;
19 20  
20 21 control {
... ...
... ... @@ -8633,161 +8633,7 @@ module OneM2M_Testcases_CSE_Release_1 {
8633 8633 group Subscription_And_Notification {
8634 8634  
8635 8635 group Create {
8636   -
8637   - /**
8638   - * @desc Check that the IUT rejects the creation of the <subscription> resource when the target subscribed-to RESOURCE_TYPE resource is not subscribable.
8639   - *
8640   - */
8641   - testcase TC_CSE_SUB_CRE_001_SUB() runs on Tester system CseSystem {
8642   -
8643   - var AeSimu v_ae1 := AeSimu.create("AE1") alive;
8644   - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
8645   - v_ae1.done;
8646   -
8647   - v_ae1.start(f_CSE_SUB_CRE_001_SUB());
8648   -
8649   - v_ae1.done;
8650   -
8651   - }
8652   -
8653   - function f_CSE_SUB_CRE_001_SUB() runs on AeSimu {
8654   - // Local variables
8655   - var MsgIn v_response;
8656   - var integer v_aeIndex := -1;
8657   - var integer v_resourceIndex := -1;
8658   - var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
8659   - var RequestPrimitive v_request;
8660   - var integer v_ae2Index := -1;
8661   -
8662   - // Test control
8663   -
8664   - // Test component configuration
8665   - f_cf01Up(true);
8666   -
8667   - // Test adapter configuration
8668   -
8669   - // Preamble
8670   - v_aeIndex := f_cse_preamble_registerAe();//AE1 is registred;
8671   -
8672   - f_cse_preamble_subscriptionVerification(v_ae2Index, v_createRequest, int23);
8673   -
8674   - v_resourceIndex := f_cse_createResource(int23, v_createRequest, v_aeIndex);//Subscription resource is created
8675   -
8676   - v_request := f_getCreateRequestPrimitive(int23, v_createRequest, v_resourceIndex);
8677   -
8678   - // Test Body
8679   - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
8680   - tc_ac.start;
8681   - alt {
8682   - [] mcaPort.receive(mw_response(mw_responsePrimitive(int5203))) -> value v_response {
8683   - tc_ac.stop;
8684   - setverdict(pass, __SCOPE__ & ": <Subscription> Resource not subscribable");
8685   - }
8686   - [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
8687   - tc_ac.stop;
8688   - setverdict(fail, __SCOPE__ & ": Wrong response status code");
8689   - }
8690   - [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
8691   - tc_ac.stop;
8692   - setverdict(fail, __SCOPE__ & ": Subscription successful whereas <Subscription> resource is not subscribable");
8693   - }
8694   - [] tc_ac.timeout {
8695   - setverdict(fail, __SCOPE__ & ": No answer while creating resource");
8696   - }
8697   - }
8698   -
8699   - f_checkAeSimuStatus();
8700   -
8701   - //Check to see if the resource is NOT present
8702   - if(f_cse_isResourceNotPresent(v_resourceIndex, f_getResourceName(v_request.primitiveContent))){
8703   - setverdict(pass, __SCOPE__ & ":INFO: Resource not created");
8704   - } else {
8705   - setverdict(fail, __SCOPE__ & ":ERROR: Resource created");
8706   - }
8707   -
8708   - //Postamble
8709   - f_cse_postamble_deleteResources();
8710   -
8711   - //Tear down
8712   - f_cf01Down();
8713   -
8714   - } // end TC_CSE_SUB_CRE_001_SUB
8715   -
8716   - testcase TC_CSE_SUB_CRE_001_CIN() runs on Tester system CseSystem {
8717   -
8718   - var AeSimu v_ae1 := AeSimu.create("AE1") alive;
8719   - v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
8720   - v_ae1.done;
8721   -
8722   - v_ae1.start(f_CSE_SUB_CRE_001_CIN());
8723   -
8724   - v_ae1.done;
8725   -
8726   - }
8727   -
8728   - function f_CSE_SUB_CRE_001_CIN() runs on AeSimu {
8729   - // Local variables
8730   - var MsgIn v_response;
8731   - var integer v_aeIndex := -1;
8732   - var integer v_containerResourceIndex := -1;
8733   - var integer v_contentInstanceResourceIndex := -1;
8734   - var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
8735   - var RequestPrimitive v_request;
8736   -
8737   - // Test control
8738   -
8739   - // Test component configuration
8740   - f_cf01Up();
8741   -
8742   - // Test adapter configuration
8743   -
8744   - // Preamble
8745   - v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
8746   -
8747   - v_containerResourceIndex := f_cse_createResource(int3, m_createContainerBase, v_aeIndex);//Container
8748   -
8749   - v_contentInstanceResourceIndex := f_cse_createResource(int4, m_createContentInstance(f_getResourceAddress(v_aeIndex), "Random Value"), v_containerResourceIndex);//ContentInstance
8750   -
8751   - v_request := f_getCreateRequestPrimitive(int23, v_createRequest, v_contentInstanceResourceIndex);
8752   -
8753   - // Test Body
8754   - mcaPort.send(f_getMsgOutPrimitive(m_request(v_request)));
8755   - tc_ac.start;
8756   - alt {
8757   - [] mcaPort.receive(mw_response(mw_responsePrimitive(int5203))) -> value v_response {
8758   - tc_ac.stop;
8759   - setverdict(pass, __SCOPE__ & ": <Subscription> Resource not subscribable");
8760   - }
8761   - [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
8762   - tc_ac.stop;
8763   - setverdict(fail, __SCOPE__ & ": Wrong response status code");
8764   - }
8765   - [] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
8766   - tc_ac.stop;
8767   - setverdict(fail, __SCOPE__ & ": Subscription successful whereas <Subscription> resource is not subscribable");
8768   - }
8769   - [] tc_ac.timeout {
8770   - setverdict(fail, __SCOPE__ & ": No answer while creating resource");
8771   - }
8772   - }
8773   -
8774   - f_checkAeSimuStatus();
8775   -
8776   - //Check to see if the resource is NOT present
8777   - if(f_cse_isResourceNotPresent(v_contentInstanceResourceIndex, f_getResourceName(v_request.primitiveContent))){
8778   - setverdict(pass, __SCOPE__ & ":INFO: Resource not created");
8779   - } else {
8780   - setverdict(fail, __SCOPE__ & ":ERROR: Resource created");
8781   - }
8782   -
8783   - //Postamble
8784   - f_cse_postamble_deleteResources();
8785   -
8786   - //Tear down
8787   - f_cf01Down();
8788   -
8789   - } // end TC_CSE_SUB_CRE_001_CIN
8790   -
  8636 +
8791 8637 /**
8792 8638 * @desc Check that the IUT rejects the creation of the <subscription> resource when the originator does not have privileges for retrieving the subscribed-to resource.
8793 8639 *
... ...