Commit c8dcec8a authored by garciay's avatar garciay
Browse files

Finalyse ECRF test suite, bug fix in progress

parent dc215c73

ccsrc/Protocols/Lost/lost_codec.cc

+26 −0
Original line number Diff line number Diff line
@@ -24,10 +24,26 @@ int lost_codec::encode (const LibItsHttp__XmlMessageBodyTypes::XmlBody& msg, OCT 
    const urn__ietf__params__xml__ns__lost1::FindService& find_service = msg.findServiceRequest();

    loggers::get_instance().log_msg("lost_codec::encode: Process FindService", (const Base_Type&)find_service);

    find_service.encode(urn__ietf__params__xml__ns__lost1::FindService_descr_, encoding_buffer, TTCN_EncDec::CT_XER, XER_EXTENDED);

  } else  if (msg.ischosen(LibItsHttp__XmlMessageBodyTypes::XmlBody::ALT_listServices)) {

    const urn__ietf__params__xml__ns__lost1::ListServices& list_services = msg.listServices();

    loggers::get_instance().log_msg("lost_codec::encode: Process ListServices", (const Base_Type&)list_services);

    list_services.encode(urn__ietf__params__xml__ns__lost1::ListServices_descr_, encoding_buffer, TTCN_EncDec::CT_XER, XER_EXTENDED);

  } else  if (msg.ischosen(LibItsHttp__XmlMessageBodyTypes::XmlBody::ALT_listServicesByLocation)) {

    const urn__ietf__params__xml__ns__lost1::ListServicesByLocation& list_services_by_location = msg.listServicesByLocation();

    loggers::get_instance().log_msg("lost_codec::encode: Process ListServicesByLocation", (const Base_Type&)list_services_by_location);

    list_services_by_location.encode(urn__ietf__params__xml__ns__lost1::ListServicesByLocation_descr_, encoding_buffer, TTCN_EncDec::CT_XER, XER_EXTENDED);

  } else if  (msg.ischosen(LibItsHttp__XmlMessageBodyTypes::XmlBody::ALT_findServiceResponse)) {

    const urn__ietf__params__xml__ns__lost1::FindServiceResponse& find_service_response = msg.findServiceResponse();

    loggers::get_instance().log_msg("lost_codec::encode: Process FindServiceResponse", (const Base_Type&)find_service_response);

    find_service_response.encode(urn__ietf__params__xml__ns__lost1::FindServiceResponse_descr_, encoding_buffer, TTCN_EncDec::CT_XER, XER_EXTENDED);

  } else if  (msg.ischosen(LibItsHttp__XmlMessageBodyTypes::XmlBody::ALT_listServicesResponse)) {

    const urn__ietf__params__xml__ns__lost1::ListServicesResponse& list_services_response = msg.listServicesResponse();

    loggers::get_instance().log_msg("lost_codec::encode: Process ListServicesResponse", (const Base_Type&)list_services_response);

    list_services_response.encode(urn__ietf__params__xml__ns__lost1::ListServicesResponse_descr_, encoding_buffer, TTCN_EncDec::CT_XER, XER_EXTENDED);

  } else if  (msg.ischosen(LibItsHttp__XmlMessageBodyTypes::XmlBody::ALT_listServicesByLocationResponse)) {

    const urn__ietf__params__xml__ns__lost1::ListServicesByLocationResponse& list_services_by_location_response = msg.listServicesByLocationResponse();

    loggers::get_instance().log_msg("lost_codec::encode: Process ListServicesByLocationResponse", (const Base_Type&)list_services_by_location_response);

    list_services_by_location_response.encode(urn__ietf__params__xml__ns__lost1::ListServicesByLocationResponse_descr_, encoding_buffer, TTCN_EncDec::CT_XER, XER_EXTENDED);

  } else {

    loggers::get_instance().warning("lost_codec::encode: Unsupported variant");

    return -1;
@@ -83,6 +99,16 @@ int lost_codec::decode (const OCTETSTRING& p_data, LibItsHttp__XmlMessageBodyTyp 
    urn__ietf__params__xml__ns__lost1::FindServiceResponse find_service_response;

    find_service_response.decode(urn__ietf__params__xml__ns__lost1::FindServiceResponse_descr_, decoding_buffer, TTCN_EncDec::CT_XER, XER_EXTENDED);

    msg.findServiceResponse() = find_service_response;

  } else if (it->second.find("<listServicesResponse") != std::string::npos) {

    loggers::get_instance().warning("lost_codec::decode: Process ListServicesResponse");

    urn__ietf__params__xml__ns__lost1::ListServicesResponse list_services_response;

    list_services_response.decode(urn__ietf__params__xml__ns__lost1::ListServicesResponse_descr_, decoding_buffer, TTCN_EncDec::CT_XER, XER_EXTENDED);

    msg.listServicesResponse() = list_services_response;

  } else if (it->second.find("<listServicesByLocationResponse") != std::string::npos) {

    loggers::get_instance().warning("lost_codec::decode: Process ListServicesByLocationResponse");

    urn__ietf__params__xml__ns__lost1::ListServicesByLocationResponse list_services_by_location_response;

    list_services_by_location_response.decode(urn__ietf__params__xml__ns__lost1::ListServicesByLocationResponse_descr_, decoding_buffer, TTCN_EncDec::CT_XER, XER_EXTENDED);

    msg.listServicesByLocationResponse() = list_services_by_location_response;

 } else if (it->second.find("<findService") != std::string::npos) {

    urn__ietf__params__xml__ns__lost1::FindService find_service;

    find_service.decode(urn__ietf__params__xml__ns__lost1::FindService_descr_, decoding_buffer, TTCN_EncDec::CT_XER, XER_EXTENDED);

etc/AtsNg112/AtsNg112.cfg

+0 −1
Original line number Diff line number Diff line
@@ -81,7 +81,6 @@ AtsNg112_TestCases.TC_ECRF_HTTP_POST_BV_06 
#AtsNg112_TestCases.TC_ECRF_HTTP_POST_BV_09

#AtsNg112_TestCases.TC_ECRF_HTTP_POST_BV_10

#AtsNg112_TestCases.TC_ECRF_HTTP_POST_BV_11

#AtsNg112_TestCases.TC_ECRF_HTTP_POST_BV_12



[GROUPS]

# In this section you can specify groups of hosts. These groups can be used inside the

ttcn/AtsNg112/AtsNg112_TestCases.ttcn

+171 −11

File changed.

Preview size limit exceeded, changes collapsed.

ttcn/AtsNg112/AtsNg112_TestControl.ttcn

+2 −3
Original line number Diff line number Diff line
@@ -38,9 +38,8 @@ module AtsNg112_TestControl { 
            execute(TC_ECRF_HTTP_POST_BV_08());

          }

          if (PICS_L_FIS_GEO1) { execute(TC_ECRF_HTTP_POST_BV_09()); }

          /*execute(TC_ECRF_HTTP_POST_BV_10());

          execute(TC_ECRF_HTTP_POST_BV_11());

          execute(TC_ECRF_HTTP_POST_BV_12());*/

          if (PICS_L_LST_ALL1) { execute(TC_ECRF_HTTP_POST_BV_10()); }

          if (PICS_L_FIS_GEO1) { execute(TC_ECRF_HTTP_POST_BV_11()); }

        }

      }

    } // End of 'control' statement

ttcn/LibEmcom/LibNg112/ttcn/LibNg112_Pics.ttcn

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ module LibNg112_Pics { 
  /**

   * @desc Does IUT support listServices?

   */

  modulepar boolean PICS_L_FIS_ALL1 := true;

  modulepar boolean PICS_L_LST_ALL1 := true;

  

  /**

   * @desc Does IUT support serviceNotImplemented error message?