Commit ca04ea42 authored by YannGarcia's avatar YannGarcia
Browse files

Merge conflicts resolutions

parents 99b9962a a908a4d2

TODO.md

+42 −0
Original line number Diff line number Diff line
@@ -6,6 +6,48 @@ This file provides the list of the TODOs related to the STF 569. 
## SRV



### AMS

Early draft ETSI GS MEC 021 2.0.8



https://forge.etsi.org/rep/mec/gs032p2-test-purposes/blob/master/Test%20Purposes/SRV/AMS/Ams_BV.tplan2  

https://forge.etsi.org/rep/mec/gs032p2-test-purposes/blob/master/Test%20Purposes/SRV/AMS/Ams_BO_BI.tplan2





- TP_MEC_SRV_AMS_001_OK       <font color="color:green">To be tested</font>



- TP_MEC_SRV_AMS_001_BR       <font color="color:green">To be tested</font>



- TP_MEC_SRV_AMS_002_OK       <font color="color:green">To be tested</font>



- TP_MEC_SRV_AMS_002_BR       <font color="color:green">To be tested</font>



- TP_MEC_SRV_AMS_003_OK       <font color="color:green">To be tested</font>



- TP_MEC_SRV_AMS_003_BR       <font color="color:green">To be tested</font>



- TP_MEC_SRV_AMS_004_OK       <font color="color:green">To be tested</font>



- TP_MEC_SRV_AMS_004_BR       <font color="color:green">To be tested</font>



- TP_MEC_SRV_AMS_005_OK       <font color="color:green">To be tested</font>



- TP_MEC_SRV_AMS_005_NF       <font color="color:green">To be tested</font>



- TP_MEC_SRV_AMS_006_OK       <font color="color:green">To be tested</font>



- TP_MEC_SRV_AMS_006_NF       <font color="color:green">To be tested</font>



- TP_MEC_SRV_AMS_007_OK       <font color="color:green">To be tested</font>



- TP_MEC_SRV_AMS_007_BR       <font color="color:green">To be tested</font>



- TP_MEC_SRV_AMS_007_NF       <font color="color:green">To be tested</font>



- TP_MEC_SRV_AMS_008_OK       <font color="color:green">To be tested</font>



- TP_MEC_SRV_AMS_008_OK       <font color="color:green">To be tested</font>



- TP_MEC_SRV_AMS_010_OK       <font color="color:green">To be tested</font>





### APPSAQ

ttcn/AtsMec/AtsMec_Ams_TestCases.ttcn

+1 −384
Original line number Diff line number Diff line
@@ -76,7 +76,6 @@ import from LibMec_Pixits all; 
                                                                                                                                                                                                   )

                                                                                                                                                                 }

                            )))))) -> value v_response {

          // TODO Need to check Location header

          var boolean v_header_matched := false;

          

          tc_ac.stop;
@@ -156,388 +155,6 @@ import from LibMec_Pixits all; 


    }  // End of testcase TP_MEC_SRV_AMS_001_BR



/*



  testcase TP_MEC_SRV_AMS_002_OK() runs on HttpComponent system HttpTestAdapter {

    var HeaderLines v_headers;

    if (not(PICS_AMS) or not(PICS_AMS_API_SUPPORTED)){

      log("*** " & testcasename() & ": PICS_AMS required for executing the TC ***");

      setverdict(inconc);

      stop;

    }



    // Test component configuration

    f_cf_01_http_up();





    // Preamble

    f_init_default_headers_list(-, -, v_headers);

    httpPort.send(

      m_http_request(

        m_http_request_post(

          "/" & PICS_ROOT_API & PX_ME_APP_AMS_URI,

          v_headers,

          m_http_message_body_json(

            m_body_json_ams_registration_request(

              m_registration_request({

                  m_service_consumer_id(PX_APP_INS_IP, *),

                  *,

                  *

                }

              )

            )

          )

        )

      )

    );

    f_selfOrClientSyncAndVerdict(c_prDone, e_success);



    // Test Body

    tc_ac.start;

    alt {

      [] httpPort.receive(

        mw_http_response(

          mw_http_response_201_created(

            mw_http_message_body_json(

              mw_body_json_app_mobility_service_info(

                mw_app_mobility_service_info(

                  {

                    mw_registration_info({

                        mw_service_consumer_id(PX_APP_INS_ID, *),

                        *,

                        *

                      }),

                    *

                  }

                )

              )

            )

          )

        )

      ) 

      {

        tc_ac.stop;



        log("*** " & testcasename() & ": PASS: IUT successfully responds with a ProblemDetails set to 400 Bad Request ***");

        f_selfOrClientSyncAndVerdict(c_tbDone, e_success);

      }

      [] tc_ac.timeout {

        log("*** " & testcasename() & ": INCONC: Expected message not received ***");

        f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout);

      }

    } // End of 'alt' statement



  }





testcase TP_MEC_SRV_AMS_002_BR() runs on HttpComponent system HttpTestAdapter {

    var HeaderLines v_headers;

    if (not(PICS_AMS) or not(PICS_AMS_API_SUPPORTED)){

      log("*** " & testcasename() & ": PICS_AMS required for executing the TC ***");

      setverdict(inconc);

      stop;

    }



    // Test component configuration

    f_cf_01_http_up();





    // Preamble

    f_init_default_headers_list(-, -, v_headers);

    httpPort.send(

      m_http_request(

        m_http_request_post(

          "/" & PICS_ROOT_API & PX_ME_APP_AMS_URI,

          v_headers,

          m_http_message_body_json(

            m_body_json_ams_registration_request(

              m_registration_request({

                  m_service_consumer(PX_APP_INS_IP, *),

                  *,

                  *

                }

              )

            )

          )

        )

      )

    );

    f_selfOrClientSyncAndVerdict(c_prDone, e_success);



    // Test Body

    tc_ac.start;

    alt {

      [] httpPort.receive(

        mw_http_response(

          mw_http_response_400_bad_request(

            mw_http_message_body_json(

              mw_body_json_ams_problem_details(

                mw_problem_details(

                  {

                    -, -, 400

                  }

                )

              )

            )

          )

        )

      ) 

      {

        tc_ac.stop;



        log("*** " & testcasename() & ": PASS: IUT successfully responds with a AppMobilityServiceInfo ***");

        f_selfOrClientSyncAndVerdict(c_tbDone, e_success);

      }

      [] tc_ac.timeout {

        log("*** " & testcasename() & ": INCONC: Expected message not received ***");

        f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout);

      }

    } // End of 'alt' statement



  }



}



group appMobilityServicesSubscriptions {

  

    testcase TP_MEC_SRV_AMS_003_OK() runs on HttpComponent system HttpTestAdapter {

    var HeaderLines v_headers;

    if (not(PICS_AMS) or not(PICS_AMS_API_SUPPORTED)){

      log("*** " & testcasename() & ": PICS_AMS required for executing the TC ***");

      setverdict(inconc);

      stop;

    }



    // Test component configuration

    f_cf_01_http_up();





    // Preamble

    f_init_default_headers_list(-, -, v_headers);

    httpPort.send(

      m_http_request(

        m_http_request_get(

          "/" & PICS_ROOT_API & PX_ME_APP_AMS_SUBS & "?subscriptionType=" & oct2char(unichar2oct(PX_SUBSCRIPTION_TYPE, "UTF-8")),

          v_headers

        )

      )

    );

    f_selfOrClientSyncAndVerdict(c_prDone, e_success);



    // Test Body

    tc_ac.start;

    alt {

      [] httpPort.receive(

        mw_http_response(

          mw_http_response_ok(

            mw_http_message_body_json(

              mw_body_json_ams_subscriptions(

                            mw_ams_subscription(PX_SUBSCRIPTION_TYPE, *, *, *, *)

              )

            )

          )

        )

      ) 

      {

        tc_ac.stop;



        log("*** " & testcasename() & ": PASS: IUT successfully responds with the list of subscriptions type MobilityProcedureSubscription ***");

        f_selfOrClientSyncAndVerdict(c_tbDone, e_success);

      }

      [] tc_ac.timeout {

        log("*** " & testcasename() & ": INCONC: Expected message not received ***");

        f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout);

      }

    } // End of 'alt' statement



  }

  



  testcase TP_MEC_SRV_AMS_002_BR() runs on HttpComponent system HttpTestAdapter {

    var HeaderLines v_headers;

    if (not(PICS_AMS) or not(PICS_AMS_API_SUPPORTED)){

      log("*** " & testcasename() & ": PICS_AMS required for executing the TC ***");

      setverdict(inconc);

      stop;

    }



    // Test component configuration

    f_cf_01_http_up();





    // Preamble

    f_init_default_headers_list(-, -, v_headers);

    httpPort.send(

      m_http_request(

        m_http_request_get(

          "/" & PICS_ROOT_API & PX_ME_APP_AMS_SUBS & "?subscriptionTyp=" & oct2char(unichar2oct(PX_SUBSCRIPTION_TYPE, "UTF-8")),

          v_headers

        )

      )

    );

    f_selfOrClientSyncAndVerdict(c_prDone, e_success);



    // Test Body

    tc_ac.start;

    alt {

      [] httpPort.receive(

        mw_http_response(

          mw_http_response_400_bad_request(

            mw_http_message_body_json(

              mw_body_json_ams_problem_details(

                mw_problem_details(

                  {

                    -, -, 400

                  }

                )

              )

            )

          )

        )

      ) 

      {

        tc_ac.stop;



        log("*** " & testcasename() & ": PASS: IUT successfully responds with a ProblemDetails set to 400 Bad Request ***");

        f_selfOrClientSyncAndVerdict(c_tbDone, e_success);

      }

      [] tc_ac.timeout {

        log("*** " & testcasename() & ": INCONC: Expected message not received ***");

        f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout);

      }

    } // End of 'alt' statement



  }





  testcase TP_MEC_SRV_AMS_004_OK() runs on HttpComponent system HttpTestAdapter {

    var HeaderLines v_headers;

    if (not(PICS_AMS) or not(PICS_AMS_API_SUPPORTED)){

      log("*** " & testcasename() & ": PICS_AMS required for executing the TC ***");

      setverdict(inconc);

      stop;

    }



    // Test component configuration

    f_cf_01_http_up();





    // Preamble

    f_init_default_headers_list(-, -, v_headers);

    httpPort.send(

      m_http_request(

        m_http_request_post(

         "/" & PICS_ROOT_API & PX_ME_APP_AMS_SUBS,

          v_headers,

          m_http_message_body_json(

            m_body_json_ams_subscriptions({*, 

				m_ams_subscription(

					PX_SUBSCRIPTION_TYPE,

  					PX_CALLBACK_REFERENCE

				)

            }, *)

          )

        )

      )

    );

    f_selfOrClientSyncAndVerdict(c_prDone, e_success);



    // Test Body

    tc_ac.start;

    alt {

      [] httpPort.receive(

        mw_http_response(

          mw_http_response_201_created(

            mw_http_message_body_json(

              mw_body_json_ams_subscriptions(

                { *, mw_ams_subscription(

                  PX_SUBSCRIPTION_TYPE,

                  PX_CALLBACK_REFERENCE

                ),

                *

                }

              )

            )

          )

        )

      ) 

      {

        tc_ac.stop;



        log("*** " & testcasename() & ": PASS: IUT successfully responds with a ProblemDetails set to 400 Bad Request ***");

        f_selfOrClientSyncAndVerdict(c_tbDone, e_success);

      }

      [] tc_ac.timeout {

        log("*** " & testcasename() & ": INCONC: Expected message not received ***");

        f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout);

      }

    } // End of 'alt' statement



  }





testcase TP_MEC_SRV_AMS_004_BR() runs on HttpComponent system HttpTestAdapter {

    var HeaderLines v_headers;

    if (not(PICS_AMS) or not(PICS_AMS_API_SUPPORTED)){

      log("*** " & testcasename() & ": PICS_AMS required for executing the TC ***");

      setverdict(inconc);

      stop;

    }



    // Test component configuration

    f_cf_01_http_up();





    // Preamble

    f_init_default_headers_list(-, -, v_headers);

    httpPort.send(

      m_http_request(

        m_http_request_post(

          "/" & PICS_ROOT_API & PX_ME_APP_AMS_SUBS,

          v_headers,

          m_http_message_body_json(

            m_body_json_ams_subscriptions(

              m_ams_subscription_error(

                PX_SUBSCRIPTION_TYPE, PX_CALLBACK_REFERENCE

              )

            )

          )

        )

      )

    );

    f_selfOrClientSyncAndVerdict(c_prDone, e_success);



    // Test Body

    tc_ac.start;

    alt {

      [] httpPort.receive(

        mw_http_response(

          mw_http_response_400_bad_request(

            mw_http_message_body_json(

              mw_body_json_ams_problem_details(

                mw_problem_details(

                    -, -, 400

                )

              )

            )

          )

        )

      ) 

      {

        tc_ac.stop;



        log("*** " & testcasename() & ": PASS: IUT successfully responds with a AppMobilityServiceInfo ***");

        f_selfOrClientSyncAndVerdict(c_tbDone, e_success);

      }

      [] tc_ac.timeout {

        log("*** " & testcasename() & ": INCONC: Expected message not received ***");

        f_selfOrClientSyncAndVerdict(c_tbDone, e_timeout);

      }

    } // End of 'alt' statement



  }*/



  } // End of group appMobilityServices



  } // End of group ams_notifications 



} // End of module AtsMec_Ams_TestCases

ttcn/LibMec/ttcn/LibMec_Pics.ttcn

+2 −0
Original line number Diff line number Diff line
@@ -32,6 +32,8 @@ module LibMec_Pics { 
  

  modulepar boolean PICS_AMS := true;

  

  modulepar boolean PICS_AMS_NOTIFICATIONS := false;

    

  modulepar charstring PICS_ROOT_API := "exampleAPI";

  

} // End of module LibMec_Pics