Commit 9fc200bf authored by Yann Garcia's avatar Yann Garcia
Browse files

Report issues from devel2 to TTF_T036

parent 078736a9
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -27,6 +27,9 @@ module LibItsCam_EncdecDeclarations {
    external function fx_enc_UtCamChangePosition (UtCamChangePosition p) return bitstring
        with {extension "prototype(convert) encode(UpperTester)"}
    
    external function fx_enc_UtCamChangePseudonym (UtCamChangePseudonym p) return bitstring
        with {extension "prototype(convert) encode(UpperTester)"}
    
    external function fx_enc_UtCamTrigger (UtCamTrigger p) return bitstring
        with {extension "prototype(convert) encode(UpperTester)"}
    
+9 −2
Original line number Diff line number Diff line
@@ -141,6 +141,13 @@ module LibItsCam_Templates {
                changeSpeed := p_changeSpeed
            }

            /**
             * @desc Request for changing pseudonym with the specified certificate.
             */
            template (value) UtCamChangePseudonym m_utCamChangePseudonym(in Oct8 p_hashedId8) := {
                hashedId8 := p_hashedId8
            }
            
            /**
             * @desc Set the acceleration control status
             * @param p_status The status to set
@@ -197,9 +204,9 @@ module LibItsCam_Templates {
                setDangerousGoods := p_dangerousGoods
            }

        }// End of group utPrimitives
        } // end utPrimitives

    } // End of group Primitives
    } // end group Primitives

    group positionTemplates {

+21 −11
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ module LibItsCam_TypesAndValues {
      boolean utCamInitializeResult,
      boolean utCamTriggerResult,
      boolean utCamChangePositionResult,
      boolean utCamChangePseudonymResult,
      boolean utActivatePositionTimeResult,
      boolean utDeactivatePositionTimeResult
    } with {
@@ -100,6 +101,15 @@ module LibItsCam_TypesAndValues {
      variant "FIELDORDER(msb)"
    }
        
    /**
     * @desc    Send template for Upper Tester event changePseudonym
     */
    type record UtCamChangePseudonym {
      Oct8 hashedId8 
    } with {
      variant "FIELDORDER(msb)"
    }
    
    /**
     * @desc 
     * @member changeCurvature Changes the curvature.
+35 −0
Original line number Diff line number Diff line
@@ -122,6 +122,41 @@ module LibItsCam_Functions {
            
        }
                    
    /**
      * @desc    Requests to change the IUT with a new pseudonym
      * @param   p_change The change to trigger.
      */
    function f_utCamChangePseudonym ( template (value) UtCamChangePseudonym p_change ) runs on ItsCam {
        
        //deactivate gnPort default alts
        vc_camDefaultActive := false;
        
        utPort.send(p_change);
        tc_wait.start;
        alt {
            [] utPort.receive(UtCamResults: { utCamChangePseudonymResult := true}) {
                tc_wait.stop;
                log("*** " & testcasename() & ": INFO: IUT pseudonym changed ***");
            }
            [] utPort.receive(UtCamResults: { utCamChangePseudonymResult := false}) {
                tc_wait.stop;
                log("*** " & testcasename() & ": INFO: IUT pseudonym unchanged ***");
                f_selfOrClientSyncAndVerdict("error", e_error);
            }
            [] a_utDefault() {
              //empty on purpose
            }
            [] tc_wait.timeout {
                log("*** " & testcasename() & ": INFO: Could not receive expected UT message from IUT in time ***");
                f_selfOrClientSyncAndVerdict("error", e_timeout);
            }
        }
        
        //activate camPort default alts
        vc_camDefaultActive := true;
        
    }
    
    } // End of group utFunctions
    
    group adapterControl {
+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ module LibItsCam_TestSystem language "TTCN-3:2010 Real Time and Performance Test
         */
        type port UpperTesterPort message {
            out 
                UtCamInitialize, UtCamTrigger, UtCamChangePosition, UtActivatePositionTime, UtDeactivatePositionTime;
                UtCamInitialize, UtCamTrigger, UtCamChangePosition, UtCamChangePseudonym, UtActivatePositionTime, UtDeactivatePositionTime;
            in 
                UtCamResults, UtCamEventInd;
        } // end UpperTesterPort