Commit ca30923a authored by petersenj's avatar petersenj
Browse files

Implemented 1310_02, 1310_03

parent ec37d322

ttcn/dPMR_TestCases.ttcn

+57 −1
Original line number Diff line number Diff line
@@ -2876,7 +2876,63 @@ module dPMR_TestCases { 
			} // end TC_PMR_1310_01



			/**

			* Transmitting individual call

			* Receiving group call with wildcards

			*/

			testcase TC_PMR_1310_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_sendVoice_MS01());

				v_ut.start(f_TC_msAction_UT(e_toStandby, m_testToneDetected_utRequest( omit, c_defaultIutDialString ,e_testToneReceived)));// 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_1310_02



			/**

			* Transmitting group call with wildcards

			*/

			testcase TC_PMR_1310_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_voiceTx_MS01());

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

								m_commandISFCSF_utRequest(	

									c_defaultCallGroupDialString, 

									omit , 

									e_pressPtt)));





				// synchronize both PTCs

				f_serverSync2ClientsAndStop({c_prDone, c_tbDone});



				// Configuration Down

				f_cfMseDown(v_mse, v_ut);



			} // end TC_PMR_1310_03



			/**

			* Receiving group call with wildcards

			*/

			testcase TC_PMR_1310_04(   ) 	// TODO JP check with Pics/Pixit the assumption is that the IUT will have c_defaultIutDialString as address and that the called address is c_defaultCallGroupDialString

			runs on ServerSyncComp			// 				("7654321" and "765432*" resp.)

ttcn/dPMR_TestExecution.ttcn

+4 −0
Original line number Diff line number Diff line
@@ -32,12 +32,14 @@ module dPMR_TestExecution { 
			

			if (PIC_ISF_OR_CSF == e_csf) {execute(TC_PMR_1007_01() );}

			if (PIC_ISF_OR_CSF == e_csf) {execute(TC_PMR_1007_02() );}

			if (PIC_ISF_OR_CSF == e_csf) {execute(TC_PMR_1007_03() );}

			

			execute(TC_PMR_1008_01() );

			if ((PIC_ISF_OR_CSF == e_isf) and PIC_ISF_VOICE_SUPPORT) {execute(TC_PMR_1009_01() );}

			

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

			if (PIC_ISF_OR_CSF == e_csf) {execute(TC_PMR_1011_01() );}

			if (PIC_ISF_OR_CSF == e_csf) {execute(TC_PMR_1012_01() );}



		//}

		//	group Framing {// Clause 5.1.3
@@ -168,6 +170,8 @@ module dPMR_TestExecution { 
		//	} // end group BroadcastCall

		//	group DialingPlan { // Clause 5.2.2

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

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

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

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