Commit 3995e80e authored by ringst's avatar ringst
Browse files

f_mtc_userTriggerAnswerCall --> f_mtc_userAnswerCall and implemented

parent 893c347a

AtsImsIot/AtsImsIot_Functions.ttcn

+34 −9
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ module AtsImsIot_Functions { 


 		/**

		  * @desc Trigger UE given by p_ueRef to initiate an MO call 

		  * @param p_userCompRef Reference to IMS UE user component

		  * @param p_ueRef Reference to IMS UE user component

		  * @param p_calledParty ImsUserInfo of called party

		  * @return

		  *     true in case of successfull execution of the trigger command
@@ -128,18 +128,43 @@ module AtsImsIot_Functions { 
		}

     	

 		/**

		  * @desc Trigger UE given by p_ueRef to initiate an MO call 

		  * @param p_userCompRef Reference to IMS UE user component

		  * @desc Check if call is answered 

		  * @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_userTriggerAnswerCall(EquipmentUser p_ueRef) 

 		function f_mtc_userAnswerCall(EquipmentUser p_ueRef) 

			runs on TestCoordinator return boolean {

			var boolean v_status := true;        		

     		// TODO

			v_status := f_mtc_userAnswerCallSuccessful(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_userAnswerCallSuccessful(EquipmentUser p_userCompRef) 

			runs on TestCoordinator return boolean {

			var boolean v_success := false;



			p_userCompRef.start(f_checkUserCallIsAnswered());



			p_userCompRef.done;



			if(f_getE2EVerdict() == pass) {

				v_success := true;	

			}

				return v_success;

		}		

 		

 		

 		/**

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

		  * @param p_userCompRef Reference to IMS UE user component

AtsImsIot/AtsImsIot_TestCases_CALL.ttcn

+16 −16
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ module AtsImsIot_TestCases_CALL { 
				

		f_mtc_userCheckRinging(v_ueB); //Test Sequence Step 2

		f_mtc_userCheckPeerIsRinging(v_ueA); //Test Sequence Step 3

		f_mtc_userTriggerAnswerCall(v_ueB); //Test Sequence Step 4

		f_mtc_userAnswerCall(v_ueB); //Test Sequence Step 4



		// checks 8, 11 (2xx)

		f_mtc_check_TP_IMS_5115_02_gm(v_gmB, true); // Check 8
@@ -168,7 +168,7 @@ module AtsImsIot_TestCases_CALL { 
		f_mtc_userCheckRinging(v_ueB); //Test Sequence Step 2

		f_mtc_userCheckRinging(v_ueB2); //Test Sequence Step 3

		f_mtc_userCheckPeerIsRinging(v_ueA); //Test Sequence Step 4

		f_mtc_userTriggerAnswerCall(v_ueB2); //Test Sequence Step 5

		f_mtc_userAnswerCall(v_ueB2); //Test Sequence Step 5



		// checks 5, 7 (2xx)

		f_mtc_check_TP_IMS_5115_02_gm(v_gmB, true); // Check 5
@@ -257,7 +257,7 @@ module AtsImsIot_TestCases_CALL { 
				

		f_mtc_userCheckRinging(v_ueB); //Test Sequence Step 2

		f_mtc_userCheckPeerIsRinging(v_ueA); //Test Sequence Step 3

		f_mtc_userTriggerAnswerCall(v_ueB); //Test Sequence Step 4

		f_mtc_userAnswerCall(v_ueB); //Test Sequence Step 4



		// checks 8, 11 (2xx)

		f_mtc_check_TP_IMS_5115_02_gm(v_gmB, true); // Check 7
@@ -508,7 +508,7 @@ module AtsImsIot_TestCases_CALL { 
				

		f_mtc_userCheckRinging(v_ueA); //Test Sequence Step 2

		f_mtc_userCheckPeerIsRinging(v_ueB); //Test Sequence Step 3

		f_mtc_userTriggerAnswerCall(v_ueA); //Test Sequence Step 4

		f_mtc_userAnswerCall(v_ueA); //Test Sequence Step 4



		// checks 6 (2xx)

		f_mtc_check_TP_IMS_5055_02_gm(v_gmA, true); // Check 6
@@ -566,7 +566,7 @@ module AtsImsIot_TestCases_CALL { 
		f_mtc_userInitiateCall (v_ueA, v_userInfoB); //Test Sequence Step 1

		f_mtc_userCheckRinging(v_ueB); //Test Sequence Step 2

		f_mtc_userCheckPeerIsRinging(v_ueA); //Test Sequence Step 3

		f_mtc_userTriggerAnswerCall(v_ueB); //Test Sequence Step 4

		f_mtc_userAnswerCall(v_ueB); //Test Sequence Step 4

		f_mtc_userCheckCallEstablished(v_ueA); //Test Sequence Step 5

		f_mtc_userCheckCallEstablished(v_ueB); //Test Sequence Step 6
@@ -645,7 +645,7 @@ module AtsImsIot_TestCases_CALL { 
						

		f_mtc_userCheckRinging(v_ueA); //Test Sequence Step 2

		f_mtc_userCheckPeerIsRinging(v_ueB); //Test Sequence Step 3

		f_mtc_userTriggerAnswerCall(v_ueA); //Test Sequence Step 4

		f_mtc_userAnswerCall(v_ueA); //Test Sequence Step 4



		f_mtc_userCheckCallEstablished(v_ueB); //Test Sequence Step 5

		f_mtc_userCheckCallEstablished(v_ueA); //Test Sequence Step 6
@@ -699,7 +699,7 @@ module AtsImsIot_TestCases_CALL { 
		f_mtc_userInitiateCall (v_ueB, v_userInfoA); //Test Sequence Step 1

		f_mtc_userCheckRinging(v_ueA); //Test Sequence Step 2

		f_mtc_userCheckPeerIsRinging(v_ueB); //Test Sequence Step 3

		f_mtc_userTriggerAnswerCall(v_ueA); //Test Sequence Step 4

		f_mtc_userAnswerCall(v_ueA); //Test Sequence Step 4

		f_mtc_userCheckCallEstablished(v_ueB); //Test Sequence Step 5

		f_mtc_userCheckCallEstablished(v_ueA); //Test Sequence Step 6
@@ -863,7 +863,7 @@ module AtsImsIot_TestCases_CALL { 
		f_mtc_userInitiateCall (v_ueA, v_userInfoB); //Test Sequence Step 1

		f_mtc_userCheckRinging(v_ueB); //Test Sequence Step 2

		f_mtc_userCheckPeerIsRinging(v_ueA); //Test Sequence Step 3

		f_mtc_userTriggerAnswerCall(v_ueB); //Test Sequence Step 4

		f_mtc_userAnswerCall(v_ueB); //Test Sequence Step 4

		f_mtc_userCheckCallEstablished(v_ueA); //Test Sequence Step 5

		f_mtc_userCheckCallEstablished(v_ueB); //Test Sequence Step 6		

		f_mtc_imsTriggerUeDeregistration(v_imsA, v_ueA); //Test Sequence Step 7
@@ -923,7 +923,7 @@ module AtsImsIot_TestCases_CALL { 
		// Test Sequence 3 --------------------->

		f_mtc_userCheckPeerIsRinging(v_ueA);

		// Test Sequence 4 --------------------->

		f_mtc_userTriggerAnswerCall(v_ueB);

		f_mtc_userAnswerCall(v_ueB);

		// Test Sequence 5 --------------------->

		f_mtc_userCheckCallEstablished(v_ueA);

		// Test Sequence 6 --------------------->
@@ -1017,7 +1017,7 @@ module AtsImsIot_TestCases_CALL { 
		// Test Sequence 3 --------------------->

		f_mtc_userCheckPeerIsRinging(v_ueA);

		// Test Sequence 4 --------------------->

		f_mtc_userTriggerAnswerCall(v_ueB);

		f_mtc_userAnswerCall(v_ueB);

		// Test Sequence 5 --------------------->

		f_mtc_userCheckCallEstablished(v_ueA);

		// Test Sequence 6 --------------------->
@@ -1111,7 +1111,7 @@ module AtsImsIot_TestCases_CALL { 
		// Test Sequence 3 --------------------->

		f_mtc_userCheckPeerIsRinging(v_ueA);

		// Test Sequence 4 --------------------->

		f_mtc_userTriggerAnswerCall(v_ueB);

		f_mtc_userAnswerCall(v_ueB);

		// Test Sequence 5 --------------------->

		f_mtc_userCheckCallEstablished(v_ueA);

		// Test Sequence 6 --------------------->
@@ -1200,7 +1200,7 @@ module AtsImsIot_TestCases_CALL { 
		// Test Sequence 3 --------------------->

		f_mtc_userCheckPeerIsRinging(v_ueA);

		// Test Sequence 4 --------------------->

		f_mtc_userTriggerAnswerCall(v_ueB);

		f_mtc_userAnswerCall(v_ueB);

		// Test Sequence 5 --------------------->

		f_mtc_userCheckCallEstablished(v_ueA);

		// Test Sequence 6 --------------------->
@@ -1312,7 +1312,7 @@ module AtsImsIot_TestCases_CALL { 
		// Test Sequence 3 --------------------->

		f_mtc_userCheckPeerIsRinging(v_ueA);

		// Test Sequence 4 --------------------->

		f_mtc_userTriggerAnswerCall(v_ueB);

		f_mtc_userAnswerCall(v_ueB);

		// Test Sequence 5 --------------------->

		f_mtc_userCheckCallEstablished(v_ueA);

		// Test Sequence 6 --------------------->
@@ -1449,7 +1449,7 @@ module AtsImsIot_TestCases_CALL { 
		// Test Sequence 3 --------------------->

		f_mtc_userCheckPeerIsRinging(v_ueA);

		// Test Sequence 4 --------------------->

		f_mtc_userTriggerAnswerCall(v_ueB);

		f_mtc_userAnswerCall(v_ueB);

		// Test Sequence 5 --------------------->

		f_mtc_userCheckCallEstablished(v_ueA);

		// Test Sequence 6 --------------------->
@@ -1585,7 +1585,7 @@ module AtsImsIot_TestCases_CALL { 
		// Test Sequence 3 --------------------->

		f_mtc_userCheckPeerIsRinging(v_ueA);

		// Test Sequence 4 --------------------->

		f_mtc_userTriggerAnswerCall(v_ueB);

		f_mtc_userAnswerCall(v_ueB);

		// Test Sequence 5 --------------------->

		f_mtc_userCheckCallEstablished(v_ueA);

		// Test Sequence 6 --------------------->
@@ -1653,7 +1653,7 @@ module AtsImsIot_TestCases_CALL { 
				

		f_mtc_userCheckRinging(v_ueB); //Test Sequence Step 2

		f_mtc_userCheckPeerIsRinging(v_ueA); //Test Sequence Step 3

		f_mtc_userTriggerAnswerCall(v_ueB); //Test Sequence Step 4

		f_mtc_userAnswerCall(v_ueB); //Test Sequence Step 4



		//check 8 (2xx)

AtsImsIot/AtsImsIot_TestCases_SS.ttcn

+8 −11
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ module AtsImsIot_TestCases_SS { 


		f_mtc_userCheckRinging(v_ueB);//Test Sequence Step 2

		f_mtc_userCheckPeerIsRinging(v_ueA);//Test Sequence Step 3

		f_mtc_userTriggerAnswerCall(v_ueB);//Test Sequence Step 4

		f_mtc_userAnswerCall(v_ueB);//Test Sequence Step 4

		f_mtc_userCheckCallEstablished(v_ueA);//Test Sequence Step 5

		f_mtc_userCheckCallEstablished(v_ueB);//Test Sequence Step 6
@@ -139,7 +139,7 @@ module AtsImsIot_TestCases_SS { 


		f_mtc_userCheckRinging(v_ueB);//Test Sequence Step 2

		f_mtc_userCheckPeerIsRinging(v_ueA);//Test Sequence Step 3

		f_mtc_userTriggerAnswerCall(v_ueB);//Test Sequence Step 4

		f_mtc_userAnswerCall(v_ueB);//Test Sequence Step 4

		f_mtc_userCheckCallEstablished(v_ueA);//Test Sequence Step 5

		f_mtc_userCheckCallEstablished(v_ueB);//Test Sequence Step 6
@@ -220,7 +220,7 @@ module AtsImsIot_TestCases_SS { 


		f_mtc_userCheckRinging(v_ueB);//Test Sequence Step 2

		f_mtc_userCheckPeerIsRinging(v_ueA);//Test Sequence Step 3

		f_mtc_userTriggerAnswerCall(v_ueB);//Test Sequence Step 4

		f_mtc_userAnswerCall(v_ueB);//Test Sequence Step 4

		

		//check 3 - 200 OK

		f_mtc_check_TP_IMS_5115_08_isc(v_iscB, false);// Check3
@@ -280,7 +280,7 @@ module AtsImsIot_TestCases_SS { 


		f_mtc_userCheckRinging(v_ueB);//Test Sequence Step 2

		f_mtc_userCheckPeerIsRinging(v_ueA);//Test Sequence Step 3

		f_mtc_userTriggerAnswerCall(v_ueB);//Test Sequence Step 4

		f_mtc_userAnswerCall(v_ueB);//Test Sequence Step 4

		

		//check 3 - 200 OK

		f_mtc_check_TP_IMS_5115_08_isc(v_iscB, false);// Check3
@@ -444,7 +444,7 @@ module AtsImsIot_TestCases_SS { 


   		//f_mtc_userCheckRinging(v_ueB2); //possible Test Sequence Step

		//f_mtc_userCheckPeerIsRinging(v_ueA); //possible Test Sequence Step

		f_mtc_userTriggerAnswerCall(v_ueB2);//Test Sequence Step 3

		f_mtc_userAnswerCall(v_ueB2);//Test Sequence Step 3



		//check 3 - 200 OK

		f_mtc_check_TP_IMS_5115_08_isc(v_iscB, false);// Check3
@@ -511,7 +511,7 @@ module AtsImsIot_TestCases_SS { 


   		//f_mtc_userCheckRinging(v_ueA2); //possible Test Sequence Step

		//f_mtc_userCheckPeerIsRinging(v_ueA); //possible Test Sequence Step

		f_mtc_userTriggerAnswerCall(v_ueA2);//Test Sequence Step 3

		f_mtc_userAnswerCall(v_ueA2);//Test Sequence Step 3



		//check 4 - 200 OK

		f_mtc_check_TP_IMS_5110_01_isc(v_iscA); // Check4
@@ -574,7 +574,7 @@ module AtsImsIot_TestCases_SS { 


   		f_mtc_userCheckRinging(v_ueB); //possible Test Sequence Step

		f_mtc_userCheckPeerIsRinging(v_ueA); //possible Test Sequence Step

		f_mtc_userTriggerAnswerCall(v_ueB);//Test Sequence Step 3

		f_mtc_userAnswerCall(v_ueB);//Test Sequence Step 3

		

		f_mtc_userCheckCallEstablished(v_ueA);//Test Sequence Step 4

		f_mtc_userCheckCallEstablished(v_ueB);//Test Sequence Step 5
@@ -637,7 +637,7 @@ module AtsImsIot_TestCases_SS { 
		

   		f_mtc_userCheckRinging(v_ueB); //possible Test Sequence Step

		f_mtc_userCheckPeerIsRinging(v_ueA); //possible Test Sequence Step

		f_mtc_userTriggerAnswerCall(v_ueA);//Test Sequence Step 3

		f_mtc_userAnswerCall(v_ueA);//Test Sequence Step 3

		

		//check 4 -200 OK

		f_mtc_check_TP_IMS_5308_02_gm(v_gmA, false);// Check4
@@ -659,7 +659,4 @@ module AtsImsIot_TestCases_SS { 
		f_cf_user_down(v_ueB);

		f_cf_roam_as_down(v_config);

	} //end testcase TC_IMS_SS_0010

	

	

	

}
 
 No newline at end of file

LibIms_ConfigAndTrigger/LibIms_UpperTester.ttcn

+12 −2
Original line number Diff line number Diff line
@@ -29,6 +29,9 @@ module LibIms_UpperTester { 
				const EquipmentCommand c_UE_REGISTRATION := "UE_REGISTRATION";

				const EquipmentCommand c_UE_CHECKisREGISTERED := "UE_CHECK_IS_REGISTER";

				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";

					

				

				/**

				 *
@@ -78,7 +81,14 @@ module LibIms_UpperTester { 
			runs on EquipmentUser {

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

			}

   			

			function f_checkUserCallIsInitiated() 

			runs on EquipmentUser {

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

			}

   			function f_checkUserCallIsAnswered() 

			runs on EquipmentUser {

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

			}

			/**

			 * 

			 * @desc Triggers de-registration of a given user via UE