Commit 7e878182 authored by Yann Garcia's avatar Yann Garcia
Browse files

Reorganize TC templates

parent d8240edd

ccsrc/Protocols/Xml/xml_codec.cc

+156 −110

File changed.

Preview size limit exceeded, changes collapsed.

ccsrc/Protocols/Xml/xml_codec.hh

+7 −5
Original line number Original line Diff line number Diff line
@@ -14,11 +14,13 @@ namespace LibHttp__XmlMessageBodyTypes { 
class xml_codec: public codec_gen<LibHttp__XmlMessageBodyTypes::XmlBody, LibHttp__XmlMessageBodyTypes::XmlBody>

class xml_codec: public codec_gen<LibHttp__XmlMessageBodyTypes::XmlBody, LibHttp__XmlMessageBodyTypes::XmlBody>

{

{

  //TITAN issue: variant "namespace for 'agent/organization' seems buggy: <Agent xsi:type="agent:Organization"> instead of xsi:type=\"ns6:Agent\" xmlns:ns6=\"http://www.cise.eu/datamodel/v1/entity/organization/

  //TITAN issue: variant "namespace for 'agent/organization' seems buggy: <Agent xsi:type="agent:Organization"> instead of xsi:type=\"ns6:Agent\" xmlns:ns6=\"http://www.cise.eu/datamodel/v1/entity/organization/

  int patch_agent_derivations(std::string& s);

  int patch_encode_agent_derivations(std::string& s);

  int patch_location_derivations(std::string& s);

  int patch_encode_location_derivations(std::string& s);

  int patch_event_derivations(std::string& s);

  int patch_encode_event_derivations(std::string& s);

  int patch_object_derivations(std::string& s);

  int patch_encode_object_derivations(std::string& s);

  int patch_document_derivations(std::string& s);

  int patch_encode_document_derivations(std::string& s);

  int patch_encode_service_capability_derivations(std::string& s);

  int patch_decode_service_capability_derivations(std::string& s);

  //TITAN issue: variant "namespace for 'agent/organization' seems buggy: <Agent xsi:type="agent:Organization"> instead of xsi:type=\"ns6:Agent\" xmlns:ns6=\"http://www.cise.eu/datamodel/v1/entity/organization/

  //TITAN issue: variant "namespace for 'agent/organization' seems buggy: <Agent xsi:type="agent:Organization"> instead of xsi:type=\"ns6:Agent\" xmlns:ns6=\"http://www.cise.eu/datamodel/v1/entity/organization/

public:

public:

  explicit xml_codec() : codec_gen<LibHttp__XmlMessageBodyTypes::XmlBody, LibHttp__XmlMessageBodyTypes::XmlBody>() { };

  explicit xml_codec() : codec_gen<LibHttp__XmlMessageBodyTypes::XmlBody, LibHttp__XmlMessageBodyTypes::XmlBody>() { };

config.mk

+1 −1
Original line number Original line Diff line number Diff line 
TTCN3_COMPILER_OPTIONS := -b -d -e -f -g -l -L -M -O -R -U none -x

TTCN3_COMPILER_OPTIONS := -b -d -e -f -g -l -L -M -O -R -U none -x

#TTCN3_DIR      := /home/yann/frameworks/titan-8.1.0

#TTCN3_DIR      := /home/y.garcia/frameworks/ttcn3-9.0.0

#WPCAP_DLL_PATH := /cygdrive/c/windows/system32/npcap/wpcap.dll

#WPCAP_DLL_PATH := /cygdrive/c/windows/system32/npcap/wpcap.dll

#NPCAP_INCLUDE  := /cygdrive/c/PROGRA~1/Npcap/sdk/include

#NPCAP_INCLUDE  := /cygdrive/c/PROGRA~1/Npcap/sdk/include

T3Q_PATH=./tools/t3q-v2.0.0b30

T3Q_PATH=./tools/t3q-v2.0.0b30

etc/AtsCise/AtsCise_Cnit.cf_

+2 −2
Original line number Original line Diff line number Diff line
@@ -138,7 +138,7 @@ system.utPort.params := "HTTP(codecs=xml:xml_codec;json:json_codec)/TCP(debug=1, 
#AtsCise_TestCases.TC_CDM_NODE_PULL_REQUEST_BO_01_06

#AtsCise_TestCases.TC_CDM_NODE_PULL_REQUEST_BO_01_06





# Check that the IUT responds with an HTTP 200 OK Acknowledgment response when receiving a PullRequest for Action service - no Acknowledgment required

# Check that the IUT responds with an HTTP 200 OK Acknowledgment response when receiving a PullRequest for Action service - no Acknowledgment required

AtsCise_TestCases.TC_CDM_NODE_PULL_REQUEST_BV_02_01

#AtsCise_TestCases.TC_CDM_NODE_PULL_REQUEST_BV_02_01

# Check that the IUT responds with an HTTP 200 OK Acknowledgment response when receiving a PullRequest for Action service - no Acknowledgment required

# Check that the IUT responds with an HTTP 200 OK Acknowledgment response when receiving a PullRequest for Action service - no Acknowledgment required

#AtsCise_TestCases.TC_CDM_NODE_PULL_REQUEST_BV_02_02

#AtsCise_TestCases.TC_CDM_NODE_PULL_REQUEST_BV_02_02

# Check that the IUT responds with an HTTP 200 OK Acknowledgment response and an error code when receiving a PullRequest with inconsistent Location

# Check that the IUT responds with an HTTP 200 OK Acknowledgment response and an error code when receiving a PullRequest with inconsistent Location
@@ -147,7 +147,7 @@ AtsCise_TestCases.TC_CDM_NODE_PULL_REQUEST_BV_02_01 
#AtsCise_TestCases.TC_CDM_NODE_PULL_REQUEST_BO_02_01

#AtsCise_TestCases.TC_CDM_NODE_PULL_REQUEST_BO_02_01





# Check the IUT sends a PullResponse before reponse timout expiry when receiving a PullRequest with an Anomaly service - no Acknowledgment required

# Check the IUT sends a PullResponse before reponse timout expiry when receiving a PullRequest with an Anomaly service - no Acknowledgment required

#AtsCise_TestCases.TC_CDM_NODE_PULL_REQUEST_BV_03

AtsCise_TestCases.TC_CDM_NODE_PULL_REQUEST_BV_03





# Check that the IUT sends a PullResponse before reponse timout expiry when receiving a PullRequest with a vessel document certificate service - no Acknowledgment required

# Check that the IUT sends a PullResponse before reponse timout expiry when receiving a PullRequest with a vessel document certificate service - no Acknowledgment required

#AtsCise_TestCases.TC_CDM_NODE_PULL_REQUEST_BV_04

#AtsCise_TestCases.TC_CDM_NODE_PULL_REQUEST_BV_04

ttcn/AtsCise/AtsCise_Templates.ttcn

0 → 100644
+760 −0

File added.

Preview size limit exceeded, changes collapsed.