Commit 98252060 authored by petersenj's avatar petersenj
Browse files

Implemented TC 0824_02 and most of 1004_01. The TC 1005_01 is untestable.

parent 6bbb3c0d

ttcn/dPMR_TestCases.ttcn

+58 −0
Changes for ttcn/dPMR_TestCases.ttcn: 58 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -56,6 +56,31 @@ module dPMR_TestCases { 


			} // end TC_PMR_0824_01



			/**

			*  All call in ISF

			*/

			testcase TC_PMR_0824_02()

			runs on ServerSyncComp

			system TestAdapter {



				//Variables

				var Mse v_mse;

				var Ut v_ut;



				//Configuration Up

				f_cfMseUp(v_mse, v_ut);



				//Test body

				v_mse.start(f_TC_testToneTransmissionCommon_ID_set_to_255_MS01());

				v_ut.start(f_TC_msAction_UT(e_setCommonIdTo255, m_testToneDetected_utRequest(c_allCallCommonId, omit, e_testToneReceived)));

				// synchronize both PTCs

				f_serverSync2ClientsAndStop({c_prDone,c_tbDone});



				// Configuration Down

				f_cfMseDown(v_mse, v_ut);



			} // end TC_PMR_0824_02



			/**

			* All call in ISF

			*/
@@ -85,6 +110,39 @@ module dPMR_TestCases { 
		} // end group AllCall



		group ChannelAccess { // Clause 5.1.2



			/**

			* interference on channel

			*/

			testcase TC_PMR_1004_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_transmitOnWrongCCAndReceiveVoice_MS01()); // TODO TODO implement!!!

				if (PIC_ISF_OR_CSF == e_isf) {

					v_ut.start(f_TC_msAction_UT(e_politeToOwnCC, m_commandISFCSF_utRequest( 	omit , 

																			c_defaultCommonId,

																			e_pressPtt)));

				} else {

					v_ut.start(f_TC_msAction_UT(e_politeToOwnCC, m_commandISFCSF_utRequest(	c_defaultPeerToPeerDialString, 

																			omit , 

																			e_pressPtt)));

				}



				// synchronize both PTCs

				f_serverSync2ClientsAndStop({c_prDone, c_tbDone});



				// Configuration Down

				f_cfMseDown(v_mse, v_ut);

			} // end TC_PMR_1004_01



		} // end group ChannelAccess



		group Framing {// Clause 5.1.3

ttcn/dPMR_TestExecution.ttcn

+5 −1
Changes for ttcn/dPMR_TestExecution.ttcn: 5 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -23,9 +23,13 @@ module dPMR_TestExecution { 
			//group AllCall { // Clause 5.1.1

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



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



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



		// Group ChannelAccess  

		// 	group ChannelAccess  { // Clause 5.1.2

				

		//}

		//	group Framing {// Clause 5.1.3

			if (PIC_CSF_VOICE_SUPPORT or PIC_ISF_VOICE_SUPPORT) {execute(TC_PMR_0401_01() );}

ttcn/dPMR_Types.ttcn

+4 −1
Changes for ttcn/dPMR_Types.ttcn: 4 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -609,7 +609,10 @@ module dPMR_Types { 
			e_useIsfChannel14 (59),  // Use ISF Channel 14

			e_useIsfChannel15 (60),  // Use ISF Channel 15

			e_useIsfChannel16 (61),  // Use ISF Channel 16

			e_makeT3DataCallWith1400Bytes (62) // make a T3 data call with 1400 bytes payload

			e_makeT3DataCallWith1400Bytes (62), // make a T3 data call with 1400 bytes payload

			e_setCommonIdTo255 (63), // set common Id to 255

			e_politeToOwnCC (64) // set to be polite to own ColourCode

			

			}



		// ------------ MS configuration parameters ---------------

ttcn/dPMR_Values.ttcn

+1 −0
Changes for ttcn/dPMR_Values.ttcn: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ module dPMR_Values { 
		const DialString c_defaultPeerToPeerDialString := "1234567"; // Tester address as dialstring

		const DialString c_defaultIutDialString := "7654321"; // TODO where shall we define these??? in Pixit or here?

		const Common_ID c_defaultCommonId := '00000111'B;

		const Common_ID c_allCallCommonId := '11111111'B;

		const DialString c_csfAllCallDialString := "*******#"; // TODO this is now according to spec, but the final "#" only means that the user will "activate the calling, but we might think this is the key sequence the operator is to press....