Commit 56631b2a authored by petersenj's avatar petersenj
Browse files

Implemented: 

TP_PMR_1420_01
TP_PMR_1420_02
TP_PMR_1420_03
TP_PMR_1420_04
TP_PMR_1420_05
TP_PMR_1420_06
TP_PMR_1421_01
TP_PMR_1423_01
TP_PMR_1424_01
TP_PMR_0853_01
TP_PMR_0850_01
TP_PMR_0855_01
TP_PMR_0856_01
TP_PMR_0857_01
TP_PMR_0846_01
TP_PMR_0847_01
TP_PMR_0818_02
Changed:
0838_01 and some e_callAll to e_p2p
parent 3686c8cd

ttcn/dPMR_Templates.ttcn

+59 −8
Original line number Diff line number Diff line
@@ -134,12 +134,13 @@ 
			group TestToneGroup {



			 	template Frame1 m_frame1AudibleTestTone (	CalledIdUP p_calledIdUP,

															Payload p_payload)  := {

															Payload p_payload,

															CommsFormat p_comms)  := {

					frameSync := c_fs2,

					frameNumber := e_frame1,

					calledIdUP := p_calledIdUP,

			   		communicationsMode := e_voice,

			        commsFormat := e_callAll, 

			        commsFormat := p_comms, 

			        reserved2bit := c_reserved2bits,

			        slowData := c_slowDataInVoiceEmpty,

			        payload := p_payload
@@ -147,12 +148,13 @@ 




			  	template Frame2 m_frame2AudibleTestTone (	CalledIdLP p_calledIdLP,

															Payload p_payload, ColourCode p_cc)  := {

															Payload p_payload, ColourCode p_cc,

															CommsFormat p_comms)  := {

					colourCode := p_cc,

					frameNumber := e_frame2,

					calledIdLP := p_calledIdLP,

			   		communicationsMode := e_voice,

			        commsFormat := e_callAll, 

			        commsFormat := p_comms, 

			        reserved2bit := c_reserved2bits,

			        slowData := c_slowDataInVoiceEmpty,

			        payload := p_payload
@@ -160,24 +162,26 @@ 




			  	template Frame3 m_frame3AudibleTestTone (	OwnIdUP p_ownIdUP,

															Payload p_payload)  := {

															Payload p_payload,

															CommsFormat p_comms)  := {

					frameSync := c_fs2,

					frameNumber := e_frame3,

					ownIdUP := p_ownIdUP,

			   		communicationsMode := e_voice,

			        commsFormat := e_callAll, 

			        commsFormat := p_comms, 

			        reserved2bit := c_reserved2bits,

			        slowData := c_slowDataInVoiceEmpty,

			        payload := p_payload

				} // end template m_frame3AudibleTestTone



			  	template Frame4 m_frame4AudibleTestTone (	OwnIdLP p_ownIdLP,

															Payload p_payload, ColourCode p_cc)  := {

															Payload p_payload, ColourCode p_cc,

															CommsFormat p_comms)  := {

					colourCode := p_cc,

					frameNumber := e_frame4,

					ownIdLP := p_ownIdLP,

			   		communicationsMode := e_voice,

			        commsFormat := e_callAll, 

			        commsFormat := p_comms, 

			        reserved2bit := c_reserved2bits,

			        slowData := c_slowDataInVoiceEmpty,

			        payload := p_payload
@@ -234,6 +238,53 @@ 
			        payload := ?

				} // end template mw_frame4Voice



				template Frame1 mw_frame1VoiceBroadcast ( CalledIdUP p_calledIdUP )  := {

					frameSync := c_fs2,

					frameNumber := e_frame1,

					calledIdUP := p_calledIdUP,

			   		communicationsMode := e_voice,

			        commsFormat := e_callAll,

			        reserved2bit := c_reserved2bits,

			        slowData := c_slowDataInVoiceEmpty,

			        payload := ?

				} // end template mw_frame1Voice





			  	template Frame2 mw_frame2VoiceBroadcast ( CalledIdLP p_calledIdLP, ColourCode p_cc)  := {

					colourCode := p_cc,

					frameNumber := e_frame2,

					calledIdLP := p_calledIdLP,

			   		communicationsMode := e_voice,

			        commsFormat := e_callAll,

			        reserved2bit := c_reserved2bits,

			        slowData := c_slowDataInVoiceEmpty,

			        payload := ?

				} // end template mw_frame2Voice

 



			  	template Frame3 mw_frame3VoiceBroadcast ( OwnIdUP p_ownIdUP )  := {

					frameSync := c_fs2,

					frameNumber := e_frame3,

					ownIdUP := p_ownIdUP,

			   		communicationsMode := e_voice,

			        commsFormat := e_callAll,

			        reserved2bit := c_reserved2bits,

			        slowData := c_slowDataInVoiceEmpty,

			        payload := ?

				} // end template mw_frame3Voice





			  	template Frame4 mw_frame4VoiceBroadcast ( OwnIdLP p_ownIdLP, ColourCode p_cc)  := {

					colourCode := p_cc,

					frameNumber := e_frame4,

					ownIdLP := p_ownIdLP,

			   		communicationsMode := e_voice,

			        commsFormat := e_callAll,

			        reserved2bit := c_reserved2bits,

			        slowData := c_slowDataInVoiceEmpty,

			        payload := ?

				} // end template mw_frame4Voice



			} // end VoiceGroup



		} // end group VoiceFrameGroup

ttcn/dPMR_TestCases.ttcn

+608 −72

File changed.

Preview size limit exceeded, changes collapsed.

ttcn/dPMR_TestExecution.ttcn

+21 −1
Original line number Diff line number Diff line
@@ -77,6 +77,8 @@ module dPMR_TestExecution { 
			if ((PIC_ISF_OR_CSF == e_csf) and PIC_CSF_TYPE_2_DATA_SUPPORT and PIC_AUTOMATIC_DISCONNECTION_REQUEST) {execute(TC_PMR_0407_03() );}

			if ((PIC_ISF_OR_CSF == e_csf) and PIC_CSF_TYPE_3_DATA_SUPPORT and PIC_AUTOMATIC_DISCONNECTION_REQUEST) {execute(TC_PMR_0407_04() );}







			if ((PIC_ISF_OR_CSF == e_csf) and PIC_CSF_VOICE_SUPPORT) {execute(TC_PMR_0811_01({csfColourCode :=c_grpBcf1}, e_useCsfChannel1) );} // 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_useCsfChannel2) );} // 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_useCsfChannel3) );} // TODO! just change a few parameters and all colour code TCs are covered.
@@ -163,7 +165,7 @@ module dPMR_TestExecution { 
		//	} // end group TalkingParty_ID

		//	group CommonSlowUserData {// Clause 5.1.7

				if (PIC_CSF_GROUP_VOICE_SS_SLD) {execute(TC_PMR_0836_01() );}

				//if (PIC_ISF_OR_CSF == e_isf) {execute(TC_PMR_0836_02() );} // TODO JP IMPLEMENT

				if (PIC_ISF_OR_CSF == e_isf) {execute(TC_PMR_0836_02() );} // TODO JP IMPLEMENT

		//	} // end group CommonSlowUserData

		//} // end group IsfCsfCommon
@@ -184,22 +186,40 @@ module dPMR_TestExecution { 
				if (PIC_CSF_NUMBER_AND_DIALING_SUPPORT and PIC_CSF_ADDRESS_SPACE_MAPPING) {execute(TC_PMR_1417_02() );} 

				if (PIC_CSF_NUMBER_AND_DIALING_SUPPORT and PIC_CSF_ADDRESS_SPACE_MAPPING) {execute(TC_PMR_1418_01() );} 

				if (PIC_CSF_NUMBER_AND_DIALING_SUPPORT and PIC_CSF_ADDRESS_SPACE_MAPPING) {execute(TC_PMR_1418_02() );} 

				if (PIC_CSF_NUMBER_AND_DIALING_SUPPORT and PIC_CSF_ADDRESS_SPACE_MAPPING) {execute(TC_PMR_1418_03() );} 

				if (PIC_CSF_NUMBER_AND_DIALING_SUPPORT and PIC_CSF_ADDRESS_SPACE_MAPPING) {execute(TC_PMR_1418_04() );} 

				if (PIC_CSF_NUMBER_AND_DIALING_SUPPORT and PIC_CSF_ADDRESS_SPACE_MAPPING) {execute(TC_PMR_1420_01() );} 

				if (PIC_CSF_NUMBER_AND_DIALING_SUPPORT and PIC_CSF_ADDRESS_SPACE_MAPPING) {execute(TC_PMR_1420_02() );} 

				if (PIC_CSF_NUMBER_AND_DIALING_SUPPORT and PIC_CSF_ADDRESS_SPACE_MAPPING) {execute(TC_PMR_1420_03() );} 

				if (PIC_CSF_NUMBER_AND_DIALING_SUPPORT and PIC_CSF_ADDRESS_SPACE_MAPPING) {execute(TC_PMR_1420_04() );} 

				if (PIC_CSF_NUMBER_AND_DIALING_SUPPORT and PIC_CSF_ADDRESS_SPACE_MAPPING) {execute(TC_PMR_1420_05() );} 

				if (PIC_CSF_NUMBER_AND_DIALING_SUPPORT and PIC_CSF_ADDRESS_SPACE_MAPPING) {execute(TC_PMR_1420_06() );} 

				if (PIC_CSF_NUMBER_AND_DIALING_SUPPORT and PIC_CSF_ADDRESS_SPACE_MAPPING) {execute(TC_PMR_1424_01() );} 

				

		//	} // end group DialingPlan

		//	group IndividualShortDataMessage { // Clause 5.2.3

		//		group ISDM_FreeTestMessage {// Clause 5.2.3.1



				if (PIC_CSF_T2Data_SS_GROUP_FREETEXT_MESSAGE) {execute(TC_PMR_0852_01() );} 

				if (PIC_CSF_T1Data_SS_GROUP_FREETEXT_MESSAGE) {execute(TC_PMR_0853_01() );} 



		//		} // end group ISDM_FreeTestMessage

		//		group ISDM_PrecodedMessage {// Clause 5.2.3.2



				if (PIC_CSF_T1Data_SS_GROUP_PRECODED_MESSAGE) {execute(TC_PMR_0850_01() );} 

				if (PIC_CSF_T2Data_SS_GROUP_PRECODED_MESSAGE) {execute(TC_PMR_0851_01() );} 



		//		} // end group ISDM_PrecodedMessage

		//		group ISDM_ShortFileTransfer {// Clause 5.2.3.3



				if ((PIC_ISF_OR_CSF == e_csf) and PIC_CSF_T3Data_INDIVIDUAL_DATA_MESSAGE) {execute(TC_PMR_0855_01() );}

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

				if ((PIC_ISF_OR_CSF == e_csf) and PIC_CSF_TYPE_2_DATA_SUPPORT) {execute(TC_PMR_0856_01() );} 



		//		} // end group ISDM_ShortFileTransfer

		//		group ISDM_StatusMessage {// Clause 5.2.3.4

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

				if ((PIC_ISF_OR_CSF == e_csf) and PIC_CSF_TYPE_2_DATA_SUPPORT) {execute(TC_PMR_0847_01() );} 

		//		} // end group ISDM_StatusMessage

		//	} // end group IndividualShortDataMessage

		//	group OACSU { // Clause 5.2.4

ttcn/dPMR_Types.ttcn

+5 −1
Original line number Diff line number Diff line
@@ -596,7 +596,11 @@ module dPMR_Types { 
			e_makeT2DataCallWithShortFileTransfer (73), // Make a T2 data with short file transfer

			e_toStandbyAndUseAckTimer (74), // go to standby and config to use AckTimer T_ack

			e_toStandbyAndUseAckTimerAndMultipleAcks (75), // go to standby and config to use AckTimer T_ack config to use multiple acks

			e_toStandbyAndConfigMaskedDialingXX_X_XXAndDialString (76) // Configure Masked dialing "XX X XX" and dial string

			e_toStandbyAndConfigMaskedDialingXX_X_XXAndDialString (76), // Configure Masked dialing "XX X XX" and dial string

			e_toStandbyAndConfigNumericGroup9991234 (77), // Configure Numeric group 9991234 

			e_reportCallFail (78), // Report call_fail

			e_makeCallWithDialStringAndThenCancelCallWithHashHash (79), // Cancel current call attempt with "##" 

			e_makeT3DataCallWithShortFileTransfer (80) // Cancel current call attempt with "##" 

			}



		/**

ttcn/dPMR_Values.ttcn

+19 −3
Original line number Diff line number Diff line
@@ -31,10 +31,10 @@ module dPMR_Values { 
		const DialString c_defaultAbreviatedIndividualDialString := "4"; // should then by the IUT be expanded to "7654324"

		const MsAddress  c_defaultCSFAbreviatedIndividualAddress := {csfAddress := '101010101111110110111110'B}; // corresponding to 7654324

		const DialString c_defaultAbreviatedGroupDialString := "*"; // should then by the IUT be expanded to "765432*"

		const MsAddress  c_defaultCSFAbreviatedGroupAddress := {csfAddress := '101010101111110111000100'B}; // corresponding to 7654324

		const MsAddress  c_defaultCSFAbreviatedGroupAddress := {csfAddress := '101010101111110111000100'B}; // corresponding to 765432*



		const DialString c_defaultMaskedIndividualDialString := "98"; // should then by the IUT be expanded to "7694821"

		const MsAddress  c_defaultCSFMaskedIndividualAddress := {csfAddress := '101010111110010011011100'B}; // corresponding to 7694824

		const MsAddress  c_defaultCSFMaskedIndividualAddress := {csfAddress := '101010111110010011011100'B}; // corresponding to 7694821

		const DialString c_defaultMaskedGroupDialString := "7*"; // should then by the IUT be expanded to "7674*21"

		const MsAddress  c_defaultCSFMaskedGroupAddress := {csfAddress := '101010110111001101101100'B}; // corresponding to 7674*21
@@ -43,6 +43,22 @@ module dPMR_Values { 
		const DialString c_defaultAbreviatedMaskedGroupDialString := "*"; // should then by the IUT be expanded to "7654*21"

		const MsAddress  c_defaultCSFAbreviatedMaskedGroupAddress := {csfAddress := '101010110000000100001010'B}; // corresponding to 7654*21



		const DialString c_defaultBroadcastGroupDialString := "#1*112345*"; // should then by the IUT be expanded to "112345*"

		const MsAddress  c_defaultCSFBroadcastGroupAddress := {csfAddress := '000110010001011100101110'B}; // corresponding to 112345*

		const DialString c_defaultAbreviatedBroadcastGroupDialString := "#1**"; // should then by the IUT be expanded to "765432*"

		const MsAddress  c_defaultCSFAbreviatedBroadcastGroupAddress := {csfAddress := '101010101111110111000100'B}; // corresponding to 765432*

		const DialString c_defaultAbreviatedMaskedBroadcastGroupDialString := "#1**"; // should then by the IUT be expanded to "7654*21"

		const MsAddress  c_defaultCSFAbreviatedMaskedBroadcastGroupAddress := {csfAddress := '101010110000000100001010'B}; // corresponding to 7654*21



		const DialString c_defaultIUTtalkGroupAddress := "9991234"

		const DialString c_defaultBroadcastInvalidNumericGroupDialString := "#1*8881234"; // Invalid numeric group address



		const DialString c_defaultBroadcastAbbreviatedNumericGroupDialString := "#1*9"; // IUT shall expands to 9991239

		const MsAddress  c_defaultCSFBroadcastAbbreviatedNumericGroupAddress := {csfAddress := '110111110011010010000110'B}; // corresponding to 7654*21



		const DialString c_defaultBroadcastAbbreviatedMaskedNumericGroupDialString := "#1*9"; // IUT shall expands to 9991934

		const MsAddress  c_defaultCSFBroadcastAbbreviatedMaskedNumericGroupAddress := {csfAddress := '110111110011011111010000'B}; // corresponding to 7654*21



		

	} //end testProfileValues