fix for: 0006832 (d362ec42) · Commits · ITS - Intelligent Transport Systems / ECall_HLAP

ttcn/AtsECall_IVS_Testcases.ttcn

+9 −9

Original line number	Diff line number	Diff line
		@@ -585,9 +585,9 @@ module AtsECall_IVS_Testcases {
		"Not all components of the IVS, which are necessary for an eCall, are available and not influenced by the previously-running communication (HMI, Audio,...)",
		c_mbYes);

		f_mnoExpect(mw_callIncoming(PX_WORKER, ?, PX_IVS_PHONE_NUMBER, PX_PSAP_PHONE_NUMBER, EXTERNAL));
		f_mnoExpect(mw_callIncoming(PX_WORKER, ?, PX_IVS_PHONE_NUMBER, PX_PSAP_PHONE_NUMBER));
		callControl.send(m_callAccept(PX_WORKER));
		f_mnoExpect(mw_callEstablished(PX_WORKER, ?, EXTERNAL));
		f_mnoExpect(mw_callEstablished(PX_WORKER, ?));

		f_verifyMSD(PX_ECALL_MESSAGE);

		@@ -1393,7 +1393,7 @@ module AtsECall_IVS_Testcases {

		f_verifyMSD(PX_ECALL_MESSAGE);

		f_mnoExpect(mw_callHangUp(PX_WORKER, ?, EXTERNAL), PX_TIMEOUT, true);
		f_mnoExpect(mw_callHangUp(PX_WORKER, ?), PX_TIMEOUT, true);

		f_userVerify("Is the IVS cleared down?",
		"IVS cleared down the call following receipt of an AL ACK CLEAR DOWN message from the PSAP",
		@@ -1518,7 +1518,7 @@ module AtsECall_IVS_Testcases {

		f_verifyMSD(ANY_DECODED_ECALL);

		f_mnoExpect(mw_callHangUp(PX_WORKER, ?, EXTERNAL), PX_TIMEOUT, true);
		f_mnoExpect(mw_callHangUp(PX_WORKER, ?), PX_TIMEOUT, true);

		f_userVerify("Is a record of the received application layer acknowledgment (AL-ACK) and time stamp, sent from the PSAP test point, stored in the IVS?",
		"A record of the received time stamped AL-ACK has been stored in the IVS",
		@@ -1594,7 +1594,7 @@ module AtsECall_IVS_Testcases {
		});

		callControl.send(m_callCreate(PX_WORKER, PX_IVS_PHONE_NUMBER));
		f_mnoExpect(mw_callEstablished(PX_WORKER, ?, EXTERNAL));
		f_mnoExpect(mw_callEstablished(PX_WORKER, ?));

		f_verifyMSD(ANY_DECODED_ECALL);

		@@ -1688,7 +1688,7 @@ module AtsECall_IVS_Testcases {
		}

		callControl.send(m_callCreate(PX_WORKER, PX_IVS_PHONE_NUMBER));
		f_mnoExpect(mw_callEstablished(PX_WORKER, ?, EXTERNAL));
		f_mnoExpect(mw_callEstablished(PX_WORKER, ?));

		// Test Body

		@@ -1775,7 +1775,7 @@ module AtsECall_IVS_Testcases {

		f_verifyMSD(ANY_DECODED_ECALL);

		f_mnoExpect(mw_callHangUp(PX_WORKER, ?, EXTERNAL), PX_TIMEOUT, true);
		f_mnoExpect(mw_callHangUp(PX_WORKER, ?), PX_TIMEOUT, true);

		adapterControl.send(m_setAutomaticAlAck(PX_WORKER, true, c_positiveAlAck));
		f_adapterExpect(mw_anyConfigChanged);
		@@ -1783,7 +1783,7 @@ module AtsECall_IVS_Testcases {
		t_callbackDelay.start;

		callControl.send(m_callCreate(PX_WORKER, PX_IVS_PHONE_NUMBER));
		f_mnoExpect(mw_callEstablished(PX_WORKER, ?, EXTERNAL));
		f_mnoExpect(mw_callEstablished(PX_WORKER, ?));

		f_userVerify("Was the call-back automatically answered by the IVS?",
		"Call answered automatically",
		@@ -1908,7 +1908,7 @@ module AtsECall_IVS_Testcases {
		}

		callControl.send(m_callCreate(PX_WORKER, PX_IVS_PHONE_NUMBER));
		f_mnoExpect(mw_callEstablished(PX_WORKER, ?, EXTERNAL));
		f_mnoExpect(mw_callEstablished(PX_WORKER, ?));

		f_expectFeedback(mw_callVoiceConnectionEstablished(PX_WORKER));

ttcn/LibItsECall_Functions.ttcn

+9 −10

Original line number	Diff line number	Diff line
		@@ -108,11 +108,11 @@ module LibItsECall_Functions {
		return v_feedback;
		}

		f_mnoExpect(mw_callIncoming(PX_WORKER, ?, p_ivsNumber, p_psapNumber, EXTERNAL));
		f_mnoExpect(mw_callIncoming(PX_WORKER, ?, p_ivsNumber, p_psapNumber));

		callControl.send(m_callAccept(PX_WORKER));

		v_feedback := f_mnoExpect(mw_callEstablished(PX_WORKER, ?, EXTERNAL));
		v_feedback := f_mnoExpect(mw_callEstablished(PX_WORKER, ?));
		if (v_feedback.failure == true) {
		f_stopIvsTestcase(inconc, "Could not establish eCall");
		}
		@@ -540,15 +540,15 @@ module LibItsECall_Functions {
		repeat;
		}

		[] callControl.receive(mw_callEstablished(PX_WORKERS[0].id, ?, INTERNAL)) {
		[] callControl.receive(mw_callEstablished(PX_WORKERS[0].id, ?)) {
		repeat;
		}

		[] callControl.receive(mw_callHangUp(PX_WORKERS[0].id, ?, INTERNAL)) {
		[] callControl.receive(mw_callHangUp(PX_WORKERS[0].id, ?)) {
		repeat;
		}

		[] callControl.receive(mw_callHangUp(PX_WORKERS[0].id, ?, EXTERNAL)) {
		[] callControl.receive(mw_callHangUp(PX_WORKERS[0].id, ?)) {
		f_stopPsapTestcase(fail, "Unexpected external hang up!");
		}

		@@ -612,8 +612,7 @@ module LibItsECall_Functions {
		}



		[] callControl.receive(mw_callHangUp(PX_WORKER, ?, EXTERNAL)) {
		[] callControl.receive(mw_callHangUp(PX_WORKER, ?)) {
		f_stopIvsTestcase(fail, "Unexpected external hang up!");
		}

		@@ -885,12 +884,12 @@ module LibItsECall_Functions {
		// monitor redial attempts
		t_redialWindowTimer.start;
		alt {
		[] callControl.receive(mw_callIncoming(PX_WORKER, ?, PX_IVS_PHONE_NUMBER, PX_PSAP_PHONE_NUMBER, EXTERNAL)) {
		[] callControl.receive(mw_callIncoming(PX_WORKER, ?, PX_IVS_PHONE_NUMBER, PX_PSAP_PHONE_NUMBER)) {
		v_redialAttempted := true;
		repeat;
		}

		[] callControl.receive(mw_callCanceled(PX_WORKER, ?, EXTERNAL)) {
		[] callControl.receive(mw_callCanceled(PX_WORKER, ?)) {
		repeat;
		}

		@@ -904,7 +903,7 @@ module LibItsECall_Functions {
		// no more redial attempts should be registered
		t_guard.start;
		alt {
		[] callControl.receive(mw_callIncoming(PX_WORKER, ?, PX_IVS_PHONE_NUMBER, PX_PSAP_PHONE_NUMBER, EXTERNAL)) {
		[] callControl.receive(mw_callIncoming(PX_WORKER, ?, PX_IVS_PHONE_NUMBER, PX_PSAP_PHONE_NUMBER)) {
		setverdict(fail, "Redial attempted after two minutes");
		}

ttcn/LibItsECall_Templates.ttcn

+20 −50

Original line number	Diff line number	Diff line
		@@ -387,17 +387,14 @@ module LibItsECall_Templates {
		* @desc Receive template for CallCancelled event
		* @param p_worker Target worker process
		* @param p_time Event timestamp
		* @param p_callRef INTERNAL/EXTERNAL
		*/
		template CallEvent mw_callCanceled (
		template(present) integer p_worker,
		template(present) charstring p_time := ?,
		template(present) CallRefType p_callRef := EXTERNAL
		template(present) charstring p_time := ?
		) := {
		callCanceled := {
		worker := p_worker,
		time := p_time,
		callRef := p_callRef
		time := p_time
		}
		}

		@@ -407,21 +404,18 @@ module LibItsECall_Templates {
		* @param p_time Event timestamp
		* @param p_from Caller ID
		* @param p_to Calling ID
		* @param p_callRef INTERNAL/EXTERNAL
		*/
		template CallEvent mw_callIncoming (
		template(present) integer p_worker,
		template(present) charstring p_time,
		template(present) TelephoneNumber p_from,
		template(present) TelephoneNumber p_to,
		template(present) CallRefType p_callRef
		template(present) TelephoneNumber p_to
		) := {
		callIncoming := {
		worker := p_worker,
		time := p_time,
		from_ := p_from,
		to_ := p_to,
		callRef := p_callRef
		to_ := p_to
		}
		}

		@@ -431,21 +425,18 @@ module LibItsECall_Templates {
		* @param p_time Event timestamp
		* @param p_from Caller ID
		* @param p_to Calling ID
		* @param p_callRef INTERNAL/EXTERNAL
		*/
		template CallEvent mw_callOutgoing (
		template(present) integer p_worker,
		template(present) charstring p_time,
		template(present) TelephoneNumber p_from,
		template(present) TelephoneNumber p_to,
		template(present) CallRefType p_callRef
		template(present) TelephoneNumber p_to
		) := {
		callOutgoing := {
		worker := p_worker,
		time := p_time,
		from_ := p_from,
		to_ := p_to,
		callRef := p_callRef
		to_ := p_to
		}
		}

		@@ -453,17 +444,14 @@ module LibItsECall_Templates {
		* @desc Receive template for CallEstablished event
		* @param p_worker Target worker process
		* @param p_time Event timestamp
		* @param p_callRef INTERNAL/EXTERNAL
		*/
		template CallEvent mw_callEstablished (
		template(present) integer p_worker,
		template(present) charstring p_time := ?,
		template(present) CallRefType p_callRef := EXTERNAL
		template(present) charstring p_time := ?
		) := {
		callEstablished := {
		worker := p_worker,
		time := p_time,
		callRef := p_callRef
		time := p_time
		}
		}

		@@ -471,17 +459,14 @@ module LibItsECall_Templates {
		* @desc Receive template for CallRejected event
		* @param p_worker Target worker process
		* @param p_time Event timestamp
		* @param p_callRef INTERNAL/EXTERNAL
		*/
		template CallEvent mw_callRejected (
		template(present) integer p_worker,
		template(present) charstring p_time := ?,
		template(present) CallRefType p_callRef := EXTERNAL
		template(present) charstring p_time := ?
		) := {
		callRejected := {
		worker := p_worker,
		time := p_time,
		callRef := p_callRef
		time := p_time
		}
		}

		@@ -489,17 +474,14 @@ module LibItsECall_Templates {
		* @desc Receive template for CallHangUp event
		* @param p_worker Target worker process
		* @param p_time Event timestamp
		* @param p_callRef INTERNAL/EXTERNAL
		*/
		template CallEvent mw_callHangUp (
		template(present) integer p_worker,
		template(present) charstring p_time := ?,
		template(present) CallRefType p_callRef := ?
		template(present) charstring p_time := ?
		) := {
		callHangUp := {
		worker := p_worker,
		time := p_time,
		callRef := p_callRef
		time := p_time
		}
		}

		@@ -507,19 +489,16 @@ module LibItsECall_Templates {
		* @desc Receive template for CallAborted event
		* @param p_worker Target worker process
		* @param p_time Event timestamp
		* @param p_callRef INTERNAL/EXTERNAL
		* @param p_reason Abortion description
		*/
		template CallEvent mw_callAborted (
		template(present) integer p_worker,
		template(present) charstring p_time,
		template(present) CallRefType p_callRef,
		template(present) charstring p_reason
		) := {
		callAborted := {
		worker := p_worker,
		time := p_time,
		callRef := p_callRef,
		reason := p_reason
		}
		}
		@@ -533,8 +512,7 @@ module LibItsECall_Templates {
		template (value) CallAcceptCmd m_callAccept (
		integer p_worker
		) := {
		worker := p_worker,
		callRef := EXTERNAL
		worker := p_worker
		}

		/**
		@@ -550,43 +528,35 @@ module LibItsECall_Templates {
		/**
		* @desc Send template for CallRejectBus command
		* @param p_worker Target worker process
		* @param p_callRef EXTERNAL
		*/
		template (value) CallRejectBusyCmd m_callRejectBusy (
		template(value) integer p_worker,
		template(value) CallRefType p_callRef := EXTERNAL
		template(value) integer p_worker
		) := {
		worker := p_worker,
		callRef := p_callRef
		worker := p_worker
		}

		/**
		* @desc Send template for CallCreate command
		* @param p_worker Target worker process
		* @param p_to Call destination
		* @param p_callRef EXTERNAL
		*/
		template (value) CallCreateCmd m_callCreate (
		template(value) integer p_worker,
		template(value) charstring p_to,
		template(value) CallRefType p_callRef := EXTERNAL
		template(value) charstring p_to
		) := {
		worker := p_worker,
		to_ := p_to,
		callRef := p_callRef
		to_ := p_to
		}

		/**
		* @desc Send template for CallCancel command
		* @param p_worker Target worker process
		* @param p_callRef EXTERNAL

		*/
		template (value) CallCancelCmd m_callCancel (
		template(value) integer p_worker,
		template(value) CallRefType p_callRef := EXTERNAL
		template(value) integer p_worker
		) := {
		worker := p_worker,
		callRef := p_callRef
		worker := p_worker
		}
		}

ttcn/LibItsECall_TypesAndValues.ttcn

+13 −36

Original line number	Diff line number	Diff line
		@@ -42,7 +42,6 @@ module LibItsECall_TypesAndValues {
		type enumerated ModemStateType {OFF, HALF, FULL, UNDEFINED};
		type enumerated ModemControlType {AUTO, MANUAL};
		type enumerated ModemDirectionType {PUSH, PULL};
		type enumerated CallRefType {INTERNAL, EXTERNAL};
		type charstring TelephoneNumber;
		type integer AckValueType (0 .. 15);
		type enumerated ClearDownType {NETWORK, APPLICATION};
		@@ -422,12 +421,10 @@ module LibItsECall_TypesAndValues {
		* @remark mode: PSAP, IVS
		*/
		type record CallAcceptCmd {
		integer worker,
		CallRefType callRef
		integer worker
		} with {
		variant "call_accept";
		variant (worker) "worker";
		variant (callRef) "call-ref";
		}

		/**
		@@ -449,12 +446,10 @@ module LibItsECall_TypesAndValues {
		* @remark mode: PSAP, IVS
		*/
		type record CallRejectBusyCmd {
		integer worker,
		CallRefType callRef
		integer worker
		} with {
		variant "call_reject_busy";
		variant (worker) "worker";
		variant (callRef) "call-ref";
		}

		/**
		@@ -466,13 +461,11 @@ module LibItsECall_TypesAndValues {
		*/
		type record CallCreateCmd {
		integer worker,
		charstring to_,
		CallRefType callRef
		charstring to_
		} with {
		variant "call_create";
		variant (worker) "worker";
		variant (to_) "to";
		variant (callRef) "call-ref";
		}

		/**
		@@ -482,12 +475,10 @@ module LibItsECall_TypesAndValues {
		* @remark mode: PSAP, IVS
		*/
		type record CallCancelCmd {
		integer worker,
		CallRefType callRef
		integer worker
		} with {
		variant "call_cancel";
		variant (worker) "worker";
		variant (callRef) "call-ref";
		}

		/**
		@@ -559,13 +550,11 @@ module LibItsECall_TypesAndValues {
		*/
		type record CallCanceledEvent {
		integer worker,
		charstring time,
		CallRefType callRef
		charstring time
		} with {
		variant "event;call_cancelled";
		variant (worker) "worker";
		variant (time) "time";
		variant (callRef) "call-ref";
		}

		/**
		@@ -581,15 +570,13 @@ module LibItsECall_TypesAndValues {
		integer worker,
		charstring time,
		TelephoneNumber from_,
		TelephoneNumber to_,
		CallRefType callRef
		TelephoneNumber to_
		} with {
		variant "event;call_incoming";
		variant (worker) "worker";
		variant (time) "time";
		variant (from_) "from";
		variant (to_) "to";
		variant (callRef) "call-ref";
		}

		/**
		@@ -605,15 +592,13 @@ module LibItsECall_TypesAndValues {
		integer worker,
		charstring time,
		TelephoneNumber from_,
		TelephoneNumber to_,
		CallRefType callRef
		TelephoneNumber to_
		} with {
		variant "event;call_outgoing";
		variant (worker) "worker";
		variant (time) "time";
		variant (from_) "from";
		variant (to_) "to";
		variant (callRef) "call-ref";
		}

		/**
		@@ -625,13 +610,11 @@ module LibItsECall_TypesAndValues {
		*/
		type record CallEstablishedEvent {
		integer worker,
		charstring time,
		CallRefType callRef
		charstring time
		} with {
		variant "event;call_established";
		variant (worker) "worker";
		variant (time) "time";
		variant (callRef) "call-ref";
		}

		/**
		@@ -643,13 +626,11 @@ module LibItsECall_TypesAndValues {
		*/
		type record CallRejectedEvent {
		integer worker,
		charstring time,
		CallRefType callRef
		charstring time
		} with {
		variant "event;call_rejected";
		variant (worker) "worker";
		variant (time) "time";
		variant (callRef) "call-ref";
		}

		/**
		@@ -661,13 +642,11 @@ module LibItsECall_TypesAndValues {
		*/
		type record CallHangUpEvent {
		integer worker,
		charstring time,
		CallRefType callRef
		charstring time
		} with {
		variant "event;call_hang_up";
		variant (worker) "worker";
		variant (time) "time";
		variant (callRef) "call-ref";
		}

		/**
		@@ -681,13 +660,11 @@ module LibItsECall_TypesAndValues {
		type record CallAbortedEvent {
		integer worker,
		charstring time,
		CallRefType callRef,
		charstring reason
		} with {
		variant "event;call_aborted";
		variant (worker) "worker";
		variant (time) "time";
		variant (callRef) "call-ref";
		variant (reason) "reason";
		}
		}

ttcn/LibItsECall_Pics.ttcn3

+1 −1

File changed.

Contains only whitespace changes.

ttcn/LibLogger.ttcn

+4 −4

File changed.

Contains only whitespace changes.