diff options
Diffstat (limited to 'testautomation/framework/optional')
| -rwxr-xr-x | testautomation/framework/optional/includes/extras_modify_objects.inc | 4 | ||||
| -rwxr-xr-x | testautomation/framework/optional/includes/security_macrosecurity.inc | 26 |
2 files changed, 20 insertions, 10 deletions
diff --git a/testautomation/framework/optional/includes/extras_modify_objects.inc b/testautomation/framework/optional/includes/extras_modify_objects.inc index f2e4717d2e96..964d28a95b77 100755 --- a/testautomation/framework/optional/includes/extras_modify_objects.inc +++ b/testautomation/framework/optional/includes/extras_modify_objects.inc @@ -41,8 +41,8 @@ testcase tModifyObjects( iMode as integer, cCategory as string, sVer as string ) const CFN = "tModifyObjects::" const RESTART = 15 - const TEMPLATE_COUNT = 236 ' For en-US/StarOffice, numbers may differ for Languages/Brands - const SAMPLE_COUNT = 60 ' For en-US/StarOffice, numbers may differ for Languages/Brands + const TEMPLATE_COUNT = 236 ' For en-US/Oracle Open Office, numbers may differ for Languages/Brands + const SAMPLE_COUNT = 56 ' For en-US/Oracle Open Office, numbers may differ for Languages/Brands dim iObjectFolder as integer diff --git a/testautomation/framework/optional/includes/security_macrosecurity.inc b/testautomation/framework/optional/includes/security_macrosecurity.inc index 2b6a05d9fcca..3df134d83d33 100755 --- a/testautomation/framework/optional/includes/security_macrosecurity.inc +++ b/testautomation/framework/optional/includes/security_macrosecurity.inc @@ -51,18 +51,14 @@ end sub testcase tMacroSecurityLevels( cFileFormat ) printlog( "Check macro execution behavior for all macro security levels" ) - warnlog( "#i110184# - Documentbound macros not executed when loaded via API" ) - goto endsub dim cWorkFile as string cWorkFile = gTesttoolPath & "framework\optional\input\BasicDocs\" cWorkFile = cWorkFile & "basic" & hGetSuffix( cFileFormat ) - cWorkFile = convertpath( cWorkFile ) - cWorkFile = convertToURL( cWorkFile ) dim iSecLevel as integer - const EXPECTED_MESSAGECOUNT = 1 + const EXPECTED_MESSAGECOUNT = 0 const ALLOW_ONE_EXTRA_MESSAGEBOX = 1 const ALLOW_NO_EXTRA_MESSAGEBOXES = 0 @@ -94,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 : @@ -104,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 @@ -119,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 |