diff options
Diffstat (limited to 'testautomation/framework')
| -rwxr-xr-x | testautomation/framework/optional/includes/security_macrosecurity.inc | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/testautomation/framework/optional/includes/security_macrosecurity.inc b/testautomation/framework/optional/includes/security_macrosecurity.inc index 220e882b334c..3df134d83d33 100755 --- a/testautomation/framework/optional/includes/security_macrosecurity.inc +++ b/testautomation/framework/optional/includes/security_macrosecurity.inc @@ -58,7 +58,7 @@ testcase tMacroSecurityLevels( cFileFormat ) dim iSecLevel as integer - const EXPECTED_MESSAGECOUNT = 1 + const EXPECTED_MESSAGECOUNT = 0 const ALLOW_ONE_EXTRA_MESSAGEBOX = 1 const ALLOW_NO_EXTRA_MESSAGEBOXES = 0 @@ -90,7 +90,11 @@ testcase tMacroSecurityLevels( cFileFormat ) case GC_MACRO_SECURITY_LEVEL_LOW : if ( not hIdentifyExecutedMacro() ) then - warnlog( "#i110184# - Macro was not executed" ) + if ( gApplication = "MATH" ) then + qaerrorlog( "#i110184# - Macro was not executed" ) + else + warnlog( "Macro was not excuted" ) + endif endif case GC_MACRO_SECURITY_LEVEL_MEDIUM : @@ -100,12 +104,19 @@ testcase tMacroSecurityLevels( cFileFormat ) endif if ( not hIdentifyExecutedMacro() ) then - warnlog( "#i110184# - Macro was not executed" ) + if ( gApplication = "MATH" ) then + qaerrorlog( "#i110184# - Macro was not executed" ) + else + warnlog( "Macro was not excuted" ) + endif endif case GC_MACRO_SECURITY_LEVEL_HIGH : - if ( not hHandleActivesOnLoad( EXPECTED_MESSAGECOUNT , ALLOW_ONE_EXTRA_MESSAGEBOX ) ) then + kontext "Active" + hCloseDialog( Active, "ok" ) + + if ( not hHandleActivesOnLoad( EXPECTED_MESSAGECOUNT , ALLOW_NO_EXTRA_MESSAGEBOXES ) ) then warnlog( "#i53710# unexpected second messagebox" ) endif @@ -115,6 +126,9 @@ testcase tMacroSecurityLevels( cFileFormat ) case GC_MACRO_SECURITY_LEVEL_VERYHIGH : + kontext "Active" + hCloseDialog( Active, "ok" ) + if ( not hHandleActivesOnLoad( EXPECTED_MESSAGECOUNT , ALLOW_NO_EXTRA_MESSAGEBOXES ) ) then warnlog( "#i53710# unexpected second messagebox" ) endif |