Commit 3fe941f8 authored by pintar's avatar pintar
Browse files

corrections to get error free

parent d072b1bc

AtsCommon/SipIsup_TestConfiguration.ttcn

+21 −15
Original line number Diff line number Diff line
@@ -14,11 +14,15 @@ 
	import from LibCommon_VerdictControl all;

	//AtsSipIsup

	import from SipIsup_TestSystem all;

	import from SipIsup_SIP_TypesAndConf all;

	import from SipIsup_ISUP_ModuleParams all;

	import from SipIsup_ISUP_ParamTypes all;

	import from SipIsup_ISUP_MsgTypes all;

 	

	//LibSip

	import from LibSip_SIPTypesAndValues all;

	import from LibSip_Interface all;

 	//LibIms

	import from LibIms_SIPTypesAndValues all;

	import from LibIms_Interface all;



	group auxSipFunction {
@@ -26,9 +30,9 @@ 
		** @desc f_IncCSeq returns an input parameter incremented by 1000

		** reason is to run the next testcase with a higher CSeq value

		*/

		function f_IncCSeq(inout CSeq loc_CSeq) 

		function f_IncCSeq(inout CSeq p_cSeq) 

			runs on ServerSyncComp 

			{	loc_CSeq.seqNumber := loc_CSeq.seqNumber + 1000;

			{	p_cSeq.seqNumber := p_cSeq.seqNumber + 1000;

				return

			}; 

		// end f_IncCSeq
@@ -44,19 +48,20 @@ 
		/*

		** @desc Creates configuration of CF0)

		*/

		function f_cf00Up(	out SipComponent      p_sipComponent, 

		function f_cf00Up(	out ImsComponent      p_imsComponent, 

							out IsupBiccComponent p_isupBiccComponent)

		runs on ServerSyncComp {

			//Variables

			var FncRetCode v_ret := e_success;

			//Create

			p_sipComponent := SipComponent.create ;

			p_imsComponent := ImsComponent.create ;

			p_isupBiccComponent := IsupBiccComponent.create ;

			//Connect

			connect(p_sipComponent:syncPort, self:syncPort) ;

			map(p_sipComponent:SIPP, system:UDP1);		// Init test Configuration

			if (PX_SIP_CheckConversation) 

				{map(p_sipComponent:opPort, system:opPortS);} // Init test Configuration			

			connect(p_imsComponent:syncPort, self:syncPort) ;

			map(p_imsComponent:SIPP, system:IMSCN1);		// Init test Configuration

			// TODO check if opPort will be used

			//if (PX_SIP_CheckConversation) 

			//	{map(p_imsComponent:opPort, system:opPortS);} // Init test Configuration			

			connect(p_isupBiccComponent:syncPort, self:syncPort) ;

			//Map

			if (PX_IsupBicc_CheckConversation or PX_IsupBicc_CheckRinging)
@@ -81,14 +86,14 @@ 
		/*

		** @desc Deletes configuration of CF03

		*/

		function f_cfTwoPtcsDown(	in SipComponent p_sipComponent, 

		function f_cfTwoPtcsDown(	in ImsComponent p_imsComponent, 

									in IsupBiccComponent p_isupBiccComponent)

		runs on ServerSyncComp {

			f_serverWaitForAllClientsToStop();

			//Variables

			var FncRetCode v_ret := e_success;

			//Disconnect

			disconnect(p_sipComponent:syncPort, self:syncPort) ;

			disconnect(p_imsComponent:syncPort, self:syncPort) ;

			disconnect(p_isupBiccComponent:syncPort, self:syncPort) ;

			//Unmap

// note-axr: workaround to avoid enumerated PIXIT parameter
@@ -99,9 +104,10 @@ 
			else {

				unmap(p_isupBiccComponent:IsupBiccP, system:atm); // BiccP

			}

			unmap(p_sipComponent:SIPP, system:UDP1);

			if (PX_SIP_CheckConversation) 

				{unmap(p_sipComponent:opPort, system:opPortS);}		

			unmap(p_imsComponent:SIPP, system:IMSCN1);

			// TODO check if opPort will be used

			//if (PX_SIP_CheckConversation) 

			//	{unmap(p_imsComponent:opPort, system:opPortS);}		

			if (PX_IsupBicc_CheckConversation or PX_IsupBicc_CheckRinging) 

				{unmap(p_isupBiccComponent:opPort_IsupBicc, system:opPortS_IsupBicc);} // Init test Configuration

AtsCommon/SipIsup_TestExecution.ttcn

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ module SipIsup_TestExecution { 
	import from SipIsup_PIXITS all;

	import from SipIsup_Testcases all;

	//SipAts

	import from SipIsup_SIP_TypesAndConf all;

	import from LibSip_SIPTypesAndValues all;

	import from SipIsup_PICS all;



	control {

AtsCommon/SipIsup_TestSystem.ttcn

+4 −6
Original line number Diff line number Diff line
@@ -11,13 +11,12 @@ 
	//LibCommon

	import from LibCommon_Sync all;

	import from LibCommon_AbstractData all;

	import from LibCommon_Time all;

	import from LibCommon_BasicTypesAndValues all;

	import from LibCommon_DataStrings all;

	import from LibCommon_TextStrings all;



	//AtsSip

	import from SipIsup_SIP_TypesAndConf all;

	//LibSip

	import from LibSip_Interface all;

	

	//AtsIsup

	import from SipIsup_ISUP_ModuleParams all;

	import from SipIsup_ISUP_ParamTypes all;
@@ -28,8 +27,7 @@ 
	*/

	type component TestAdapter {

		port IsupBiccPort atm;

		port SipPort UDP1, UDP2, UDP3, TCP1, TCP2, TCP3;

		port operatorPort opPortS;

		port SipPort IMSCN1, IMSCN2;

		port operatorPort_IsupBicc opPortS_IsupBicc;

	}

AtsCommon/SipIsup_Testcases.ttcn

+2248 −2242

File changed.

Preview size limit exceeded, changes collapsed.