Commit bcceecd8 authored by ringst's avatar ringst
Browse files

f_mtc_TriggerEndCall --> f_mtc_EndCall + implemented

parent 8793e10d

AtsImsIot/AtsImsIot_Functions.ttcn

+31 −9
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ module AtsImsIot_Functions { 
		}

     	

 		/**

		  * @desc Check if call is answered 

		  * @desc Answer call 

		  * @param p_ueRef Reference to IMS UE user component

		  * @return

		  *     true in case of successfull execution of the trigger command
@@ -164,21 +164,43 @@ module AtsImsIot_Functions { 
				return v_success;

		}		

 		

 		

 		/**

		  * @desc Trigger UE given by p_ueRef to end current call 

		  * @param p_userCompRef Reference to IMS UE user component

		  * @desc End the call 

		  * @param p_ueRef Reference to IMS UE user component

		  * @return

		  *     true in case of successfull execution of the trigger command

		  *     otherwise false

		  */

 		function f_mtc_triggerEndCall(EquipmentUser p_ueRef) 

 		function f_mtc_EndCall(EquipmentUser p_ueRef) 

			runs on TestCoordinator return boolean {

			var boolean v_status := true;        		

     		// TODO

			v_status := f_mtc_userEndCallSuccessful(p_ueRef); 

			return v_status;

     		}

     		

		/**

		* 

		* @desc Starts user component behaviour for checking that the User 

		* 		Call has been ansered

		* @param p_userCompRef Reference to IMS UE user component

		* @return 

		* 		true in case of successfull execution of the trigger command

		*		otherwise false

		*/

		function f_mtc_userEndCallSuccessful(EquipmentUser p_userCompRef) 

			runs on TestCoordinator return boolean {

			var boolean v_success := false;



			p_userCompRef.start(f_checkUserCallIsEnded());



			p_userCompRef.done;



			if(f_getE2EVerdict() == pass) {

				v_success := true;	

			}

				return v_success;

		}	

		

		 /**

		  * @desc Trigger UE given by p_ueRef to add a new media stream 

		  * @param p_userCompRef Reference to IMS UE user component

AtsImsIot/AtsImsIot_TestCases_CALL.ttcn

+15 −15
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ module AtsImsIot_TestCases_CALL { 
		f_mtc_check_TP_IMS_5107_02_gm(v_gmA, false); // Check2 

		f_mtc_check_TP_IMS_5107_02_mw(v_mw, false); // Check2 



		f_mtc_triggerEndCall(v_ueA); //Test Sequence Step 7

		f_mtc_EndCall(v_ueA); //Test Sequence Step 7



		// check 5 (BYE)

		f_mtc_check_TP_IMS_5107_01_gm(v_gmA, false); // Check3
@@ -189,7 +189,7 @@ module AtsImsIot_TestCases_CALL { 
		f_mtc_check_TP_IMS_5107_02_gm(v_gmA, false); // Check2 

		f_mtc_check_TP_IMS_5107_02_mw(v_mw, false); // Check2 



		f_mtc_triggerEndCall(v_ueA); //Test Sequence Step 9

		f_mtc_EndCall(v_ueA); //Test Sequence Step 9



		// check 3 (BYE)

		f_mtc_check_TP_IMS_5107_01_gm(v_gmA, false); // Check3
@@ -274,7 +274,7 @@ module AtsImsIot_TestCases_CALL { 
		f_mtc_check_TP_IMS_5107_02_gm(v_gmA, false); // Check3 

		f_mtc_check_TP_IMS_5107_02_mw(v_mw, false); // Check3 



		f_mtc_triggerEndCall(v_ueA); //Test Sequence Step 7

		f_mtc_EndCall(v_ueA); //Test Sequence Step 7



		// check 5 (BYE)

		f_mtc_check_TP_IMS_5107_01_gm(v_gmA, false); // Check4
@@ -517,7 +517,7 @@ module AtsImsIot_TestCases_CALL { 
		f_mtc_userCheckCallEstablished(v_ueB); //Test Sequence Step 5

		f_mtc_userCheckCallEstablished(v_ueA); //Test Sequence Step 6



		f_mtc_triggerEndCall(v_ueA); //Test Sequence Step 7

		f_mtc_EndCall(v_ueA); //Test Sequence Step 7



		// check 4 (BYE)

		f_mtc_check_TP_IMS_5301_01_gm(v_gmA, false); // Check4
@@ -598,7 +598,7 @@ module AtsImsIot_TestCases_CALL { 
		f_mtc_userCheckCallResumed(v_ueB);  //Test Sequence Step 11

		f_mtc_userCheckCallResumed(v_ueA);  //Test Sequence Step 12



		f_mtc_triggerEndCall(v_ueA); //Test Sequence Step 13

		f_mtc_EndCall(v_ueA); //Test Sequence Step 13



		f_mtc_userCheckCallEnded(v_ueB); //Test Sequence Step 14

		f_mtc_userCheckCallEnded(v_ueA); //Test Sequence Step 15
@@ -650,7 +650,7 @@ module AtsImsIot_TestCases_CALL { 
		f_mtc_userCheckCallEstablished(v_ueB); //Test Sequence Step 5

		f_mtc_userCheckCallEstablished(v_ueA); //Test Sequence Step 6



		f_mtc_triggerEndCall(v_ueB); //Test Sequence Step 7

		f_mtc_EndCall(v_ueB); //Test Sequence Step 7



		// check 1 (BYE)

		f_mtc_check_TP_IMS_5052_01_gm(v_gmB, false); // Check1
@@ -723,7 +723,7 @@ module AtsImsIot_TestCases_CALL { 
		f_mtc_userCheckCallResumed(v_ueA);  //Test Sequence Step 11

		f_mtc_userCheckCallResumed(v_ueB);  //Test Sequence Step 12



		f_mtc_triggerEndCall(v_ueA); //Test Sequence Step 13

		f_mtc_EndCall(v_ueA); //Test Sequence Step 13



		f_mtc_userCheckCallEnded(v_ueB); //Test Sequence Step 14

		f_mtc_userCheckCallEnded(v_ueA); //Test Sequence Step 15
@@ -961,7 +961,7 @@ module AtsImsIot_TestCases_CALL { 
		// Test Sequence 12 -------------------->

		f_mtc_userCheckCallResumed(v_ueA);

		// Test Sequence 13 -------------------->

		f_mtc_triggerEndCall(v_ueA);

		f_mtc_EndCall(v_ueA);

		// Test Sequence 14 -------------------->

		f_mtc_userCheckCallEnded(v_ueB );

		// Test Sequence 15 -------------------->
@@ -1055,7 +1055,7 @@ module AtsImsIot_TestCases_CALL { 
		// Test Sequence 12 -------------------->

		f_mtc_userCheckCallResumed(v_ueA);

		// Test Sequence 13 -------------------->

		f_mtc_triggerEndCall(v_ueA);

		f_mtc_EndCall(v_ueA);

		// Test Sequence 14 -------------------->

		f_mtc_userCheckCallEnded(v_ueB );

		// Test Sequence 15 -------------------->
@@ -1139,7 +1139,7 @@ module AtsImsIot_TestCases_CALL { 
		f_mtc_check_TP_IMS_5121_02_mw(v_mw,1);

		

		// Test Sequence 12 -------------------->

		f_mtc_triggerEndCall(v_ueA);

		f_mtc_EndCall(v_ueA);

		// Test Sequence 13 -------------------->

		f_mtc_userCheckCallEnded(v_ueB );
@@ -1250,7 +1250,7 @@ module AtsImsIot_TestCases_CALL { 
		f_mtc_userCheckNewMediaStream(v_ueA);

		

		// Test Sequence 17 -------------------->

		f_mtc_triggerEndCall(v_ueB);

		f_mtc_EndCall(v_ueB);

		

		// check 2

		f_mtc_check_TP_IMS_5121_02_gm(v_gmB,0);
@@ -1391,7 +1391,7 @@ module AtsImsIot_TestCases_CALL { 
		// optional

		

		// Test Sequence 21 -------------------->

		f_mtc_triggerEndCall(v_ueB);

		f_mtc_EndCall(v_ueB);

		

		// Test Sequence 22 -------------------->

		f_mtc_userCheckCallEnded(v_ueA );
@@ -1528,7 +1528,7 @@ module AtsImsIot_TestCases_CALL { 
		// optional

		

		// Test Sequence 21 -------------------->

		f_mtc_triggerEndCall(v_ueB);

		f_mtc_EndCall(v_ueB);

		

		// Test Sequence 22 -------------------->

		f_mtc_userCheckCallEnded(v_ueA );
@@ -1667,7 +1667,7 @@ module AtsImsIot_TestCases_CALL { 
		f_mtc_check_TP_IMS_5408_01_gm(v_gmA, false); // Check4 

		f_mtc_check_TP_IMS_5408_01_mw(v_mw, false); // Check4 



		f_mtc_triggerEndCall(v_ueA); //Test Sequence Step 7

		f_mtc_EndCall(v_ueA); //Test Sequence Step 7



		// check 5 (BYE)

		f_mtc_check_TP_IMS_5408_03_gm(v_gmA, false); // Check4
@@ -1787,7 +1787,7 @@ module AtsImsIot_TestCases_CALL { 
		f_mtc_userCheckCallResumed(v_ueB);  //Test Sequence Step 11

		f_mtc_userCheckCallResumed(v_ueA);  //Test Sequence Step 12



		f_mtc_triggerEndCall(v_ueA); //Test Sequence Step 13

		f_mtc_EndCall(v_ueA); //Test Sequence Step 13



		f_mtc_userCheckCallEnded(v_ueB); //Test Sequence Step 14

		f_mtc_userCheckCallEnded(v_ueA); //Test Sequence Step 15

AtsImsIot/AtsImsIot_TestCases_SS.ttcn

+8 −8
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ module AtsImsIot_TestCases_SS { 
		f_mtc_check_TP_IMS_5312_01_isc(v_iscB); // Check4 



		f_mtc_userCheckCallResumed(v_ueB);//Test Sequence Step 12

		f_mtc_triggerEndCall(v_ueA);//Test Sequence Step 13

		f_mtc_EndCall(v_ueA);//Test Sequence Step 13

		f_mtc_userCheckCallEnded(v_ueB );//Test Sequence Step 14

		f_mtc_userCheckCallEnded(v_ueA);//Test Sequence Step 15
@@ -169,7 +169,7 @@ module AtsImsIot_TestCases_SS { 
		f_mtc_check_TP_IMS_5312_01_isc(v_iscB); // Check4 



		f_mtc_userCheckCallResumed(v_ueB);//Test Sequence Step 12

		f_mtc_triggerEndCall(v_ueA);//Test Sequence Step 13

		f_mtc_EndCall(v_ueA);//Test Sequence Step 13

		f_mtc_userCheckCallEnded(v_ueB );//Test Sequence Step 14

		f_mtc_userCheckCallEnded(v_ueA);//Test Sequence Step 15
@@ -229,7 +229,7 @@ module AtsImsIot_TestCases_SS { 
		f_mtc_userCheckCallEstablished(v_ueA);//Test Sequence Step 5

		f_mtc_userCheckCallEstablished(v_ueB);//Test Sequence Step 6



		f_mtc_triggerEndCall(v_ueA);//Test Sequence Step 7

		f_mtc_EndCall(v_ueA);//Test Sequence Step 7

		f_mtc_userCheckCallEnded(v_ueB);//Test Sequence Step 8

		f_mtc_userCheckCallEnded(v_ueA);//Test Sequence Step 9
@@ -289,7 +289,7 @@ module AtsImsIot_TestCases_SS { 
		f_mtc_userCheckCallEstablished(v_ueA);//Test Sequence Step 5

		f_mtc_userCheckCallEstablished(v_ueB);//Test Sequence Step 6



		f_mtc_triggerEndCall(v_ueA);//Test Sequence Step 7

		f_mtc_EndCall(v_ueA);//Test Sequence Step 7

		f_mtc_userCheckCallEnded(v_ueB);//Test Sequence Step 8

		f_mtc_userCheckCallEnded(v_ueA);//Test Sequence Step 9
@@ -453,7 +453,7 @@ module AtsImsIot_TestCases_SS { 
		f_mtc_userCheckCallEstablished(v_ueA);//Test Sequence Step 4

		f_mtc_userCheckCallEstablished(v_ueB2);//Test Sequence Step 5



		f_mtc_triggerEndCall(v_ueA);//Test Sequence Step 6

		f_mtc_EndCall(v_ueA);//Test Sequence Step 6

		f_mtc_userCheckCallEnded(v_ueB2);//Test Sequence Step 7

		f_mtc_userCheckCallEnded(v_ueA);//Test Sequence Step 8
@@ -520,7 +520,7 @@ module AtsImsIot_TestCases_SS { 
		f_mtc_userCheckCallEstablished(v_ueB);//Test Sequence Step 4

		f_mtc_userCheckCallEstablished(v_ueA2);//Test Sequence Step 5



		f_mtc_triggerEndCall(v_ueB);//Test Sequence Step 6

		f_mtc_EndCall(v_ueB);//Test Sequence Step 6

		f_mtc_userCheckCallEnded(v_ueA2);//Test Sequence Step 7

		f_mtc_userCheckCallEnded(v_ueB);//Test Sequence Step 8
@@ -579,7 +579,7 @@ module AtsImsIot_TestCases_SS { 
		f_mtc_userCheckCallEstablished(v_ueA);//Test Sequence Step 4

		f_mtc_userCheckCallEstablished(v_ueB);//Test Sequence Step 5



		f_mtc_triggerEndCall(v_ueB);//Test Sequence Step 6

		f_mtc_EndCall(v_ueB);//Test Sequence Step 6

		f_mtc_userCheckCallEnded(v_ueA);//Test Sequence Step 7

		f_mtc_userCheckCallEnded(v_ueB);//Test Sequence Step 8
@@ -646,7 +646,7 @@ module AtsImsIot_TestCases_SS { 
		f_mtc_userCheckCallEstablished(v_ueB);//Test Sequence Step 4

		f_mtc_userCheckCallEstablished(v_ueA);//Test Sequence Step 5



		f_mtc_triggerEndCall(v_ueB);//Test Sequence Step 6

		f_mtc_EndCall(v_ueB);//Test Sequence Step 6

		f_mtc_userCheckCallEnded(v_ueA);//Test Sequence Step 7

		f_mtc_userCheckCallEnded(v_ueB);//Test Sequence Step 8

LibIms_ConfigAndTrigger/LibIms_UpperTester.ttcn

+6 −1
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ module LibIms_UpperTester { 
				const EquipmentCommand c_UE_CHECKisnotREGISTERED := "UE_CHECK_IS_NOT_REGISTERED";

				const EquipmentCommand c_UE_CHECK_CALLisINITIALIZED := "UE_CHECK_CALL_IS_INITIALIZED";

				const EquipmentCommand c_UE_CHECK_CALLisANSWERED := "UE_CHECK_CALL_IS_ANSWERED";

				const EquipmentCommand c_UE_CHECK_CALLisENDED := "UE_CHECK_CALL_IS_ANSWERED";

				

				

				/**
@@ -88,6 +89,10 @@ module LibIms_UpperTester { 
   			function f_checkUserCallIsAnswered() 

			runs on EquipmentUser {

				f_sendEquipmentCmd(valueof(m_EQ_Request(c_UE_CHECK_CALLisANSWERED, {})));

			}

			function f_checkUserCallIsEnded() 

            runs on EquipmentUser {

            	f_sendEquipmentCmd(valueof(m_EQ_Request(c_UE_CHECK_CALLisENDED, {})));

            }			

			/**

			 *