Commit af57c803 authored by nikolajev's avatar nikolajev
Browse files

Errors preventing compilation on TestCast tool: 

* str2oct -> char2oct, as str2oct
* match(value, template) -> cannot match(template, template)
* value list assignment for record, requires number of values match the number of fields
parent df88aaba

ttcn/AtsImsIot/AtsImsIot_Functions.ttcn

+3 −3
Original line number Diff line number Diff line
@@ -2412,7 +2412,7 @@ module AtsImsIot_Functions { 
		* @param p_monitor Reference of NAPTR component

		* @param p_msg The NAPTR message

		*/

	 	function f_getNaptrMsg ( InterfaceMonitor p_monitor, in template (present) EnumMessage p_enum, out template (present) NAPTRmessage p_msg )

	 	function f_getNaptrMsg ( InterfaceMonitor p_monitor, in template (present) EnumMessage p_enum, out /*template (present)*/ NAPTRmessage p_msg )

	 	runs on ImsInterfaceMonitor {

            timer	t_local	:= PX_MAX_MSG_WAIT;

            var boolean	v_loop	:= true;
@@ -2420,7 +2420,7 @@ module AtsImsIot_Functions { 
            while ( v_loop ) {            

	            alt {

                    []	naptrPort.receive ( mw_EnumQuery_Base ) -> value p_msg {

            	   		if ( match ( p_enum, p_msg.enumMessage )) {

            	   		if ( match (p_msg.enumMessage, p_enum)) {

							t_local.stop;

							setverdict(pass, self, "***f_getNaptrMsg: expected NAPTR message received***");

							break;
@@ -2428,7 +2428,7 @@ module AtsImsIot_Functions { 
            			t_local.start;

            		}

                    []	naptrPort.receive ( mw_EnumResponse_Base ) -> value p_msg {

                        if ( match ( p_enum, p_msg.enumMessage )) {

                        if ( match (p_msg.enumMessage,  p_enum)) {

                            t_local.stop;

                            setverdict(pass, self, "***f_getNaptrMsg: expected NAPTR message received***");

                            break;

ttcn/AtsImsIot/AtsImsIot_TestCases_CALL.ttcn

+17 −17
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ module AtsImsIot_TestCases_CALL { 
		var ImsUserInfo v_userTelInfoB := f_getTelUserId(PX_EUT_B);

        var ImsInterfaceMonitor v_mxA := f_cf_create_monitor(c_mx_A);

        var ImsInterfaceMonitor v_mxB := f_cf_create_monitor(c_mx_B);

		var CF_INT_CALL v_config := {v_gmA, v_mxA, v_ic, v_mxB, v_gmB};

		var CF_INT_CALL v_config := {v_gmA, v_mxA, v_ic, v_mxB, v_gmB, omit};

				

		// map/connect component ports

		f_cf_adapter_up();
@@ -149,7 +149,7 @@ module AtsImsIot_TestCases_CALL { 
		var ImsUserInfo v_userInfoB := f_getAnyValidUser(PX_EUT_B);

        var ImsInterfaceMonitor v_mxA := f_cf_create_monitor(c_mx_A);

        var ImsInterfaceMonitor v_mxB := f_cf_create_monitor(c_mx_B);

        var CF_INT_CALL v_config := {v_gmA, v_mxA, v_ic, v_mxB, v_gmB};

        var CF_INT_CALL v_config := {v_gmA, v_mxA, v_ic, v_mxB, v_gmB, omit};

				

		// map/connect component ports

		f_cf_adapter_up();
@@ -259,7 +259,7 @@ module AtsImsIot_TestCases_CALL { 
		var ImsUserInfo v_userInfoB := f_getTelUserId(PX_EUT_B);

        var ImsInterfaceMonitor v_mxA := f_cf_create_monitor(c_mx_A);

        var ImsInterfaceMonitor v_mxB := f_cf_create_monitor(c_mx_B);

        var CF_INT_CALL v_config := {v_gmA, v_mxA, v_ic, v_mxB, v_gmB};

        var CF_INT_CALL v_config := {v_gmA, v_mxA, v_ic, v_mxB, v_gmB, omit};

				

		// map/connect component ports

		f_cf_adapter_up();
@@ -353,7 +353,7 @@ module AtsImsIot_TestCases_CALL { 
		var ImsUserInfo v_userInfoB := f_getAnyValidUser(PX_EUT_B);

        var ImsInterfaceMonitor v_mxA := f_cf_create_monitor(c_mx_A);

        var ImsInterfaceMonitor v_mxB := f_cf_create_monitor(c_mx_B);

        var CF_INT_CALL v_config := {v_gmA, v_mxA, v_ic, v_mxB, omit};

        var CF_INT_CALL v_config := {v_gmA, v_mxA, v_ic, v_mxB, omit, omit};

				

		// map/connect component ports

		f_cf_adapter_up();
@@ -402,7 +402,7 @@ module AtsImsIot_TestCases_CALL { 
		var ImsUserInfo v_userInfoB := f_getAnyValidUser(PX_EUT_B);

        var ImsInterfaceMonitor v_mxA := f_cf_create_monitor(c_mx_A);

        var ImsInterfaceMonitor v_mxB := f_cf_create_monitor(c_mx_B);

        var CF_INT_CALL v_config := {v_gmA, v_mxA, v_ic, v_mxB, omit};

        var CF_INT_CALL v_config := {v_gmA, v_mxA, v_ic, v_mxB, omit, omit};

				

		// map/connect component ports

		f_cf_adapter_up();
@@ -448,7 +448,7 @@ module AtsImsIot_TestCases_CALL { 
		var ImsUserInfo v_userInfoB := f_getAnyValidUser(PX_EUT_B);

        var ImsInterfaceMonitor v_mxA := f_cf_create_monitor(c_mx_A);

        var ImsInterfaceMonitor v_mxB := f_cf_create_monitor(c_mx_B);

        var CF_INT_CALL v_config := {v_gmA, v_mxA, v_ic, v_mxB, omit};

        var CF_INT_CALL v_config := {v_gmA, v_mxA, v_ic, v_mxB, omit, omit};

				

		// map/connect component ports

		f_cf_adapter_up();
@@ -494,7 +494,7 @@ module AtsImsIot_TestCases_CALL { 
		var ImsUserInfo v_userInfoB := f_getAnyValidUser(PX_EUT_B);

        var ImsInterfaceMonitor v_mxA := f_cf_create_monitor(c_mx_A);

        var ImsInterfaceMonitor v_mxB := f_cf_create_monitor(c_mx_B);

        var CF_INT_CALL v_config := {v_gmA, v_mxA, v_ic, v_mxB, omit};

        var CF_INT_CALL v_config := {v_gmA, v_mxA, v_ic, v_mxB, omit, omit};

				

		// map/connect component ports

		f_cf_adapter_up();
@@ -1045,7 +1045,7 @@ module AtsImsIot_TestCases_CALL { 
		var ImsUserInfo v_userInfoB := f_getSipUserId(PX_EUT_B);

        var ImsInterfaceMonitor v_mxA := f_cf_create_monitor(c_mx_A);

        var ImsInterfaceMonitor v_mxB := f_cf_create_monitor(c_mx_B);

        var CF_INT_CALL v_config := {v_gmA, v_mxA, v_ic, v_mxB, v_gmB};

        var CF_INT_CALL v_config := {v_gmA, v_mxA, v_ic, v_mxB, v_gmB, omit};

				

		// map/connect component ports

		f_cf_adapter_up();
@@ -1103,7 +1103,7 @@ module AtsImsIot_TestCases_CALL { 
		var ImsUserInfo v_userInfoB := f_getSipUserId(PX_EUT_B);

        var ImsInterfaceMonitor v_mxA := f_cf_create_monitor(c_mx_A);

        var ImsInterfaceMonitor v_mxB := f_cf_create_monitor(c_mx_B);

        var CF_INT_CALL v_config := {v_gmA, v_mxA, v_ic, v_mxB, v_gmB};

        var CF_INT_CALL v_config := {v_gmA, v_mxA, v_ic, v_mxB, v_gmB, omit};

				

		// map/connect component ports

		f_cf_adapter_up();
@@ -1162,7 +1162,7 @@ module AtsImsIot_TestCases_CALL { 
		var IotEquipmentUser v_ueB := f_cf_create_IotEquipmentUser(c_userUE_B);

        var ImsInterfaceMonitor v_mxA := f_cf_create_monitor(c_mx_A);

        var ImsInterfaceMonitor v_mxB := f_cf_create_monitor(c_mx_B);

        var CF_INT_CALL v_config := {v_gmA, v_mxA, v_ic, v_mxB, v_gmB};

        var CF_INT_CALL v_config := {v_gmA, v_mxA, v_ic, v_mxB, v_gmB, omit};

				

		// map/connect component ports

		f_cf_adapter_up();
@@ -1267,7 +1267,7 @@ module AtsImsIot_TestCases_CALL { 
		var IotEquipmentUser v_ueB := f_cf_create_IotEquipmentUser(c_userUE_B);

        var ImsInterfaceMonitor v_mxA := f_cf_create_monitor(c_mx_A);

        var ImsInterfaceMonitor v_mxB := f_cf_create_monitor(c_mx_B);

        var CF_INT_CALL v_config := {v_gmA, v_mxA, v_ic, v_mxB, v_gmB};

        var CF_INT_CALL v_config := {v_gmA, v_mxA, v_ic, v_mxB, v_gmB, omit};

				

		// map/connect component ports

		f_cf_adapter_up();
@@ -1372,7 +1372,7 @@ module AtsImsIot_TestCases_CALL { 
		var IotEquipmentUser v_ueB := f_cf_create_IotEquipmentUser(c_userUE_B);

        var ImsInterfaceMonitor v_mxA := f_cf_create_monitor(c_mx_A);

        var ImsInterfaceMonitor v_mxB := f_cf_create_monitor(c_mx_B);

        var CF_INT_CALL v_config := {v_gmA, v_mxA, v_ic, v_mxB, v_gmB};

        var CF_INT_CALL v_config := {v_gmA, v_mxA, v_ic, v_mxB, v_gmB, omit};

				

		// map/connect component ports

		f_cf_adapter_up();
@@ -1470,7 +1470,7 @@ module AtsImsIot_TestCases_CALL { 
		var IotEquipmentUser v_ueB := f_cf_create_IotEquipmentUser(c_userUE_B);

        var ImsInterfaceMonitor v_mxA := f_cf_create_monitor(c_mx_A);

        var ImsInterfaceMonitor v_mxB := f_cf_create_monitor(c_mx_B);

        var CF_INT_CALL v_config := {v_gmA, v_mxA, v_ic, v_mxB, v_gmB};

        var CF_INT_CALL v_config := {v_gmA, v_mxA, v_ic, v_mxB, v_gmB, omit};

				

		// map/connect component ports

		f_cf_adapter_up();
@@ -1595,7 +1595,7 @@ module AtsImsIot_TestCases_CALL { 
		var IotEquipmentUser v_ueB := f_cf_create_IotEquipmentUser(c_userUE_B);

        var ImsInterfaceMonitor v_mxA := f_cf_create_monitor(c_mx_A);

        var ImsInterfaceMonitor v_mxB := f_cf_create_monitor(c_mx_B);

        var CF_INT_CALL v_config := {v_gmA, v_mxA, v_ic, v_mxB, v_gmB};

        var CF_INT_CALL v_config := {v_gmA, v_mxA, v_ic, v_mxB, v_gmB, omit};

				

		// map/connect component ports

		f_cf_adapter_up();
@@ -1747,7 +1747,7 @@ module AtsImsIot_TestCases_CALL { 
		var IotEquipmentUser v_ueB := f_cf_create_IotEquipmentUser(c_userUE_B);

        var ImsInterfaceMonitor v_mxA := f_cf_create_monitor(c_mx_A);

        var ImsInterfaceMonitor v_mxB := f_cf_create_monitor(c_mx_B);

        var CF_INT_CALL v_config := {v_gmA, v_mxA, v_ic, v_mxB, v_gmB};

        var CF_INT_CALL v_config := {v_gmA, v_mxA, v_ic, v_mxB, v_gmB, omit};

				

		// map/connect component ports

		f_cf_adapter_up();
@@ -1901,7 +1901,7 @@ module AtsImsIot_TestCases_CALL { 
		var ImsUserInfo v_userInfoB := f_getAnyValidUser(PX_EUT_B);

        var ImsInterfaceMonitor v_mxA := f_cf_create_monitor(c_mx_A);

        var ImsInterfaceMonitor v_mxB := f_cf_create_monitor(c_mx_B);

        var CF_INT_CALL v_config := {v_gmA, v_mxA, v_ic, v_mxB, v_gmB};

        var CF_INT_CALL v_config := {v_gmA, v_mxA, v_ic, v_mxB, v_gmB, omit};

				

		// map/connect component ports

		f_cf_adapter_up();
@@ -1997,7 +1997,7 @@ module AtsImsIot_TestCases_CALL { 
		var ImsUserInfo v_userInfoB := f_getSipUserId(PX_EUT_B);

        var ImsInterfaceMonitor v_mxA := f_cf_create_monitor(c_mx_A);

        var ImsInterfaceMonitor v_mxB := f_cf_create_monitor(c_mx_B);

        var CF_INT_CALL v_config := {v_gmA, v_mxA, v_ic, v_mxB, v_gmB};

        var CF_INT_CALL v_config := {v_gmA, v_mxA, v_ic, v_mxB, v_gmB, omit};

				

		// map/connect component ports

		f_cf_adapter_up();

ttcn/AtsImsIot/AtsImsIot_TestCases_MESS.ttcn

+6 −6
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ module AtsImsIot_TestCases_MESS { 
		var ImsInterfaceMonitor v_ic := f_cf_create_monitor(c_ic);

        var ImsInterfaceMonitor v_mxA := f_cf_create_monitor(c_mx_A);

        var ImsInterfaceMonitor v_mxB := f_cf_create_monitor(c_mx_B);

        var CF_INT_CALL v_config := {v_gmA, v_mxA, v_ic, v_mxB, omit};

        var CF_INT_CALL v_config := {v_gmA, v_mxA, v_ic, v_mxB, omit, omit};

		

		// map/connect component ports

		f_cf_adapter_up();
@@ -81,7 +81,7 @@ module AtsImsIot_TestCases_MESS { 
		var ImsInterfaceMonitor v_ic := f_cf_create_monitor(c_ic);

        var ImsInterfaceMonitor v_mxA := f_cf_create_monitor(c_mx_A);

        var ImsInterfaceMonitor v_mxB := f_cf_create_monitor(c_mx_B);

        var CF_INT_CALL v_config := {v_gmA, v_mxA, v_ic, v_mxB, v_gmB};

        var CF_INT_CALL v_config := {v_gmA, v_mxA, v_ic, v_mxB, v_gmB, omit};

		

		// map/connect component ports

		f_cf_adapter_up();
@@ -138,7 +138,7 @@ module AtsImsIot_TestCases_MESS { 
		var ImsInterfaceMonitor v_ic := f_cf_create_monitor(c_ic);

        var ImsInterfaceMonitor v_mxA := f_cf_create_monitor(c_mx_A);

        var ImsInterfaceMonitor v_mxB := f_cf_create_monitor(c_mx_B);

        var CF_INT_CALL v_config := {v_gmA, v_mxA, v_ic, v_mxB, v_gmB};

        var CF_INT_CALL v_config := {v_gmA, v_mxA, v_ic, v_mxB, v_gmB, omit};

		

		// map/connect component ports

		f_cf_adapter_up();
@@ -196,7 +196,7 @@ module AtsImsIot_TestCases_MESS { 
		var ImsInterfaceMonitor v_ic := f_cf_create_monitor(c_ic);

        var ImsInterfaceMonitor v_mxA := f_cf_create_monitor(c_mx_A);

        var ImsInterfaceMonitor v_mxB := f_cf_create_monitor(c_mx_B);

        var CF_INT_CALL v_config := {v_gmA, v_mxA, v_ic, v_mxB, v_gmB};

        var CF_INT_CALL v_config := {v_gmA, v_mxA, v_ic, v_mxB, v_gmB, omit};

		v_config.naptr	:= f_cf_create_monitor ( c_naptr );

		

		// map/connect component ports
@@ -300,7 +300,7 @@ module AtsImsIot_TestCases_MESS { 
		var ImsInterfaceMonitor v_ic := f_cf_create_monitor(c_ic);

        var ImsInterfaceMonitor v_mxA := f_cf_create_monitor(c_mx_A);

        var ImsInterfaceMonitor v_mxB := f_cf_create_monitor(c_mx_B);

        var CF_INT_CALL v_config := {v_gmA, v_mxA, v_ic, v_mxB, omit};

        var CF_INT_CALL v_config := {v_gmA, v_mxA, v_ic, v_mxB, omit, omit};

		

		// map/connect component ports

		f_cf_adapter_up();
@@ -343,7 +343,7 @@ module AtsImsIot_TestCases_MESS { 
		var ImsInterfaceMonitor v_ic := f_cf_create_monitor(c_ic);

        var ImsInterfaceMonitor v_mxA := f_cf_create_monitor(c_mx_A);

        var ImsInterfaceMonitor v_mxB := f_cf_create_monitor(c_mx_B);

        var CF_INT_CALL v_config := {v_gmA, v_mxA, v_ic, v_mxB, omit};

        var CF_INT_CALL v_config := {v_gmA, v_mxA, v_ic, v_mxB, omit, omit};

		

		// map/connect component ports

		f_cf_adapter_up();

ttcn/LibMsrp/LibMsrp_Templates.ttcn3

+388 −388
Original line number Diff line number Diff line
@@ -219,12 +219,12 @@ module LibMsrp_Templates { 
            contentType := { 

                contentTypeID := e_CONTENT_TYPE, 

                mediaType := { 

                    mediaType := str2oct("text"), 

                    subType := str2oct("plain"), 

                    mediaType := char2oct("text"), 

                    subType := char2oct("plain"), 

                    genParams := omit 

                } // End of 'mediaType' field

            }, // End of 'contentType' field

            data := str2oct("Hey Bob, are you there?")

            data := char2oct("Hey Bob, are you there?")

        } // End of template m_msrpByteRange_Dummy

        

        template MediaType mw_mediaType_any := {
@@ -344,10 +344,10 @@ module LibMsrp_Templates { 
                }, // End of 'startLine' field 

                headers := { 

                    toPaths := { 

                        m_msrpFromPath_Dummy 

                        m_msrpToPath_Dummy 

                    }, 

                    fromPaths := { 

                        m_msrpToPath_Dummy 

                        m_msrpFromPath_Dummy 

                    }, 

                    headers := { 

                        { messageID := m_msrpMessageID_Dummy }