Finalyze Vessel subscription loockup TCs for I1 (a932c348) · Commits · CDM - Common information sharing environment and Data Model / CISE Data Model

ccsrc/Protocols/Xml/xml_codec.cc

+26 −12

Original line number	Original line	Diff line number	Diff line
	@@ -345,24 +345,38 @@ int xml_codec::patch_encode_service_capability_derivations(std::string& s) {
	std::string search;		std::string search;
	std::string replace;		std::string replace;
	size_t idx = 0;		size_t idx = 0;
			if (s.find("tq0000:SubscriptionCapability") != std::string::npos) {
			search.assign("tq0000:SubscriptionCapability");
			replace.assign("ns3:SubscriptionCapability");
			idx = 0;
			loggers::get_instance().log("xml_codec::patch_encode_service_capability_derivations: Apply TITAN workaround: %s --> %s", search.c_str(), replace.c_str());
			while ((idx = s.find(search, idx)) != std::string::npos) {
			s.replace(idx, search.length(), replace);
			idx += replace.length();
			} // End of 'while' statement
			search.assign("<ns4:PullRequest ");
			replace.assign("<ns4:PullRequest xmlns:ns3=\"http://www.cise.eu/servicemodel/v1/service/\" ");
			loggers::get_instance().log("xml_codec::patch_encode_service_capability_derivations: Apply TITAN workaround once: %s --> %s", search.c_str(), replace.c_str());
			idx = s.find(search);
			s.replace(idx, search.length(), replace);
			// search.assign(" xsi:type=\"tq0000:SubscriptionCapability\"");
			// replace.assign("");
			// idx = 0;
			// loggers::get_instance().log("xml_codec::patch_encode_service_capability_derivations: Apply TITAN workaround: %s --> %s", search.c_str(), replace.c_str());
			// while ((idx = s.find(search, idx)) != std::string::npos) {
			// s.replace(idx, search.length(), replace);
			// idx += replace.length();
			// } // End of 'while' statement
	// if (s.find("<Requests xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"") != std::string::npos) {		// if (s.find("<Requests xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"") != std::string::npos) {
	// search.assign("<Requests xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"");		// search.assign("<Requests xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"");
	// replace.assign("<Requests xmlns:ns3=\"http://www.cise.eu/servicemodel/v1/service/\"");		// replace.assign("<Requests xsi:type=\"ns4:SubscriptionCapability\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"");
	// loggers::get_instance().log("xml_codec::patch_encode_service_capability_derivations: Apply TITAN workaround: %s --> %s", search.c_str(), replace.c_str());		// loggers::get_instance().log("xml_codec::patch_encode_service_capability_derivations: Apply TITAN workaround: %s --> %s", search.c_str(), replace.c_str());
			// idx = 0;
	// while ((idx = s.find(search, idx)) != std::string::npos) {		// while ((idx = s.find(search, idx)) != std::string::npos) {
	// s.replace(idx, search.length(), replace);		// s.replace(idx, search.length(), replace);
	// idx += replace.length();		// idx += replace.length();
	// } // End of 'while' statement		// } // End of 'while' statement
	// }		// }
	if (s.find("xsi:type=\"tq0000:SubscriptionCapability\"") != std::string::npos) {
	search.assign("xsi:type=\"tq0000:SubscriptionCapability\"");
	replace.assign("xsi:type=\"ns3:SubscriptionCapability\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"");
	idx = 0;
	loggers::get_instance().log("xml_codec::patch_encode_service_capability_derivations: Apply TITAN workaround: %s --> %s", search.c_str(), replace.c_str());
	while ((idx = s.find(search, idx)) != std::string::npos) {
	s.replace(idx, search.length(), replace);
	idx += replace.length();
	} // End of 'while' statement
	}		}

	return 0;		return 0;

etc/AtsCise/AtsCise_Cnit.cf_

+61 −2

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

	## cise_node_i1		## cise_node_i1
	# Check that the IUT responds with an HTTP 200 OK Acknowledgment response when receiving a PullRequest for Vessel service - no Acknowledgment required		# Check that the IUT responds with an HTTP 200 OK Acknowledgment response when receiving a PullRequest for Vessel service - no Acknowledgment required
	AtsCise_TestCases.TC_CDM_NODE_EI_NA_PULL_REQUEST_BV_01_01		#AtsCise_TestCases.TC_CDM_NODE_EI_NA_PULL_REQUEST_BV_01_01
	# Check that the IUT sends a PullResponse before reponse timout expiry when receiving a PullRequest with timeout on response - no Acknowledgment required		# Check that the IUT sends a PullResponse before reponse timout expiry when receiving a PullRequest with timeout on response - no Acknowledgment required
	#AtsCise_TestCases.TC_CDM_NODE_EI_NA_PULL_REQUEST_BV_01_02		#AtsCise_TestCases.TC_CDM_NODE_EI_NA_PULL_REQUEST_BV_01_02
	# Check that the IUT responds with an HTTP 200 OK Acknowledgment response when receiving a PullRequest for a unknown vessel - no Acknowledgment required		# Check that the IUT responds with an HTTP 200 OK Acknowledgment response when receiving a PullRequest for a unknown vessel - no Acknowledgment required
	@@ -218,25 +218,84 @@ AtsCise_TestCases.TC_CDM_NODE_EI_NA_PULL_REQUEST_BV_01_01
	#AtsCise_TestCases.TC_CDM_NODE_EI_NA_PULL_DISC_BV_11		#AtsCise_TestCases.TC_CDM_NODE_EI_NA_PULL_DISC_BV_11

	# Check that the IUT responds with an HTTP 200 OK Acknowledgment response when receiving a subscription for VesselService		# Check that the IUT responds with an HTTP 200 OK Acknowledgment response when receiving a subscription for VesselService
	#AtsCise_TestCases.TC_CDM_NODE_EI_NA_SUB_BV_01		AtsCise_TestCases.TC_CDM_NODE_EI_NA_SUB_BV_01
	# Check that the IUT responds with an HTTP 200 OK Acknowledgment response and an error code when receiving a subscription ending in past		# Check that the IUT responds with an HTTP 200 OK Acknowledgment response and an error code when receiving a subscription ending in past
	#AtsCise_TestCases.TC_CDM_NODE_EI_NA_SUB_BO_01		#AtsCise_TestCases.TC_CDM_NODE_EI_NA_SUB_BO_01

	# Check that the IUT sends a request of subcribers list for ActionService when triggered		# Check that the IUT sends a request of subcribers list for ActionService when triggered
	#AtsCise_TestCases.TC_CDM_NODE_EI_NA_SUB_BV_02		#AtsCise_TestCases.TC_CDM_NODE_EI_NA_SUB_BV_02

			# Check that the IUT sends a request of subcribers list for AnomalyService when triggered
			#AtsCise_TestCases.TC_CDM_NODE_EI_NA_SUB_BV_03

			# Check that the IUT sends a request of subcribers list for CertificateDocumentService when triggered
			#AtsCise_TestCases.TC_CDM_NODE_EI_NA_SUB_BV_04

			# Check that the IUT sends a request of subcribers list for IncidentService when triggered
			#AtsCise_TestCases.TC_CDM_NODE_EI_NA_SUB_BV_05

			# Check that the IUT sends a request of subcribers list for IrregularMigrationIncidentService when triggered
			#AtsCise_TestCases.TC_CDM_NODE_EI_NA_SUB_BV_06

			# Check that the IUT sends a request of subcribers list for LawInfringementIncidentService when triggered
			#AtsCise_TestCases.TC_CDM_NODE_EI_NA_SUB_BV_07

			# Check that the IUT sends a request of subcribers list for MeteoOceanographicConditionService when triggered
			#AtsCise_TestCases.TC_CDM_NODE_EI_NA_SUB_BV_08

			# Check that the IUT sends a request of subcribers list for OrganizationService when triggered
			#AtsCise_TestCases.TC_CDM_NODE_EI_NA_SUB_BV_09

			# Check that the IUT sends a request of subcribers list for RiskService when triggered
			#AtsCise_TestCases.TC_CDM_NODE_EI_NA_SUB_BV_10

			# Check that the IUT sends a request of subcribers list for CargoService when triggered
			#AtsCise_TestCases.TC_CDM_NODE_EI_NA_SUB_BV_11

	# Check that the IUT responds with an HTTP 200 OK Acknowledgment response when receiving a request of subcribers list for VesselService		# Check that the IUT responds with an HTTP 200 OK Acknowledgment response when receiving a request of subcribers list for VesselService
	#AtsCise_TestCases.TC_CDM_NODE_EI_NA_SUB_LOOK_BV_01_01		#AtsCise_TestCases.TC_CDM_NODE_EI_NA_SUB_LOOK_BV_01_01
	# Check that the IUT responds with an HTTP 200 OK Acknowledgment response with an empty list when no subscription was done for VesselService		# Check that the IUT responds with an HTTP 200 OK Acknowledgment response with an empty list when no subscription was done for VesselService
	#AtsCise_TestCases.TC_CDM_NODE_EI_NA_SUB_LOOK_BV_01_02		#AtsCise_TestCases.TC_CDM_NODE_EI_NA_SUB_LOOK_BV_01_02

			# Check that the IUT responds with an HTTP 200 OK Acknowledgment response when receiving a request of subcribers list for ActionService
			#AtsCise_TestCases.TC_CDM_NODE_EI_NA_SUB_LOOK_BV_02

			# Check that the IUT responds with an HTTP 200 OK Acknowledgment response when receiving a request of subcribers list for AnomalyService
			#AtsCise_TestCases.TC_CDM_NODE_EI_NA_SUB_LOOK_BV_03

			# Check that the IUT responds with an HTTP 200 OK Acknowledgment response when receiving a request of subcribers list for CertificateDocumentService
			#AtsCise_TestCases.TC_CDM_NODE_EI_NA_SUB_LOOK_BV_04

			# Check that the IUT responds with an HTTP 200 OK Acknowledgment response when receiving a request of subcribers list for IncidentService
			#AtsCise_TestCases.TC_CDM_NODE_EI_NA_SUB_LOOK_BV_05

			# Check that the IUT responds with an HTTP 200 OK Acknowledgment response when receiving a request of subcribers list for IrregularMigrationIncidentService
			#AtsCise_TestCases.TC_CDM_NODE_EI_NA_SUB_LOOK_BV_06

			# Check that the IUT responds with an HTTP 200 OK Acknowledgment response when receiving a request of subcribers list for LawInfringementIncidentService
			#AtsCise_TestCases.TC_CDM_NODE_EI_NA_SUB_LOOK_BV_07

			# Check that the IUT responds with an HTTP 200 OK Acknowledgment response when receiving a request of subcribers list for MeteoOceanographicConditionService
			#AtsCise_TestCases.TC_CDM_NODE_EI_NA_SUB_LOOK_BV_08

			# Check that the IUT responds with an HTTP 200 OK Acknowledgment response when receiving a request of subcribers list for OrganizationService
			#AtsCise_TestCases.TC_CDM_NODE_EI_NA_SUB_LOOK_BV_09

			# Check that the IUT responds with an HTTP 200 OK Acknowledgment response when receiving a request of subcribers list for RiskService
			#AtsCise_TestCases.TC_CDM_NODE_EI_NA_SUB_LOOK_BV_10

			# Check that the IUT responds with an HTTP 200 OK Acknowledgment response when receiving a request of subcribers list for CargoService
			#AtsCise_TestCases.TC_CDM_NODE_EI_NA_SUB_LOOK_BV_11

	# Check that the IUT responds with an HTTP 200 OK Acknowledgment response when receiving a request to delete subscription for VesselService		# Check that the IUT responds with an HTTP 200 OK Acknowledgment response when receiving a request to delete subscription for VesselService
	#AtsCise_TestCases.TC_CDM_NODE_EI_NA_SUB_DELETE_BV_01_01		#AtsCise_TestCases.TC_CDM_NODE_EI_NA_SUB_DELETE_BV_01_01
	# Check that the IUT responds with an HTTP 200 OK Acknowledgment response with an error code when receiving a request to delete an unknown subscription for VesselService		# Check that the IUT responds with an HTTP 200 OK Acknowledgment response with an error code when receiving a request to delete an unknown subscription for VesselService
	#AtsCise_TestCases.TC_CDM_NODE_EI_NA_SUB_DELETE_BV_01_02		#AtsCise_TestCases.TC_CDM_NODE_EI_NA_SUB_DELETE_BV_01_02





	#Check that the IUT responds with an HTTP 200 OK Acknowledgment response when receiving a Push for notification for VesselService		#Check that the IUT responds with an HTTP 200 OK Acknowledgment response when receiving a Push for notification for VesselService
	#AtsCise_TestCases.TC_CDM_NODE_EI_NA_PUSH_NOT_BV_01		#AtsCise_TestCases.TC_CDM_NODE_EI_NA_PUSH_NOT_BV_01

test-purposes/AtsCise/AtsCise.tplan2

+183 −183

File changed.

Preview size limit exceeded, changes collapsed.

test-purposes/cise-common.tplan2

+6 −5

Original line number	Original line	Diff line number	Diff line
	@@ -4,17 +4,18 @@ Package CISE_Common {
	pics:		pics:
	- IUT_CDM_NODE // Set to true if the IUT is acting as a CISE node		- IUT_CDM_NODE // Set to true if the IUT is acting as a CISE node
	- IUT_CDM_ADAPTOR // Set to true if the IUT is acting as a CISE adaptor		- IUT_CDM_ADAPTOR // Set to true if the IUT is acting as a CISE adaptor
	- CDM_PULL_REQUEST // Set to true if the IUT supports PullRequest		- CDM_PULL // Set to true if the IUT supports Pull communication
	- CDM_PUSH_REQUEST		- CDM_PUSH // Set to true if the IUT supports Push communication
	- CDM_SUBSCRIBE_REQUEST		- CDM_SUBSCRIBE // Set to true if the IUT supports Pull/Subscribe communication
	- CDM_FEEDBACK_REQUEST		- CDM_FEEDBACK // Set to true if the IUT supports Feedback communication
	- CISE_SHA1 // Set to true if signature with SHA-1 is supported		- CISE_SHA1 // Set to true if signature with SHA-1 is supported
	- CISE_SHA256 // Set to true if signature with SHA-256 is supported		- CISE_SHA256 // Set to true if signature with SHA-256 is supported
	- CISE_SHA384 // Set to true if signature with SHA-384 is supported		- CISE_SHA384 // Set to true if signature with SHA-384 is supported
	- CDM_VESSEL_SERVICE // Set to true if Vessel service is supported by the ServiceRegistry		- CDM_VESSEL_SERVICE // Set to true if Vessel service is supported by the ServiceRegistry
	- CDM_ACTION_SERVICE // Set to true if Action service is supported by the ServiceRegistry		- CDM_ACTION_SERVICE // Set to true if Action service is supported by the ServiceRegistry
	- CDM_ANOMALY_SERVICE // Set to true if Anomaly service is supported by the ServiceRegistry		- CDM_ANOMALY_SERVICE // Set to true if Anomaly service is supported by the ServiceRegistry
	- CDM_CERTIFICATE_DOCUMENT_SERVICE // Set to true if Document service is supported by the ServiceRegistry		- CDM_CERTIFICATE_DOCUMENT_SERVICE
			// Set to true if Document service is supported by the ServiceRegistry
	- CDM_INCIDENT_SERVICE // Set to true if Document service is supported by the ServiceRegistry		- CDM_INCIDENT_SERVICE // Set to true if Document service is supported by the ServiceRegistry
	- CDM_METEO_SERVICE // Set to true if MeteoCondition service is supported by the ServiceRegistry		- CDM_METEO_SERVICE // Set to true if MeteoCondition service is supported by the ServiceRegistry
	- CDM_ORGANIZATION_SERVICE		- CDM_ORGANIZATION_SERVICE

ttcn/AtsCise/AtsCise_TestCases.ttcn

+994 −41

File changed.

Preview size limit exceeded, changes collapsed.

Admin message