Commit deb44da7 authored by poglitsch's avatar poglitsch
Browse files

stable version

parent 1f27fcc3
Loading
Loading
Loading
Loading
+7 −9
Original line number Diff line number Diff line
@@ -76,15 +76,15 @@ module AtsImsIot_Behavior {
        function f_gen_receive( 
          in charstring p_tpId,
          in charstring p_log, // TODO: usage? what is in this param?
          in integer p_skipCount,
          in integer p_skipCount
        ) runs on InterfaceMonitor {
            
			tc_wait.start;
            
            alt {
            	// preamble (consume prior messages)
            	[p_msgCount > 0] mPort.receive {
            		p_msgCount := p_msgCount - 1;
            	[p_skipCount > 0] mPort.receive {
            		p_skipCount := p_skipCount - 1;
            		log("***f_gen_receive: Message skipped (intentionally) when checking for " & p_tpId & " at interface " & vc_interfaceName & " ****");
            		repeat;
            	}
@@ -153,8 +153,7 @@ module AtsImsIot_Behavior {
			in template Request p_message,
			in verdicttype p_verdict,
			in charstring p_tpId,
			in charstring p_log, // TODO ???
			in boolean p_forward
			in charstring p_log // TODO ???
		) runs on InterfaceMonitor {
			var Request v_message;
			[] mPort.receive(p_message) -> value v_message {
@@ -174,8 +173,7 @@ module AtsImsIot_Behavior {
    		in template Response p_message,
    		in verdicttype p_verdict,
    		in charstring p_tpId,
    		in charstring p_log,
    		in boolean p_forward
    		in charstring p_log
		) runs on InterfaceMonitor {
			var Response v_message;
			[] mPort.receive(p_message) -> value v_message {
@@ -202,7 +200,7 @@ module AtsImsIot_Behavior {
            f_imsIot_receive(
                {mw_SipRequest(mdw_TP_IMS_4002_01(?))},//? CallId can be checked
                {mw_SipRequest(mw_MESSAGE_Request_Base(?))},
                "TP_IMS_4002_01 @ " & p_interfaceName,
                "TP_IMS_4002_01",
                "MESSAGE request",
                0,
                false
@@ -218,7 +216,7 @@ module AtsImsIot_Behavior {
            f_imsIot_receive(
                {mw_SipRequest(mdw_TP_IMS_4002_01(?))},//? CallId can be checked
                {mw_SipRequest(mw_MESSAGE_Request_Base(?))},
                "TP_IMS_4002_01 @ " & p_interfaceName,
                "TP_IMS_4002_01",
                "MESSAGE request",
                0,
                false
+3 −3
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ module AtsImsIot_Functions {
 		 * @param p_userCompRef Reference ot IMS UE user component
 		 * @param p_content Content of meessage to be received
 		 */
 		function f_userCheckMessageReceipt(EutTrigger p_userCompRef) runs on TestCoordinator return boolean {
 		function f_mtc_userCheckMessageReceipt(EutTrigger p_userCompRef) runs on TestCoordinator return boolean {
 			var boolean v_success := false;
 			
 			p_userCompRef.start(f_userCheckMessageReceipt());
@@ -103,7 +103,7 @@ module AtsImsIot_Functions {
 		  
 		  for(var integer i := 0; i < v_size; i := i+1) {
 		     if(PX_IMS_USER_DATA[i].productIndex == p_productIdx) {
 		      p_userInfo :=  PX_IMS_USER_DATA[i].userInfos;
 		      p_userInfo :=  PX_IMS_USER_DATA[i].userInfos[0]; // TODO improve this
 		      return true;
 		    }
 		    
@@ -123,7 +123,7 @@ module AtsImsIot_Functions {
     		
     		if( not f_getUserInfo(p_productIdx, v_userInfo) ) { return false; } 
     		
     		v_status := f_mtc_userRegister(p_userCompRef, v_userInfo.publidId, v_userInfo.privateId, v_userInfo.password); 
     		v_status := f_mtc_userRegister(p_userCompRef, v_userInfo.publicId, v_userInfo.privateId, v_userInfo.password); 
     		
     		return v_status;
     	}
+16 −16
Original line number Diff line number Diff line
@@ -5,13 +5,13 @@
 */
module AtsImsIot_TestCases {
 
	import from AtsImsIot_Functions {
		function all;
	}
	import from Interface_configuration {modulepar PX_EUT_A, PX_EUT_B;}

	import from LibIot_TypesAndValues {
		const all;
	}
	import from AtsImsIot_Functions {function all;}
	
	import from AtsImsIot_Behavior all;
	
	import from LibIot_TypesAndValues {const all;}
	
	import from LibIot_TestConfiguration {
		function
@@ -61,8 +61,8 @@ module AtsImsIot_TestCases {
		f_cf_monitor_up(v_mw);
		
		// preamble
		f_PR_user_home_registration(v_ueA);
		f_PR_user_home_registration(v_ueB);
		f_PR_user_home_registration(v_ueA, PX_EUT_A);
		f_PR_user_home_registration(v_ueB, PX_EUT_B);
		
		// test body
		f_mtc_userSendMessage(v_ueA, "body>1300Bytes"); // TODO add body here
@@ -95,8 +95,8 @@ module AtsImsIot_TestCases {
		f_cf_trigger_up(v_ueB2);
		
		// preamble
		f_PR_user_home_registration(v_ueA);
		f_PR_user_home_registration(v_ueB2);
		f_PR_user_home_registration(v_ueA, PX_EUT_A);
		f_PR_user_home_registration(v_ueB2,PX_EUT_B);
		
		// test body
		
+3 −3
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ module LibIms_ConfigAndTrigger {
		* @member userInfos Lists information about all users configured in the HSS of this core IMS
		*/
		type record CoreImsUserInfo {
			charstring       productIndex,
			integer       productIndex,
			ImsUserInfoList  userInfos
		}
	
@@ -140,7 +140,7 @@ module LibIms_ConfigAndTrigger {
			*/
		modulepar CoreImsUserInfoList PX_IMS_USER_DATA := {
			{
				productIndex := "ETSI",
				productIndex := 0,
				userInfos := {
					{
						publicId := "userSIP",
@@ -161,7 +161,7 @@ module LibIms_ConfigAndTrigger {
				}
			},
			{
				productIndex := "TT",
				productIndex := 1,
				userInfos := {
					{
						publicId := "userSIP",
+8 −4
Original line number Diff line number Diff line
@@ -5,7 +5,9 @@
 */

module LibIot_Functions {
	import from LibIot_PIXITS {modulepar PX_TTCN3_VERDICT;}
	import from LibIot_PIXITS {
		modulepar PX_EUT_TRIGGER_RESPONSE, PX_TTCN3_VERDICT;
	}

	import from LibIot_TypesAndValues {
		signature Trigger;
@@ -98,7 +100,7 @@ module LibIot_Functions {
    				return p_new;
    			}
    			else {
    				return p_org
    				return p_org;
    			}
    		}
    		else if (p_org.verdict == inconc) {
@@ -107,7 +109,7 @@ module LibIot_Functions {
    				return p_new;
    			}
    			else {
    				return p_org
    				return p_org;
    			}
    		}
    		else if (p_org.verdict == fail) {
@@ -118,12 +120,14 @@ module LibIot_Functions {
    				return p_org;
    			}
    			else {
    				return p_new
    				return p_new;
    			}
    		}
    		else if (p_org.verdict == error) {
    			return p_org;
    		}
    		
    		return p_org;
    	}
    
    	/**
Loading