Commit 7cea7052 authored by petersenj's avatar petersenj
Browse files

Changed TCs 1310_01 and 1310_03 and 1310_04

Implemented 1317_01, 1317_02, 1317_03 and 1317_04
parent ca30923a
Loading
Loading
Loading
Loading
+177 −6
Original line number Diff line number Diff line
@@ -107,6 +107,118 @@ module dPMR_TestCases {

			} // end TC_PMR_0824_03

			/**
			* Standard user interface transmitting All Call 
			*/
			testcase TC_PMR_1317_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_defaultCSFAllCallAddress)); // TODO JP change to set the address to the group-address
				v_ut.start(f_TC_msAction_UT(e_toStandby, // TODO check if this is to be configured
								m_commandISFCSF_utRequest(	
									c_csfAllCallDialString, 
									omit , 
									e_pressPtt)));


				// synchronize both PTCs
				f_serverSync2ClientsAndStop({c_prDone, c_tbDone});

				// Configuration Down
				f_cfMseDown(v_mse, v_ut);

			} // end TC_PMR_1317_01

			/**
			* Standard user interface transmitting All Call within prefix
			*/
			testcase TC_PMR_1317_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_defaultCSFAllCallWithPrefixAddress)); 
				v_ut.start(f_TC_msAction_UT(e_toStandby, // TODO check if this is to be configured
								m_commandISFCSF_utRequest(	
									c_csfAllCallWithPrefixDialString, 
									omit , 
									e_pressPtt)));


				// synchronize both PTCs
				f_serverSync2ClientsAndStop({c_prDone, c_tbDone});

				// Configuration Down
				f_cfMseDown(v_mse, v_ut);

			} // end TC_PMR_1317_02

			/**
			* Standard user interface receiving All Call
			*/
			testcase TC_PMR_1317_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_sendVoiceToAddress_MS01(c_defaultCSFAllCallAddress));
				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_1317_03

			/**
			* Standard user interface receiving All Call within a prefix
			*/
			testcase TC_PMR_1317_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_sendVoiceToAddress_MS01(c_defaultCSFAllCallWithPrefixAddress));
				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_1317_04

		} // end group AllCall

		group ChannelAccess { // Clause 5.1.2
@@ -2859,7 +2971,7 @@ module dPMR_TestCases {
				f_cfMseUp(v_mse, v_ut);

				//Test body
				v_mse.start(f_TC_voiceTx_MS01());
				v_mse.start(f_TC_voiceTxWithTesterId_MS01(c_defaultTesterPeerToPeerCSFAddress));
				v_ut.start(f_TC_msAction_UT(e_toStandby, // TODO check if this is to be configured
								m_commandISFCSF_utRequest(	
									c_defaultPeerToPeerDialString, 
@@ -2915,7 +3027,7 @@ module dPMR_TestCases {
				f_cfMseUp(v_mse, v_ut);

				//Test body
				v_mse.start(f_TC_voiceTx_MS01());
				v_mse.start(f_TC_voiceTxWithTesterId_MS01(c_defaultTesterGroupCSFAddress)); // TODO JP change to set the address to the group-address
				v_ut.start(f_TC_msAction_UT(e_toStandby, // TODO check if this is to be configured
								m_commandISFCSF_utRequest(	
									c_defaultCallGroupDialString, 
@@ -2945,7 +3057,7 @@ module dPMR_TestCases {
				f_cfMseUp(v_mse, v_ut);

				//Test body
				v_mse.start(f_TC_sendVoiceToGroup_MS01());
				v_mse.start(f_TC_sendVoiceToAddress_MS01(c_defaultTesterGroupCSFAddress));
				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
 

@@ -3892,7 +4004,7 @@ module dPMR_TestCases {
		/**
		 * @desc 	this function will send a voice (test Tone) transmission with default group default (p2p in CSF)
		 */
		function f_TC_sendVoiceToGroup_MS01()
		function f_TC_sendVoiceToAddress_MS01(MsAddress p_address)
		runs on Mse{
			// Variables
			var default v_dftMse;
@@ -3900,7 +4012,7 @@ module dPMR_TestCases {
	
			//Test System Parameters
			f_initMse();
			vc_mse.iutId :=  { csfAddress := '101010101111110111000100'B}; // c_defaultIutDialString as address and that the called address is c_defaultCallGroupDialString
			vc_mse.iutId :=  p_address; 
			vc_mse.iutIdUP 		:= f_msAddress2Upper(vc_mse.iutId);
			vc_mse.iutIdLP 		:= f_msAddress2Lower(vc_mse.iutId);

@@ -3936,7 +4048,7 @@ module dPMR_TestCases {
		
			deactivate;

		} // end function f_TC_sendVoiceToGroup_MS01
		} // end function f_TC_sendVoiceToAddress_MS01
		
		/**
		* @desc Checks that the MS responds with an ACK when receiving an Connection Request message.
@@ -4358,6 +4470,65 @@ module dPMR_TestCases {

		} // end function f_TC_voiceTx_MS01

		/**
		* @desc	Check that a voice transmission from the MS (IUT) consists of a Header Frame, a list of
		*       Super Frames, and an End Frame,
		*/
		function f_TC_voiceTxWithTesterId_MS01 ( MsAddress  p_address )
		runs on Mse{
			// Variables
			var FncRetCode v_ret := e_success;
			var UInt16 v_sfCount := 0;
			var default v_defvar;

			//Test System Parameters
			f_initMse();
			vc_mse.testerId 	:= p_address; 
			vc_mse.testerIdUP 	:= f_msAddress2Upper(p_address);
			vc_mse.testerIdLP 	:= f_msAddress2Lower(p_address);
	
			//Default
			v_defvar := activate(a_dftMse(vc_mse.colourCode, e_voice));

			//Preamble
			v_ret := f_taToStandby();
			f_clientSyncAndVerdict(c_prDone, v_ret);

			//Test Body
			tc_ac.start ;
			alt {
			[] dp1Port.receive(	m_voiceorT1orT2PayloadTransmission(
									m_headerFrame(
										mw_headerInformationTx(
											vc_mse.testerId, 
											vc_mse.iutId, 
											e_voice, 
											e_p2p),
					                       vc_mse.colourCode),
									mw_superFrameList_OneOrManyElem(
										m_superFrame(
											mw_frame1Voice(vc_mse.testerIdUP ),
				            	       		mw_frame2Voice(vc_mse.testerIdLP, vc_mse.colourCode),
											mw_frame3Voice(vc_mse.iutIdUP),
											mw_frame4Voice(vc_mse.iutIdLP,vc_mse.colourCode))),
									m_endFrame(mw_endInformation(e_noAckReq)))) 
 				{
					// received correctly
					tc_ac.stop ;
					setverdict(pass);
				}
			[] tc_ac.timeout
			  	{
					log("**** f_TC_voiceTxWithId_MS01: Timeout: TC Timer expiration before reception of complete Voice transmission ****");
					setverdict(fail);	
				}
			} // end alt
			f_clientSyncAndVerdict(c_tbDone, v_ret);

			deactivate;

		} // end function f_TC_voiceTxWithId_MS01

		/**
		* @desc	Check that a voice transmission from the MS (IUT) consists of a Header Frame, a list of
		*       Super Frames, and an End Frame, is not sent from the IUT
+5 −1
Original line number Diff line number Diff line
@@ -26,6 +26,10 @@ module dPMR_TestExecution {

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

				if (PIC_ISF_OR_CSF == e_csf and (PIC_CSF_NUMBER_AND_DIALING_SUPPORT and PIC_CSF_ADDRESS_SPACE_MAPPING)) {execute(TC_PMR_1317_01() );}
				if (PIC_ISF_OR_CSF == e_csf and (PIC_CSF_NUMBER_AND_DIALING_SUPPORT and PIC_CSF_ADDRESS_SPACE_MAPPING)) {execute(TC_PMR_1317_02() );}
				if (PIC_ISF_OR_CSF == e_csf and (PIC_CSF_NUMBER_AND_DIALING_SUPPORT and PIC_CSF_ADDRESS_SPACE_MAPPING)) {execute(TC_PMR_1317_03() );}
				if (PIC_ISF_OR_CSF == e_csf and (PIC_CSF_NUMBER_AND_DIALING_SUPPORT and PIC_CSF_ADDRESS_SPACE_MAPPING)) {execute(TC_PMR_1317_04() );}
		// 	group ChannelAccess  { // Clause 5.1.2

			if (PIC_MS_POLITE_OWN_CC) {execute(TC_PMR_1004_01() );}
@@ -171,7 +175,7 @@ module dPMR_TestExecution {
		//	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) {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_1416_01() );} 
+6 −0
Original line number Diff line number Diff line
@@ -16,12 +16,18 @@ module dPMR_Values {
		// Collection of all values that are applied when TP does not specify explicity its value
		const PoliteLvl c_polteteLevel := e_politeCc; // Default polite level
		const DialString c_defaultCallGroupDialString := "765432*"; // Digit 7 is a "wildcard" 
		const MsAddress  c_defaultTesterGroupCSFAddress := {csfAddress := '101010101111110111000100'B}; // corresponding to 765432*
		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 MsAddress  c_defaultIutCSFAddress := {csfAddress := '101010101111110110111011'B}; // corresponding to 7654321
		const MsAddress  c_defaultTesterPeerToPeerCSFAddress := {csfAddress := '000110111001000111111101'B}; // corresponding to 1234567
		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....
		const DialString c_csfAllCallWithPrefixDialString := "7******#"; // 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....
		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******
		
		
	} //end testProfileValues