Commit 5c31b03c authored by petersenj's avatar petersenj
Browse files

TP_PMR_0802_03 implemented and Ut function changed

parent 7296997a

ttcn/dPMR_Functions.ttcn

+8 −6
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
        */

		function f_initMse()

		runs on Mse{

			vc_mse.colourCode := f_getColourCode();

			vc_mse.iut_useAllCallCommonId := false;

			vc_mse.tester_useAllCallCommonId := false;

			vc_mse.iutId 		:= f_createMsAddressIUT(vc_mse.iut_useAllCallCommonId);
@@ -48,7 +49,7 @@ 
        */

		function f_initMse_isfAllCall(boolean p_iutUseAllCall, boolean p_testerUseAllCall)

		runs on Mse{



			vc_mse.colourCode := f_getColourCode();

			vc_mse.iut_useAllCallCommonId := p_iutUseAllCall;

			vc_mse.tester_useAllCallCommonId := p_testerUseAllCall;

			vc_mse.iutId := f_createMsAddressIUT(p_iutUseAllCall);
@@ -65,6 +66,7 @@ 
        */

		function f_initUt()

		runs on Ut{

			vc_ut.colourCode := f_getColourCode();

			vc_ut.iut_useAllCallCommonId := false;

			vc_ut.tester_useAllCallCommonId := false;

			vc_ut.iutId := f_createMsAddressIUT(vc_ut.iut_useAllCallCommonId);
@@ -83,7 +85,7 @@ 
        */

		function f_initUt_isfAllCall(boolean p_iutUseAllCall, boolean p_testerUseAllCall)

		runs on Ut{



			vc_ut.colourCode := f_getColourCode();

			vc_ut.iut_useAllCallCommonId := p_iutUseAllCall;

			vc_ut.tester_useAllCallCommonId := p_testerUseAllCall;

			vc_ut.iutId := f_createMsAddressIUT(vc_ut.iut_useAllCallCommonId);
@@ -148,7 +150,7 @@ 
			var CsfChannelNr ret_csfChannelNr;

			var IsfColourCode v_isf_cc; 

			var CsfColourCode v_csf_cc; 

			if (PIC_ISF_OR_CSF == e_isf) {

			if (ischosen(p_cc.isfColourCode)){

				v_isf_cc :=  p_cc.isfColourCode;

				if (c_grpAcf1 == v_isf_cc)  {ret_isfChannelNr := e_isfChannelNr_1}

				if (c_grpAcf2 == v_isf_cc)  {ret_isfChannelNr := e_isfChannelNr_2}
@@ -353,7 +355,7 @@ group UtilityFunctions { 
			 *			certain channel using the Pixit id or address

			 * @param	p_cc the colour code (the channel)

			*/

			function f_msToStandby_UT( ColourCode p_cc ) 

			function f_msToStandby_UT() 

			runs on Ut

			return FncRetCode {

				//Variables
@@ -361,11 +363,11 @@ group UtilityFunctions { 


				//Preamble // TODO JP check if we can configure the ConnReqMode here

				if (PIC_ISF_OR_CSF == e_isf) {

					v_ret := f_handshake_Ut(m_msToStandBy_utRequest(f_getChannelNrFromColourCode(p_cc), 

					v_ret := f_handshake_Ut(m_msToStandBy_utRequest(f_getChannelNrFromColourCode(vc_ut.colourCode), 

																	  omit, 

																	  f_getCommonId(vc_ut.iutId)));

				} else { // its e_csf

					v_ret := f_handshake_Ut(m_msToStandBy_utRequest(f_getChannelNrFromColourCode(p_cc), 

					v_ret := f_handshake_Ut(m_msToStandBy_utRequest(f_getChannelNrFromColourCode(vc_ut.colourCode), 

																	  fx_calcDialString(PXT_CSF_ADDRESS_IUT), 

																	  omit));

				}

ttcn/dPMR_TestCases.ttcn

+111 −347

File changed.

Preview size limit exceeded, changes collapsed.

ttcn/dPMR_TestSystem.ttcn

+2 −0
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ group portDefs { 
group componentVariableDefs {

	

	type record MseParams {

		ColourCode	colourCode,

		boolean 	iut_useAllCallCommonId,

		boolean 	tester_useAllCallCommonId,

		MsAddress 	iutId,
@@ -109,6 +110,7 @@ group componentVariableDefs { 
	}



	type record UtParams {

		ColourCode	colourCode,

		boolean 	iut_useAllCallCommonId,

		boolean 	tester_useAllCallCommonId,

		MsAddress 	iutId,