summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--[-rwxr-xr-x]testautomation/framework/required/includes/script_organizers.inc15
-rw-r--r--testautomation/math/optional/includes/m_105.inc20
-rwxr-xr-xtestautomation/xml/optional/c_datapilot_pagefields.bas2
-rwxr-xr-xtestautomation/xml/optional/c_xml_print_scale.bas2
-rwxr-xr-xtestautomation/xml/optional/c_xml_scenario.bas2
-rwxr-xr-xtestautomation/xml/optional/calc_xml_7_export.bas2
-rwxr-xr-xtestautomation/xml/optional/ch_xml_japanese_candlestick.bas2
-rw-r--r--testautomation/xml/optional/includes/c_xml_print_scale.inc2
-rw-r--r--testautomation/xml/optional/includes/c_xml_scenario.inc2
-rw-r--r--[-rwxr-xr-x]testautomation/xml/optional/includes/sxc7_01.inc2
-rw-r--r--[-rwxr-xr-x]testautomation/xml/optional/includes/sxc7_02.inc2
-rw-r--r--[-rwxr-xr-x]testautomation/xml/optional/includes/sxc7_03.inc2
12 files changed, 32 insertions, 23 deletions
diff --git a/testautomation/framework/required/includes/script_organizers.inc b/testautomation/framework/required/includes/script_organizers.inc
index b9ed84201..3a70c8051 100755..100644
--- 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 )
diff --git a/testautomation/math/optional/includes/m_105.inc b/testautomation/math/optional/includes/m_105.inc
index 373643b2e..0caad76e7 100644
--- a/testautomation/math/optional/includes/m_105.inc
+++ b/testautomation/math/optional/includes/m_105.inc
@@ -302,8 +302,8 @@ testcase tToolsCatalog
dim bChecked as boolean
dim sFileName as string
dim sAllSymbols as string
- dim lAllSymbols(100) as string
- dim lAllSymbolsSort(100) as string
+ dim lAllSymbols(200) as string
+ dim lAllSymbolsSort(200) as string
dim iTimeOut as integer
dim sFilterName as string
dim sFilter as string
@@ -335,8 +335,8 @@ testcase tToolsCatalog
'/// There are 2 Symbol sets: 1. 'Greek' with 54 entries and 2. 'Special' with 12 entries ///'
'///+ These symbol set names are availble in 2 listboxes 1. 'Old Symbol Set' and 2. 'Symbol Set' ///'
iSymbolSets = OldSymbolSet.GetItemCount
- if (iSymbolSets <> 2) then
- WarnLog "- OldSymbolSet: '" + iSymbolSets + "' is not 2; expected is 2. ('Special' and 'Greek')"
+ if (iSymbolSets <> 3) then
+ WarnLog "- OldSymbolSet: '" + iSymbolSets + "' is not 3; expected is 3. ('Special' and 'Greek' and 'iGreek')"
for i = 1 to iSymbolSets
qaErrorLog "- " + i + ": '" + OldSymbolSet.GetItemText(i) + "'"
next i
@@ -452,8 +452,8 @@ testcase tToolsCatalog
next j
next i
- if (listCount(lAllSymbols()) <> 66) then
- warnlog "There have to be 66 Symbols, but there are: " + listCount(lAllSymbols())
+ if (listCount(lAllSymbols()) <> 106) then
+ warnlog "There have to be 106 Symbols, but there are: " + listCount(lAllSymbols())
endif
' TODO: check sAllSymbols for not allowed characters!
listCopy(lAllSymbols(),lAllSymbolsSort())
@@ -509,8 +509,8 @@ testcase tToolsCatalogNew
Kontext "EditSymbols"
if EditSymbols.exists then
iStartingSymbolSetCount = SymbolSet.getItemCount
- if iStartingSymbolSetCount <> 2 then
- qaErrorLog "There are already other symbolsets, instead of 2: " + iStartingSymbolSetCount
+ if iStartingSymbolSetCount <> 3 then
+ qaErrorLog "There are already other symbolsets, instead of 3: " + iStartingSymbolSetCount
for i = 1 to iStartingSymbolSetCount
printlog "("+i+"/"+iStartingSymbolSetCount+"): '" + SymbolSet.getItemText (i) + "'"
next i
@@ -673,8 +673,8 @@ testcase tToolsCatalogNew
endif
Kontext "SymboleMath"
j = symbolset.getItemCount
- if j <> 2 then
- warnlog "There is a number != 2 of symbollists listed"
+ if j <> 3 then
+ warnlog "There is a number != 3 of symbollists listed"
else
printlog "Everything is cleaned up."
endif
diff --git a/testautomation/xml/optional/c_datapilot_pagefields.bas b/testautomation/xml/optional/c_datapilot_pagefields.bas
index 80c41c98b..555232260 100755
--- a/testautomation/xml/optional/c_datapilot_pagefields.bas
+++ b/testautomation/xml/optional/c_datapilot_pagefields.bas
@@ -25,7 +25,7 @@
'
'/************************************************************************
'*
-'* owner : oliver.creamer@Sun.COM
+'* owner : oliver.craemer@Sun.COM
'*
'* short description : Lookup for correct attributes of datapilot pagefields
'*
diff --git a/testautomation/xml/optional/c_xml_print_scale.bas b/testautomation/xml/optional/c_xml_print_scale.bas
index 97a5eaab3..479ad76d2 100755
--- a/testautomation/xml/optional/c_xml_print_scale.bas
+++ b/testautomation/xml/optional/c_xml_print_scale.bas
@@ -25,7 +25,7 @@
'
'/************************************************************************
'*
-'* owner : oliver.creamer@Sun.COM
+'* owner : oliver.craemer@Sun.COM
'*
'* short description : Lookup for correct attributes for calc print scaling
'*
diff --git a/testautomation/xml/optional/c_xml_scenario.bas b/testautomation/xml/optional/c_xml_scenario.bas
index 982e965ed..c22ed31fb 100755
--- a/testautomation/xml/optional/c_xml_scenario.bas
+++ b/testautomation/xml/optional/c_xml_scenario.bas
@@ -25,7 +25,7 @@
'
'/************************************************************************
'*
-'* owner : oliver.creamer@Sun.COM
+'* owner : oliver.craemer@Sun.COM
'*
'* short description : Lookup for correct attributes of calc scenarios
'*
diff --git a/testautomation/xml/optional/calc_xml_7_export.bas b/testautomation/xml/optional/calc_xml_7_export.bas
index 2c85dd62a..37cc950ec 100755
--- a/testautomation/xml/optional/calc_xml_7_export.bas
+++ b/testautomation/xml/optional/calc_xml_7_export.bas
@@ -25,7 +25,7 @@
'
'/************************************************************************
'*
-'* owner : oliver.creamer@oracle.com
+'* owner : oliver.craemer@oracle.com
'*
'* short description : Export test for the Calc XML 6.0/7/OOo 1.x format
'*
diff --git a/testautomation/xml/optional/ch_xml_japanese_candlestick.bas b/testautomation/xml/optional/ch_xml_japanese_candlestick.bas
index 23cfea116..e9d824afe 100755
--- a/testautomation/xml/optional/ch_xml_japanese_candlestick.bas
+++ b/testautomation/xml/optional/ch_xml_japanese_candlestick.bas
@@ -25,7 +25,7 @@
'
'/************************************************************************
'*
-'* owner : oliver.creamer@Sun.COM
+'* owner : oliver.craemer@Sun.COM
'*
'* short description : Detailed test of the chart types
'*
diff --git a/testautomation/xml/optional/includes/c_xml_print_scale.inc b/testautomation/xml/optional/includes/c_xml_print_scale.inc
index b9e924a31..48201f17f 100644
--- a/testautomation/xml/optional/includes/c_xml_print_scale.inc
+++ b/testautomation/xml/optional/includes/c_xml_print_scale.inc
@@ -25,7 +25,7 @@
'
'/************************************************************************
'*
-'* owner : oliver.creamer@oracle.com
+'* owner : oliver.craemer@oracle.com
'*
'* short description : Check content.xml and styles.xml for correct print scaling settings
'*
diff --git a/testautomation/xml/optional/includes/c_xml_scenario.inc b/testautomation/xml/optional/includes/c_xml_scenario.inc
index f98b8db41..ddaf8fbcd 100644
--- a/testautomation/xml/optional/includes/c_xml_scenario.inc
+++ b/testautomation/xml/optional/includes/c_xml_scenario.inc
@@ -25,7 +25,7 @@
'
'/************************************************************************
'*
-'* owner : oliver.creamer@oracle.com
+'* owner : oliver.craemer@oracle.com
'*
'* short description : Check content.xml for correct scenario attributes
'*
diff --git a/testautomation/xml/optional/includes/sxc7_01.inc b/testautomation/xml/optional/includes/sxc7_01.inc
index d32b7b357..0dace41f0 100755..100644
--- a/testautomation/xml/optional/includes/sxc7_01.inc
+++ b/testautomation/xml/optional/includes/sxc7_01.inc
@@ -25,7 +25,7 @@
'
'/************************************************************************
'*
-'* owner : oliver.creamer@oracle.com
+'* owner : oliver.craemer@oracle.com
'*
'* short description : XML Calc Include File
'*
diff --git a/testautomation/xml/optional/includes/sxc7_02.inc b/testautomation/xml/optional/includes/sxc7_02.inc
index 304a15b2a..8696cb359 100755..100644
--- a/testautomation/xml/optional/includes/sxc7_02.inc
+++ b/testautomation/xml/optional/includes/sxc7_02.inc
@@ -25,7 +25,7 @@
'
'/************************************************************************
'*
-'* owner : oliver.creamer@oracle.com
+'* owner : oliver.craemer@oracle.com
'*
'* short description : XML Calc Include File
'*
diff --git a/testautomation/xml/optional/includes/sxc7_03.inc b/testautomation/xml/optional/includes/sxc7_03.inc
index e6c4d9945..5c8661303 100755..100644
--- a/testautomation/xml/optional/includes/sxc7_03.inc
+++ b/testautomation/xml/optional/includes/sxc7_03.inc
@@ -25,7 +25,7 @@
'
'/************************************************************************
'*
-'* owner : oliver.creamer@oracle.com
+'* owner : oliver.craemer@oracle.com
'*
'* short description : XML Calc Include File
'*
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-22 01:28:25 +0000