Cleanup, and ut function changes in progress (4fdb3b32) · Commits · DMR / dPMR

ttcn/dPMR_Functions.ttcn

+8 −7

Original line number	Original line	Diff line number	Diff line
	@@ -386,21 +386,22 @@ group UtilityFunctions {
	* certain channel using the Pixit id or address		* certain channel using the Pixit id or address
	* @param p_cc the colour code (the channel)		* @param p_cc the colour code (the channel)
	*/		*/
	function f_msToStandby_UT()		function f_msToStandby_UT(UtActParams p_utActParam)
	runs on Ut		runs on Ut
	return FncRetCode {		return FncRetCode {
	//Variables		//Variables
	var FncRetCode v_ret := e_success;		var FncRetCode v_ret := e_success;

	//Preamble // TODO JP check if we can configure the ConnReqMode here		//Preamble
	if (PIC_ISF_OR_CSF == e_isf) {		if (PIC_ISF_OR_CSF == e_isf) {
	v_ret := f_handshake_Ut(m_msToStandBy_utRequest(f_getChannelNrFromColourCode(vc_ut.colourCode),		v_ret := f_handshake_Ut(m_isfStandby_utRequest(f_getChannelNrFromColourCode(vc_ut.colourCode),
	omit,		omit,
	f_getCommonId(vc_ut.iutId)));		f_getCommonId(vc_ut.iutId),
			p_utActParam));
	} else { // its e_csf		} else { // its e_csf
	v_ret := f_handshake_Ut(m_msToStandBy_utRequest(f_getChannelNrFromColourCode(vc_ut.colourCode),		v_ret := f_handshake_Ut(m_csfStandby_utRequest(f_getChannelNrFromColourCode(vc_ut.colourCode),
	fx_calcDialString(PXT_CSF_ADDRESS_IUT),		omit,
	omit));		p_utActParam));
	}		}

	return v_ret;		return v_ret;

ttcn/dPMR_Templates.ttcn

+10 −19

Original line number	Original line	Diff line number	Diff line
	@@ -251,7 +251,7 @@
	CrcD p_crcD,		CrcD p_crcD,
	Data p_data) := {		Data p_data) := {
	colourCode := p_cc,		colourCode := p_cc,
	packetDataFrameNumber := ? ,//todo jp		packetDataFrameNumber := p_packetDataFrameNumber ,
	validDataLength := p_validDataLen ,		validDataLength := p_validDataLen ,
	reserved14bit := c_reserved14bitForT3Data ,		reserved14bit := c_reserved14bitForT3Data ,
	crcForData := p_crcD,		crcForData := p_crcD,
	@@ -498,7 +498,7 @@
	MsAddress p_calledId ,		MsAddress p_calledId ,
	MsAddress p_ownId,		MsAddress p_ownId,
	CommunicationsMode p_commMode,		CommunicationsMode p_commMode,
	CommsFormat p_commFormat // todo jp theis might be needed: in template CallInformation p_callInfo		CommsFormat p_commFormat
	) := {		) := {
	headerType := p_hdrTp,		headerType := p_hdrTp,
	calledId := p_calledId,		calledId := p_calledId,
	@@ -647,38 +647,29 @@
	utActParams := p_utActParameter		utActParams := p_utActParameter
	}		}


	template UtRequest m_msToStandBy_utRequest( ChannelNumber p_channelNumber,
	in template DialString p_dialString,
	in template Common_ID p_commonId ) := {
	channelNr := p_channelNumber,
	politeLvl := omit ,
	dialString := p_dialString,
	isfCidAddr := p_commonId,
	utActParams := omit
	}

	template UtRequest m_isfStandby_utRequest(		template UtRequest m_isfStandby_utRequest(
	ChannelNumber p_channelNumber,		ChannelNumber p_channelNumber,
	PoliteLvl p_politeLvl,		in template PoliteLvl p_politeLvl,
	in template Common_ID p_commonId) :=		Common_ID p_commonId,
			in template UtActParams p_cfgParams) :=
	{		{
	channelNr := p_channelNumber,		channelNr := p_channelNumber,
	politeLvl := p_politeLvl ,		politeLvl := p_politeLvl ,
	dialString := omit,		dialString := omit,
	isfCidAddr := p_commonId,		isfCidAddr := p_commonId,
	utActParams := omit		utActParams := p_cfgParams
	}		}

	template UtRequest m_csfStandby_utRequest(		template UtRequest m_csfStandby_utRequest(
	ChannelNumber p_channelNumber,		ChannelNumber p_channelNumber,
	PoliteLvl p_politeLvl) :=		in template PoliteLvl p_politeLvl,
			UtActParams p_cfgParams) :=
	{		{
	channelNr := p_channelNumber,		channelNr := p_channelNumber,
	politeLvl := p_politeLvl ,		politeLvl := p_politeLvl ,
	dialString := omit,		dialString := omit,
	isfCidAddr := omit ,		isfCidAddr := omit ,
	utActParams := omit		utActParams := p_cfgParams
	}		}

	template UtRequest m_commandISFCSF_utRequest( in template DialString p_dialstr ,		template UtRequest m_commandISFCSF_utRequest( in template DialString p_dialstr ,

ttcn/dPMR_TestCases.ttcn

+57 −58

Original line number	Original line	Diff line number	Diff line
	@@ -47,7 +47,7 @@ module dPMR_TestCases {

	//Test body		//Test body
	v_mse.start(f_TC_testToneTransmissionCommon_ID_set_to_255_MS01());		v_mse.start(f_TC_testToneTransmissionCommon_ID_set_to_255_MS01());
	v_ut.start(f_TC_msAction_UT(m_testToneDetected_utRequest(c_allCall, omit, e_testToneReceived)));		v_ut.start(f_TC_msAction_UT(e_toStandby, m_testToneDetected_utRequest(c_allCall, omit, e_testToneReceived)));
	// synchronize both PTCs		// synchronize both PTCs
	f_serverSync2ClientsAndStop({c_prDone,c_tbDone});		f_serverSync2ClientsAndStop({c_prDone,c_tbDone});

	@@ -72,7 +72,7 @@ module dPMR_TestCases {

	//Test body		//Test body
	v_mse.start(f_TC_testToneTransmissionCommon_ID_set_to_default_MS01());		v_mse.start(f_TC_testToneTransmissionCommon_ID_set_to_default_MS01());
	v_ut.start(f_TC_msAction_UT(m_testToneDetected_utRequest(c_allCall, omit,e_testToneReceived)));		v_ut.start(f_TC_msAction_UT(e_toStandby, m_testToneDetected_utRequest(c_allCall, omit,e_testToneReceived)));

	// synchronize both PTCs		// synchronize both PTCs
	f_serverSync2ClientsAndStop({c_prDone,c_tbDone});		f_serverSync2ClientsAndStop({c_prDone,c_tbDone});
	@@ -105,11 +105,11 @@ module dPMR_TestCases {
	//Test body		//Test body
	v_mse.start(f_TC_voiceTx_MS01());		v_mse.start(f_TC_voiceTx_MS01());
	if (PIC_ISF_OR_CSF == e_isf) {		if (PIC_ISF_OR_CSF == e_isf) {
	v_ut.start(f_TC_msAction_UT(m_commandISFCSF_utRequest( omit ,		v_ut.start(f_TC_msAction_UT(e_toStandby, m_commandISFCSF_utRequest( omit ,
	c_defaultCommonId,		c_defaultCommonId,
	e_pressPtt)));		e_pressPtt)));
	} else {		} else {
	v_ut.start(f_TC_msAction_UT(m_commandISFCSF_utRequest( c_defaultPeerToPeerDialString,		v_ut.start(f_TC_msAction_UT(e_toStandby, m_commandISFCSF_utRequest( c_defaultPeerToPeerDialString,
	omit ,		omit ,
	e_pressPtt)));		e_pressPtt)));
	}		}
	@@ -137,7 +137,7 @@ module dPMR_TestCases {

	//Test body		//Test body
	v_mse.start(f_TC_connectionRequestTx_MS01());		v_mse.start(f_TC_connectionRequestTx_MS01());
	v_ut.start(f_TC_msAction_UT(m_commandCSF_utRequest( c_defaultPeerToPeerDialString ,		v_ut.start(f_TC_msAction_UT(e_toStandby, m_commandCSF_utRequest( c_defaultPeerToPeerDialString ,
	e_makeManualConnectionRequest)));		e_makeManualConnectionRequest)));

	// synchronize both PTCs		// synchronize both PTCs
	@@ -162,7 +162,7 @@ module dPMR_TestCases {

	//Test body		//Test body
	v_mse.start(f_TC_voiceWithAutomaticConnectionRequestOnlyCheckFramesTx_MS01());		v_mse.start(f_TC_voiceWithAutomaticConnectionRequestOnlyCheckFramesTx_MS01());
	v_ut.start(f_TC_msAction_UT(m_commandCSF_utRequest( c_defaultPeerToPeerDialString ,		v_ut.start(f_TC_msAction_UT(e_toStandby, m_commandCSF_utRequest( c_defaultPeerToPeerDialString ,
	e_makeOACSUCall)));		e_makeOACSUCall)));


	@@ -190,9 +190,8 @@ module dPMR_TestCases {

	//Test body		//Test body
	v_mse.start(f_TC_ackOnConnectionRequest_MS01());		v_mse.start(f_TC_ackOnConnectionRequest_MS01());
	v_ut.start(f_TC_msAction_UT(m_commandCSF_utRequest( c_defaultPeerToPeerDialString ,		v_ut.start(f_TC_msAction_UT(e_toStandby, m_commandCSF_utRequest( c_defaultPeerToPeerDialString ,
	e_ifOACSUEnabledPleaseAccept)));		e_ifOACSUEnabledPleaseAccept)));
	// TODOREMOVE v_ut.start(f_TC_msToStandby_UT( )); // TODO JP change to reequest:IfOACSUEnabledPleaseAccept

	// synchronize both PTCs		// synchronize both PTCs
	f_serverSync2ClientsAndStop({c_prDone});		f_serverSync2ClientsAndStop({c_prDone});
	@@ -242,7 +241,7 @@ module dPMR_TestCases {

	//Test body		//Test body
	v_mse.start(f_TC_disconnectionRequestTx_MS01());		v_mse.start(f_TC_disconnectionRequestTx_MS01());
	v_ut.start(f_TC_msAction_UT(		v_ut.start(f_TC_msAction_UT(e_toStandby,
	m_commandCSF_utRequest( c_defaultPeerToPeerDialString ,		m_commandCSF_utRequest( c_defaultPeerToPeerDialString ,
	e_makeManualDisconnectionRequest)));		e_makeManualDisconnectionRequest)));

	@@ -269,7 +268,7 @@ module dPMR_TestCases {

	//Test body		//Test body
	v_mse.start(f_TC_T1DataWithAutomaticDisconnectionRequestTx_MS01());		v_mse.start(f_TC_T1DataWithAutomaticDisconnectionRequestTx_MS01());
	v_ut.start(f_TC_msAction_UT(		v_ut.start(f_TC_msAction_UT(e_toStandby,
	m_commandCSF_utRequest( c_defaultPeerToPeerDialString ,		m_commandCSF_utRequest( c_defaultPeerToPeerDialString ,
	e_makeT1DataWithAutomaticDisconnectionRequest)));		e_makeT1DataWithAutomaticDisconnectionRequest)));

	@@ -298,7 +297,7 @@ module dPMR_TestCases {

	//Test body		//Test body
	v_mse.start(f_TC_voiceTx_MS01());		v_mse.start(f_TC_voiceTx_MS01());
	v_ut.start(f_TC_msAction_UT(m_commandISFCSF_utRequest( c_defaultPeerToPeerDialString,		v_ut.start(f_TC_msAction_UT(e_toStandby, m_commandISFCSF_utRequest( c_defaultPeerToPeerDialString,
	omit ,		omit ,
	e_pressPtt)));		e_pressPtt)));

	@@ -327,7 +326,7 @@ module dPMR_TestCases {

	//Test body		//Test body
	v_mse.start(f_TC_T3DataHeaderTx_MS01());		v_mse.start(f_TC_T3DataHeaderTx_MS01());
	v_ut.start(f_TC_msAction_UT(m_commandCSF_utRequest( c_defaultPeerToPeerDialString, e_makeT3DataCall))); // TODO JP must be wrong!!!!		v_ut.start(f_TC_msAction_UT(e_toStandby, m_commandCSF_utRequest( c_defaultPeerToPeerDialString, e_makeT3DataCall)));

	// synchronize both PTCs		// synchronize both PTCs
	f_serverSync2ClientsAndStop({c_prDone, c_tbDone});		f_serverSync2ClientsAndStop({c_prDone, c_tbDone});
	@@ -358,7 +357,7 @@ module dPMR_TestCases {

	//Test body		//Test body
	v_mse.start(f_TC_T1DataHeaderTx_MS01());		v_mse.start(f_TC_T1DataHeaderTx_MS01());
	v_ut.start(f_TC_msAction_UT(		v_ut.start(f_TC_msAction_UT(e_toStandby,
	m_commandCSF_utRequest( c_defaultPeerToPeerDialString ,		m_commandCSF_utRequest( c_defaultPeerToPeerDialString ,
	e_makeT1DataCall)));		e_makeT1DataCall)));

	@@ -389,7 +388,7 @@ module dPMR_TestCases {

	//Test body		//Test body
	v_mse.start(f_TC_T2DataHeaderTx_MS01());		v_mse.start(f_TC_T2DataHeaderTx_MS01());
	v_ut.start(f_TC_msAction_UT(		v_ut.start(f_TC_msAction_UT(e_toStandby,
	m_commandCSF_utRequest( c_defaultPeerToPeerDialString ,		m_commandCSF_utRequest( c_defaultPeerToPeerDialString ,
	e_makeT2DataCall)));		e_makeT2DataCall)));

	@@ -421,13 +420,13 @@ module dPMR_TestCases {
	//Test body		//Test body
	v_mse.start(f_TC_voiceTx_MS01());		v_mse.start(f_TC_voiceTx_MS01());
	if (PIC_ISF_OR_CSF == e_isf) {		if (PIC_ISF_OR_CSF == e_isf) {
	v_ut.start(f_TC_msAction_UT(		v_ut.start(f_TC_msAction_UT(e_toStandby,
	m_commandISFCSF_utRequest(		m_commandISFCSF_utRequest(
	omit ,		omit ,
	c_defaultCommonId,		c_defaultCommonId,
	e_pressPtt)));		e_pressPtt)));
	} else {		} else {
	v_ut.start(f_TC_msAction_UT(		v_ut.start(f_TC_msAction_UT(e_toStandby,
	m_commandISFCSF_utRequest(		m_commandISFCSF_utRequest(
	c_defaultPeerToPeerDialString,		c_defaultPeerToPeerDialString,
	omit ,		omit ,
	@@ -464,13 +463,13 @@ module dPMR_TestCases {
	//Test body		//Test body
	v_mse.start(f_TC_voiceTx_MS01()); // TODO Check if change needed!!		v_mse.start(f_TC_voiceTx_MS01()); // TODO Check if change needed!!
	if (PIC_ISF_OR_CSF == e_isf) {		if (PIC_ISF_OR_CSF == e_isf) {
	v_ut.start(f_TC_msAction_UT(		v_ut.start(f_TC_msAction_UT(e_toStandby,
	m_commandISFCSF_utRequest(		m_commandISFCSF_utRequest(
	omit ,		omit ,
	c_defaultCommonId,		c_defaultCommonId,
	e_pressPtt)));		e_pressPtt)));
	} else {		} else {
	v_ut.start(f_TC_msAction_UT(		v_ut.start(f_TC_msAction_UT(e_toStandby,
	m_commandISFCSF_utRequest(		m_commandISFCSF_utRequest(
	c_defaultPeerToPeerDialString,		c_defaultPeerToPeerDialString,
	omit ,		omit ,
	@@ -501,13 +500,13 @@ module dPMR_TestCases {
	//Test body		//Test body
	v_mse.start(f_TC_voiceTx_MS01()); // TODO Check if change needed!!		v_mse.start(f_TC_voiceTx_MS01()); // TODO Check if change needed!!
	if (PIC_ISF_OR_CSF == e_isf) {		if (PIC_ISF_OR_CSF == e_isf) {
	v_ut.start(f_TC_msAction_UT(		v_ut.start(f_TC_msAction_UT(e_toStandby,
	m_commandISFCSF_utRequest(		m_commandISFCSF_utRequest(
	omit ,		omit ,
	c_defaultCommonId,		c_defaultCommonId,
	e_pressPtt)));		e_pressPtt)));
	} else {		} else {
	v_ut.start(f_TC_msAction_UT(		v_ut.start(f_TC_msAction_UT(e_toStandby,
	m_commandISFCSF_utRequest(		m_commandISFCSF_utRequest(
	c_defaultPeerToPeerDialString,		c_defaultPeerToPeerDialString,
	omit ,		omit ,
	@@ -536,15 +535,15 @@ module dPMR_TestCases {
	f_cfMseUp(v_mse, v_ut);		f_cfMseUp(v_mse, v_ut);

	//Test body		//Test body
	v_mse.start(f_TC_voiceTxCheckCommsModeandCommsFormatIn_MS01()); // TODO Check if change needed!!		v_mse.start(f_TC_voiceTxCheckCommsModeandCommsFormatIn_MS01());
	if (PIC_ISF_OR_CSF == e_isf) {		if (PIC_ISF_OR_CSF == e_isf) {
	v_ut.start(f_TC_msAction_UT(		v_ut.start(f_TC_msAction_UT(e_toStandby,
	m_commandISFCSF_utRequest(		m_commandISFCSF_utRequest(
	omit ,		omit ,
	c_defaultCommonId,		c_defaultCommonId,
	e_pressPtt)));		e_pressPtt)));
	} else {		} else {
	v_ut.start(f_TC_msAction_UT(		v_ut.start(f_TC_msAction_UT(e_toStandby,
	m_commandISFCSF_utRequest(		m_commandISFCSF_utRequest(
	c_defaultPeerToPeerDialString,		c_defaultPeerToPeerDialString,
	omit ,		omit ,
	@@ -579,13 +578,13 @@ module dPMR_TestCases {
	//Test body		//Test body
	v_mse.start(f_TC_voiceTxCheckPowerSavePreambleAndCallInfoExtHeader_MS01());		v_mse.start(f_TC_voiceTxCheckPowerSavePreambleAndCallInfoExtHeader_MS01());
	if (PIC_ISF_OR_CSF == e_isf) {		if (PIC_ISF_OR_CSF == e_isf) {
	v_ut.start(f_TC_msAction_UT(		v_ut.start(f_TC_msAction_UT(e_toStandby,
	m_commandISFCSF_utRequest(		m_commandISFCSF_utRequest(
	omit ,		omit ,
	c_defaultCommonId,		c_defaultCommonId,
	e_makeMSPowersaveAndPressPtt)));		e_makeMSPowersaveAndPressPtt)));
	} else {		} else {
	v_ut.start(f_TC_msAction_UT(		v_ut.start(f_TC_msAction_UT(e_toStandby,
	m_commandISFCSF_utRequest(		m_commandISFCSF_utRequest(
	c_defaultPeerToPeerDialString,		c_defaultPeerToPeerDialString,
	omit ,		omit ,
	@@ -616,13 +615,13 @@ module dPMR_TestCases {
	//Test body		//Test body
	v_mse.start(f_TC_voiceTxCheckPowerSavePreambleAndCallInfoExtHeader_MS01());		v_mse.start(f_TC_voiceTxCheckPowerSavePreambleAndCallInfoExtHeader_MS01());
	if (PIC_ISF_OR_CSF == e_isf) {		if (PIC_ISF_OR_CSF == e_isf) {
	v_ut.start(f_TC_msAction_UT(		v_ut.start(f_TC_msAction_UT(e_toStandby,
	m_commandISFCSF_utRequest(		m_commandISFCSF_utRequest(
	omit ,		omit ,
	c_defaultCommonId,		c_defaultCommonId,
	e_makeMSPowersaveAndPressPtt)));		e_makeMSPowersaveAndPressPtt)));
	} else {		} else {
	v_ut.start(f_TC_msAction_UT(		v_ut.start(f_TC_msAction_UT(e_toStandby,
	m_commandISFCSF_utRequest(		m_commandISFCSF_utRequest(
	c_defaultPeerToPeerDialString,		c_defaultPeerToPeerDialString,
	omit ,		omit ,
	@@ -654,13 +653,13 @@ module dPMR_TestCases {
	//Test body		//Test body
	v_mse.start(f_TC_voiceTxCheckPowersaveCallInfoExtHeaders15_MS01());		v_mse.start(f_TC_voiceTxCheckPowersaveCallInfoExtHeaders15_MS01());
	if (PIC_ISF_OR_CSF == e_isf) {		if (PIC_ISF_OR_CSF == e_isf) {
	v_ut.start(f_TC_msAction_UT(		v_ut.start(f_TC_msAction_UT(e_toStandby,
	m_commandISFCSF_utRequest(		m_commandISFCSF_utRequest(
	omit ,		omit ,
	c_defaultCommonId,		c_defaultCommonId,
	e_makeMSPowersave15ExtHdrsAndPressPtt)));		e_makeMSPowersave15ExtHdrsAndPressPtt)));
	} else {		} else {
	v_ut.start(f_TC_msAction_UT(		v_ut.start(f_TC_msAction_UT(e_toStandby,
	m_commandISFCSF_utRequest(		m_commandISFCSF_utRequest(
	c_defaultPeerToPeerDialString,		c_defaultPeerToPeerDialString,
	omit ,		omit ,
	@@ -696,13 +695,13 @@ module dPMR_TestCases {
	//Test body		//Test body
	v_mse.start(f_TC_sendVoice_MS01());		v_mse.start(f_TC_sendVoice_MS01());
	if (PIC_ISF_OR_CSF == e_isf) {		if (PIC_ISF_OR_CSF == e_isf) {
	v_ut.start(f_TC_msAction_UT(		v_ut.start(f_TC_msAction_UT(e_toStandby,
	m_commandISFCSF_utRequest(		m_commandISFCSF_utRequest(
	omit ,		omit ,
	c_defaultCommonId,		c_defaultCommonId,
	e_enableTalkingPartyIDAndCheckThatTESTER_IdIsPresented)));		e_enableTalkingPartyIDAndCheckThatTESTER_IdIsPresented)));
	} else {		} else {
	v_ut.start(f_TC_msAction_UT(		v_ut.start(f_TC_msAction_UT(e_toStandby,
	m_commandISFCSF_utRequest(		m_commandISFCSF_utRequest(
	c_defaultPeerToPeerDialString,		c_defaultPeerToPeerDialString,
	omit ,		omit ,
	@@ -741,7 +740,7 @@ module dPMR_TestCases {

	//Test body		//Test body
	v_mse.start(f_TC_broadcastTx_MS01());		v_mse.start(f_TC_broadcastTx_MS01());
	v_ut.start(f_TC_msAction_UT(		v_ut.start(f_TC_msAction_UT(e_toStandby,
	m_commandISFCSF_utRequest(		m_commandISFCSF_utRequest(
	c_csfAllCallDialString,		c_csfAllCallDialString,
	omit ,		omit ,
	@@ -774,7 +773,7 @@ module dPMR_TestCases {

	//Test body		//Test body
	v_mse.start(f_TC_voiceTx_MS01());		v_mse.start(f_TC_voiceTx_MS01());
	v_ut.start(f_TC_msAction_UT(		v_ut.start(f_TC_msAction_UT(e_toStandby,
	m_commandISFCSF_utRequest(		m_commandISFCSF_utRequest(
	c_defaultPeerToPeerDialString,		c_defaultPeerToPeerDialString,
	omit ,		omit ,
	@@ -804,7 +803,7 @@ module dPMR_TestCases {

	//Test body		//Test body
	v_mse.start(f_TC_sendVoiceToGroup_MS01());		v_mse.start(f_TC_sendVoiceToGroup_MS01());
	v_ut.start(f_TC_msAction_UT(m_testToneDetected_utRequest( omit, c_defaultIutDialString ,e_testToneReceived)));		v_ut.start(f_TC_msAction_UT(e_toStandby, m_testToneDetected_utRequest( omit, c_defaultIutDialString ,e_testToneReceived)));


	// synchronize both PTCs		// synchronize both PTCs
	@@ -830,7 +829,7 @@ module dPMR_TestCases {

	//Test body		//Test body
	v_mse.start(f_TC_receiveNoVoice_MS01());		v_mse.start(f_TC_receiveNoVoice_MS01());
	v_ut.start(f_TC_msAction_UT(m_commandCSF_utRequest( c_defaultPeerToPeerDialString ,e_enterDialStrinDoNotPressSendOrHash)));		v_ut.start(f_TC_msAction_UT(e_toStandby, m_commandCSF_utRequest( c_defaultPeerToPeerDialString ,e_enterDialStrinDoNotPressSendOrHash)));


	// synchronize both PTCs		// synchronize both PTCs
	@@ -856,7 +855,7 @@ module dPMR_TestCases {

	//Test body		//Test body
	v_mse.start(f_TC_voiceTx_MS01());		v_mse.start(f_TC_voiceTx_MS01());
	v_ut.start(f_TC_msAction_UT(m_commandCSF_utRequest( c_defaultPeerToPeerDialString,		v_ut.start(f_TC_msAction_UT(e_toStandby, m_commandCSF_utRequest( c_defaultPeerToPeerDialString,
	e_enterDialStringAndPressSendKeyOrHash)));		e_enterDialStringAndPressSendKeyOrHash)));

	// synchronize both PTCs		// synchronize both PTCs
	@@ -887,7 +886,7 @@ module dPMR_TestCases {
	v_mse.start(f_TC_T1orT2DataTx_MS01(		v_mse.start(f_TC_T1orT2DataTx_MS01(
	e_dataT2,		e_dataT2,
	mw_slowData(?,e_freeTextMessage,?,?)));		mw_slowData(?,e_freeTextMessage,?,?)));
	v_ut.start(f_TC_msAction_UT(		v_ut.start(f_TC_msAction_UT(e_toStandby,
	m_commandCSF_utRequest( c_defaultPeerToPeerDialString ,		m_commandCSF_utRequest( c_defaultPeerToPeerDialString ,
	e_makeT2DataCallWithFreeTextMessage)));		e_makeT2DataCallWithFreeTextMessage)));

	@@ -920,7 +919,7 @@ module dPMR_TestCases {
	v_mse.start(f_TC_T1orT2DataTx_MS01(		v_mse.start(f_TC_T1orT2DataTx_MS01(
	e_dataT2,		e_dataT2,
	mw_slowData(?,e_precodedMessage,?,?)));		mw_slowData(?,e_precodedMessage,?,?)));
	v_ut.start(f_TC_msAction_UT(		v_ut.start(f_TC_msAction_UT(e_toStandby,
	m_commandCSF_utRequest( c_defaultPeerToPeerDialString ,		m_commandCSF_utRequest( c_defaultPeerToPeerDialString ,
	e_makeT2DataCallWithFreeTextMessage)));		e_makeT2DataCallWithFreeTextMessage)));

	@@ -955,7 +954,7 @@ module dPMR_TestCases {

	//Test body		//Test body
	v_mse.start(f_TC_voiceWithAutomaticConnectionRequestTx_MS01());		v_mse.start(f_TC_voiceWithAutomaticConnectionRequestTx_MS01());
	v_ut.start(f_TC_msAction_UT(m_commandCSF_utRequest( c_defaultPeerToPeerDialString ,		v_ut.start(f_TC_msAction_UT(e_toStandby, m_commandCSF_utRequest( c_defaultPeerToPeerDialString ,
	e_makeOACSUCall)));		e_makeOACSUCall)));


	@@ -984,7 +983,7 @@ module dPMR_TestCases {

	//Test body		//Test body
	v_mse.start(f_TC_connectionRequestTxSendAck_MS01(e_ack));		v_mse.start(f_TC_connectionRequestTxSendAck_MS01(e_ack));
	v_ut.start(f_TC_msAction_UT(m_commandCSF_utRequest( c_defaultPeerToPeerDialString ,		v_ut.start(f_TC_msAction_UT(e_toStandby, m_commandCSF_utRequest( c_defaultPeerToPeerDialString ,
	e_makeOACSUCallandSayOkWhenDisplayedThatCallCanStart)));		e_makeOACSUCallandSayOkWhenDisplayedThatCallCanStart)));

	// synchronize both PTCs		// synchronize both PTCs
	@@ -1008,7 +1007,7 @@ module dPMR_TestCases {

	//Test body		//Test body
	v_mse.start(f_TC_connectionRequestTxSendAck_MS01(e_nackReqDenied));		v_mse.start(f_TC_connectionRequestTxSendAck_MS01(e_nackReqDenied));
	v_ut.start(f_TC_msAction_UT(m_commandCSF_utRequest( c_defaultPeerToPeerDialString ,		v_ut.start(f_TC_msAction_UT(e_toStandby, m_commandCSF_utRequest( c_defaultPeerToPeerDialString ,
	e_makeOACSUCallAndCheckCallFail)));		e_makeOACSUCallAndCheckCallFail)));

	// synchronize both PTCs		// synchronize both PTCs
	@@ -1038,7 +1037,7 @@ module dPMR_TestCases {

	//Test body		//Test body
	v_mse.start(f_TC_voiceTXCheckSLD_MS01(e_callAll));		v_mse.start(f_TC_voiceTXCheckSLD_MS01(e_callAll));
	v_ut.start(f_TC_msAction_UT(m_commandCSF_utRequest( c_defaultCallGroupDialString ,		v_ut.start(f_TC_msAction_UT(e_toStandby, m_commandCSF_utRequest( c_defaultCallGroupDialString ,
	e_enableSlowDataAndSetPresetSlowDataAndPresPtt)));		e_enableSlowDataAndSetPresetSlowDataAndPresPtt)));

	// synchronize both PTCs		// synchronize both PTCs
	@@ -1062,7 +1061,7 @@ module dPMR_TestCases {

	//Test body		//Test body
	v_mse.start(f_TC_voiceTXCheckSLD_MS01(e_callAll));		v_mse.start(f_TC_voiceTXCheckSLD_MS01(e_callAll));
	v_ut.start(f_TC_msAction_UT(m_commandCSF_utRequest( c_defaultPeerToPeerDialString ,		v_ut.start(f_TC_msAction_UT(e_toStandby, m_commandCSF_utRequest( c_defaultPeerToPeerDialString ,
	e_enableSlowDataAndSetPresetSlowDataAndPresPtt)));		e_enableSlowDataAndSetPresetSlowDataAndPresPtt)));

	// synchronize both PTCs		// synchronize both PTCs
	@@ -1088,7 +1087,7 @@ module dPMR_TestCases {

	//Test body		//Test body
	v_mse.start(f_TC_T3DataHeaderTx_MS01());		v_mse.start(f_TC_T3DataHeaderTx_MS01());
	v_ut.start(f_TC_msAction_UT(m_commandCSF_utRequest( c_defaultPeerToPeerDialString, e_makeT3DataCall))); // TODO JP must be wrong!!!!		v_ut.start(f_TC_msAction_UT(e_toStandby, m_commandCSF_utRequest( c_defaultPeerToPeerDialString, e_makeT3DataCall)));

	// synchronize both PTCs		// synchronize both PTCs
	f_serverSync2ClientsAndStop({c_prDone, c_tbDone});		f_serverSync2ClientsAndStop({c_prDone, c_tbDone});
	@@ -1110,7 +1109,7 @@ module dPMR_TestCases {

	//Test body		//Test body
	v_mse.start(f_TC_ackOnT3Data_MS01());		v_mse.start(f_TC_ackOnT3Data_MS01());
	v_ut.start(f_TC_msAction_UT(m_commandCSF_utRequest( c_defaultPeerToPeerDialString, e_receiveT3DataCall))); // TODO JP must be wrong!!!!		v_ut.start(f_TC_msAction_UT(e_toStandby, m_commandCSF_utRequest( c_defaultPeerToPeerDialString, e_receiveT3DataCall)));

	// synchronize both PTCs		// synchronize both PTCs
	f_serverSync2ClientsAndStop({c_prDone, c_tbDone});		f_serverSync2ClientsAndStop({c_prDone, c_tbDone});
	@@ -1131,7 +1130,7 @@ module dPMR_TestCases {

	//Test body		//Test body
	v_mse.start(f_TC_nackOnT3Data_MS01());		v_mse.start(f_TC_nackOnT3Data_MS01());
	v_ut.start(f_TC_msAction_UT(m_commandCSF_utRequest( c_defaultPeerToPeerDialString, e_receiveT3DataCall))); // TODO JP must be wrong!!!!		v_ut.start(f_TC_msAction_UT(e_toStandby, m_commandCSF_utRequest( c_defaultPeerToPeerDialString, e_receiveT3DataCall)));

	// synchronize both PTCs		// synchronize both PTCs
	f_serverSync2ClientsAndStop({c_prDone, c_tbDone});		f_serverSync2ClientsAndStop({c_prDone, c_tbDone});
	@@ -1400,7 +1399,7 @@ module dPMR_TestCases {
	//Test Body		//Test Body
	tc_ac.start ;		tc_ac.start ;
	dp1Port.send( m_voiceorT1orT2PayloadTransmission(		dp1Port.send( m_voiceorT1orT2PayloadTransmission(
	m_packetDataHeaderFrame( // todo jp this is wrong template, this should be only for t3!		m_headerFrame(
	m_headerInformation(		m_headerInformation(
	e_commStartHeader,		e_commStartHeader,
	vc_mse.iutId,		vc_mse.iutId,
	@@ -1436,10 +1435,10 @@ module dPMR_TestCases {
	e_shortFileTransfer,		e_shortFileTransfer,
	e_finishAfterFrame,		e_finishAfterFrame,
	PXT_DATA_T1_F4_length)))),		PXT_DATA_T1_F4_length)))),
	m_endFrame(m_endInformationAck))); // TODO is this correct?		m_endFrame(m_endInformationAck)));

	alt {		alt {
	[] dp1Port.receive(m_acknowledgement( // TODO check if ok.		[] dp1Port.receive(m_acknowledgement(
	m_headerInformation(e_ackHeader, vc_mse.testerId, vc_mse.iutId, e_voice, e_p2p),		m_headerInformation(e_ackHeader, vc_mse.testerId, vc_mse.iutId, e_voice, e_p2p),
	vc_mse.colourCode)		vc_mse.colourCode)
	)		)
	@@ -1479,7 +1478,7 @@ module dPMR_TestCases {

	//Test Body		//Test Body
	tc_ac.start ;		tc_ac.start ;
	dp1Port.send( m_T3DataPayloadTransmission( // todo check it does not contain matching!		dp1Port.send( m_T3DataPayloadTransmission(
	m_packetDataHeaderFrame(		m_packetDataHeaderFrame(
	m_headerInformation(		m_headerInformation(
	e_commStartHeader,		e_commStartHeader,
	@@ -1495,14 +1494,14 @@ module dPMR_TestCases {
	32,		32,
	PXT_SINGLE_T3_DATA_FRAME_CRC,		PXT_SINGLE_T3_DATA_FRAME_CRC,
	PXT_SINGLE_T3_DATA_FRAME)),		PXT_SINGLE_T3_DATA_FRAME)),
	m_endFrame(m_endInformationAck)));// TODO is this correct?		m_endFrame(m_endInformationAck)));

	alt {		alt {
	[] dp1Port.receive(m_acknowledgement(		[] dp1Port.receive(m_acknowledgement(
	mw_ackHeaderInformationTx(		mw_ackHeaderInformationTx(
	vc_mse.testerId,		vc_mse.testerId,
	vc_mse.iutId,		vc_mse.iutId,
	e_voice,		e_dataT3,
	e_p2p,		e_p2p,
	e_ack),		e_ack),
	vc_mse.colourCode)		vc_mse.colourCode)
	@@ -1544,7 +1543,7 @@ module dPMR_TestCases {

	//Test Body		//Test Body
	tc_ac.start ;		tc_ac.start ;
	dp1Port.send( m_T3DataPayloadTransmission(// todo check it does not contain matching!		dp1Port.send( m_T3DataPayloadTransmission(
	m_packetDataHeaderFrame(		m_packetDataHeaderFrame(
	m_headerInformation(		m_headerInformation(
	e_commStartHeader,		e_commStartHeader,
	@@ -1578,7 +1577,7 @@ module dPMR_TestCases {
	32,		32,
	PXT_SINGLE_T3_DATA_FRAME_WRONG_CRC,		PXT_SINGLE_T3_DATA_FRAME_WRONG_CRC,
	PXT_SINGLE_T3_DATA_FRAME)),		PXT_SINGLE_T3_DATA_FRAME)),
	m_endFrame(m_endInformationAck)));// TODO is this correct?		m_endFrame(m_endInformationAck)));

	alt {		alt {
	[] dp1Port.receive(m_acknowledgement(		[] dp1Port.receive(m_acknowledgement(
	@@ -2130,7 +2129,7 @@ module dPMR_TestCases {

	/**		/**
	* @desc Check that a T3 Data message is received		* @desc Check that a T3 Data message is received
	// TODO can this be removed???		// TODOTODO
	*		*
	*/		*/
	/* function f_TC_T3Tx_MS01 (CommunicationsMode p_commsMode )		/* function f_TC_T3Tx_MS01 (CommunicationsMode p_commsMode )
	@@ -2759,7 +2758,7 @@ module dPMR_TestCases {
	* @param p_actionRequest the request for action		* @param p_actionRequest the request for action
	*		*
	*/		*/
	function f_TC_msAction_UT(in template UtRequest p_utRequest) runs on Ut {		function f_TC_msAction_UT(UtActParams p_utCfgParam,in template UtRequest p_utRequest) runs on Ut {
	//Variables		//Variables
	var default v_dftUt;		var default v_dftUt;
	var FncRetCode v_ret := e_success;		var FncRetCode v_ret := e_success;
	@@ -2773,7 +2772,7 @@ module dPMR_TestCases {
	v_dftUt := activate(a_dftUt());		v_dftUt := activate(a_dftUt());

	//Preamble		//Preamble
	v_ret := f_msToStandby_UT();		v_ret := f_msToStandby_UT(p_utCfgParam);
	f_clientSyncAndVerdict(c_prDone, v_ret);		f_clientSyncAndVerdict(c_prDone, v_ret);

	//Test body		//Test body
	@@ -2805,7 +2804,7 @@ module dPMR_TestCases {
	//Default		//Default
	v_dftUt := activate(a_dftUt());		v_dftUt := activate(a_dftUt());

	v_ret := f_msToStandby_UT();		v_ret := f_msToStandby_UT(e_toStandby);

	f_clientSyncAndVerdict(c_prDone, v_ret);		f_clientSyncAndVerdict(c_prDone, v_ret);

ttcn/dPMR_TestExecution.ttcn

+0 −27

Original line number	Original line	Diff line number	Diff line
	@@ -137,32 +137,5 @@ module dPMR_TestExecution {
	//} // end group ISF_only		//} // end group ISF_only


	// Group:












	// TODO TO BE DONE


	// execute(TC_PMR_0802_01( PIC_COLOUR_CODE ) ); // Group: Late Entry

	// execute(TC_PMR_1103_01( PIC_COLOUR_CODE ) ); // Group: Powersave preamble

	// execute(TC_PMR_0852_01( PIC_COLOUR_CODE ) ); // Group: CSF Individual short data

	// execute(TP_PMR_0837_01( PIC_COLOUR_CODE ) ); // Group: CSF Short appended data

	// }


	} // end control		} // end control
	} // end module dPMR_TestExecution		} // end module dPMR_TestExecution

ttcn/dPMR_Types.ttcn

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -570,7 +570,9 @@ module dPMR_Types {
	e_makeOACSUCallAndCheckCallFail (20), // Make a OACSU call and Check That Call Fail		e_makeOACSUCallAndCheckCallFail (20), // Make a OACSU call and Check That Call Fail
	e_enableSlowDataAndSetPresetSlowDataAndPresPtt (21), // Enable Slow Data and Set Preset Slow Data and press Ptt		e_enableSlowDataAndSetPresetSlowDataAndPresPtt (21), // Enable Slow Data and Set Preset Slow Data and press Ptt
	e_makeT3DataCall (22), // Make a T3 data call with preset data???		e_makeT3DataCall (22), // Make a T3 data call with preset data???
	e_receiveT3DataCall (23) // receive T3 data call		e_receiveT3DataCall (23), // receive T3 data call
			e_toStandby (24), // Please put the MS to standby
			e_enablePowersaveMode (25) // Enable Powersave Mode
	}		}

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