Commit c80c1861 authored by garciay's avatar garciay
Browse files

Change SSP & ITS-AID types for transferring from lower layer to upper layer

parent 9f2b70df
Loading
Loading
Loading
Loading
+198 −198
Original line number Original line Diff line number Diff line
@@ -2333,7 +2333,7 @@ module ItsDenm_TpFunctions {
            tc_ac.start;
            tc_ac.start;
            alt {
            alt {
              [] denmPort.receive(
              [] denmPort.receive(
				  mw_denmInd_SSP(
                  mw_denmIndWithSecurityParameters(
                      mw_denmPdu(
                      mw_denmPdu(
                          mw_denm(
                          mw_denm(
                              mw_anyDenmMgmtCon,
                              mw_anyDenmMgmtCon,
+31 −0
Original line number Original line Diff line number Diff line
@@ -740,6 +740,37 @@ module ItsIvim_TestCases {
    
    
    group iviMessageReception {
    group iviMessageReception {
        
        
        /**
         * @desc Check that content of received IVIM is transmitted to 
         *       applications and other facilities.
         * <pre>
         * Pics Selection: PICS_IVIM_RECEPTION
         * Initial conditions: 
         *     with {
         *         the IUT being in the "initial state"
         *         and the IUT having receive a valid IVIM
         *     }
         * Expected behaviour:
         *     ensure that {
         *         when {
         *             the IUT receives a valid IVIM
         *         }
         *         then {
         *             the IUT forwards the IVIM content to upper layers
         *             and the IUT forwards the IVIM content to other facilities
         *         }
         *     }
         * </pre>
         * 
         * @version   1.0.4
         * @see       ETSI TS 103 191-2 v0.0.1 TP_IS_IVI_MSGF_BV_02
         */
        testcase TC_IVIM_MSP_BV_01() runs on ItsIvim system ItsIvimSystem {
            
            f_IS_IVI_MSGF_BV_02();
            
        } // end TC_IVIM_MSP_BV_01
        
    } // End of group iviMessageReception
    } // End of group iviMessageReception
    
    
} // End of module ItsIvim_TestCases
} // End of module ItsIvim_TestCases
+60 −0
Original line number Original line Diff line number Diff line
@@ -1532,6 +1532,66 @@ module ItsIvim_TpFunctions {
    
    
    group iviMessageReception {
    group iviMessageReception {
        
        
        /**
         * @desc    TP Function for TC_IS_IVI_MSGF_BV_02
         */
        function f_IS_IVI_MSGF_BV_02() runs on ItsIvim {
            
            // Local variables
            var IvimReq v_ivimReq;
            var integer i;
            
            // Test control
            if (not PICS_IVIM_RECEPTION) {
                log("*** " & testcasename() & ": PICS_IVIM_RECEPTION required for executing the TC ***");
                setverdict(inconc);
                stop;
            }              
            
            // Test component configuration
            f_cfUp();
            
            // Test adapter configuration
            
            // Preamble
            f_prInitialState();
            f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
            
            // Test Body
            v_ivimReq := valueof(
                m_ivimReq(
                    m_ivimStructurePdu(
                        m_ivimStructure(
                            m_iviManagementContainer(
                                f_getProvider(),
                                1,
                                IviStatus_new_
                            )
                        )
                    )
                )
            );
            ivimPort.send(v_ivimReq);
            
            f_sleep(PX_TNOAC);
            for(i:=0; i < lengthof(vc_utEvents) and not match(v_ivimReq.msgOut, vc_utEvents[i].iviMsg); i:=i+1) {
                // empty on purpose 
            }
            if(i < lengthof(vc_utEvents)) {
                log("*** " & testcasename() & ": PASS: IVIM was transmitted to upper layer ***");
                f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
            }
            else {
                log("*** " & testcasename() & ": FAIL: IVIM was not transmitted to upper layer ***");
                f_selfOrClientSyncAndVerdict(c_tbDone, e_error);
            }
            
            // Postamble
            f_poDefault();
            f_cfDown();
            
        } // End of function f_IS_IVI_MSGF_BV_02
        
    } // End of group iviMessageReception
    } // End of group iviMessageReception
    
    
} // End of module ItsIvim_TpFunctions
} // End of module ItsIvim_TpFunctions
+1 −1
Original line number Original line Diff line number Diff line
@@ -274,7 +274,7 @@ module ItsMapem_TestCases {
         * Initial conditions: 
         * Initial conditions: 
         *   with {
         *   with {
         *        the IUT being in the "initial state"
         *        the IUT being in the "initial state"
         *        and the IUT sending MAPEM
         *        and the IUT having receive a valid MAPEM
         *    }
         *    }
         * Expected behaviour:
         * Expected behaviour:
         *    ensure that {
         *    ensure that {
+7 −7
Original line number Original line Diff line number Diff line
@@ -212,6 +212,7 @@ module ItsMapem_TpFunctions {
            function f_IS_RLT_COMM_BV_01 () runs on ItsMapemSpatem {
            function f_IS_RLT_COMM_BV_01 () runs on ItsMapemSpatem {
                
                
                // Local variables
                // Local variables
                var boolean v_tlmServiceStarted := false;
                
                
                // Test control
                // Test control
                if (not PICS_RSU or not PICS_MAPEM_GENERATION or not PICS_SPATEM_GENERATION) {
                if (not PICS_RSU or not PICS_MAPEM_GENERATION or not PICS_SPATEM_GENERATION) {
@@ -229,7 +230,7 @@ module ItsMapem_TpFunctions {
                // Test Body
                // Test Body
                tc_ac.start;
                tc_ac.start;
                alt {
                alt {
                    [] mapemSpatemPort.receive(
                    [v_tlmServiceStarted == false] mapemSpatemPort.receive(
                        mw_mapemInd(
                        mw_mapemInd(
                            mw_mapemPdu(
                            mw_mapemPdu(
                                mw_mapemWellFormatted
                                mw_mapemWellFormatted
@@ -405,9 +406,9 @@ module ItsMapem_TpFunctions {
                        f_selfOrClientSyncAndVerdict(c_tbDone, e_error);
                        f_selfOrClientSyncAndVerdict(c_tbDone, e_error);
                    }
                    }
                    [] mapemSpatemPort.receive(
                    [] mapemSpatemPort.receive(
                        mw_spatemInd(
                        mw_mapemInd(
                            mw_spatemPdu(
                            mw_mapemPdu(
                                mw_spatemWellFormatted
                                mw_mapemWellFormatted
                    ))) { 
                    ))) { 
                        tc_ac.stop;
                        tc_ac.stop;
                        log("*** " & testcasename() & ": FAIL:  Expected MAPEM received, but not encapsulated in GBC packet. ***");
                        log("*** " & testcasename() & ": FAIL:  Expected MAPEM received, but not encapsulated in GBC packet. ***");
@@ -420,7 +421,6 @@ module ItsMapem_TpFunctions {
                }
                }
                
                
                // Postamble
                // Postamble
                f_utTriggerEvent(m_utTriggerEvent(stopTLMService));
                f_poDefault();
                f_poDefault();
                f_cfDown();
                f_cfDown();
                
                
Loading