Renaming of functions and timers as of description in (72b0cbd8) · Commits · DMR / dPMR

ttcn/dPMR_Functions.ttcn

+4 −4

Original line number	Diff line number	Diff line
		@@ -22,7 +22,7 @@



		function f_iutInit_Ut( MsCfgParams p_msCfgParams , FncRetCode p_ret )
		function f_msConfig_Ut( MsCfgParams p_msCfgParams , FncRetCode p_ret )
		runs on Ut return FncRetCode{
		if(p_ret != e_success){
		return e_error;
		@@ -38,15 +38,15 @@
		[]utPort.receive(e_error){
		setverdict(fail);
		tc_maxTimeCfgActRly.stop;
		log("* f_iutInit_Ut: Error message received on upper tester *");
		log("* f_msConfig_Ut: Error message received on upper tester *");
		}
		[]tc_maxTimeCfgActRly.timeout{
		setverdict(fail);
		log("* f_iutInit_Ut: timeout of configuration or action *");
		log("* f_msConfig_Ut: timeout of configuration or action *");
		}
		}
		return e_error;
		} // end f_iutInit_Ut
		} // end f_msConfig_Ut


		} // end module dPMR_Functions

ttcn/dPMR_Pixits.ttcn

+17 −0

Original line number	Diff line number	Diff line
		@@ -29,4 +29,21 @@ module dPMR_Pixits {
		modulepar {float PXT_MAX_TIME_CFG_ACT_RLY := 200E-3} // Value To be checked !!!



		/* @desc Guard timer to control a reaction from the IUT to a stimulus sent by the tester (e.g. a message).
		On expiry of this timer, the IUT is considered not to be be able to send the expected response
		*/
		modulepar {float PXT_TAC := 2.0}

		// @desc Guard timer to control a non-reaction from the IUT to a stimulus sent by the tester (e.g. a message).
		// On expiry of this timer, it is considered that, as it is expected in the test purpose,

		// the IUT has not responded to the stimulus
		modulepar {float PXT_TNOAC := 5.0}

		// @desc Wait for an implicit send. This guard timer is used to limitated the time where the tester is waiting
		// for the response of the IUT that is triggered out by an action from the test operator.
		// On expiry of this timer, it is considered that the action will not succeed, and thus the test case will be terminated.
		modulepar {float PXT_TWAIT := 60.0}

		} // end module dPMR_Pixits

ttcn/dPMR_TestCases.ttcn

+9 −48

Original line number	Diff line number	Diff line
		@@ -44,8 +44,8 @@ group IsfCsfCommon {
		f_cfSimuUp(v_simu, v_ut);

		//Test body
		v_simu.start(f_TC_PMR_0406_01_Simu(p_cc/c_grpBcf1/));
		v_ut.start(f_TC_IutToStandby_Ut(p_cc/c_grpBcf1/)); // select CC B channel 1
		v_simu.start(f_msAckOnConnectionRequest_Simu(p_cc/c_grpBcf1/));
		v_ut.start(f_TC_MsToStandby_Ut(p_cc/c_grpBcf1/)); // select CC B channel 1

		// synchronize both PTCs
		f_serverSync2ClientsAndStop({c_prDone});
		@@ -56,7 +56,7 @@ group IsfCsfCommon {
		} // end TC_PMR_0406_01


		function f_TC_PMR_0406_01_Simu( ColourCode p_cc )
		function f_msAckOnConnectionRequest_Simu( ColourCode p_cc )
		runs on Simu {
		// Variables
		var FncRetCode v_ret := e_success;
		@@ -67,13 +67,13 @@ group IsfCsfCommon {
		f_clientSyncAndVerdict(c_prDone, v_ret);

		//Test Body
		t_tcTimer.start ;
		tc_ac.start ;
		dp1Port.send(m_callOrSrvReq(m_headerFrameConnectReq(PXT_CALLED_ID, PXT_OWN_ID, e_voice, e_p2p, p_cc),m_endFrameConnectReq));
		alt {
		[] dp1Port.receive(mw_acknowledgementAckOnConnectReq(PXT_OWN_ID, PXT_CALLED_ID, e_voice, e_p2p)) {
		setverdict(pass);
		}
		[] t_tcTimer.timeout {
		[] tc_ac.timeout {
		log("** TC_PMR_0406_01: TC Timer expiration before reception of Acknowledgement **");
		setverdict(fail);
		}
		@@ -82,65 +82,26 @@ group IsfCsfCommon {
		//no Postamble

		deactivate;
		} // end f_TC_PMR_0406_01_Simu
		} // end f_msAckOnConnectionRequest_Simu

		function f_TC_IutToStandby_Ut( ColourCode p_cc )
		function f_TC_MsToStandby_Ut( ColourCode p_cc )
		runs on Ut {
		//Variables
		var FncRetCode v_ret := e_success;
		//Default
		activate(a_dftUt());
		//Preamble
		v_ret := f_iutInit_Ut(valueof(m_msCfgParams(p_cc)), v_ret);
		v_ret := f_msConfig_Ut(valueof(m_msCfgParams(p_cc)), v_ret);
		f_clientSyncAndVerdict(c_prDone, v_ret);
		//No Test body
		//Default
		deactivate;
		} // end f_TC_IutToStandby_Ut
		} // end f_TC_MsToStandby_Ut




		/*
		* @desc TP Ref: TP_PMR_0406_01
		* TP version: V1.1.1
		*
		*/
		/*

		testcase TC_PMR_0406_01()
		runs on Simu
		system TestAdapter {
		// Variables

		// Configuration

		//Default



		//Preamble
		action("Bring IUT to Standby state");

		//Test Body
		t_tcTimer.start ;
		dp1Port.send(m_callOrSrvReq);
		alt {
		[] dp1Port.receive(mw_acknowledgement()) {
		setverdict(pass);
		}
		[] t_tcTimer.timeout {
		log("** TC_PMR_0406_01: TC Timer expiration before reception of Acknowledgement **");
		setverdict(fail);
		}
		} // end alt


		//Postamble


		}//end TC_PMR_0406_01
		*/

		} // end group Framing

ttcn/dPMR_TestSystem.ttcn

+4 −1

Original line number	Diff line number	Diff line
		@@ -28,7 +28,10 @@ group componentDefs {
		//port TaPort taPort;
		port UtPort utPort;

		timer t_tcTimer := c_MaxTcExecutionTime ;
		timer tc_ac := PXT_TAC;
		timer tc_noac := PXT_TNOAC;
		timer tc_wait := PXT_TWAIT;

		// PtcSyncPort used for synchronization between 2 PTCs
		// port SyncPort ptcSyncPort;
		//port CfPort cfPort;

ttcn/dPMR_Values.ttcn

+0 −5

Original line number	Diff line number	Diff line
		@@ -70,11 +70,6 @@ const UInt10 c_maxNbrOfSfs := 665;
		const UInt4 c_maxNmbPDF := 8;



		const float c_MaxTcExecutionTime := 60.0; // TO BE CHECKED !!!



		const Bit1 c_reserved1bit := '0'B;
		const Bit2 c_reserved2bits := '00'B;
		const Bit4 c_reserved4bits := '0000'B;