Bug fixed in mixed types StationType & StationID (40d6a39a) · Commits · TTCN-3 Libraries / LibIts

ttcn/Common/LibItsCommon_Functions.ttcn

+7 −0

Original line number	Diff line number	Diff line
		@@ -127,6 +127,13 @@ module LibItsCommon_Functions {

		} // end f_getTsStationId

		function f_getTsStationType()
		return StationType {

		return PX_TESTER_STATION_TYPE;

		} // end f_getTsStationType

		/**
		* @desc Gets the current latitude of test system
		* @return Test system's latitude

ttcn/Common/LibItsCommon_Pixits.ttcn

+6 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,12 @@ module LibItsCommon_Pixits {
		*/
		modulepar integer PX_TESTER_STATION_ID := 111111;

		/**
		* @desc Tester Station Type
		* Station Type used in CAM/DENM messages sent by the tester
		*/
		modulepar integer PX_TESTER_STATION_TYPE := 3;

		/**
		* @desc The Latitude of the tester.
		*/

ttcn/DENM/LibItsDenm_Templates.ttcn

+3 −5

Original line number	Diff line number	Diff line
		@@ -393,7 +393,6 @@ module LibItsDenm_Templates {
		* @desc Send template for Management Container
		* @param p_actionID The action id
		* @param p_isNegation The negation flag (Default: false)
		* @param p_isCancellation The cancellation flag (Default: false)
		* @param p_validityDuration The validity duration (Default: omit)
		* @param p_transmissionInterval The transmission interval (Default: omit)
		* @param p_detectionTime The detection time (Default: current time)
		@@ -401,7 +400,7 @@ module LibItsDenm_Templates {
		*/
		template (value) ManagementContainer m_denmMgmtCon(
		template (value) ActionID p_actionID,
		template (value) StationType p_stationType := f_getTsStationId(),
		template (value) StationType p_stationType := f_getTsStationType(),
		template (value) ValidityDuration p_validityDuration := c_defaultValidity,
		template (omit) TransmissionInterval p_transmissionInterval := omit,
		template (value) TimestampIts p_detectionTime := f_getCurrentTime(),
		@@ -431,7 +430,7 @@ module LibItsDenm_Templates {
		*/
		template (value) ManagementContainer m_denmMgmtConTermination (
		template (value) ActionID p_actionID,
		template (value) StationType p_stationType := f_getTsStationId(),
		template (value) StationType p_stationType := f_getTsStationType(),
		template (value) ValidityDuration p_validityDuration := c_defaultValidity,
		template (omit) TransmissionInterval p_transmissionInterval := omit,
		template (value) TimestampIts p_detectionTime := f_getCurrentTime(),
		@@ -446,13 +445,12 @@ module LibItsDenm_Templates {
		* @param p_actionID The expected action id
		* @param p_referenceTime The reference time (Default: any)
		* @param p_isNegation The expected negation flag (Default: false)
		* @param p_isCancellation The expected cancellation flag (Default: false)
		* @param p_validityDuration The expected validity duration (Default: any or omit)
		* @param p_transmissionInterval The expected transmission interval (Default: any or omit)
		*/
		template (present) ManagementContainer mw_denmMgmtCon(
		template (present) ActionID p_actionID,
		template (present) StationType p_stationType := f_getTsStationId(),
		template (present) StationType p_stationType := f_getTsStationType(),
		template (present) TimestampIts p_referenceTime := ?,
		template ValidityDuration p_validityDuration := ?,
		template TransmissionInterval p_transmissionInterval := *,