Commit 909e0577 authored by mullers's avatar mullers
Browse files

UT config added and master TC with UT added

parent 79c32cc9

ttcn/dPMR_TestCases.ttcn

+71 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ module dPMR_TestCases { 
	import from dPMR_TestSystem all;

//	import from dPMR_templates all;

//	import from dPMR_messages all;

	import from dPMR_TestConfiguration all;



group IsfCsfCommon {
@@ -30,4 +31,74 @@ group IsfCsfCommon { 


} // end group IsfCsfCommon



group twoPTC {



				

	/*

	 * @desc		

	*/

	testcase TC_XXX()

	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_XXX_Simu());

		v_ut.start(f_TC_action_state_orTC_ID_Ut());



		// synchronize both PTCs on these 2 sychronization points

		f_serverSync2ClientsAndStop({c_prDone, c_tbDone});



		// Configuration Down

		f_cfSimuDown(v_simu, v_ut);



	} // end TC_XXX



	/*

	 * @desc

	*/

	function f_TC_XXX_Simu() 

	runs on Simu {

		//Variables



		//Default



		// Preamble



		// Test body



		//Postamble



		deactivate;



	} // end f_TC_XXX_Simu



	/*

	 * @desc

	*/

	function f_TC_action_state_orTC_ID_Ut() 

	runs on Ut {

		//Variables



		//Default



		// Preamble



		// Test body



		//Postamble



		deactivate;



	} // end f_TC_action_state_orTC_ID_Ut



	

} // end twoPTC



} // end module dPMR_TestCases

ttcn/dPMR_TestConfiguration.ttcn

+36 −0
Original line number Diff line number Diff line
@@ -19,6 +19,42 @@ module dPMR_TestConfiguration { 
//	import from dPMR_ExternalFns all;

	



group configFns {



	function f_cfSimuUp(

		out Simu p_simu, 

		out Ut p_ut)

	runs on ServerSyncComp {



		//create

		p_simu := Simu.create;

		p_ut := Ut.create;

		//Connect

		connect(p_simu:syncPort, self:syncPort);

		connect(p_ut:syncPort, self:syncPort);

		//Map

		map(p_simu:dp1Port, system:taDp1Port);

		map(p_ut:utPort, system:taUtPort);



	}//end f_cfSimuUp



	function f_cfSimuDown(

		in Simu p_simu, 

		in Ut p_ut)

	runs on ServerSyncComp {

		//Disconnect

		disconnect(p_simu:syncPort, self:syncPort);

		disconnect(p_ut:syncPort, self:syncPort);

		//Unmap

		unmap(p_simu:dp1Port, system:taDp1Port);

		unmap(p_ut:utPort, system:taUtPort);



	}//end f_cfSimuDown



	

	

}// end configFns



group mapFns {

	

	/*

ttcn/dPMR_TestSystem.ttcn

+51 −9
Original line number Diff line number Diff line
@@ -19,10 +19,14 @@ module dPMR_TestSystem { 
//	import from dPMR_Pics all;

//	import from dPMR_Pixits all;



group componentDefs {



	type component Simu {

		

		port Dp1Port	dp1Port ;

//		port SyncPort syncPort;

		port SyncPort	syncPort;

		//port TaPort		taPort;

		port UtPort		utPort;

		// PtcSyncPort used for synchronization between 2 PTCs

//		port SyncPort ptcSyncPort;

		//port CfPort cfPort;
@@ -36,7 +40,7 @@ module dPMR_TestSystem { 
//		port Dp2PortTx   dp2Tx ;

	//		port MacPduPort 		macPdu ;

//		port PhyPort			phy;

//		port TaPort				ta;

		

//		// Component variables

//		var SimuParams vc_simu ;

		//Timers
@@ -53,9 +57,24 @@ module dPMR_TestSystem { 
		//Ports

		port TaDp1Port taDp1Port;

//		port TaDp2PortRx tadPmrCommands;

//		port TaUtPort  taUtPort ;

		port TaUtPort  taUtPort ;

	} // end of type component TestAdapter



	type component Ut {

		//Ports

		port UtPort utPort;

		//Timers

	//	timer tc_maxTimeCfgActRly := PXT_MAX_TIME_CFG_ACT_RLY;

	//	timer tc_maxCaseExecPeriod := PXT_MAX_CASE_EXEC_PERIOD;



		//Type compatible with SyncComp

		var StringStack v_stateStack:= c_initStringStack;

		port SyncPort syncPort;

	//	timer t_sync := mp_syncTimeLimit;

	}



}//end componentDefs





group portDefs {
@@ -87,6 +106,33 @@ group portDefs { 
		in 	PacketDataTransmission ;

	}



	type port UtPort message{

		inout FncRetCode;

	//	out BsCfgParams;

	//	out TsCfgParams;

	//	out MsTsCfgParams;

	//	out MsCfgParams;

    // 	out BsActParams;

	//	out TsActParams;

	//	out MsTsActParams;		

	//	out MsActParams;

	//	in IutIndMsg;

	}



	type port TaUtPort message{

		inout FncRetCode;

	//	out BsCfgParams;

	//	out TsCfgParams;

	//	out MsTsCfgParams;

	//	out MsCfgParams;

    // 	out BsActParams;

	//	out TsActParams;

	//	out MsTsActParams;		

	//	out MsActParams;

	//	in IutIndMsg;

	}





	//@desc: The port for MAC Management messsages

//	type port MacPduPort message {inout MacPduPrimitives};

//	type port MacBcMessagePort message {in MacBcMsgPrimitives};
@@ -102,9 +148,5 @@ group portDefs { 


}	// end group portDefs



group primitives {





}//end primitives



}  // end of module dPMR_TestSystem