Commit e5920bfe authored by mullers's avatar mullers
Browse files

Finn' s changes merged

parent 6df96813
Loading
Loading
Loading
Loading
+63 −0
Original line number Diff line number Diff line
/*
 *	@author 	STF 340
 *  @version    $vx.x.x$
 *	@desc		Alternative default behaviour steps are defined here.
 *
 */
module dPMR_Defaults {


	//LibCommon
	import from LibCommon_DataStrings all;
	import from LibCommon_BasicTypesAndValues all;
	import from LibCommon_DataStrings all;
	import from LibCommon_Sync all;
	import from LibCommon_VerdictControl all;

	//Ats
	import from dPMR_TestSystem all;
	import from dPMR_Messages all;
//	import from dPMR_Pixits all;
	import from dPMR_Types all;
	import from dPMR_Values all;


altstep a_dftUt()
	runs on Ut{
		[]syncPort.receive(m_syncServerStop){
				log("a_dftUt: Test component received STOP signal from MTC - going to IDLE state");
				log("a_dftUt: TEST COMPONENT NOW STOPPING ITSELF!");
				stop;
			}
		[]utPort.receive(e_error){
			setverdict(inconc);
			log("*** a_dftUt: Unexpected error message received on upper tester ***");
			repeat;
		}
		[]utPort.receive{
			setverdict(inconc);
			log("*** a_dftUt: Unexpected message received on upper tester ***");
			repeat;
		}
	}





	altstep a_dftSimu()
	runs on Simu{
		[]syncPort.receive(m_syncServerStop){
				log("a_dftSimu: Test component received STOP signal from MTC - going to IDLE state");
				log("a_dftSimu: TEST COMPONENT NOW STOPPING ITSELF!");
				stop;
		}
	   
		[]dp1Port.receive{
			setverdict(inconc);
			log("*** a_dftSimu: Unexpected message received on dp1Port ***");
			repeat;
		}
	}

 } // end module dPMR_Defaults
 No newline at end of file
+3 −2
Original line number Diff line number Diff line
@@ -81,7 +81,8 @@ type record HeaderFrame {
  CommunicationsMode  communicationsMode,
  CommsFormat         commsFormat,
  Reserved2bit        reserved2bit,
  CallInformation     callInformation
  CallInformation     callInformation,
  ColourCode		  colourCode			// Not part of the Header Information but needed for testing
}


+11 −1
Original line number Diff line number Diff line
@@ -13,10 +13,20 @@ module dPMR_Pixits {
	//Ats
	import from dPMR_Types all;
	import from dPMR_Values all;
	import from dPMR_TestConfiguration all;




	// @desc: Value of IUT Address
	modulepar {CalledId PXT_CALLED_ID := '111111110000000000000000'B}


	// @desc: Value of Tester Address
	modulepar {OwnId PXT_OWN_ID := '111111110000000000000001'B}


	// @desc: Max Time of IUT sending back response of configuration/action's func/msg
	modulepar {float PXT_MAX_TIME_CFG_ACT_RLY := 200E-3}  // Value To be checked !!!


} // end module dPMR_Pixits 
+47 −12
Original line number Diff line number Diff line
@@ -20,24 +20,59 @@
	import from dPMR_Values all;


//	template CallOrSrvReq m_callOrSrvReq( template HeaderFrame p_headerFrame ,
//										  template EndFrame p_endFrame ) :=
//		{
//			headerFrame := p_headerFrame ,
//			endFrame := p_endFrame 
//		}
	template CallOrSrvReq m_callOrSrvReq( template HeaderFrame p_headerFrame ,
										  template EndFrame p_endFrame ) := {
			headerFrame := p_headerFrame ,
			endFrame := p_endFrame 
		}


// 	template HeaderFrame m_headerFrame := {
		// TO BE DONE !!!
//	}
 	template HeaderFrame m_headerFrameConnectReq( CalledId p_calledId , 
												  OwnId    p_ownId, 
												  CommunicationsMode p_commMode,
												  CommsFormat p_commFormat,
												  ColourCode p_cc ) := {
		headerType := e_connReqHeader,
  		calledId := p_calledId,
  		ownId := p_ownId,
  		communicationsMode := p_commMode,
    	commsFormat := p_commFormat,
  		reserved2bit := c_reserved2bits,
  		callInformation := { 
			ciInformationNormalOrPws :=c_ciInformationNormal },
		colourCode := p_cc
	}

 
//	template EndFrame m_endFrame := {
		// TO BE DONE !!!
//	}

	template EndFrame m_endFrameConnectReq := {
	 	endType := e_endFrame ,
  		ackRequest := e_AckReq,
  		txWait := e_noSpecTime,
  		statusMessage := c_dummyStatusValue,
  		reserved4bit := c_reserved4bits
	}

 	

 	template MsCfgParams m_msCfgParams( ColourCode p_cc ) := {
		colourCode := p_cc
	}



	template AckFrame mw_acknowledgementAckOnConnectReq( CalledId p_calledId , 
												  		 OwnId    p_ownId ,
														 CommunicationsMode p_commMode,
														 CommsFormat p_commFormat ) := {
	  headerType := e_ack,
	  calledId := p_calledId,
	  ownId := p_ownId,
	  communicationsMode := p_commMode,
	  commsFormat := p_commFormat,
	  reserved2bit := c_reserved2bits,
  	  callInformation := { 
		  ciInformationNormalOrPws :=c_ciInformationNormal }
	}

 } // end module dPMR_Templates
 No newline at end of file
+131 −50
Original line number Diff line number Diff line
/*
 *	@author 	STF 340
 *  @version 	$Id$
 *              TP doc version: 1.1.1
 *	@desc		SS Testcases
 */

@@ -18,11 +19,91 @@ module dPMR_TestCases {
	import from dPMR_Templates all;
	import from dPMR_Messages all;
	import from dPMR_TestConfiguration all;
	import from dPMR_Values all;
	import from dPMR_Types all;
	import from dPMR_Functions all;
	import from dPMR_Defaults all;
	import from dPMR_Pixits all;

group IsfCsfCommon {

	group Framing {

	/*
	 * @desc	TP Ref: TP_PMR_0406_01
	*/
	testcase TC_PMR_0406_01()
	runs on ServerSyncComp
	system TestAdapter {

		//Variables
		var Simu v_simu;
		var Ut v_ut;

		//Configuration Up
		f_cfSimuUp(v_simu, v_ut);

		//Test body
		v_simu.start(f_TC_PMR_0406_01_Simu(c_grpBcf1));
		v_ut.start(f_TC_IutToStandby_Ut(c_grpBcf1)); // select CC B channel 1

		// synchronize both PTCs on these 2 sychronization points
		f_serverSync2ClientsAndStop({c_prDone});

		// Configuration Down
		f_cfSimuDown(v_simu, v_ut);

	} // end TC_PMR_0406_01


	function f_TC_PMR_0406_01_Simu( ColourCode p_cc )
	runs on Simu {
		// Variables
		var FncRetCode v_ret := e_success;
		// Configuration
		//Default
		activate(a_dftSimu());
		//Preamble
		f_clientSyncAndVerdict(c_prDone, v_ret); 
		
		//Test Body
		t_tcTimer.start ;
		dp1Port.send(m_callOrSrvReq(m_headerFrameConnectReq(PXT_CALLED_ID, PXT_OWN_ID, e_voice, e_p2p, p_cc),m_endFrameConnectReq));
		alt {
			[] dp1Port.receive(mw_acknowledgementAckOnConnectReq(PXT_OWN_ID, PXT_CALLED_ID, e_voice, e_p2p)) {
					setverdict(pass);
				}
			[] t_tcTimer.timeout {
					log("**** TC_PMR_0406_01: TC Timer expiration before reception of Acknowledgement ****");
					setverdict(fail);	
				}
		} // end alt

		
		//Postamble
		
		deactivate;
	} // end f_TC_PMR_0406_01_Simu





	function f_TC_IutToStandby_Ut( ColourCode p_cc ) 
	runs on Ut {
		//Variables
		var FncRetCode v_ret := e_success;
		//Default
		activate(a_dftUt());
		//Preamble
		v_ret := f_iutInit_Ut(valueof(m_msCfgParams(p_cc)), v_ret);
		f_clientSyncAndVerdict(c_prDone, v_ret); 
		//No Test body
		//Default
		deactivate;
	} // end f_TC_IutToStandby_Ut




	/*
Loading