Commit 4520051c authored by mullers's avatar mullers
Browse files

some small changes

parent 235185f4

ttcn/dPMR_Pics.ttcn

+1 −2
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ module dPMR_Pics { 
	//Ats

	import from dPMR_Types all;

	import from dPMR_Values all;

	import from dPMR_TestConfiguration all;



	group Entitygroup { // PICS Clause A.5
@@ -427,7 +426,7 @@ module dPMR_Pics { 
		* @remark	see PICS, Table A.20/2.

		*/

		modulepar {boolean PIC_CSF_USER_DIALING_PLAN := true}

/**************/		



		/**

		* @desc  	Is the CSF Supplementary Service Dialing string convention?

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

ttcn/dPMR_Pixits.ttcn

+6 −10
Original line number Diff line number Diff line
@@ -79,9 +79,9 @@ module dPMR_Pixits { 
		* 	

		* @remark 	only used for TP 0836_1 and 0843_01 

		*/

		modulepar {Data PXT_SINGLE_T3_DATA_FRAME } // TODO set correctly!

		modulepar {CrcD PXT_SINGLE_T3_DATA_FRAME_CRC}

		modulepar {CrcD PXT_SINGLE_T3_DATA_FRAME_WRONG_CRC}

		modulepar {Data PXT_SINGLE_T3_DATA_FRAME } // TODO set correctly! add dummy bytes

		modulepar {CrcD PXT_SINGLE_T3_DATA_FRAME_CRC} //TODO remove

		modulepar {CrcD PXT_SINGLE_T3_DATA_FRAME_WRONG_CRC} //TODO dummy

		

	} // end InputData
@@ -95,9 +95,8 @@ module dPMR_Pixits { 
		/**

		* @desc 	Primary Individual Address of the Tester in CSF

		* @remark 	see clause 8.2.2 and A.2

		*/ // TODO JP shall this really be here????

		*/ // TODO JP shall this really be here???? //TODO delete

		modulepar {CSFAddress PXT_CSF_ADDRESS_TESTER := '000110111001000111111101'B }// for dialstring "1234567" this will be 1B91FD in Hex which is 000110111001000111111101

	//

	

		/**

		* @desc 	Primary Individual Address of the IUT in CSF
@@ -111,10 +110,7 @@ module dPMR_Pixits { 
		/**

		* @desc 	Max Time of IUT sending back response of configuration/action's func/msg 

		*/

		//modulepar {float PXT_MAX_TIME_CFG_ACT_RLY := 200E-3}  // TODO Value To be checked !!!

		// Changed for validation to 10 seconds, should perhaps be permanent?

		modulepar {float PXT_MAX_TIME_CFG_ACT_RLY := 20.0}  // TODO Value To be checked !!!



		modulepar {float PXT_MAX_TIME_CFG_ACT_RLY := 200E-3} //20.0 for validation



		/** 

		*	@desc Guard timer to control a reaction from the IUT to a stimulus sent by the tester (e.g. a message).

ttcn/dPMR_TestCases.ttcn

+6 −3
Original line number Diff line number Diff line
@@ -6638,7 +6638,7 @@ module dPMR_TestCases { 
			f_clientSyncAndVerdict(c_prDone, v_ret);



			//Test Body

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

			tc_ac.start ;

			alt {

			[] dp1Port.receive(	m_voiceorT1orT2PayloadTransmission(

									m_headerFrame(
@@ -6957,7 +6957,7 @@ module dPMR_TestCases { 
					}

					else

					{

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

						// received 15 ok, lets check they are decreasing //TODO JP comment: should we consider headerInformation1 as well? yes, make a generic check that HI0 == HI1

						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);
@@ -7547,7 +7547,7 @@ module dPMR_TestCases { 
										vc_mse.iutId, 

										e_dataT3, 

										e_p2p,

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

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

								 	vc_mse.colourCode)); // normal ack

					//now receive resend.

					alt {
@@ -8149,6 +8149,7 @@ module dPMR_TestCases { 
		*       

		*/

		// TODO JP check if ok.. This should be ok, but if not configurable the TC may not be applicable

		// Delete it and puit it in excel-file

		function f_TC_connectionRequestTx_MS01 ( )

		runs on Mse{

			// Variables
@@ -8199,6 +8200,7 @@ module dPMR_TestCases { 
		*       

		*/

		// TODO JP check if ok.. This should be ok, but if not configurable the TC may not be applicable

		// Delete it and puit it in excel-file

		function f_TC_connectionRequestTxSendAck_MS01 (CiTypeAck p_ackType)

		runs on Mse{

			// Variables
@@ -8257,6 +8259,7 @@ module dPMR_TestCases { 
		*       

		*/

		// TODO JP check if ok.. This should be ok, but if not configurable the TC may not be applicable

		// Delete it and puit it in excel-file

		function f_TC_disconnectionRequestTx_MS01()

		runs on Mse {

			// Variables

ttcn/dPMR_TestSystem.ttcn

+2 −3
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ module dPMR_TestSystem { 
	import from dPMR_Types all;

	import from dPMR_Messages all;

	import from dPMR_Pixits all;

	//import from dPMR_Pics all;

	import from dPMR_Pics all;



group componentDefs {
@@ -34,7 +34,7 @@ group componentDefs { 
		timer tc_ac := PXT_TAC;

		timer tc_noac := PXT_TNOAC;

		timer tc_wait := PXT_TWAIT;

		timer tc_t_ack := 3.0; // TODO JP cannot use the PICS, get circular reference!!! Check why

		timer tc_t_ack := PIC_T_ACK;

		timer tc_t_toStopInterference := 1.0;



		//Component variable
@@ -53,7 +53,6 @@ group componentDefs { 
	type component TestAdapter { 

		//Ports

		port Dp1Port taDp1Port;

//		port TaDp2PortRx tadPmrCommands;

		port Dp1Port  taUtPort ;

		port TaTaPort taTaPort;

	}