Commit 7296997a authored by mullers's avatar mullers
Browse files

review of TTCN

parent 7c662475

ttcn/dPMR_Templates.ttcn

+23 −0
Original line number Diff line number Diff line
@@ -567,6 +567,29 @@ 
			utActParams := omit

		}



		template UtRequest m_isfStandby_utRequest(

			ChannelNumber 	p_channelNumber,

			PoliteLvl		p_politeLvl,

			in template Common_ID p_commonId) := 

			{

				channelNr := p_channelNumber,

				politeLvl  := p_politeLvl ,

				dialString := omit,

				isfCidAddr := p_commonId ,

				utActParams := omit

		}



		template UtRequest m_csfStandby_utRequest(

			ChannelNumber 	p_channelNumber,

			PoliteLvl		p_politeLvl) := 

			{

				channelNr := p_channelNumber,

				politeLvl  := p_politeLvl ,

				dialString := omit,

				isfCidAddr := omit ,

				utActParams := omit

		}



		template UtRequest m_commandISFCSF_utRequest( ChannelNumber p_channelNumber, 

		                                                       in template DialString p_dialstr ,

		                                                       in template Common_ID p_commonId,

ttcn/dPMR_TestCases.ttcn

+12 −13
Original line number Diff line number Diff line
@@ -1284,6 +1284,7 @@ module dPMR_TestCases { 
			 *	@param p_actionRequest the request for action

			 *

			 */

			 //TODO rename f_tc_action

			function f_TC_msCommandConfirm(in template UtRequest p_utRequest) runs on Ut {

				//Variables

				var default v_dftUt;
@@ -1296,22 +1297,20 @@ module dPMR_TestCases { 
				v_dftUt := activate(a_dftUt());

			

				//Preamble

				v_ret := f_handshake_Ut(p_utRequest);

				//todo use corrected f_msToStandby_UT

				//todo use vc_ut.cc

				if (PIC_ISF_OR_CSF == e_isf) {

						v_ret := f_handshake_Ut(	m_isfStandby_utRequest(	f_getChannelNrFromColourCode({ isfColourCode := c_grpAcf1 }), 

																			e_politeCc , 

																			c_defaultCommonId));

				} else {

						v_ret := f_handshake_Ut(m_csfStandby_utRequest(	f_getChannelNrFromColourCode({ isfColourCode := c_grpAcf1 }), 

																		e_politeCc));

				}

				f_clientSyncAndVerdict(c_prDone, v_ret);



				//Test body

				tc_maxCaseExecPeriod.start;

				alt {

					[]utPort.receive(mw_utConfirm_success){

						tc_maxCaseExecPeriod.stop;

						setverdict(pass);

					}

					[]tc_maxCaseExecPeriod.timeout{

						log("**** f_TC_msCommandConfirm: Timeout: Expected message not received. ****");

						setverdict(fail);

					}

				}//end alt



				v_ret := f_handshake_Ut(p_utRequest);

				f_clientSyncAndVerdict(c_tbDone, v_ret); 

			

				//no Postamble