Commit b2101a8c authored by pintar's avatar pintar
Browse files

corrections due to validation of STF346 from week 45

parent a5435795

BC/ttcn/AtsIms_Mw_TCFunctions.ttcn

+277 −182

File changed.

Preview size limit exceeded, changes collapsed.

BC/ttcn/AtsIms_Mw_Testcases.ttcn

+6 −6
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ module AtsIms_Mw_Testcases 
		} // end TC_IMST2_MW_GEN_06

		

		/*

		* @desc TC_IMST2_MW_GEN_07 / Config Ref: CF_1Mw1Gm UserProfileRef: M4a

		* @desc TC_IMST2_MW_GEN_07 / Config Ref: CF_1Mw1Gm UserProfileRef: M4b

		* @param p_cSeq_s Transaction Id

		*/

		testcase TC_IMST2_MW_GEN_07(inout CSeq p_cSeq_s)
@@ -164,7 +164,7 @@ module AtsIms_Mw_Testcases 
		system TestAdapter {

			//Variables

			var ImsComponent v_imsComponent_ue1, v_imsComponent_mw;

			f_cf_1Mwi1Gm_M4aUp(v_imsComponent_ue1, v_imsComponent_mw);

			f_cf_1Mws1Gm_M4bUp(v_imsComponent_ue1, v_imsComponent_mw);



			//Start

			f_IncCSeq(p_cSeq_s); v_imsComponent_ue1.start(f_TC_IMST2_MW_GEN_07_UE1(p_cSeq_s));
@@ -173,7 +173,7 @@ module AtsIms_Mw_Testcases 
			// synchronize both PTCs on 2 sychronization points

			f_serverSync2Clients({c_prDone, c_tbDone});



			f_cf_1Mwi1Gm_M4aDown(v_imsComponent_ue1, v_imsComponent_mw);

			f_cf_1Mws1Gm_M4bDown(v_imsComponent_ue1, v_imsComponent_mw);



		} // end TC_IMST2_MW_GEN_07
@@ -266,7 +266,7 @@ module AtsIms_Mw_Testcases 
		} // end TC_IMST2_MW_GEN_11

		

		/*

		* @desc TC_IMST2_MW_GEN_12 / Config Ref: CF_1Mw1Gm UserProfileRef: M4a

		* @desc TC_IMST2_MW_GEN_12 / Config Ref: CF_1Mw1Gm UserProfileRef: M4b

		* @param p_cSeq_s Transaction Id

		*/

		testcase TC_IMST2_MW_GEN_12(inout CSeq p_cSeq_s)
@@ -274,7 +274,7 @@ module AtsIms_Mw_Testcases 
		system TestAdapter {

			//Variables

			var ImsComponent v_imsComponent_ue1, v_imsComponent_mw;

			f_cf_1Mwi1Gm_M4aUp(v_imsComponent_ue1, v_imsComponent_mw);

			f_cf_1Mws1Gm_M4bUp(v_imsComponent_ue1, v_imsComponent_mw);



			//Start

			f_IncCSeq(p_cSeq_s); v_imsComponent_ue1.start(f_TC_IMST2_MW_GEN_12_UE1(p_cSeq_s));
@@ -283,7 +283,7 @@ module AtsIms_Mw_Testcases 
			// synchronize both PTCs on 2 sychronization points

			f_serverSync2Clients({c_prDone, c_tbDone});



			f_cf_1Mwi1Gm_M4aDown(v_imsComponent_ue1, v_imsComponent_mw);

			f_cf_1Mws1Gm_M4bDown(v_imsComponent_ue1, v_imsComponent_mw);



		} // end TC_IMST2_MW_GEN_12

BC/ttcn/AtsIms_TestConfiguration.ttcn

+16 −16
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ group auxSipFunction { 
			//Connect

			connect(p_imsComponent_mwp1:syncPort, self:syncPort) ;

			//Map 

			map(p_imsComponent_mwp1:SIPP, system:MW_P1);// Init test Configuration

			map(p_imsComponent_mwp1:SIPP, system:MW_I1);// Init test Configuration

			

			f_setVerdict(v_ret);

		}//end f_cf_1MwiUp
@@ -131,7 +131,7 @@ group auxSipFunction { 
			connect(p_imsComponent_mwi1:syncPort, self:syncPort) ;	

			//Map 

			map(p_imsComponent_ue1:SIPP, system:UE1);// Init test Configuration

			map(p_imsComponent_mwi1:SIPP, system:MW_I1);// Init test Configuration

			map(p_imsComponent_mwi1:SIPP, system:MW_P1);// Init test Configuration

			

			f_setVerdict(v_ret);

		}//end f_cf_1Mwi1Gm_M3Up
@@ -139,7 +139,7 @@ group auxSipFunction { 
		/**

		 * 

		 * @desc Creates test configuration of CF_1Mwi1Gm_M4a: UserProfileRef: M4a - SCSCF from SUT conected with component ICSCF from TS

		 * @param p_imsComponent_mwi2	mwi2 component

		 * @param p_imsComponent_mwi2	mwsicomponent

		 * @param p_imsComponent_ue1	ue1 component

		 */

		function f_cf_1Mwi1Gm_M4aUp(out ImsComponent p_imsComponent_ue1,
@@ -159,7 +159,7 @@ group auxSipFunction { 
			connect(p_imsComponent_mwi2:syncPort, self:syncPort) ;

			//Map 

			map(p_imsComponent_ue1:SIPP, system:UE1);// Init test Configuration

			map(p_imsComponent_mwi2:SIPP, system:MW_I2);// Init test Configuration

			map(p_imsComponent_mwi2:SIPP, system:MW_S2);// Init test Configuration

			

			f_setVerdict(v_ret);

		}//end f_cf_1Mwi1Gm_M4aUp
@@ -167,11 +167,11 @@ group auxSipFunction { 
		/**

		 * 

		 * @desc Creates test configuration of CF_1Mws1Gm_M4b: UserProfileRef: M4b - ICSCF from SUT conected with component SCSCF from TS

		 * @param p_imsComponent_mws1	mws1 component

		 * @param p_imsComponent_mws2	mws2 component

		 * @param p_imsComponent_ue1	ue1 component

		 */

		function f_cf_1Mws1Gm_M4bUp(out ImsComponent p_imsComponent_ue1,

									out ImsComponent p_imsComponent_mws1)

									out ImsComponent p_imsComponent_mws2)

		runs on ServerSyncComp 

		{

			//Variables
@@ -179,14 +179,14 @@ group auxSipFunction { 


			//Create

			p_imsComponent_ue1 := ImsComponent.create ;

			p_imsComponent_mws1 := ImsComponent.create ;

			p_imsComponent_mws2 := ImsComponent.create ;



			//Connect		

			connect(p_imsComponent_ue1:syncPort, self:syncPort) ;

			connect(p_imsComponent_mws1:syncPort, self:syncPort) ;

			connect(p_imsComponent_mws2:syncPort, self:syncPort) ;

			//Map 

			map(p_imsComponent_ue1:SIPP, system:UE1);// Init test Configuration

			map(p_imsComponent_mws1:SIPP, system:MW_S1);// Init test Configuration

			map(p_imsComponent_mws2:SIPP, system:MW_I2);// Init test Configuration

			

			f_setVerdict(v_ret);

		}//end f_cf_1Mws1Gm_M4bUp
@@ -421,7 +421,7 @@ group auxSipFunction { 
			//Disconnect

			disconnect(p_imsComponent_mwp1:syncPort, self:syncPort) ;

			//Unmap

			unmap(p_imsComponent_mwp1:SIPP, system:MW_P1);				

			unmap(p_imsComponent_mwp1:SIPP, system:MW_I1);				

		}//end f_cf_1MwpDown



		/**
@@ -442,7 +442,7 @@ group auxSipFunction { 
			disconnect(p_imsComponent_mwi1:syncPort, self:syncPort);

			//Unmap

			unmap(p_imsComponent_ue1:SIPP, system:UE1);

			unmap(p_imsComponent_mwi1:SIPP, system:MW_I1);

			unmap(p_imsComponent_mwi1:SIPP, system:MW_P1);

		}//end f_cf_1Mwi1Gm_M3Down



		/**
@@ -463,17 +463,17 @@ group auxSipFunction { 
			disconnect(p_imsComponent_mwi2:syncPort, self:syncPort);

			//Unmap

			unmap(p_imsComponent_ue1:SIPP, system:UE1);

			unmap(p_imsComponent_mwi2:SIPP, system:MW_I2);

			unmap(p_imsComponent_mwi2:SIPP, system:MW_S2);

		}//end f_cf_1Mwi1Gm_M4aDown	



		/**

		* 

		* @desc Deletes configuration of CF_1Mws1Gm_M4b: UserProfileRef: M4b

		* @param p_imsComponent_mws1	mws1 component

		* @param p_imsComponent_mws2	mws2 component

		* @param p_imsComponent_ue1		ue1 component		

		*/

		function f_cf_1Mws1Gm_M4bDown(in ImsComponent p_imsComponent_ue1,

									  in ImsComponent p_imsComponent_mws1

									  in ImsComponent p_imsComponent_mws2

									  )

		runs on ServerSyncComp 

		{
@@ -481,10 +481,10 @@ group auxSipFunction { 


			//Disconnect

			disconnect(p_imsComponent_ue1:syncPort, self:syncPort);

			disconnect(p_imsComponent_mws1:syncPort, self:syncPort);

			disconnect(p_imsComponent_mws2:syncPort, self:syncPort);

			//Unmap

			unmap(p_imsComponent_ue1:SIPP, system:UE1);

			unmap(p_imsComponent_mws1:SIPP, system:MW_S1);

			unmap(p_imsComponent_mws2:SIPP, system:MW_I2);

		}//end f_cf_1Mws1Gm_M4bDown



		/**