Commit 6580ca29 authored by Garcia's avatar Garcia
Browse files

Enhance LIS test cases

parent d7c043ad

ttcn/AtsNg112/AtsNg112_TestCases.ttcn

+2 −2
Original line number Diff line number Diff line
@@ -728,8 +728,8 @@ module AtsNg112_TestCases { 
                    // Extract Civic address element from Tuple

                    v_temp := v_geopriv.location_info.elem_list[0];

                    v_result := decvalue_unichar(v_temp, v_civic_address);

                    log(match(v_civic_address, mw_civicAddress(PX_CIVIC_ADDR_COUNTRY, PX_CIVIC_ADDR_A1, -))); // FIXME Required by TITAN to get details in case of mismatch

                    if (match(v_civic_address,  mw_civicAddress(PX_CIVIC_ADDR_COUNTRY, PX_CIVIC_ADDR_A1, -))) {

                    log(match(v_civic_address, mw_civicAddress(PX_CIVIC_ADDR_COUNTRY, PX_CIVIC_ADDR_A1, PX_CIVIC_ADDR_A3, PX_CIVIC_ADDR_A4, PX_CIVIC_ADDR_STS, PX_CIVIC_ADDR_LMK))); // FIXME Required by TITAN to get details in case of mismatch

                    if (match(v_civic_address,  mw_civicAddress(PX_CIVIC_ADDR_COUNTRY, PX_CIVIC_ADDR_A1, PX_CIVIC_ADDR_A3, PX_CIVIC_ADDR_A4, PX_CIVIC_ADDR_STS, PX_CIVIC_ADDR_LMK))) {

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

                      f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_success);

                    } else {

ttcn/LibEmcom/LibNg112/ttcn/LibNg112_Pixits.ttcn

+8 −0
Original line number Diff line number Diff line
@@ -68,6 +68,14 @@ module LibNg112_Pixits { 
  

  modulepar XSD.String PX_CIVIC_ADDR_A1 := "NSW";

  

  modulepar XSD.String PX_CIVIC_ADDR_A3 := "Wollongong";

  

  modulepar XSD.String PX_CIVIC_ADDR_A4 := "Gwynneville";

  

  modulepar XSD.String PX_CIVIC_ADDR_STS := "Northfield Avenue";

  

  modulepar XSD.String PX_CIVIC_ADDR_LMK := "University of Wollongong";

  

  modulepar XSD.Token PX_LOST_ID := "6020688f1ce1896d";

  

  modulepar XSD.AnyURI PX_LOST_SERVICE_URN_1 := "urn:service:sos.police";

ttcn/patch_lib_http/LibItsHttp_XmlTemplates.ttcn

+41 −52
Original line number Diff line number Diff line
@@ -283,35 +283,24 @@ module LibItsHttp_XmlTemplates { 
    template CivicAddress mw_civicAddress(

                                          template (present) Iso3166a2 p_country := ?,

                                          template (present) XSD.Token p_a1 := ?,

                                          template CaType p_a2 := omit,

                                          template (present) CaType p_a3 := ?,

                                          template (present) CaType p_a4 := ?,/*

                                          template XSD.String p_a5 := *,

                                          template XSD.String p_a6 := *,

                                          template (present) XSD.String p_pRD := ?,

                                          template (present) XSD.String p_pOD := ?,

                                          template (present) XSD.String p_a3 := ?,

                                          template (present) XSD.String p_a4 := ?,

                                          template (present) XSD.String p_sTS := ?,

                                          template (present) XSD.String p_hNO := ?,

                                          template (present) XSD.String p_hNS := ?,

                                          template (present) XSD.String p_lMK := ?,

                                          template (present) XSD.String p_lOC := ?,

                                          template (present) XSD.String p_fLR := ?,

                                          template (present) XSD.String p_nAM := ?,

                                          template (present) XSD.String p_pC := ?,*/

                                          template (present) CivicAddress.elem_list p_elem_list := ?

    ) := {

      attr    := *,

      country := p_country,

      a1 := mw_ca_type(p_a1),

      a2 := p_a2,

      a3 := p_a3,

      a4 := p_a4,

      a2 := *,

      a3 := mw_ca_type(p_a3),

      a4 := mw_ca_type(p_a4),

      a5 := *,

      a6 := *,

      pRM := *,

      pRD := *,

      rD := *,

	    sTS := *,

      sTS := mw_ca_type(p_sTS),

      pOD := *,

      pOM := *,

      rDSEC := *,
@@ -319,7 +308,7 @@ module LibItsHttp_XmlTemplates { 
      rDSUBBR := *,

      hNO := *,

      hNS := *,

	    lMK := *,

      lMK := mw_ca_type(p_lMK),

      lOC := *,

      fLR := *,

      nAM := *,