summaryrefslogtreecommitdiff
path: root/testautomation/framework/required/includes/script_organizers.inc
diff options
context:
space:
mode:
Diffstat (limited to 'testautomation/framework/required/includes/script_organizers.inc')
-rwxr-xr-xtestautomation/framework/required/includes/script_organizers.inc15
1 files changed, 12 insertions, 3 deletions
diff --git a/testautomation/framework/required/includes/script_organizers.inc b/testautomation/framework/required/includes/script_organizers.inc
index b9ed8420134e..3a70c8051808 100755
--- a/testautomation/framework/required/includes/script_organizers.inc
+++ b/testautomation/framework/required/includes/script_organizers.inc
@@ -78,6 +78,7 @@ testcase tUpdtScripts
dim iCurrentDialog as integer
dim iDiffCount as integer
+ dim max_diffcount as integer
hInitSingleDoc()
@@ -109,25 +110,33 @@ testcase tUpdtScripts
case DLG_JAVASCRIPT: ToolsMacrosOrganizeMacrosJavaScript
kontext "ScriptOrganizer"
hGetAllNodeNames( ScriptTreeList, cScriptNamesList() )
+ max_diffcount = 0
case DLG_BEANSHELL: ToolsMacrosOrganizeMacrosBeanShell
kontext "ScriptOrganizer"
hGetAllNodeNames( ScriptTreeList, cScriptNamesList() )
+ max_diffcount = 0
case DLG_PYTHON: ToolsMacrosOrganizeMacrosPython
kontext "ScriptOrganizer"
hGetAllNodeNames( ScriptTreeList, cScriptNamesList() )
+ max_diffcount = 0
case DLG_BASIC_ORG: ToolsMacro_uno
Kontext "Makro"
hGetScriptNames( MakroAus, MakroListe, cScriptNamesList() )
+ max_diffcount = 6
case DLG_RUN_MACRO: ToolsMacrosRunMacro
kontext "ScriptSelector"
hGetScriptNames( LibraryTreeList, ScriptList, cScriptNamesList() )
+ max_diffcount = 6
end select
printlog( "Compare to reference list, create new one if differences were found" )
- iDiffCount = hManageComparisionList( sFileIn, sFileOut, cScriptNamesList() )
-
- if ( iDiffCount <> 0 ) then warnlog( "The number of scripts has changed, please review." )
+ iDiffCount = abs( hManageComparisionList( sFileIn, sFileOut, cScriptNamesList() ) )
+ ' Usually we should have 0 differences in the list. However, as we do not have
+ ' a unique way of installing the office (Root-Installation, archives and
+ ' others) we need a little tolerance here. If a number of bundled extensions
+ ' are installed, we have more scripts.
+ if ( iDiffCount > max_diffcount ) then warnlog( "The number of scripts has changed, please review." )
printlog( "Close <" & sDialog & ">" )
select case ( sDialog )