Commit f715720a authored by Iztok Juvancic's avatar Iztok Juvancic
Browse files

aded tests

:>:
parent 7835a4ce
Loading
Loading
Loading
Loading
+4 −1
Original line number Diff line number Diff line
@@ -145,7 +145,10 @@ module DiameterShDh_PIXITS {
         *  TODO
        */
        modulepar charstring PX_NotExistingUserIdentity := "origin.etsi2.org";

        /** @desc    UTF8String
         *  TODO
        */
        modulepar charstring PX_PublicPSIIdentity := "publicservice@etsi.org";
        /** @desc    UTF8String
         *  TODO
        */
+60 −7
Original line number Diff line number Diff line
@@ -758,7 +758,7 @@ module DiameterShDh_TCFunctions {
                                           vc_sessionId,                       // containing a Session-ID AVP
                                           mdw_puaBodyAvps(
                                                           *,
                                                           mw_experimentalResult(DIAMETER_ERROR_USER_DATA_CANNOT_BE_MODIFIED_E),
                                                           mw_experimentalResult((DIAMETER_ERROR_USER_DATA_CANNOT_BE_MODIFIED_E)),
                                                           vc_originHost_IUT,              // containing an Origin-Host AVP
                                                           vc_originRealm_IUT
                        ))
@@ -802,7 +802,7 @@ module DiameterShDh_TCFunctions {
                                           vc_sessionId,                       // containing a Session-ID AVP
                                           mdw_puaBodyAvps(
                                                           *,
                                                           mw_experimentalResultCode(DIAMETER_ERROR_USER_UNKNOWN_E),
                                                           mw_experimentalResult(DIAMETER_ERROR_USER_UNKNOWN_E),
                                                           vc_originHost_IUT,              // containing an Origin-Host AVP
                                                           vc_originRealm_IUT
                        ))
@@ -834,8 +834,8 @@ module DiameterShDh_TCFunctions {
                                                     vc_originRealm,                // containing an Origin-Realm AVP
                                                     vc_destinationHost,            // containing an Destination-Host AVP
                                                     vc_destinationRealm,           // containing a Destination-Realm AVP
                                                     m_specific_user_Identity (
                                                                m_private_user_identity(PX_NotRelatedPrivateIdentity)
                                                     m_msisdn_user_Identity (
                                                                   m_MSISDN_user_identity(char2oct(PX_NotRelatedPrivateIdentity))
                                                                )
                                                    )
                                     )
@@ -846,7 +846,7 @@ module DiameterShDh_TCFunctions {
                                           vc_sessionId,                       // containing a Session-ID AVP
                                           mdw_puaBodyAvps(
                                                           *,
                                                           mw_experimentalResultCode(DIAMETER_ERROR_IDENTITIES_DONT_MATCH_E),
                                                           mw_experimentalResult(DIAMETER_ERROR_IDENTITIES_DONT_MATCH_E),
                                                           vc_originHost_IUT,              // containing an Origin-Host AVP
                                                           vc_originRealm_IUT
                        ))
@@ -868,7 +868,33 @@ module DiameterShDh_TCFunctions {
                    f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict()); 
                    log("*** " & __SCOPE__ & ": INFO: Preamble done. ***");

                    //TODO TestBody
                    //TestBody
                    f_send_PUR(
                               md_pUR(
                                      vc_sessionId,
                                      md_purBodyAvps(
                                                     m_auth_Session_State,
                                                     vc_originHost,                 // containing an Origin-Host AVP
                                                     vc_originRealm,                // containing an Origin-Realm AVP
                                                     vc_destinationHost,            // containing an Destination-Host AVP
                                                     vc_destinationRealm,           // containing a Destination-Realm AVP
                                                     m_msisdn_user_Identity (
                                                                   m_MSISDN_user_identity(char2oct(PX_PublicUser_MSISDN))
                                                                )
                                                    )
                                     )
                    );

                    f_awaiting_PUA(
                                   mdw_pUA( 
                                           vc_sessionId,                       // containing a Session-ID AVP
                                           mdw_puaBodyAvps(
                                                           *,
                                                           mw_experimentalResult(DIAMETER_ERROR_OPERATION_NOT_ALLOWED_E),
                                                           vc_originHost_IUT,              // containing an Origin-Host AVP
                                                           vc_originRealm_IUT
                        ))
                    );

                    f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict()); 

@@ -886,8 +912,35 @@ module DiameterShDh_TCFunctions {
                    f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict()); 
                    log("*** " & __SCOPE__ & ": INFO: Preamble done. ***");

                    //TODO TestBody
                    //TestBody
                    f_send_PUR(
                               md_pUR(
                                      vc_sessionId,
                                      md_purBodyAvps(
                                                     m_auth_Session_State,
                                                     vc_originHost,                 // containing an Origin-Host AVP
                                                     vc_originRealm,                // containing an Origin-Realm AVP
                                                     vc_destinationHost,            // containing an Destination-Host AVP
                                                     vc_destinationRealm,           // containing a Destination-Realm AVP
                                                     m_specific_user_Identity (
                                                            m_public_user_identity(PX_PublicPSIIdentity) //PSI?
                                                                       ),
                                                     m_data_Reference(PSI_ACTIVATION_E),
                                                     m_user_Data_dummy
                                                     )
                                     )
                    );

                    f_awaiting_PUA(
                                   mdw_pUA( 
                                           vc_sessionId,                       // containing a Session-ID AVP
                                           mdw_puaBodyAvps(
                                                           mw_resultCode(DIAMETER_SUCCESS_E),
                                                           *,
                                                           vc_originHost_IUT,              // containing an Origin-Host AVP
                                                           vc_originRealm_IUT
                        ))
                    );
                    f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict()); 

                    f_postamble_Sh_AS();
+8 −2
Original line number Diff line number Diff line
@@ -109,6 +109,12 @@ module DiameterShDh_Templates {
                    public_Identity_AVP := p_public_identity
                }
                
                template (value) User_Identity_AVP m_msisdn_user_Identity (
                  in template (value) MSISDN_AVP p_msisdn_identity 
                ) modifies m_user_Identity_dummy := {
                    mSISDN_AVP := p_msisdn_identity
                }
                
                template (value) Data_Reference_AVP m_data_Reference(
                                                                     in template (value) Data_Reference_Type p_aVP_Data
                ) modifies m_data_Reference_dummy := {
@@ -675,8 +681,8 @@ module DiameterShDh_Templates {
                } // End of template md_pUA
    
                template (present) PUA_Body_AVP mdw_puaBodyAvps(
                                                                template (present) Result_Code_AVP              p_resultCode,
                                                                template (present) Experimental_Result_AVP p_exp_rescode,
                                                                template Result_Code_AVP              p_resultCode,
                                                                template Experimental_Result_AVP p_exp_rescode,
                                                                template (present) Origin_Host_AVP              p_originHost,
                                                                template (present) Origin_Realm_AVP             p_originRealm
                ) modifies mw_PUA_Body_dummy := {
+11 −2
Original line number Diff line number Diff line
@@ -1611,6 +1611,7 @@ module DiameterShDh_TestCases {
                        log("*** " & __SCOPE__ & ": ERROR: 'PICS_HSS_IUT' required for executing the TC. ***"); 
                        stop;
                    }
                    
                    // Test component configuration
                    f_cf_1Sh_asUp(v_diameterSh_as);
        
@@ -1652,7 +1653,11 @@ module DiameterShDh_TestCases {
                    // Local variables
                     var DiameterShDh v_diameterSh_as; 
            
                    //TODO Test control - PICS
                    //Test control
                    if (not PICS_HSS_IUT) {
                        log("*** " & __SCOPE__ & ": ERROR: 'PICS_HSS_IUT' required for executing the TC. ***"); 
                        stop;
                    }
            
                    // Test component configuration
                    f_cf_1Sh_asUp(v_diameterSh_as);
@@ -1695,7 +1700,11 @@ module DiameterShDh_TestCases {
                    // Local variables
                     var DiameterShDh v_diameterSh_as; 
            
                    //TODO Test control - PICS
                    //Test control
                    if (not PICS_HSS_IUT) {
                        log("*** " & __SCOPE__ & ": ERROR: 'PICS_HSS_IUT' required for executing the TC. ***"); 
                        stop;
                    }
            
                    // Test component configuration
                    f_cf_1Sh_asUp(v_diameterSh_as);