Commit bc86dd19 authored by Michael Proestler's avatar Michael Proestler
Browse files

lis refactoring, renaming, pics

parent f1e47d00

ttcn/AtsLIS/AtsLIS_Functions.ttcn

+6 −0
Original line number Diff line number Diff line
@@ -14,12 +14,18 @@ module AtsLIS_Functions { 
	import from urn_ietf_params_xml_ns_geopriv_held all;



	function f_sendRequest(template (value) LocationRequest request) runs on HttpComponent {

      var boolean c_debug := true;



	  // Local variables

      var Headers v_headers;

      

      f_init_default_headers_list(-, -, v_headers);

      f_remove_headers_list({ c_header_accept, c_header_authorization }, v_headers);



      if (c_debug) {

        f_set_headers_list({ "X-TestcaseName"},{ testcasename()},v_headers);

      }

      

	  httpPort.send(

      	             m_http_request(

                                     m_http_request_post(

ttcn/AtsLIS/AtsLIS_Pics.ttcn

+37 −1
Original line number Diff line number Diff line 
module AtsLIS_Pics {



  /**

   * @desc Does the IUT support HELD by Value?

   */

  modulepar boolean PICS_LIS_HELD_BY_VALUE := true;





  /**

   * @desc Does the IUT support HELD by Reference?

   */

  modulepar boolean PICS_LIS_HELD_BY_REFERENCE := true;



  /**

   * @desc Does the IUT support HELD by Reference via HTTP GET?

   */

  modulepar boolean PICS_LIS_HELD_BY_REFERENCE_GET := true;



  /**

   * @desc Does the IUT support geometry Point?

   */

  modulepar boolean PICS_LIS_GEOMETRY_POINT := true;





  /**

   * @desc Does the IUT support geometry Circle?

   */

  modulepar boolean PICS_LIS_GEOMETRY_CIRCLE := true;





  /**

   * @desc Does the IUT support Civic?

   */

  modulepar boolean PICS_LIS_CIVIC := true;









  /**

   * @desc HTTP post URI for LIS protocol

   */

ttcn/AtsLIS/AtsLIS_TestCases.ttcn

+23 −21
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ module AtsLIS_TestCases { 
     */

    testcase TC_LIS_HELD_BV_01() runs on HttpComponent system TestAdapter {             

        // Test control

        f_check_pics({ values := {PICS_HTTP_POST_REQUEST, PICS_LOCATION_HELD, PICS_H_QRY_GEO1}, names := {"PICS_HTTP_POST_REQUEST", "PICS_LOCATION_HELD", "PICS_H_QRY_GEO1"}});

        f_check_pics({ values := {PICS_LIS_HELD_BY_VALUE, PICS_LIS_GEOMETRY_POINT}, names := {"PICS_LIS_HELD_BY_VALUE", "PICS_LIS_GEOMETRY_POINT"}});

        

        // Test component configuration

        f_cf_01_http_up();
@@ -210,7 +210,7 @@ module AtsLIS_TestCases { 
			                                     

        // Postamble

        f_cf_01_http_down();

    } // End of testcase TC_LIS_HTTP_POST_BV_01

    } // End of testcase TC_LIS_HELD_BV_01

       

    /**

     * @desc "IUT successfully responds with a Circle when it receives a HTTP POST location request without location type"
@@ -218,7 +218,7 @@ module AtsLIS_TestCases { 
    testcase TC_LIS_HELD_BV_02() runs on HttpComponent system TestAdapter {

        

        // Test control

        f_check_pics({ values := {PICS_HTTP_POST_REQUEST, PICS_LOCATION_HELD, PICS_H_QRY_GEO2}, names := {"PICS_HTTP_POST_REQUEST", "PICS_LOCATION_HELD", "PICS_H_QRY_GEO2"}});

        f_check_pics({ values := {PICS_LIS_HELD_BY_VALUE, PICS_LIS_GEOMETRY_CIRCLE}, names := {"PICS_LIS_HELD_BY_VALUE", "PICS_LIS_GEOMETRY_CIRCLE"}});



        

        // Test component configuration
@@ -253,14 +253,14 @@ module AtsLIS_TestCases { 
        

        // Postamble

        f_cf_01_http_down();

    } // End of testcase TC_LIS_HTTP_POST_BV_02

    } // End of testcase TC_LIS_HELD_BV_02

         

/**

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

     */

    testcase TC_LIS_HELD_BV_03() runs on HttpComponent system TestAdapter {

        // Test control

        f_check_pics({ values := {PICS_HTTP_POST_REQUEST, PICS_LOCATION_HELD, PICS_H_QRY_GEO4}, names := {"PICS_HTTP_POST_REQUEST", "PICS_LOCATION_HELD", "PICS_H_QRY_GEO4"}});

        f_check_pics({ values := {PICS_LIS_HELD_BY_REFERENCE, PICS_LIS_GEOMETRY_POINT}, names := {"PICS_LIS_HELD_BY_REFERENCE", "PICS_LIS_GEOMETRY_POINT"}});

        

        // Test component configuration

        f_cf_01_http_up();
@@ -292,14 +292,15 @@ module AtsLIS_TestCases { 
        

        // Postamble

        f_cf_01_http_down();

    } // End of testcase TC_LIS_HTTP_POST_BV_03

    } // End of testcase TC_LIS_HELD_BV_03





	/**

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

     */

    testcase TC_LIS_HELD_BV_04() runs on HttpComponent system TestAdapter {

        // Test control

        f_check_pics({ values := {PICS_HTTP_POST_REQUEST, PICS_LOCATION_HELD, PICS_H_QRY_STR1, PICS_H_QRY_GEO2, PICS_H_QRY_GEO4 }, names := {"PICS_HTTP_POST_REQUEST", "PICS_LOCATION_HELD", "PICS_H_QRY_STR1", "PICS_H_QRY_GEO2", "PICS_H_QRY_GEO4"}});

        f_check_pics({ values := {PICS_LIS_HELD_BY_REFERENCE, PICS_LIS_GEOMETRY_CIRCLE}, names := {"PICS_LIS_HELD_BY_REFERENCE", "PICS_LIS_GEOMETRY_CIRCLE"}});

        

        // Test component configuration

        f_cf_01_http_up();
@@ -340,7 +341,7 @@ module AtsLIS_TestCases { 
        

        // Postamble

        f_cf_01_http_down();

    } // End of testcase TC_LIS_HTTP_POST_BV_04

    } // End of testcase TC_LIS_HELD_BV_04





	/**
@@ -349,7 +350,7 @@ module AtsLIS_TestCases { 
    testcase TC_LIS_HELD_BV_05() runs on HttpComponent system TestAdapter {

        

        // Test control

        f_check_pics({ values := {PICS_HTTP_POST_REQUEST, PICS_LOCATION_HELD, PICS_H_QRY_CIV1}, names := {"PICS_HTTP_POST_REQUEST", "PICS_LOCATION_HELD", "PICS_H_QRY_CIV1"}});

        f_check_pics({ values := {PICS_LIS_HELD_BY_VALUE, PICS_LIS_CIVIC}, names := {"PICS_LIS_HELD_BY_VALUE", "PICS_LIS_CIVIC"}});



        

        // Test component configuration
@@ -389,17 +390,18 @@ module AtsLIS_TestCases { 
        

        // Postamble

        f_cf_01_http_down();

    } // End of testcase TC_LIS_HTTP_POST_BV_02

    } // End of testcase TC_LIS_HELD_BV_05





	/**

     * @desc "IUT successfully responds with a Cirle when the locationURI is dereferenced by HeldRequest"

     */

    testcase TC_LIS_HELD_BV_06() runs on HttpComponent system TestAdapter {

      	// Local Variables

        // Local Variabls

        var HttpMessage v_response;



        // Test control

        f_check_pics({ values := {PICS_HTTP_POST_REQUEST, PICS_LOCATION_HELD, PICS_H_QRY_STR1, PICS_H_QRY_GEO2, PICS_H_QRY_GEO4 }, names := {"PICS_HTTP_POST_REQUEST", "PICS_LOCATION_HELD", "PICS_H_QRY_STR1", "PICS_H_QRY_GEO2", "PICS_H_QRY_GEO4"}});

        f_check_pics({ values := {PICS_LIS_HELD_BY_REFERENCE_GET, PICS_LIS_GEOMETRY_CIRCLE}, names := {"PICS_LIS_HELD_BY_REFERENCE_GET", "PICS_LIS_GEOMETRY_CIRCLE"}});

        

        // Test component configuration

        f_cf_01_http_up();
@@ -473,7 +475,7 @@ module AtsLIS_TestCases { 
        

        // Postamble

        f_cf_01_http_down();

    } // End of testcase TC_LIS_HTTP_POST_BV_04

    } // End of testcase TC_LIS_HELD_BV_06

         

  } // End of group lis_role