Commit 28758abd authored by garciay's avatar garciay
Browse files

Move Adapter & Start/Stop capture into... 

Move Adapter & Start/Stop capture into f_cf_roam_reg_up()/f_cf_roam_reg_down(), f_cf_roam_call_up()/f_cf_roam_call_down(), f_cf_int_as_up()/f_cf_int_as_down()
Need to add f_cf_adapter_up()/f_cf_adapter_down() to map acPort in all TCs
parent 55da41b6

AtsImsIot/AtsImsIot_TestCases_CALL.ttcn

+63 −22
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ module AtsImsIot_TestCases_CALL { 
		var CF_INT_CALL v_config := {v_gmA, v_mw, v_gmB};

				

		// map/connect component ports

		f_cf_adapter_up();

		f_cf_user_up(v_ueA);

		f_cf_user_up(v_ueB);

		f_cf_int_call_up(v_config);
@@ -109,11 +110,12 @@ module AtsImsIot_TestCases_CALL { 
		// postamble

		f_PO_user_home_deregistration(v_ueA);

		f_PO_user_home_deregistration(v_ueB);

		f_cf_int_call_down(v_config);

		

		//unmap/disconnet component ports

		f_cf_user_down(v_ueA);

		f_cf_user_down(v_ueB);

		f_cf_int_call_down(v_config);

		f_cf_adapter_down();

	} //end testcase TC_IMS_CALL_0001
@@ -134,6 +136,7 @@ module AtsImsIot_TestCases_CALL { 
		var CF_INT_CALL v_config := {v_gmA, v_mw, v_gmB};

				

		// map/connect component ports

		f_cf_adapter_up();

		f_cf_user_up(v_ueA);

		f_cf_user_up(v_ueB);

		f_cf_user_up(v_ueB2);
@@ -200,12 +203,13 @@ module AtsImsIot_TestCases_CALL { 
		f_PO_user_home_deregistration(v_ueA);

		f_PO_user_home_deregistration(v_ueB);

		f_PO_user_home_deregistration(v_ueB2);

		f_cf_int_call_down(v_config);

		

		//unmap/disconnet component ports

		f_cf_user_down(v_ueA);

		f_cf_user_down(v_ueB);

		f_cf_user_down(v_ueB2);

		f_cf_int_call_down(v_config);

		f_cf_adapter_down();

	} //end testcase TC_IMS_CALL_0001F
@@ -225,6 +229,7 @@ module AtsImsIot_TestCases_CALL { 
		var CF_INT_CALL v_config := {v_gmA, v_mw, v_gmB};

				

		// map/connect component ports

		f_cf_adapter_up();

		f_cf_user_up(v_ueA);

		f_cf_user_up(v_ueB);

		f_cf_int_call_up(v_config);
@@ -281,11 +286,12 @@ module AtsImsIot_TestCases_CALL { 
		// postamble

		f_PO_user_home_deregistration(v_ueA);

		f_PO_user_home_deregistration(v_ueB);

		f_cf_int_call_down(v_config);

		

		//unmap/disconnet component ports

		f_cf_user_down(v_ueA);

		f_cf_user_down(v_ueB);

		f_cf_int_call_down(v_config);

		f_cf_adapter_down();

	} //end testcase TC_IMS_CALL_0002
@@ -304,6 +310,7 @@ module AtsImsIot_TestCases_CALL { 
		var CF_INT_CALL v_config := {v_gmA, v_mw, omit};

				

		// map/connect component ports

		f_cf_adapter_up();

		f_cf_user_up(v_ueA);

		f_cf_user_up(v_ueB);

		f_cf_int_call_up(v_config);
@@ -324,11 +331,12 @@ module AtsImsIot_TestCases_CALL { 
		// postamble

		f_PO_user_home_deregistration(v_ueA);

		f_PO_user_home_deregistration(v_ueB);

		f_cf_int_call_down(v_config);

		

		//unmap/disconnet component ports

		f_cf_user_down(v_ueA);

		f_cf_user_down(v_ueB);

		f_cf_int_call_down(v_config);

		f_cf_adapter_down();

	} //end testcase TC_IMS_CALL_0003
@@ -346,6 +354,7 @@ module AtsImsIot_TestCases_CALL { 
		var CF_INT_CALL v_config := {v_gmA, v_mw, omit};

				

		// map/connect component ports

		f_cf_adapter_up();

		f_cf_user_up(v_ueA);

		f_cf_int_call_up(v_config);
@@ -364,10 +373,11 @@ module AtsImsIot_TestCases_CALL { 
		

		// postamble

		f_PO_user_home_deregistration(v_ueA);

		f_cf_int_call_down(v_config);

		

		//unmap/disconnet component ports

		f_cf_user_down(v_ueA);

		f_cf_int_call_down(v_config);

		f_cf_adapter_down();

	} //end testcase TC_IMS_CALL_0004
@@ -385,6 +395,7 @@ module AtsImsIot_TestCases_CALL { 
		var CF_INT_CALL v_config := {v_gmA, v_mw, omit};

				

		// map/connect component ports

		f_cf_adapter_up();

		f_cf_user_up(v_ueA);

		f_cf_int_call_up(v_config);
@@ -403,10 +414,11 @@ module AtsImsIot_TestCases_CALL { 
		

		// postamble

		f_PO_user_home_deregistration(v_ueA);

		f_cf_int_call_down(v_config);

		

		//unmap/disconnet component ports

		f_cf_user_down(v_ueA);

		f_cf_int_call_down(v_config);

		f_cf_adapter_down();

	} //end testcase TC_IMS_CALL_0005
@@ -424,6 +436,7 @@ module AtsImsIot_TestCases_CALL { 
		var CF_INT_CALL v_config := {v_gmA, v_mw, omit};

				

		// map/connect component ports

		f_cf_adapter_up();

		f_cf_user_up(v_ueA);

		f_cf_int_call_up(v_config);
@@ -442,10 +455,11 @@ module AtsImsIot_TestCases_CALL { 
		

		// postamble

		f_PO_user_home_deregistration(v_ueA);

		f_cf_int_call_down(v_config);

		

		//unmap/disconnet component ports

		f_cf_user_down(v_ueA);

		f_cf_int_call_down(v_config);

		f_cf_adapter_down();

	} //end testcase TC_IMS_CALL_0006
@@ -465,6 +479,7 @@ module AtsImsIot_TestCases_CALL { 
		//var CF_INT_CALL v_config := {v_gmA, v_mw, v_gmB};

				

		// map/connect component ports

		f_cf_adapter_up();

		f_cf_user_up(v_ueA);

		f_cf_user_up(v_ueB);

  		f_cf_roam_call_up(v_gmA, v_mw, v_gmB);
@@ -514,11 +529,12 @@ module AtsImsIot_TestCases_CALL { 
		// postamble

		f_PO_user_home_deregistration(v_ueA);

		f_PO_user_home_deregistration(v_ueB);

		f_cf_roam_call_down(v_gmA, v_mw, v_gmB);

		

		//unmap/disconnet component ports

		f_cf_user_down(v_ueA);

		f_cf_user_down(v_ueB);

		f_cf_roam_call_down(v_gmA, v_mw, v_gmB);

		f_cf_adapter_down();

	} //end testcase TC_IMS_CALL_0007
@@ -537,6 +553,7 @@ module AtsImsIot_TestCases_CALL { 
		var ImsUserInfo v_userInfoB := f_getSipUserId(PX_EUT_B);

				

		// map/connect component ports

		f_cf_adapter_up();

		f_cf_user_up(v_ueA);

		f_cf_user_up(v_ueB);

		f_cf_roam_call_up(v_gmA, v_mw, v_gmB);
@@ -589,11 +606,12 @@ module AtsImsIot_TestCases_CALL { 
		// postamble

		f_PO_user_home_deregistration(v_ueA);

		f_PO_user_home_deregistration(v_ueB);

		f_cf_roam_call_down(v_gmA, v_mw, v_gmB);

		

		//unmap/disconnet component ports

		f_cf_user_down(v_ueA);

		f_cf_user_down(v_ueB);

		f_cf_roam_call_down(v_gmA, v_mw, v_gmB);

		f_cf_adapter_down();

	} //end testcase TC_IMS_CALL_0008
@@ -613,6 +631,7 @@ module AtsImsIot_TestCases_CALL { 
		

				

		// map/connect component ports

		f_cf_adapter_up();

		f_cf_user_up(v_ueA);

		f_cf_user_up(v_ueB);

  		f_cf_roam_call_up(v_gmA, v_mw, v_gmB);
@@ -643,11 +662,12 @@ module AtsImsIot_TestCases_CALL { 
		// postamble

		f_PO_user_home_deregistration(v_ueA);

		f_PO_user_home_deregistration(v_ueB);

		f_cf_roam_call_down(v_gmA, v_mw, v_gmB);

		

		//unmap/disconnet component ports

		f_cf_user_down(v_ueA);

		f_cf_user_down(v_ueB);

		f_cf_roam_call_down(v_gmA, v_mw, v_gmB);

		f_cf_adapter_down();

	} //end testcase TC_IMS_CALL_0009
@@ -666,6 +686,7 @@ module AtsImsIot_TestCases_CALL { 
		var ImsUserInfo v_userInfoB := f_getAnyValidUser(PX_EUT_B);

				

		// map/connect component ports

		f_cf_adapter_up();

		f_cf_user_up(v_ueA);

		f_cf_user_up(v_ueB);

		f_cf_roam_call_up(v_gmA, v_mw, v_gmB);
@@ -710,11 +731,12 @@ module AtsImsIot_TestCases_CALL { 
		// postamble

		f_PO_user_home_deregistration(v_ueA);

		f_PO_user_home_deregistration(v_ueB);

		f_cf_roam_call_down(v_gmA, v_mw, v_gmB);

		

		//unmap/disconnet component ports

		f_cf_user_down(v_ueA);

		f_cf_user_down(v_ueB);

		f_cf_roam_call_down(v_gmA, v_mw, v_gmB);

		f_cf_adapter_down();

	} //end testcase TC_IMS_CALL_0010
@@ -733,6 +755,7 @@ module AtsImsIot_TestCases_CALL { 
		var ImsUserInfo v_userInfoB := f_getAnyValidUser(PX_EUT_B);

				

		// map/connect component ports

		f_cf_adapter_up();

		f_cf_user_up(v_ueA);

		f_cf_user_up(v_ueB);

		f_cf_roam_call_up(v_gmA, v_mw, v_gmB);
@@ -754,11 +777,11 @@ module AtsImsIot_TestCases_CALL { 
				

		// postamble

		f_PO_user_home_deregistration(v_ueA);

		

		f_cf_roam_call_down(v_gmA, v_mw, v_gmB);

		

		//unmap/disconnet component ports

		f_cf_user_down(v_ueA);

		f_cf_roam_call_down(v_gmA, v_mw, v_gmB);

		f_cf_adapter_down();

	} //end testcase TC_IMS_CALL_0013
@@ -777,6 +800,7 @@ module AtsImsIot_TestCases_CALL { 
		var ImsUserInfo v_userInfoB := f_getSipUserId(PX_EUT_B);

				

		// map/connect component ports

		f_cf_adapter_up();

		f_cf_user_up(v_ueA);

		f_cf_user_up(v_ueB);

		f_cf_roam_call_up(v_gmA, v_mw, v_gmB);
@@ -800,11 +824,12 @@ module AtsImsIot_TestCases_CALL { 
		// postamble

		f_PO_user_home_deregistration(v_ueA);

		f_PO_user_home_deregistration(v_ueB);

		f_cf_roam_call_down(v_gmA, v_mw, v_gmB);

		

		//unmap/disconnet component ports

		f_cf_user_down(v_ueA);

		f_cf_user_down(v_ueB);

		f_cf_roam_call_down(v_gmA, v_mw, v_gmB);

		f_cf_adapter_down();

	} //end testcase TC_IMS_CALL_0014
@@ -824,6 +849,7 @@ module AtsImsIot_TestCases_CALL { 
		var ImsUserInfo v_userInfoB := f_getSipUserId(PX_EUT_B);

				

		// map/connect component ports

		f_cf_adapter_up();

		f_cf_user_up(v_ueA);

		f_cf_user_up(v_ueB);

		f_cf_user_up(v_imsA);
@@ -849,12 +875,13 @@ module AtsImsIot_TestCases_CALL { 
		// postamble

		f_PO_user_home_deregistration(v_ueA);

		f_PO_user_home_deregistration(v_ueB);

		f_cf_roam_call_down(v_gmA, v_mw, v_gmB);

		

		//unmap/disconnet component ports

		f_cf_user_down(v_ueA);

		f_cf_user_down(v_ueB);

		f_cf_user_down(v_imsA);

		f_cf_roam_call_down(v_gmA, v_mw, v_gmB);

		f_cf_adapter_down();

	} //end testcase TC_IMS_CALL_0016
@@ -876,6 +903,7 @@ module AtsImsIot_TestCases_CALL { 
		var CF_INT_CALL v_config := {v_gmA, v_mw, v_gmB};

				

		// map/connect component ports

		f_cf_adapter_up();

		f_cf_user_up(v_ueA);

		f_cf_user_up(v_ueB);
@@ -942,11 +970,12 @@ module AtsImsIot_TestCases_CALL { 
		// postamble

		f_PO_user_home_deregistration(v_ueA);

		f_PO_user_home_deregistration(v_ueB);

		f_cf_int_call_down(v_config);

		

		//unmap/disconnet component ports

		f_cf_user_down(v_ueA);

		f_cf_user_down(v_ueB);

		f_cf_int_call_down(v_config);

		f_cf_adapter_down();

	}
@@ -968,6 +997,7 @@ module AtsImsIot_TestCases_CALL { 
		var CF_INT_CALL v_config := {v_gmA, v_mw, v_gmB};

				

		// map/connect component ports

		f_cf_adapter_up();

		f_cf_user_up(v_ueA);

		f_cf_user_up(v_ueB);
@@ -1034,11 +1064,12 @@ module AtsImsIot_TestCases_CALL { 
		// postamble

		f_PO_user_home_deregistration(v_ueA);

		f_PO_user_home_deregistration(v_ueB);

		f_cf_int_call_down(v_config);

		

		//unmap/disconnet component ports

		f_cf_user_down(v_ueA);

		f_cf_user_down(v_ueB);

		f_cf_int_call_down(v_config);

		f_cf_adapter_down();

	}
@@ -1060,6 +1091,7 @@ module AtsImsIot_TestCases_CALL { 
		var CF_INT_CALL v_config := {v_gmA, v_mw, v_gmB};

				

		// map/connect component ports

		f_cf_adapter_up();

		f_cf_user_up(v_ueA);

		f_cf_user_up(v_ueB);
@@ -1121,11 +1153,12 @@ module AtsImsIot_TestCases_CALL { 
		// postamble

		f_PO_user_home_deregistration(v_ueA);

		f_PO_user_home_deregistration(v_ueB);

		f_cf_int_call_down(v_config);

		

		//unmap/disconnet component ports

		f_cf_user_down(v_ueA);

		f_cf_user_down(v_ueB);

		f_cf_int_call_down(v_config);

		f_cf_adapter_down();

	}
@@ -1147,6 +1180,7 @@ module AtsImsIot_TestCases_CALL { 
		var CF_INT_CALL v_config := {v_gmA, v_mw, v_gmB};

				

		// map/connect component ports

		f_cf_adapter_up();

		f_cf_user_up(v_ueA);

		f_cf_user_up(v_ueB);
@@ -1231,11 +1265,12 @@ module AtsImsIot_TestCases_CALL { 
		// postamble

		f_PO_user_home_deregistration(v_ueA);

		f_PO_user_home_deregistration(v_ueB);

		f_cf_int_call_down(v_config);

		

		//unmap/disconnet component ports

		f_cf_user_down(v_ueA);

		f_cf_user_down(v_ueB);

		f_cf_int_call_down(v_config);

		f_cf_adapter_down();

	}
@@ -1257,6 +1292,7 @@ module AtsImsIot_TestCases_CALL { 
		var CF_INT_CALL v_config := {v_gmA, v_mw, v_gmB};

				

		// map/connect component ports

		f_cf_adapter_up();

		f_cf_user_up(v_ueA);

		f_cf_user_up(v_ueB);
@@ -1366,11 +1402,12 @@ module AtsImsIot_TestCases_CALL { 
		// postamble

		f_PO_user_home_deregistration(v_ueA);

		f_PO_user_home_deregistration(v_ueB);

		f_cf_int_call_down(v_config);

		

		//unmap/disconnet component ports

		f_cf_user_down(v_ueA);

		f_cf_user_down(v_ueB);

		f_cf_int_call_down(v_config);

		f_cf_adapter_down();

	}
@@ -1392,6 +1429,7 @@ module AtsImsIot_TestCases_CALL { 
		var CF_INT_CALL v_config := {v_gmA, v_mw, v_gmB};

				

		// map/connect component ports

		f_cf_adapter_up();

		f_cf_user_up(v_ueA);

		f_cf_user_up(v_ueB);
@@ -1501,11 +1539,12 @@ module AtsImsIot_TestCases_CALL { 
		// postamble

		f_PO_user_home_deregistration(v_ueA);

		f_PO_user_home_deregistration(v_ueB);

		f_cf_int_call_down(v_config);

		

		//unmap/disconnet component ports

		f_cf_user_down(v_ueA);

		f_cf_user_down(v_ueB);

		f_cf_int_call_down(v_config);

		f_cf_adapter_down();

	}
@@ -1526,6 +1565,7 @@ module AtsImsIot_TestCases_CALL { 
		var CF_INT_CALL v_config := {v_gmA, v_mw, omit};

				

		// map/connect component ports

		f_cf_adapter_up();

		f_cf_user_up(v_ueA);

		f_cf_user_up(v_ueB);
@@ -1562,11 +1602,12 @@ module AtsImsIot_TestCases_CALL { 
		// postamble

		f_PO_user_home_deregistration(v_ueA);

		f_PO_user_home_deregistration(v_ueB);

		f_cf_int_call_down(v_config);

		

		//unmap/disconnet component ports

		f_cf_user_down(v_ueA);

		f_cf_user_down(v_ueB);

		f_cf_int_call_down(v_config);

		f_cf_adapter_down();

	}

AtsImsIot/AtsImsIot_TestCases_MESS.ttcn

+18 −6
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ module AtsImsIot_TestCases_MESS { 
		var CF_INT_CALL v_config := {v_gmA, v_mw, v_gmB};

		

		// map/connect component ports

		f_cf_adapter_up();

		f_cf_user_up(v_ueA);

		f_cf_user_up(v_ueB);

		f_cf_int_call_up(v_config);
@@ -120,11 +121,12 @@ module AtsImsIot_TestCases_MESS { 
		// postabmle

		f_PO_user_home_deregistration(v_ueA);

		f_PO_user_home_deregistration(v_ueB);

		f_cf_int_call_down(v_config);

		

		//unmap/disconnet component ports

		f_cf_user_down(v_ueA);

		f_cf_user_down(v_ueB);

		f_cf_int_call_down(v_config);

		f_cf_adapter_down();

	}
@@ -143,6 +145,7 @@ module AtsImsIot_TestCases_MESS { 
		var CF_INT_CALL v_config := {v_gmA, v_mw, v_gmB};

		

		// map/connect component ports

		f_cf_adapter_up();

		f_cf_user_up(v_ueA);

		f_cf_user_up(v_ueB);

		f_cf_int_call_up(v_config);
@@ -169,11 +172,12 @@ module AtsImsIot_TestCases_MESS { 
		// postabmle

		f_PO_user_home_deregistration(v_ueA);

		f_PO_user_home_deregistration(v_ueB);

		f_cf_int_call_down(v_config);

		

		//unmap/disconnet component ports

		f_cf_user_down(v_ueA);

		f_cf_user_down(v_ueB);

		f_cf_int_call_down(v_config);

		f_cf_adapter_down();

	}

	

	/**
@@ -191,6 +195,7 @@ module AtsImsIot_TestCases_MESS { 
		var CF_INT_CALL v_config := {v_gmA, v_mw, v_gmB};

		

		// map/connect component ports

		f_cf_adapter_up();

		f_cf_user_up(v_ueA);

		f_cf_user_up(v_ueB);

		f_cf_int_call_up(v_config);
@@ -215,11 +220,12 @@ module AtsImsIot_TestCases_MESS { 
		// postabmle

		f_PO_user_home_deregistration(v_ueA);

		f_PO_user_home_deregistration(v_ueB);

		f_cf_int_call_down(v_config);

		

		//unmap/disconnet component ports

		f_cf_user_down(v_ueA);

		f_cf_user_down(v_ueB);

		f_cf_int_call_down(v_config);

		f_cf_adapter_down();

	}
@@ -238,6 +244,7 @@ module AtsImsIot_TestCases_MESS { 
		var ImsInterfaceMonitor v_mw := f_cf_create_monitor(c_mw);

		

		// map/connect component ports

		f_cf_adapter_up();

		f_cf_user_up(v_ueA);

		f_cf_user_up(v_ueB);

		f_cf_roam_call_up(v_gmA, v_mw, v_gmB);
@@ -261,11 +268,12 @@ module AtsImsIot_TestCases_MESS { 
		// postabmle

		f_PO_user_home_deregistration(v_ueA);

		f_PO_user_roaming_deregistration(v_ueB);

		f_cf_roam_call_down(v_gmA, v_mw, v_gmB);

		

		//unmap/disconnet component ports

		f_cf_user_down(v_ueA);

		f_cf_user_down(v_ueB);

		f_cf_roam_call_down(v_gmA, v_mw, v_gmB);

		f_cf_adapter_down();

	}

	

	/**
@@ -281,6 +289,7 @@ module AtsImsIot_TestCases_MESS { 
		var CF_INT_CALL v_config := {v_gmA, v_mw, omit};

		

		// map/connect component ports

		f_cf_adapter_up();

		f_cf_user_up(v_ueA);

		f_cf_int_call_up(v_config);
@@ -297,10 +306,11 @@ module AtsImsIot_TestCases_MESS { 
		

		// postabmle

		f_PO_user_home_deregistration(v_ueA);

		f_cf_int_call_down(v_config);

		

		//unmap/disconnet component ports

		f_cf_user_down(v_ueA);

		f_cf_int_call_down(v_config);

		f_cf_adapter_down();

	}
@@ -318,6 +328,7 @@ module AtsImsIot_TestCases_MESS { 
		var CF_INT_CALL v_config := {v_gmA, v_mw, omit};

		

		// map/connect component ports

		f_cf_adapter_up();

		f_cf_user_up(v_ueA);

		f_cf_user_up(v_ueB);

		f_cf_int_call_up(v_config);
@@ -337,10 +348,11 @@ module AtsImsIot_TestCases_MESS { 
		// postabmle

		f_PO_user_home_deregistration(v_ueA);

		f_PO_user_home_deregistration(v_ueB);

		f_cf_int_call_down(v_config);

		

		//unmap/disconnet component ports

		f_cf_user_down(v_ueA);

		f_cf_user_down(v_ueB);

		f_cf_int_call_down(v_config);

		f_cf_adapter_down();

	}

}
 
 No newline at end of file

AtsImsIot/AtsImsIot_TestCases_REG.ttcn

+367 −365
Original line number Diff line number Diff line
@@ -105,6 +105,7 @@ module AtsImsIot_TestCases_REG { 
		var Response v_200OK_Step9;

		

		// map/connect component ports

		f_cf_adapter_up();

		f_cf_user_up(v_ueB);

		f_cf_roam_reg_up(v_gmA, v_mw);
@@ -133,6 +134,7 @@ module AtsImsIot_TestCases_REG { 
		// unmap/disconnect component ports

		f_cf_user_down(v_ueB);

		f_cf_roam_reg_down(v_gmA, v_mw);

		f_cf_adapter_down();

	}



	/**

AtsImsIot/AtsImsIot_TestConfiguration.ttcn

+292 −3

File changed.

Preview size limit exceeded, changes collapsed.

AtsImsIot/AtsImsIot_TestControl.ttcn3

+6 −4
Original line number Diff line number Diff line
@@ -4,12 +4,14 @@ 
 *	@desc		This module provides ATS specific test control declarations.

 */

module AtsImsIot_TestControl {

	//import from AtsImsIot_TestCases_CALL all;

	import from AtsImsIot_TestCases_CALL all;

	import from AtsImsIot_TestCases_MESS all;

	//import from AtsImsIot_TestCases_REG all;

	//import from AtsImsIot_TestCases_SS all;

	import from AtsImsIot_TestCases_REG all;

	import from AtsImsIot_TestCases_SS all;



  control {

    execute(TC_IMS_MESS_0001());

    //execute(TC_IMS_MESS_0001());

    //execute(TC_IMS_CALL_0007());

    execute(TC_IMS_REG_0002());

  }

}
 
 No newline at end of file