Commit 3686c8cd authored by petersenj's avatar petersenj
Browse files

Implemented 

TP_PMR_1403_02
TP_PMR_1417_01
TP_PMR_1417_02
TP_PMR_1418_01
TP_PMR_1418_02
TP_PMR_1418_03
TP_PMR_1418_04
parent 7cea7052

ttcn/dPMR_TestCases.ttcn

+179 −2
Original line number Diff line number Diff line
@@ -3070,7 +3070,7 @@ module dPMR_TestCases { 
			} // end TC_PMR_1310_04

			

			/**

			* Transmitting individual call

			* Call not initiated without using hash or send key

			*/

			testcase TC_PMR_1403_01(   ) 	

			runs on ServerSyncComp
@@ -3095,6 +3095,32 @@ module dPMR_TestCases { 


			} // end TC_PMR_1403_01



			/**

			* Call  initiated when using hash or send key

			*/

			testcase TC_PMR_1403_02(   ) 	

			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

				v_mse.start(f_TC_voiceTx_MS01());

				v_ut.start(f_TC_msAction_UT(e_toStandby, m_commandCSF_utRequest( c_defaultPeerToPeerDialString ,e_enterDialStringAndPressSendKeyOrHash)));// TODO check if this is to be configured

 



				// synchronize both PTCs

				f_serverSync2ClientsAndStop({c_prDone, c_tbDone});



				// Configuration Down

				f_cfMseDown(v_mse, v_ut);



			} // end TC_PMR_1403_02

			

			/**

			* call initiated using 7 digit dialing string

			*/
@@ -3120,6 +3146,156 @@ module dPMR_TestCases { 
				f_cfMseDown(v_mse, v_ut);

			} // end TC_PMR_1416_01

		

			/**

			* Abbreviated dialing for induvidual calls

			*/

			testcase TC_PMR_1417_01(   )

			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  

				v_mse.start(f_TC_voiceTxWithTesterId_MS01(c_defaultCSFAbreviatedIndividualAddress));

					v_ut.start(f_TC_msAction_UT(e_toStandby, m_commandCSF_utRequest(	c_defaultAbreviatedIndividualDialString, // TODO check if this is to be configured

																		e_enterDialStringAndPressSendKeyOrHash)));



				// synchronize both PTCs

				f_serverSync2ClientsAndStop({c_prDone, c_tbDone});



				// Configuration Down

				f_cfMseDown(v_mse, v_ut);

			} // end TC_PMR_1417_01

			

			/**

			* Abbreviated dialing for group calls

			*/

			testcase TC_PMR_1417_02(   )

			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  

				v_mse.start(f_TC_voiceTxWithTesterId_MS01(c_defaultCSFAbreviatedGroupAddress));

					v_ut.start(f_TC_msAction_UT(e_toStandby, m_commandCSF_utRequest(	c_defaultAbreviatedGroupDialString, // TODO check if this is to be configured

																		e_enterDialStringAndPressSendKeyOrHash)));



				// synchronize both PTCs

				f_serverSync2ClientsAndStop({c_prDone, c_tbDone});



				// Configuration Down

				f_cfMseDown(v_mse, v_ut);

			} // end TC_PMR_1417_02



			/**

			* Masked dialing works for induvidual calls

			*/

			testcase TC_PMR_1418_01(   )

			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  

				v_mse.start(f_TC_voiceTxWithTesterId_MS01(c_defaultCSFMaskedIndividualAddress));

					v_ut.start(f_TC_msAction_UT(e_toStandby, m_commandCSF_utRequest(	c_defaultMaskedIndividualDialString, 

																		e_toStandbyAndConfigMaskedDialingXX_X_XXAndDialString)));



				// synchronize both PTCs

				f_serverSync2ClientsAndStop({c_prDone, c_tbDone});



				// Configuration Down

				f_cfMseDown(v_mse, v_ut);

			} // end TC_PMR_1418_01



			/**

			* Masked dialing works for group calls

			*/

			testcase TC_PMR_1418_02(   )

			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  

				v_mse.start(f_TC_voiceTxWithTesterId_MS01(c_defaultCSFMaskedGroupAddress));

					v_ut.start(f_TC_msAction_UT(e_toStandby, m_commandCSF_utRequest(	c_defaultMaskedGroupDialString, 

																		e_toStandbyAndConfigMaskedDialingXX_X_XXAndDialString)));



				// synchronize both PTCs

				f_serverSync2ClientsAndStop({c_prDone, c_tbDone});



				// Configuration Down

				f_cfMseDown(v_mse, v_ut);

			} // end TC_PMR_1418_02



			/**

			* Abreviated Masked dialing works for induvidual calls

			*/

			testcase TC_PMR_1418_03(   )

			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  

				v_mse.start(f_TC_voiceTxWithTesterId_MS01(c_defaultCSFAbreviatedMaskedIndividualAddress));

					v_ut.start(f_TC_msAction_UT(e_toStandby, m_commandCSF_utRequest(	c_defaultAbreviatedMaskedIndividualDialString, 

																		e_toStandbyAndConfigMaskedDialingXX_X_XXAndDialString)));



				// synchronize both PTCs

				f_serverSync2ClientsAndStop({c_prDone, c_tbDone});



				// Configuration Down

				f_cfMseDown(v_mse, v_ut);

			} // end TC_PMR_1418_03



			/**

			* Abreviated Masked dialing works for group calls

			*/

			testcase TC_PMR_1418_04(   )

			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  

				v_mse.start(f_TC_voiceTxWithTesterId_MS01(c_defaultCSFAbreviatedMaskedGroupAddress));

					v_ut.start(f_TC_msAction_UT(e_toStandby, m_commandCSF_utRequest(	c_defaultAbreviatedMaskedGroupDialString, 

																		e_toStandbyAndConfigMaskedDialingXX_X_XXAndDialString)));



				// synchronize both PTCs

				f_serverSync2ClientsAndStop({c_prDone, c_tbDone});



				// Configuration Down

				f_cfMseDown(v_mse, v_ut);

			} // end TC_PMR_1418_04



		} // end group DialingPlan

		group IndividualShortDataMessage { // Clause 5.2.3

			group ISDM_FreeTestMessage {// Clause 5.2.3.1
@@ -4472,7 +4648,8 @@ module dPMR_TestCases { 


		/**

		* @desc	Check that a voice transmission from the MS (IUT) consists of a Header Frame, a list of

		*       Super Frames, and an End Frame,

		*       Super Frames, and an End Frame, is sent to the tester id

		* @param p_address is the receiving entity

		*/

		function f_TC_voiceTxWithTesterId_MS01 ( MsAddress  p_address )

		runs on Mse{

ttcn/dPMR_TestExecution.ttcn

+5 −0
Original line number Diff line number Diff line
@@ -178,7 +178,12 @@ module dPMR_TestExecution { 
				if (PIC_CSF_NUMBER_AND_DIALING_SUPPORT and PIC_CSF_ADDRESS_SPACE_MAPPING) {execute(TC_PMR_1310_03() );} 

				if (PIC_CSF_NUMBER_AND_DIALING_SUPPORT and PIC_CSF_ADDRESS_SPACE_MAPPING and PIC_CSF_GROUP_CALL) {execute(TC_PMR_1310_04() );} // reused everything and solved it with templates

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

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

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

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

				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() );} 

				

		//	} // end group DialingPlan

		//	group IndividualShortDataMessage { // Clause 5.2.3

ttcn/dPMR_Types.ttcn

+2 −1
Original line number Diff line number Diff line
@@ -595,7 +595,8 @@ module dPMR_Types { 
			e_makeT2DataCallPrecodedMessage (72), // Make a T2 data with precoded message

			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_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

			}



		/**

ttcn/dPMR_Values.ttcn

+14 −0
Original line number Diff line number Diff line
@@ -28,6 +28,20 @@ module dPMR_Values { 
		const DialString c_defaultInduvidualInGroupNotTheIUT_DialString := "7654320"; 

		const MsAddress  c_defaultCSFAllCallAddress := {csfAddress := '111110000011001110100110'B}; // corresponding to *******

		const MsAddress  c_defaultCSFAllCallWithPrefixAddress := {csfAddress := '101101010010111000111010'B}; // corresponding to 7******

		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 DialString c_defaultMaskedIndividualDialString := "98"; // should then by the IUT be expanded to "7694821"

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

		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



		const DialString c_defaultAbreviatedMaskedIndividualDialString := "9"; // should then by the IUT be expanded to "7654921"

		const MsAddress  c_defaultCSFAbreviatedMaskedIndividualAddress := {csfAddress := '101010110000000010010001'B}; // corresponding to 7654921

		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

		

		

	} //end testProfileValues