Commit fbfab76d authored by petersenj's avatar petersenj
Browse files

Some TODO removed, some left, I need to discuss these...

parent 9656afdb

ttcn/dPMR_Pics.ttcn

+0 −7
Original line number Diff line number Diff line
@@ -281,8 +281,6 @@ module dPMR_Pics { 
		*/

		modulepar {boolean PIC_CSF_T3Data_INDIVIDUAL_DATA_MESSAGE := true}



	// TODO Table A.13 not needed!



	

		/**

		* @desc  	Is the CSF Type 2 Data IUT is supporting IP over dPMR?
@@ -574,11 +572,6 @@ module dPMR_Pics { 
		modulepar {boolean PIC_MS_POLITE_OWN_CC := true}

		

	

		



			// TODO Table A.25		 not needed

			

	

		/**

		* @desc  	Is the Channel Check Timer

		* @remark	see PICS, Table A.26/1.

ttcn/dPMR_Templates.ttcn

+0 −2
Original line number Diff line number Diff line
@@ -21,8 +21,6 @@ 
	import from dPMR_Types all;

	import from dPMR_Values all;



	//TODO group templates in Acknowledegment / ConnectionReq / Disconnect / SuperFrame





	group MessageTemplates {

		group AcknowledegmentTemplates {

ttcn/dPMR_TestCases.ttcn

+6 −7
Original line number Diff line number Diff line
@@ -3101,8 +3101,8 @@ module dPMR_TestCases { 
			/**

			* 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.) all these are now in dPMR_values not in the PIXIT

			testcase TC_PMR_1310_04(   ) 	

			runs on ServerSyncComp			

			system TestAdapter {

		      	var Mse v_mse;

				var Ut v_ut;
@@ -5283,7 +5283,7 @@ module dPMR_TestCases { 
			f_clientSyncAndVerdict(c_prDone, v_ret);



			//Test Body

			tc_ac.start ;

			tc_ac.start ; // TODO use  another value on the timer!!!!!!!!!!

			alt {

			[] dp1Port.receive(	m_voiceorT1orT2PayloadTransmission(

									m_headerFrame(
@@ -5306,9 +5306,8 @@ module dPMR_TestCases { 
					setverdict(fail);

					log("**** f_TC_voiceTxNotTransmitted_MS01: : data received when that should not be sent ****");

				}

			[] tc_ac.timeout // TODO JP seams that this is 2 secconds, is this correct???

			[] tc_ac.timeout 

			  	{

					// TODO JP might be neccessary to set this within the testtone period that should be about 1 minute

					setverdict(pass);	

				}

			} // end alt
@@ -5603,7 +5602,7 @@ module dPMR_TestCases { 
					}

					else

					{

						// received 15 ok, lets check they are decreasing //TODO JP should we consider headerInformation1 as well?

						// received 15 ok, lets check they are decreasing //TODO JP comment: should we consider headerInformation1 as well?

						v_testCaseOk := true;

						v_testCaseOk := v_testCaseOk and (v_payloadTransmission.extHdrFrameList[0].headerInformation0.callInformation.ciInformationNormalOrPws.ciInfoNormalOrPws.ciInformationPws == e_extHdrFrame15);

						v_testCaseOk := v_testCaseOk and (v_payloadTransmission.extHdrFrameList[1].headerInformation0.callInformation.ciInformationNormalOrPws.ciInfoNormalOrPws.ciInformationPws == e_extHdrFrame14);
@@ -6193,7 +6192,7 @@ module dPMR_TestCases { 
										vc_mse.iutId, 

										e_dataT3, 

										e_p2p,

										m_dataT3callInfoAck(e_nackReqResend,'00000011'B)), // TODO number3???

										m_dataT3callInfoAck(e_nackReqResend,'00000011'B)), // TODO number3??? as constant?

								 	vc_mse.colourCode)); // normal ack

					//now receive resend.

					alt {

ttcn/dPMR_TestExecution.ttcn

+35 −35
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ module dPMR_TestExecution { 
				PIC_AUTOMATIC_CONNECTION_REQUEST and

				PIC_CSF_VOICE_SUPPORT and PIC_CSF_VOICE_SS_OACSU) 	{execute(TC_PMR_0405_02() );}



			if ((PIC_ISF_OR_CSF == e_csf) and PIC_CSF_VOICE_SUPPORT) {execute(TC_PMR_0406_01() );} //TODO remark that voice support is perhaps optional according to Pete

			if ((PIC_ISF_OR_CSF == e_csf) and PIC_CSF_VOICE_SUPPORT) {execute(TC_PMR_0406_01() );} 



			if ((PIC_ISF_OR_CSF == e_csf) and PIC_CSF_TYPE_1_DATA_SUPPORT) {execute(TC_PMR_0406_02() );} 

			if ((PIC_ISF_OR_CSF == e_csf) and PIC_CSF_TYPE_2_DATA_SUPPORT) {execute(TC_PMR_0406_03() );}
@@ -80,39 +80,39 @@ module dPMR_TestExecution { 






			if ((PIC_ISF_OR_CSF == e_csf) and PIC_CSF_VOICE_SUPPORT) {execute(TC_PMR_0811_01({csfColourCode :=c_grpBcf1}, e_useCsfChannel1) );} // TODO! just change a few parameters and all colour code TCs are covered.

			if ((PIC_ISF_OR_CSF == e_csf) and PIC_CSF_VOICE_SUPPORT) {execute(TC_PMR_0811_02({csfColourCode :=c_grpBcf2}, e_useCsfChannel2) );} // TODO! just change a few parameters and all colour code TCs are covered.

			if ((PIC_ISF_OR_CSF == e_csf) and PIC_CSF_VOICE_SUPPORT) {execute(TC_PMR_0811_03({csfColourCode :=c_grpBcf3}, e_useCsfChannel3) );} // TODO! just change a few parameters and all colour code TCs are covered.

			if ((PIC_ISF_OR_CSF == e_csf) and PIC_CSF_VOICE_SUPPORT) {execute(TC_PMR_0811_04({csfColourCode :=c_grpBcf4}, e_useCsfChannel4) );} // TODO! just change a few parameters and all colour code TCs are covered.

			if ((PIC_ISF_OR_CSF == e_csf) and PIC_CSF_VOICE_SUPPORT) {execute(TC_PMR_0811_05({csfColourCode :=c_grpBcf5}, e_useCsfChannel5) );} // TODO! just change a few parameters and all colour code TCs are covered.

			if ((PIC_ISF_OR_CSF == e_csf) and PIC_CSF_VOICE_SUPPORT) {execute(TC_PMR_0811_06({csfColourCode :=c_grpBcf6}, e_useCsfChannel6) );} // TODO! just change a few parameters and all colour code TCs are covered.

			if ((PIC_ISF_OR_CSF == e_csf) and PIC_CSF_VOICE_SUPPORT) {execute(TC_PMR_0811_07({csfColourCode :=c_grpBcf7}, e_useCsfChannel7) );} // TODO! just change a few parameters and all colour code TCs are covered.

			if ((PIC_ISF_OR_CSF == e_csf) and PIC_CSF_VOICE_SUPPORT) {execute(TC_PMR_0811_08({csfColourCode :=c_grpBcf8}, e_useCsfChannel8) );} // TODO! just change a few parameters and all colour code TCs are covered.

			if ((PIC_ISF_OR_CSF == e_csf) and PIC_CSF_VOICE_SUPPORT) {execute(TC_PMR_0811_09({csfColourCode :=c_grpBcf9}, e_useCsfChannel9) );} // TODO! just change a few parameters and all colour code TCs are covered.

			if ((PIC_ISF_OR_CSF == e_csf) and PIC_CSF_VOICE_SUPPORT) {execute(TC_PMR_0811_10({csfColourCode :=c_grpBcf10}, e_useCsfChannel10) );} // TODO! just change a few parameters and all colour code TCs are covered.

			if ((PIC_ISF_OR_CSF == e_csf) and PIC_CSF_VOICE_SUPPORT) {execute(TC_PMR_0811_11({csfColourCode :=c_grpBcf11}, e_useCsfChannel11) );} // TODO! just change a few parameters and all colour code TCs are covered.

			if ((PIC_ISF_OR_CSF == e_csf) and PIC_CSF_VOICE_SUPPORT) {execute(TC_PMR_0811_12({csfColourCode :=c_grpBcf12}, e_useCsfChannel12) );} // TODO! just change a few parameters and all colour code TCs are covered.

			if ((PIC_ISF_OR_CSF == e_csf) and PIC_CSF_VOICE_SUPPORT) {execute(TC_PMR_0811_13({csfColourCode :=c_grpBcf13}, e_useCsfChannel13) );} // TODO! just change a few parameters and all colour code TCs are covered.

			if ((PIC_ISF_OR_CSF == e_csf) and PIC_CSF_VOICE_SUPPORT) {execute(TC_PMR_0811_14({csfColourCode :=c_grpBcf14}, e_useCsfChannel14) );} // TODO! just change a few parameters and all colour code TCs are covered.

			if ((PIC_ISF_OR_CSF == e_csf) and PIC_CSF_VOICE_SUPPORT) {execute(TC_PMR_0811_15({csfColourCode :=c_grpBcf15}, e_useCsfChannel15) );} // TODO! just change a few parameters and all colour code TCs are covered.

			if ((PIC_ISF_OR_CSF == e_csf) and PIC_CSF_VOICE_SUPPORT) {execute(TC_PMR_0811_16({csfColourCode :=c_grpBcf16}, e_useCsfChannel16) );} // TODO! just change a few parameters and all colour code TCs are covered.



			if ((PIC_ISF_OR_CSF == e_isf) and PIC_ISF_VOICE_SUPPORT) {execute(TC_PMR_0812_01({isfColourCode :=c_grpAcf1}, e_useIsfChannel1) );} // TODO! just change a few parameters and all colour code TCs are covered.

			if ((PIC_ISF_OR_CSF == e_isf) and PIC_ISF_VOICE_SUPPORT) {execute(TC_PMR_0812_02({isfColourCode :=c_grpAcf2}, e_useIsfChannel2) );} // TODO! just change a few parameters and all colour code TCs are covered.

			if ((PIC_ISF_OR_CSF == e_isf) and PIC_ISF_VOICE_SUPPORT) {execute(TC_PMR_0812_03({isfColourCode :=c_grpAcf3}, e_useIsfChannel3) );} // TODO! just change a few parameters and all colour code TCs are covered.

			if ((PIC_ISF_OR_CSF == e_isf) and PIC_ISF_VOICE_SUPPORT) {execute(TC_PMR_0812_04({isfColourCode :=c_grpAcf4}, e_useIsfChannel4) );} // TODO! just change a few parameters and all colour code TCs are covered.

			if ((PIC_ISF_OR_CSF == e_isf) and PIC_ISF_VOICE_SUPPORT) {execute(TC_PMR_0812_05({isfColourCode :=c_grpAcf5}, e_useIsfChannel5) );} // TODO! just change a few parameters and all colour code TCs are covered.

			if ((PIC_ISF_OR_CSF == e_isf) and PIC_ISF_VOICE_SUPPORT) {execute(TC_PMR_0812_06({isfColourCode :=c_grpAcf6}, e_useIsfChannel6) );} // TODO! just change a few parameters and all colour code TCs are covered.

			if ((PIC_ISF_OR_CSF == e_isf) and PIC_ISF_VOICE_SUPPORT) {execute(TC_PMR_0812_07({isfColourCode :=c_grpAcf7}, e_useIsfChannel7) );} // TODO! just change a few parameters and all colour code TCs are covered.

			if ((PIC_ISF_OR_CSF == e_isf) and PIC_ISF_VOICE_SUPPORT) {execute(TC_PMR_0812_08({isfColourCode :=c_grpAcf8}, e_useIsfChannel8) );} // TODO! just change a few parameters and all colour code TCs are covered.

			if ((PIC_ISF_OR_CSF == e_isf) and PIC_ISF_VOICE_SUPPORT) {execute(TC_PMR_0812_09({isfColourCode :=c_grpAcf9}, e_useIsfChannel9) );} // TODO! just change a few parameters and all colour code TCs are covered.

			if ((PIC_ISF_OR_CSF == e_isf) and PIC_ISF_VOICE_SUPPORT) {execute(TC_PMR_0812_10({isfColourCode :=c_grpAcf10}, e_useIsfChannel10) );} // TODO! just change a few parameters and all colour code TCs are covered.

			if ((PIC_ISF_OR_CSF == e_isf) and PIC_ISF_VOICE_SUPPORT) {execute(TC_PMR_0812_11({isfColourCode :=c_grpAcf11}, e_useIsfChannel11) );} // TODO! just change a few parameters and all colour code TCs are covered.

			if ((PIC_ISF_OR_CSF == e_isf) and PIC_ISF_VOICE_SUPPORT) {execute(TC_PMR_0812_12({isfColourCode :=c_grpAcf12}, e_useIsfChannel12) );} // TODO! just change a few parameters and all colour code TCs are covered.

			if ((PIC_ISF_OR_CSF == e_isf) and PIC_ISF_VOICE_SUPPORT) {execute(TC_PMR_0812_13({isfColourCode :=c_grpAcf13}, e_useIsfChannel13) );} // TODO! just change a few parameters and all colour code TCs are covered.

			if ((PIC_ISF_OR_CSF == e_isf) and PIC_ISF_VOICE_SUPPORT) {execute(TC_PMR_0812_14({isfColourCode :=c_grpAcf14}, e_useIsfChannel14) );} // TODO! just change a few parameters and all colour code TCs are covered.

			if ((PIC_ISF_OR_CSF == e_isf) and PIC_ISF_VOICE_SUPPORT) {execute(TC_PMR_0812_15({isfColourCode :=c_grpAcf15}, e_useIsfChannel15) );} // TODO! just change a few parameters and all colour code TCs are covered.

			if ((PIC_ISF_OR_CSF == e_isf) and PIC_ISF_VOICE_SUPPORT) {execute(TC_PMR_0812_16({isfColourCode :=c_grpAcf16}, e_useIsfChannel16) );} // TODO! just change a few parameters and all colour code TCs are covered.

			if ((PIC_ISF_OR_CSF == e_csf) and PIC_CSF_VOICE_SUPPORT) {execute(TC_PMR_0811_01({csfColourCode :=c_grpBcf1}, e_useCsfChannel1) );} 

			if ((PIC_ISF_OR_CSF == e_csf) and PIC_CSF_VOICE_SUPPORT) {execute(TC_PMR_0811_02({csfColourCode :=c_grpBcf2}, e_useCsfChannel2) );} 

			if ((PIC_ISF_OR_CSF == e_csf) and PIC_CSF_VOICE_SUPPORT) {execute(TC_PMR_0811_03({csfColourCode :=c_grpBcf3}, e_useCsfChannel3) );} 

			if ((PIC_ISF_OR_CSF == e_csf) and PIC_CSF_VOICE_SUPPORT) {execute(TC_PMR_0811_04({csfColourCode :=c_grpBcf4}, e_useCsfChannel4) );} 

			if ((PIC_ISF_OR_CSF == e_csf) and PIC_CSF_VOICE_SUPPORT) {execute(TC_PMR_0811_05({csfColourCode :=c_grpBcf5}, e_useCsfChannel5) );} 

			if ((PIC_ISF_OR_CSF == e_csf) and PIC_CSF_VOICE_SUPPORT) {execute(TC_PMR_0811_06({csfColourCode :=c_grpBcf6}, e_useCsfChannel6) );} 

			if ((PIC_ISF_OR_CSF == e_csf) and PIC_CSF_VOICE_SUPPORT) {execute(TC_PMR_0811_07({csfColourCode :=c_grpBcf7}, e_useCsfChannel7) );} 

			if ((PIC_ISF_OR_CSF == e_csf) and PIC_CSF_VOICE_SUPPORT) {execute(TC_PMR_0811_08({csfColourCode :=c_grpBcf8}, e_useCsfChannel8) );} 

			if ((PIC_ISF_OR_CSF == e_csf) and PIC_CSF_VOICE_SUPPORT) {execute(TC_PMR_0811_09({csfColourCode :=c_grpBcf9}, e_useCsfChannel9) );} 

			if ((PIC_ISF_OR_CSF == e_csf) and PIC_CSF_VOICE_SUPPORT) {execute(TC_PMR_0811_10({csfColourCode :=c_grpBcf10}, e_useCsfChannel10) );} 

			if ((PIC_ISF_OR_CSF == e_csf) and PIC_CSF_VOICE_SUPPORT) {execute(TC_PMR_0811_11({csfColourCode :=c_grpBcf11}, e_useCsfChannel11) );} 

			if ((PIC_ISF_OR_CSF == e_csf) and PIC_CSF_VOICE_SUPPORT) {execute(TC_PMR_0811_12({csfColourCode :=c_grpBcf12}, e_useCsfChannel12) );} 

			if ((PIC_ISF_OR_CSF == e_csf) and PIC_CSF_VOICE_SUPPORT) {execute(TC_PMR_0811_13({csfColourCode :=c_grpBcf13}, e_useCsfChannel13) );} 

			if ((PIC_ISF_OR_CSF == e_csf) and PIC_CSF_VOICE_SUPPORT) {execute(TC_PMR_0811_14({csfColourCode :=c_grpBcf14}, e_useCsfChannel14) );} 

			if ((PIC_ISF_OR_CSF == e_csf) and PIC_CSF_VOICE_SUPPORT) {execute(TC_PMR_0811_15({csfColourCode :=c_grpBcf15}, e_useCsfChannel15) );} 

			if ((PIC_ISF_OR_CSF == e_csf) and PIC_CSF_VOICE_SUPPORT) {execute(TC_PMR_0811_16({csfColourCode :=c_grpBcf16}, e_useCsfChannel16) );} 



			if ((PIC_ISF_OR_CSF == e_isf) and PIC_ISF_VOICE_SUPPORT) {execute(TC_PMR_0812_01({isfColourCode :=c_grpAcf1}, e_useIsfChannel1) );} 

			if ((PIC_ISF_OR_CSF == e_isf) and PIC_ISF_VOICE_SUPPORT) {execute(TC_PMR_0812_02({isfColourCode :=c_grpAcf2}, e_useIsfChannel2) );} 

			if ((PIC_ISF_OR_CSF == e_isf) and PIC_ISF_VOICE_SUPPORT) {execute(TC_PMR_0812_03({isfColourCode :=c_grpAcf3}, e_useIsfChannel3) );} 

			if ((PIC_ISF_OR_CSF == e_isf) and PIC_ISF_VOICE_SUPPORT) {execute(TC_PMR_0812_04({isfColourCode :=c_grpAcf4}, e_useIsfChannel4) );} 

			if ((PIC_ISF_OR_CSF == e_isf) and PIC_ISF_VOICE_SUPPORT) {execute(TC_PMR_0812_05({isfColourCode :=c_grpAcf5}, e_useIsfChannel5) );} 

			if ((PIC_ISF_OR_CSF == e_isf) and PIC_ISF_VOICE_SUPPORT) {execute(TC_PMR_0812_06({isfColourCode :=c_grpAcf6}, e_useIsfChannel6) );} 

			if ((PIC_ISF_OR_CSF == e_isf) and PIC_ISF_VOICE_SUPPORT) {execute(TC_PMR_0812_07({isfColourCode :=c_grpAcf7}, e_useIsfChannel7) );} 

			if ((PIC_ISF_OR_CSF == e_isf) and PIC_ISF_VOICE_SUPPORT) {execute(TC_PMR_0812_08({isfColourCode :=c_grpAcf8}, e_useIsfChannel8) );} 

			if ((PIC_ISF_OR_CSF == e_isf) and PIC_ISF_VOICE_SUPPORT) {execute(TC_PMR_0812_09({isfColourCode :=c_grpAcf9}, e_useIsfChannel9) );} 

			if ((PIC_ISF_OR_CSF == e_isf) and PIC_ISF_VOICE_SUPPORT) {execute(TC_PMR_0812_10({isfColourCode :=c_grpAcf10}, e_useIsfChannel10) );} 

			if ((PIC_ISF_OR_CSF == e_isf) and PIC_ISF_VOICE_SUPPORT) {execute(TC_PMR_0812_11({isfColourCode :=c_grpAcf11}, e_useIsfChannel11) );} 

			if ((PIC_ISF_OR_CSF == e_isf) and PIC_ISF_VOICE_SUPPORT) {execute(TC_PMR_0812_12({isfColourCode :=c_grpAcf12}, e_useIsfChannel12) );} 

			if ((PIC_ISF_OR_CSF == e_isf) and PIC_ISF_VOICE_SUPPORT) {execute(TC_PMR_0812_13({isfColourCode :=c_grpAcf13}, e_useIsfChannel13) );} 

			if ((PIC_ISF_OR_CSF == e_isf) and PIC_ISF_VOICE_SUPPORT) {execute(TC_PMR_0812_14({isfColourCode :=c_grpAcf14}, e_useIsfChannel14) );} 

			if ((PIC_ISF_OR_CSF == e_isf) and PIC_ISF_VOICE_SUPPORT) {execute(TC_PMR_0812_15({isfColourCode :=c_grpAcf15}, e_useIsfChannel15) );} 

			if ((PIC_ISF_OR_CSF == e_isf) and PIC_ISF_VOICE_SUPPORT) {execute(TC_PMR_0812_16({isfColourCode :=c_grpAcf16}, e_useIsfChannel16) );} 



			//	group HeaderFrames { // Clause 5.1.3.2

			if ((PIC_ISF_OR_CSF == e_csf) and PIC_CSF_TYPE_3_DATA_SUPPORT) {execute(TC_PMR_0816_01() );}
@@ -166,7 +166,7 @@ module dPMR_TestExecution { 
		//	} // end group TalkingParty_ID

		//	group CommonSlowUserData {// Clause 5.1.7

				if (PIC_CSF_GROUP_VOICE_SS_SLD) {execute(TC_PMR_0836_01() );}

				if (PIC_ISF_OR_CSF == e_isf) {execute(TC_PMR_0836_02() );} // TODO JP IMPLEMENT

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

		//	} // end group CommonSlowUserData

		//} // end group IsfCsfCommon

ttcn/dPMR_Pixits.ttcn

+2 −2

File changed.

Contains only whitespace changes.