Commit d7c043ad authored by Garcia's avatar Garcia
Browse files

Conflict fixed after merge with TTCN-3 developments branch

parent 7682e153

ttcn/AtsNg112/AtsNg112_TestCases.ttcn

+1 −80
Original line number Diff line number Diff line
@@ -92,18 +92,6 @@ module AtsNg112_TestCases { 
  

  group lis_role {

    

<<<<<<< HEAD

    // Libcommon

    import from LibCommon_Time all;

    import from LibCommon_VerdictControl all;

    import from LibCommon_Sync all;

    

    // LibHttp

    import from LibItsHttp_TypesAndValues all;

    import from LibItsHttp_Functions all;

    import from LibItsHttp_Templates all;

    import from LibItsHttp_TestSystem all;

=======

    /**

     * @desc "IUT successfully responds with a Point when it receives a HTTP POST location request without location type" 

     * @reference
@@ -354,7 +342,6 @@ module AtsNg112_TestCases { 
        // Postamble

        f_cf_01_http_down();

    } // End of testcase TC_LIS_HTTP_POST_BV_02

>>>>>>> TTCN_3_Developments

    

    /**

     * @desc IUT successfully responds with a reference when it receives a HTTP POST location request with location type locationURI and exact attribute
@@ -441,14 +428,6 @@ module AtsNg112_TestCases { 
        f_cf_01_http_down();

    } // End of testcase TC_LIS_HTTP_POST_BV_03

    

<<<<<<< HEAD

    // LibNg112

    import from LibNg112_TypesAndValues all;

    import from LibNg112_Templates all;

    import from LibNg112_Functions all;

    import from LibNg112_TestSystem all;

    import from LibNg112_Pics all;

=======

    /**

     * @desc IUT successfully responds with a reference and geodetic location when it receives a HTTP POST location request with location types locationURI and geodetic and exact attribute

     * @reference
@@ -577,7 +556,6 @@ module AtsNg112_TestCases { 
        // Postamble

        f_cf_01_http_down();

    } // End of testcase TC_LIS_HTTP_POST_BV_04

>>>>>>> TTCN_3_Developments

    

    /**

     * @desc "IUT successfully responds with an error response when it receives a HTTP POST location request for an unknown device"
@@ -1174,63 +1152,6 @@ module AtsNg112_TestCases { 
        f_cf_01_http_down();

    } // End of testcase TC_ECRF_HTTP_POST_BV_02

    

<<<<<<< HEAD

    /**

     * @desc "IUT successfully processes all mandatory HTTP headers when it receives a HTTP POST request" 

     * @reference 

                "ETSI TS 103 479 Vm.t.e (yyyy-mm) Clause 5.5 Location Information Server (LIS)",

                "Next Generation 112 Long Term Definition http://www.eena.org/uploads/gallery/files/pdf/2013-03-15-eena_ng_longtermdefinitionupdated.pdf Clause 4.10",

                "https://tools.ietf.org/html/rfc5985"

     */

    testcase TC_LIS_HTTP_POST_BV_01() runs on HttpComponent system TestAdapter {

        // Local variables

        var HeaderLines v_headers;

        

        // Test control

        if ((not PICS_HTTP_POST_REQUEST) or (not PICS_LOCATION_HELD)) {

            log("*** " & testcasename() & ": PICS_HTTP_POST_REQUEST and PICS_LOCATION_HELD required for executing the TC ***");

            setverdict(inconc);

            stop;

        }

        

        // Test component configuration

        f_cf_01_http_up();

        

        // Test adapter configuration

        

        // Preamble

        f_init_default_headers_list(v_headers);

        httpPort.send(

                      m_http_request(

                                     m_http_request_get(

                                                        PICS_LISP_URI,

                                                        v_headers

        )));

        f_selfOrClientSyncAndVerdictTestBody(c_prDone, e_success);

        

        // Test body

        tc_ac.start;

        alt {

            [] httpPort.receive(

                                mw_http_response

            ) {

                tc_ac.stop;

                log("*** " & testcasename() & ": PASS: Security protocol version set to 3 ***");

                f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_success);

                

            }

            [] tc_ac.timeout {

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

                f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_timeout);

            }

        } // End of 'alt' statement

        

        // Postamble

        f_cf_01_http_down();

    } // End of testcase TC_LIS_HTTP_POST_BV_01

    

=======

  } // End of group ecrf_role

  

>>>>>>> TTCN_3_Developments

} // End of module AtsNg112_TestCases

ttcn/TestCodec/TestCodec_Register.ttcn

+0 −4
Original line number Diff line number Diff line
@@ -62,11 +62,7 @@ module TestCodec_Register { 
                }        

        ));

        var bitstring v_enc_msg := fx_enc_REGISTER_Request (v_org_msg);

<<<<<<< HEAD

        var integer v_result := fx_dec_REGISTER_Request (v_enc_msg, v_dec_msg);

=======

        var integer v_result := fx_dec_REGISTER_Request (v_enc_msg, v_dec_msg);

>>>>>>> TTCN_3_Developments

        

        if (v_result == 0) {

          if (match(v_dec_msg, v_org_msg)) {