Merging Titan/TTwb branches (b31a7094) · Commits · TTCN-3 Libraries / LibIts

ttcn/IVIM/LibItsIvim_Templates.ttcn

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -76,7 +76,7 @@ module LibItsIvim_Templates {
	* @param p_iviMsg The expected IVI Message		* @param p_iviMsg The expected IVI Message
	*/		*/
	template (value) IvimInd m_ivimInd(		template (value) IvimInd m_ivimInd(
	template (value) IVIM p_iviMsg		in template (value) IVIM p_iviMsg
	) := {		) := {
	msgIn := p_iviMsg,		msgIn := p_iviMsg,
	recvTime := omit,		recvTime := omit,
	@@ -168,7 +168,7 @@ module LibItsIvim_Templates {
	template (value) UtIvimInitialize m_ivimStructureInitialize(		template (value) UtIvimInitialize m_ivimStructureInitialize(
	in HashedId8 p_hashedId8 := '0000000000000000'O		in HashedId8 p_hashedId8 := '0000000000000000'O
	) := {		) := {
	hashedId8 := '0000000000000000'O		hashedId8 := p_hashedId8
	} // End of template m_ivimStructureInitialize		} // End of template m_ivimStructureInitialize

	/**		/**

ttcn/MapemSpatem/LibItsMapemSpatem_Templates.ttcn

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -453,7 +453,7 @@ module LibItsMapemSpatem_Templates {
	ingressApproach := p_ingressApproach, // inbound Approach IDs to which this lane belongs		ingressApproach := p_ingressApproach, // inbound Approach IDs to which this lane belongs
	egressApproach := p_egressApproach, // outbound Approach IDs to which this lane belongs		egressApproach := p_egressApproach, // outbound Approach IDs to which this lane belongs
	laneAttributes := p_laneAttributes, // All Attribute information about the basic selected lane type		laneAttributes := p_laneAttributes, // All Attribute information about the basic selected lane type
	maneuvers := omit, // the permitted maneuvers for this lane		maneuvers := p_allowedManeuvers, // the permitted maneuvers for this lane
	nodeList := p_nodeListXY, // Lane spatial path information as well as various Attribute information along the node path		nodeList := p_nodeListXY, // Lane spatial path information as well as various Attribute information along the node path
	// Attributes found here are more general and may come and go over the length of the lane.		// Attributes found here are more general and may come and go over the length of the lane.
	connectsTo := p_connectsToList, // a list of other lanes and their signal group IDs each connecting lane and its signal group ID is given, therefore this element provides the information formerly in "signalGroups" in prior editions.		connectsTo := p_connectsToList, // a list of other lanes and their signal group IDs each connecting lane and its signal group ID is given, therefore this element provides the information formerly in "signalGroups" in prior editions.

ttcn/MapemSpatem/LibItsMapemSpatem_TypesAndValues.ttcn

+2 −2

Original line number	Original line	Diff line number	Diff line
	/**		/**
	* @author ETSI / STF484 / STF517		* @author ETSI / STF484 / STF517
	* @version $URL$		* @version $Url: https://oldforge.etsi.org/svn/LibIts/tags/20170222_STF527_Final/ttcn/MapemSpatem/LibItsMapemSpatem_TypesAndValues.ttcn $
	* $Id$		* $Id: LibItsMapemSpatem_TypesAndValues.ttcn 1307 2016-12-13 07:51:14Z garciay $
	* @desc Module containing types and values for MAPEM SPATEM		* @desc Module containing types and values for MAPEM SPATEM
	* @copyright ETSI Copyright Notification		* @copyright ETSI Copyright Notification
	* No part may be reproduced except as authorized by written permission.		* No part may be reproduced except as authorized by written permission.

ttcn/Rtcmem/LibItsRtcmem_Functions.ttcn

+6 −2

Original line number	Original line	Diff line number	Diff line
	@@ -130,9 +130,13 @@ module LibItsRtcmem_Functions {
	utPort.send(p_event);		utPort.send(p_event);
	tc_wait.start;		tc_wait.start;
	alt {		alt {
	[] utPort.receive(UtRtcmemResults: { utRtcmemTerminationResult := ?}) {		[] utPort.receive(UtRtcmemResults: { utRtcmemTerminationResult := true}) {
	tc_wait.stop;		tc_wait.stop;
	}		}
			[] utPort.receive(UtRtcmemResults: { utRtcmemTerminationResult := false}) {
			tc_wait.stop;
			f_selfOrClientSyncAndVerdict("RTCMEM Termination failed", e_error);
			}
	[] tc_wait.timeout {		[] tc_wait.timeout {
	log("* " & testcasename() & ": INFO: Could not receive expected UT message from IUT in time *");		log("* " & testcasename() & ": INFO: Could not receive expected UT message from IUT in time *");
	f_selfOrClientSyncAndVerdict("error", e_timeout);		f_selfOrClientSyncAndVerdict("error", e_timeout);
	@@ -225,7 +229,7 @@ module LibItsRtcmem_Functions {
	*/		*/
	altstep a_default() runs on ItsRtcmem {		altstep a_default() runs on ItsRtcmem {
	[vc_rtcmemDefaultActive] rtcmemPort.receive(mw_rtcmemInd(mw_rtcmemPdu(mw_defaultRtcmem))) {		[vc_rtcmemDefaultActive] rtcmemPort.receive(mw_rtcmemInd(mw_rtcmemPdu(mw_defaultRtcmem))) {
	log("* " & testcasename() & ": INFO: RTCMEMM received in default *");		log("* " & testcasename() & ": INFO: RTCMEM received in default *");
	vc_rtcmemReceived := true;		vc_rtcmemReceived := true;
	repeat;		repeat;
	}		}

ttcn/Rtcmem/LibItsRtcmem_TypesAndValues.ttcn

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -81,7 +81,7 @@ module LibItsRtcmem_TypesAndValues {
	type record UtRtcmemEventInd {		type record UtRtcmemEventInd {
	RTCMEM rtcmemMsg		RTCMEM rtcmemMsg
	} with {		} with {
	encode (rtcmemMsg) "LibItsRtcmem_asn1"		encode (rtcmemMsg) "PER"
	}		}

	/**		/**

Admin message