Commit 48eacf53 authored by filatov's avatar filatov
Browse files

TITANISATION: UT and AC messages (Common, CAM, DENM, BTP)

parent 0720d504

ttcn/BTP/LibItsBtp_Functions.ttcn

+3 −1
Original line number Original line Diff line number Diff line
@@ -41,7 +41,9 @@ 
            utPort.send(p_init);

            utPort.send(p_init);

            tc_wait.start;

            tc_wait.start;

            alt {

            alt {

                [] utPort.receive(UtInitializeResult:true) {

//FIXME RGY As discussed, port in type is changed to a top-level union type

//                [] utPort.receive(UtInitializeResult:true) {

                [] utPort.receive(UtCommonResults:{utInitializeResult:=true}) {

                    tc_wait.stop;

                    tc_wait.stop;

                    log("*** f_utInitializeIut: INFO: IUT initialized ***");

                    log("*** f_utInitializeIut: INFO: IUT initialized ***");

                }

                }

ttcn/BTP/LibItsBtp_TestSystem.ttcn

+3 −1
Original line number Original line Diff line number Diff line
@@ -29,7 +29,9 @@ module LibItsBtp_TestSystem { 
            out 

            out 

                UtInitialize, UtBtpTrigger;

                UtInitialize, UtBtpTrigger;

            in 

            in 

                UtInitializeResult, UtBtpTriggerResult, UtBtpEventInd;

//FIXME RGY!!! As discussed, list of booleans is changed by a top-level union type

//                UtInitializeResult, UtBtpTriggerResult, UtBtpEventInd;

                  UtCommonResults, UtBtpTriggerResult, UtBtpEventInd;

        } // end UpperTesterPort

        } // end UpperTesterPort

        

        

    } // end portDefinitions

    } // end portDefinitions

ttcn/BTP/LibItsBtp_TypesAndValues.ttcn

+6 −1
Original line number Original line Diff line number Diff line
@@ -145,7 +145,12 @@ module LibItsBtp_TypesAndValues { 
                GenerateBtpB btpB

                GenerateBtpB btpB

            }

            }

    

    

            type boolean UtBtpTriggerResult;

//FIXME RGY As discussed, boolean results are replaced by a union of the results

//            type boolean UtBtpTriggerResult;

            type union UtBtpResults {

              boolean utBtpTriggerResult

            }

            type UtBtpResults.utBtpTriggerResult UtBtpTriggerResult;

            

            

            /**

            /**

             * @desc Upper Tester message to request triggering of an BTPA message at IUT 

             * @desc Upper Tester message to request triggering of an BTPA message at IUT

ttcn/CAM/LibItsCam_Functions.ttcn

+9 −3
Original line number Original line Diff line number Diff line
@@ -49,7 +49,9 @@ module LibItsCam_Functions { 
            utPort.send(p_init);

            utPort.send(p_init);

            tc_wait.start;

            tc_wait.start;

            alt {

            alt {

                [] utPort.receive(UtInitializeResult:true) {

//FIXME RGY As discussed, port in type is changed to a top-level union type

//                [] utPort.receive(UtInitializeResult:true) {

                [] utPort.receive(UtCommonResults:{utInitializeResult:=true}) {

                    tc_wait.stop;

                    tc_wait.stop;

                    log("*** f_utInitializeIut: INFO: IUT initialized ***");

                    log("*** f_utInitializeIut: INFO: IUT initialized ***");

                }

                }
@@ -81,7 +83,9 @@ module LibItsCam_Functions { 
            utPort.send(p_event);

            utPort.send(p_event);

            tc_wait.start;

            tc_wait.start;

            alt {

            alt {

                [] utPort.receive(UtCamTriggerResult:true) {

//FIXME RGY As discussed, port in type is changed to a top-level union type 

//                [] utPort.receive(UtCamTriggerResult:true) {

                [] utPort.receive(UpperTesterCamResults:{utCamTriggerResult:=true}) {

                    tc_wait.stop;

                    tc_wait.stop;

                }

                }

                [] utPort.receive {

                [] utPort.receive {
@@ -107,7 +111,9 @@ module LibItsCam_Functions { 
            

            

            utPort.send(p_position);

            utPort.send(p_position);

            alt {

            alt {

                [] utPort.receive(UtChangePositionResult:?) {

//FIXME RGY As discussed, port in type is changed to a top-level union type 

//                [] utPort.receive(UtChangePositionResult:?) {

                [] utPort.receive(UtCommonResults:{utChangePositionResult:=?}) {

                    tc_wait.stop;

                    tc_wait.stop;

                }

                }

                [] utPort.receive {

                [] utPort.receive {

ttcn/CAM/LibItsCam_TestSystem.ttcn

+6 −2
Original line number Original line Diff line number Diff line
@@ -37,7 +37,9 @@ module LibItsCam_TestSystem { 
            out

            out

                AcGnssPrimitive, AcSecPrimitive;

                AcGnssPrimitive, AcSecPrimitive;

            in

            in

                AcGnssResponse, AcGnssDistanceCovered, AcSecResponse;

//FIXME RGY As discussed, list of boolean result responses is collected into a top-level union

//                AcGnssResponse, AcGnssDistanceCovered, AcSecResponse;

                AdapterControlResults;

        } // end AdapterControlPort

        } // end AdapterControlPort

        

        

        /**

        /**
@@ -47,7 +49,9 @@ module LibItsCam_TestSystem { 
            out 

            out 

                UtInitialize, UtCamTrigger, UtChangePosition, UtActivatePositionTime, UtDeactivatePositionTime;

                UtInitialize, UtCamTrigger, UtChangePosition, UtActivatePositionTime, UtDeactivatePositionTime;

            in 

            in 

                UtInitializeResult, UtCamTriggerResult, UtChangePositionResult, UtActivatePositionTimeResult, UtDeactivatePositionTimeResult, UtCamEventInd;

//FIXME RGY As discussed, list of boolean result responses is collected into a top-level union

//                UtInitializeResult, UtCamTriggerResult, UtChangePositionResult, UtActivatePositionTimeResult, UtDeactivatePositionTimeResult, UtCamEventInd;

                UtCommonResults, UpperTesterCamResults, UtCamEventInd;

        } // end UpperTesterPort

        } // end UpperTesterPort

        

        

    } // end portDefinitions

    } // end portDefinitions