Commit afc1077a authored by petersenj's avatar petersenj
Browse files

implemented TCs: 

TP_PMR_0818_01
TP_PMR_0819_01
TP_PMR_0820_01
TP_PMR_0821_01
TP_PMR_0822_01
TP_PMR_0804_01
TP_PMR_0805_01
TP_PMR_0811_02
TP_PMR_0811_03
TP_PMR_0811_04
TP_PMR_0811_05
TP_PMR_0811_06
TP_PMR_0811_07
TP_PMR_0811_08
TP_PMR_0811_09
TP_PMR_0811_10
TP_PMR_0811_11
TP_PMR_0811_12
TP_PMR_0811_13
TP_PMR_0811_14
TP_PMR_0811_15
TP_PMR_0811_16
parent 4fdb3b32

ttcn/dPMR_ExtFunctions.ttcn

+2 −1
Original line number Diff line number Diff line
@@ -22,9 +22,10 @@ module dPMR_ExtFunctions { 
	 * @param	p_addr Used to calculate the actual dial string used

	 * @remark		clause A.2.1 This is the reverse of the B2 algorithm

	*/

	external function fx_calcDialString( CSFAddress p_addr )

	external function xf_calcDialString( CSFAddress p_addr )

	return DialString;



	external function xf_getCRCValue(Data p_data) return CrcD;





}  // end module dPMR_ExtFunctions

ttcn/dPMR_Templates.ttcn

+23 −15
Original line number Diff line number Diff line
@@ -474,26 +474,29 @@ 
				ciInformationNormalOrPws :=c_ciInformationNormal }

		} // end m_headerInformation

		

	 	template HeaderInformation  m_ackHeaderInformation( HeaderType p_hdrTp,

														 MsAddress p_calledId , 

	 	template HeaderInformation  m_ackHeaderInformation( MsAddress p_calledId , 

													     	MsAddress    p_ownId, 

													     	CommunicationsMode p_commMode,

													    	 CommsFormat p_commFormat,

															 in template CallInformation p_callInfo

													    	) := {

			headerType := p_hdrTp,

			headerType := e_ackHeader,

	  		calledId := p_calledId,

	  		ownId := p_ownId,

	  		communicationsMode := p_commMode,

	    	commsFormat := p_commFormat,

	  		reserved2bit := c_reserved2bits,

	  		callInformation := p_callInfo

		} // end m_headerInformation

		} // end m_ackHeaderInformation



		template CallInformation m_callInfoAck(CiTypeAck p_callInfoAck) := {

			ciInformationAck := {p_callInfoAck, '00000001'B}

		}



		template CallInformation m_dataT3callInfoAck(CiTypeAck p_callInfoAck,CiInfoAck p_ciInfoAck) := {

			ciInformationAck := {p_callInfoAck, p_ciInfoAck}

		}



		template PacketDataHeaderInformation  m_packetDataHeaderInformation(HeaderType p_hdrTp,

																			MsAddress p_calledId , 

													     					MsAddress    p_ownId,
@@ -511,8 +514,8 @@ 
		} // end m_packetDataHeaderInformation



		

	 	template HeaderInformation  mw_headerInformationTx ( MsAddress p_calledId , 

													      		  MsAddress    p_ownId, 

	 	template HeaderInformation  mw_headerInformationTx (  template MsAddress p_calledId , 

												      		  template MsAddress    p_ownId, 

												      		  template CommunicationsMode p_commMode,

												          	  template CommsFormat p_commFormat

												     		) := {
@@ -525,6 +528,11 @@ 
	  		callInformation := ?

		} // end mw_headerInformationVoiceTx



//		template MsAddress mw_msAddress( ISFAddress p_isfAddress) :=

//			{ isfAddress := p_isfAddress }

		template MsAddress mw_msAddress( template Common_ID  p_commonId, template FixedPart p_fixedPart) :=

			{ isfAddress := {p_commonId,p_fixedPart} }



		

	 	template HeaderInformation  mw_ackHeaderInformationTx ( MsAddress p_calledId , 

													      		  MsAddress    p_ownId,

ttcn/dPMR_TestCases.ttcn

+1155 −180

File changed.

Preview size limit exceeded, changes collapsed.

ttcn/dPMR_TestConfiguration.ttcn

+5 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ module dPMR_TestConfiguration { 


group configFns {



	/*

	/* @desc	This function brngs it up

	 * @remark This function implements the CF_dPMR_01 configuration

	 */

	function f_cfMseUp(
@@ -41,6 +41,10 @@ group configFns { 


	}//end f_cfMseUp



	/*

	* @desc	This function brings it down

	*/



	function f_cfMseDown(

		in Mse p_mse, 

		in Ut p_ut)

ttcn/dPMR_TestExecution.ttcn

+25 −5
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ module dPMR_TestExecution { 
	import from dPMR_Pixits all;

	import from dPMR_Pics all;

	import from dPMR_Functions all;

	import from dPMR_Values all;





//	import from DMR_TestCasesDemo all;
@@ -42,7 +43,22 @@ module dPMR_TestExecution { 


			if ((PIC_ISF_OR_CSF == e_csf) and PIC_CSF_TYPE_1_DATA_SUPPORT and PIC_AUTOMATIC_DISCONNECTION_REQUEST) {execute(TC_PMR_0407_02() );}



			if ((PIC_ISF_OR_CSF == e_csf) and PIC_CSF_VOICE_SUPPORT) {execute(TC_PMR_0811_01() );} // TODO JP perhaps change this to 0811_XX to loop through all colour codes

			if ((PIC_ISF_OR_CSF == e_csf) and PIC_CSF_VOICE_SUPPORT) {execute(TC_PMR_0811_01({csfColourCode :=c_grpBcf1}, e_useCsfChanne1) );} // TODO! just change a few parameters and all colour code TCs are covered.

			if ((PIC_ISF_OR_CSF == e_csf) and PIC_CSF_VOICE_SUPPORT) {execute(TC_PMR_0811_02({csfColourCode :=c_grpBcf2}, e_useCsfChanne2) );} // TODO! just change a few parameters and all colour code TCs are covered.

			if ((PIC_ISF_OR_CSF == e_csf) and PIC_CSF_VOICE_SUPPORT) {execute(TC_PMR_0811_03({csfColourCode :=c_grpBcf3}, e_useCsfChanne3) );} // TODO! just change a few parameters and all colour code TCs are covered.

			if ((PIC_ISF_OR_CSF == e_csf) and PIC_CSF_VOICE_SUPPORT) {execute(TC_PMR_0811_04({csfColourCode :=c_grpBcf4}, e_useCsfChanne4) );} // TODO! just change a few parameters and all colour code TCs are covered.

			if ((PIC_ISF_OR_CSF == e_csf) and PIC_CSF_VOICE_SUPPORT) {execute(TC_PMR_0811_05({csfColourCode :=c_grpBcf5}, e_useCsfChanne5) );} // TODO! just change a few parameters and all colour code TCs are covered.

			if ((PIC_ISF_OR_CSF == e_csf) and PIC_CSF_VOICE_SUPPORT) {execute(TC_PMR_0811_06({csfColourCode :=c_grpBcf6}, e_useCsfChanne6) );} // TODO! just change a few parameters and all colour code TCs are covered.

			if ((PIC_ISF_OR_CSF == e_csf) and PIC_CSF_VOICE_SUPPORT) {execute(TC_PMR_0811_07({csfColourCode :=c_grpBcf7}, e_useCsfChanne7) );} // TODO! just change a few parameters and all colour code TCs are covered.

			if ((PIC_ISF_OR_CSF == e_csf) and PIC_CSF_VOICE_SUPPORT) {execute(TC_PMR_0811_08({csfColourCode :=c_grpBcf8}, e_useCsfChanne8) );} // TODO! just change a few parameters and all colour code TCs are covered.

			if ((PIC_ISF_OR_CSF == e_csf) and PIC_CSF_VOICE_SUPPORT) {execute(TC_PMR_0811_09({csfColourCode :=c_grpBcf9}, e_useCsfChanne9) );} // TODO! just change a few parameters and all colour code TCs are covered.

			if ((PIC_ISF_OR_CSF == e_csf) and PIC_CSF_VOICE_SUPPORT) {execute(TC_PMR_0811_10({csfColourCode :=c_grpBcf10}, e_useCsfChanne10) );} // TODO! just change a few parameters and all colour code TCs are covered.

			if ((PIC_ISF_OR_CSF == e_csf) and PIC_CSF_VOICE_SUPPORT) {execute(TC_PMR_0811_11({csfColourCode :=c_grpBcf11}, e_useCsfChanne11) );} // TODO! just change a few parameters and all colour code TCs are covered.

			if ((PIC_ISF_OR_CSF == e_csf) and PIC_CSF_VOICE_SUPPORT) {execute(TC_PMR_0811_12({csfColourCode :=c_grpBcf12}, e_useCsfChanne12) );} // TODO! just change a few parameters and all colour code TCs are covered.

			if ((PIC_ISF_OR_CSF == e_csf) and PIC_CSF_VOICE_SUPPORT) {execute(TC_PMR_0811_13({csfColourCode :=c_grpBcf13}, e_useCsfChanne13) );} // TODO! just change a few parameters and all colour code TCs are covered.

			if ((PIC_ISF_OR_CSF == e_csf) and PIC_CSF_VOICE_SUPPORT) {execute(TC_PMR_0811_14({csfColourCode :=c_grpBcf14}, e_useCsfChanne14) );} // TODO! just change a few parameters and all colour code TCs are covered.

			if ((PIC_ISF_OR_CSF == e_csf) and PIC_CSF_VOICE_SUPPORT) {execute(TC_PMR_0811_15({csfColourCode :=c_grpBcf15}, e_useCsfChanne15) );} // TODO! just change a few parameters and all colour code TCs are covered.

			if ((PIC_ISF_OR_CSF == e_csf) and PIC_CSF_VOICE_SUPPORT) {execute(TC_PMR_0811_16({csfColourCode :=c_grpBcf16}, e_useCsfChanne16) );} // TODO! just change a few parameters and all colour code TCs are covered.





			//	group HeaderFrames { // Clause 5.1.3.2
@@ -127,13 +143,17 @@ module dPMR_TestExecution { 
		//	group Type3Data { // Clause 5.2.7

				if (PIC_CSF_T3Data_INDIVIDUAL_DATA_MESSAGE) {execute(TC_PMR_0808_01() );}

				if (PIC_CSF_T3Data_INDIVIDUAL_DATA_MESSAGE) {execute(TC_PMR_0817_01() );}

//				if (PIC_CSF_T3Data_INDIVIDUAL_DATA_MESSAGE) {execute(TC_PMR_0819_01() );}

//				if (PIC_CSF_T3Data_INDIVIDUAL_DATA_MESSAGE) {execute(TC_PMR_0820_01() );}

//				if (PIC_CSF_T3Data_INDIVIDUAL_DATA_MESSAGE) {execute(TC_PMR_0821_01() );}

//				if (PIC_CSF_T3Data_INDIVIDUAL_DATA_MESSAGE) {execute(TC_PMR_0822_01() );}

				if (PIC_CSF_T3Data_INDIVIDUAL_DATA_MESSAGE) {execute(TC_PMR_0819_01() );}

				if (PIC_CSF_T3Data_INDIVIDUAL_DATA_MESSAGE) {execute(TC_PMR_0820_01() );}

				if (PIC_CSF_T3Data_INDIVIDUAL_DATA_MESSAGE) {execute(TC_PMR_0821_01() );}

				if (PIC_CSF_T3Data_INDIVIDUAL_DATA_MESSAGE) {execute(TC_PMR_0822_01() );}

		//	} // end group Type3Data

		//} // end group CSF_only

		//group ISF_only {// Clause 5.3



				if (PIC_ISF_OR_CSF == e_isf) {execute(TC_PMR_0804_01() );}

				if (PIC_ISF_OR_CSF == e_isf) {execute(TC_PMR_0805_01() );}



		//} // end group ISF_only