Implemented Test Case 0405_01 (07babc33) · Commits · DMR / dPMR

ttcn/dPMR_Templates.ttcn

+26 −1

Original line number	Diff line number	Diff line
		@@ -243,6 +243,20 @@
		CommunicationsMode p_commMode,
		CommsFormat p_commFormat
		) := {
		headerType := e_commStartHeader,
		calledId := p_calledId,
		ownId := p_ownId,
		communicationsMode := p_commMode,
		commsFormat := p_commFormat,
		reserved2bit := c_reserved2bits,
		callInformation := ?
		} // end mw_headerInformationVoiceTx

		template HeaderInformation mw_headerConnectRequestTx ( MsAddress p_calledId ,
		MsAddress p_ownId,
		CommunicationsMode p_commMode,
		CommsFormat p_commFormat
		) := {
		headerType := e_connReqHeader,
		calledId := p_calledId,
		ownId := p_ownId,
		@@ -329,6 +343,17 @@
		utActParams := p_utActParameter
		}

		template UtRequest m_msMakeManualConnectionRequest_utRequest( ChannelNumber p_channelNumber,
		in template DialString p_dialstr ,
		UtActParams p_utActParameter) := {
		channelNr := p_channelNumber,
		politeLvl := omit ,
		callType := omit ,
		dialString := p_dialstr,
		isfCidAddr := omit ,
		utActParams := p_utActParameter
		}

		template UtRequest m_msCfgParamsCsfPoliteRx( ChannelNumber p_channelNumber, DialString p_dialstr ) := {
		channelNr := p_channelNumber,
		politeLvl := omit ,

ttcn/dPMR_TestCases.ttcn

+120 −7

Original line number	Diff line number	Diff line
		@@ -111,6 +111,32 @@ module dPMR_TestCases {
		f_cfMseDown(v_mse, v_ut);
		} // end TC_PMR_0401_01


		/**
		* @param p_cc The colour code (channel) used
		*/
		testcase TC_PMR_0405_01( ColourCode p_cc )
		runs on ServerSyncComp
		system TestAdapter {
		var Mse v_mse;
		var Ut v_ut;
		var FncRetCode v_ret := e_success;

		//Configuration Up
		f_cfMseUp(v_mse, v_ut);

		//Test body // TODO JP check with Sebastian... Exactly the same testcase as 0801_1 since the templates checks the frames received
		v_mse.start(f_TC_ConnectionRequestTx_MS01(p_cc));/f_TC_voiceTx_MS01(p_cc)/
		v_ut.start(f_TC_msMakeManualConnectionRequest(p_cc)); //f_TC_msPressPttThenDekeyPtt_UT(p_cc));

		// synchronize both PTCs
		f_serverSync2ClientsAndStop({c_prDone, c_tbDone});

		// Configuration Down
		f_cfMseDown(v_mse, v_ut);
		} // end TC_PMR_0405_01


		/**
		* @param p_cc The colour code (channel) used
		*/
		@@ -381,7 +407,7 @@ module dPMR_TestCases {
		} // end alt
		}
		else {
		log("** f_msVoiceTx_Simu: Error: More headers received before voice super frames **");
		log("** f_TC_voiceTx_MS01: Error: More headers received before voice super frames **");
		setverdict(inconc);
		}
		}
		@@ -396,6 +422,59 @@ module dPMR_TestCases {

		} // end function f_TC_voiceTx_MS01

		/**
		* @desc Check that a manual Connection Request is sent from the IUT
		*
		* @param p_cc Colour Code
		*/
		function f_TC_ConnectionRequestTx_MS01 ( ColourCode p_cc )
		runs on Mse{
		// Variables
		var FncRetCode v_ret := e_success;
		var UInt16 v_sfCount := 0;
		var boolean v_headerReceived := false;
		var default defvar;


		//Test System Parameters
		f_initMse();

		//Default
		defvar := activate(a_dftMse());

		//Preamble
		f_clientSyncAndVerdict(c_prDone, v_ret);

		//Test Body
		tc_ac.start ;
		alt {
		[] dp1Port.receive(m_headerFrame(mw_headerConnectRequestTx(
		vc_mse.testerId, vc_mse.iutId, e_voice, e_p2p),
		p_cc))
		{
		alt {
		[] dp1Port.receive(m_endFrame(mw_endInformation(e_AckReq)))
		{
		tc_ac.stop ;
		setverdict(pass);
		}
		[] tc_ac.timeout {
		log("** f_TC_ConnectionRequestTx_MS01: Timeout: TC Timer expiration before reception of complete Voice transmission **");
		setverdict(fail);
		}
		} // end alt
		}
		[] tc_ac.timeout {
		log("** f_TC_ConnectionRequestTx_MS01: Timeout: TC Timer expiration before reception of Connectio Request **");
		setverdict(fail);
		}
		} // end alt
		f_clientSyncAndVerdict(c_tbDone, v_ret);

		deactivate;

		} // end function f_TC_ConnectionRequestTx_MS01

		}//end commonTCFunctions


		@@ -472,7 +551,7 @@ module dPMR_TestCases {
		setverdict(pass);
		}
		[]tc_maxCaseExecPeriod.timeout{
		log("** f_TC_msWaitVoiceReceived_UT: Timeout: Expected message not received. **");
		log("** f_TC_msWaitVoiceNotReceived_UT: Timeout: Expected message not received. **");
		setverdict(fail);
		}
		}//end alt
		@@ -522,11 +601,11 @@ module dPMR_TestCases {

		} // end f_TC_msToStandby_UT



		/**
		* @desc This function commands Ms to press PTT and then dekey PTT.
		* @desc This function commands Tester to press PTT and then dekey PTT.
		* @param p_cc Colour Code
		* @param p_politeLvl Polite Level
		* @param p_callType Call Type
		*/
		function f_TC_msPressPttThenDekeyPtt_UT(ColourCode p_cc)
		runs on Ut{
		@@ -567,6 +646,40 @@ module dPMR_TestCases {
		}//end f_TC_msPressPttThenDekeyPtt_UT


		/**
		* @desc This function commands Tester to make manual Connection Request.
		* @param p_cc Colour Code
		*/
		function f_TC_msMakeManualConnectionRequest(ColourCode p_cc)
		runs on Ut{
		//Variables
		var FncRetCode v_ret := e_success;
		var default defvar;

		//Test System Parameters
		f_initUt();

		//Default
		defvar := activate(a_dftUt());

		//Preamble
		// TODO JP SM FK Why should this have a polite level,
		f_TC_msToStandby_UT(p_cc);

		f_clientSyncAndVerdict(c_prDone, v_ret);

		//Test body//TODO JP make it an f_handshake_Ut(m_testToneDetected_utReq)
		v_ret := f_handshake_Ut(m_msMakeManualConnectionRequest_utRequest( f_getChannelNrFromColourCode(p_cc),
		c_defaultPeerToPeerAddress ,
		e_makeManualConnectionRequest));
		//v_ret := f_handshake_Ut(m_msAct_utReq);
		//if (v_ret != e_success) {f_clientSyncAndVerdict(c_tbDone, v_ret);}

		//Default
		deactivate;

		}//end f_TC_msMakeManualConnectionRequest

		}//end ut_TC_Functions

		} // end module dPMR_TestCases

ttcn/dPMR_Types.ttcn

+2 −1

Original line number	Diff line number	Diff line
		@@ -524,7 +524,8 @@ module dPMR_Types {
		//e_dekeyPtt (1),
		e_statusMessageReceived (1), //Have you received a status message?
		e_testToneReceived (2), //Have you heard a test tone?
		e_testToneNotReceived (3) //Have you NOT heard a test tone?
		e_testToneNotReceived (3), //Have you NOT heard a test tone?
		e_makeManualConnectionRequest (4) // Make a manual Connection Request
		}

		// ------------ MS configuration parameters ---------------

ttcn/dPMR_Values.ttcn

+1 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@ module dPMR_Values {
		// Collection of all values that are applied when TP does not specify explicity its value
		const PoliteLvl c_polteteLevel := e_politeCc; // Default polite level
		const DialString c_defaultCallGroup := "012345*"; // Digit 7 is a "wildcard"
		const DialString c_defaultPeerToPeerAddress := "0123456";


		} //end testProfileValues