[Libreoffice-commits] .: 5 commits - testautomation/framework testautomation/math testautomation/xml
Jan Holesovsky
kendy at kemper.freedesktop.org
Sun Oct 24 09:49:53 PDT 2010
testautomation/framework/required/includes/script_organizers.inc | 15 +++++-
testautomation/math/optional/includes/m_105.inc | 22 +++++-----
testautomation/xml/optional/c_datapilot_pagefields.bas | 2
testautomation/xml/optional/c_xml_print_scale.bas | 2
testautomation/xml/optional/c_xml_scenario.bas | 2
testautomation/xml/optional/calc_xml_7_export.bas | 2
testautomation/xml/optional/ch_xml_japanese_candlestick.bas | 2
testautomation/xml/optional/includes/c_xml_print_scale.inc | 2
testautomation/xml/optional/includes/c_xml_scenario.inc | 2
testautomation/xml/optional/includes/sxc7_01.inc | 2
testautomation/xml/optional/includes/sxc7_02.inc | 2
testautomation/xml/optional/includes/sxc7_03.inc | 2
12 files changed, 33 insertions(+), 24 deletions(-)
New commits:
commit d43b2489be5f0c93fbabcf3ba465027f233bbf95
Merge: db5dc20... 6ebd013...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Sun Oct 24 16:56:15 2010 +0200
Merge commit 'ooo/OOO330_m12'
commit 6ebd013d614574925a475cc6bc1a50142c545811
Merge: 57c7499... 2a2a467...
Author: Jens-Heiner Rechtien <hr at openoffice.org>
Date: Thu Oct 14 15:53:35 2010 +0200
CWS-TOOLING: integrate CWS automationooo330m9
commit 2a2a4670a18c7965e896d6f68ac676a4ec474a86
Author: Joerg Skottke [jsk] <jsk at openoffice.org>
Date: Thu Oct 14 08:09:38 2010 +0200
automationooo330m9: #i115026 - Fuzzy list matching to avoid warnings if the office is installed in some special - non standard - way. As we have no standard, this applies to all installations.
diff --git a/testautomation/framework/required/includes/script_organizers.inc b/testautomation/framework/required/includes/script_organizers.inc
index b9ed842..3a70c80 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 )
commit 1d62040b273e62d14b6844c15f775b935cfdfbc3
Author: Oliver Craemer [oc] <oc at openoffice.org>
Date: Tue Oct 12 15:22:57 2010 +0200
#163885 # Correction of mispelled testownername
diff --git a/testautomation/xml/optional/c_datapilot_pagefields.bas b/testautomation/xml/optional/c_datapilot_pagefields.bas
index 80c41c9..5552322 100755
--- a/testautomation/xml/optional/c_datapilot_pagefields.bas
+++ b/testautomation/xml/optional/c_datapilot_pagefields.bas
@@ -25,7 +25,7 @@
'
'/************************************************************************
'*
-'* owner : oliver.creamer at Sun.COM
+'* owner : oliver.craemer at 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 97a5eaa..479ad76 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 at Sun.COM
+'* owner : oliver.craemer at 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 982e965..c22ed31 100755
--- a/testautomation/xml/optional/c_xml_scenario.bas
+++ b/testautomation/xml/optional/c_xml_scenario.bas
@@ -25,7 +25,7 @@
'
'/************************************************************************
'*
-'* owner : oliver.creamer at Sun.COM
+'* owner : oliver.craemer at 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 2c85dd6..37cc950 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 at oracle.com
+'* owner : oliver.craemer at 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 23cfea1..e9d824a 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 at Sun.COM
+'* owner : oliver.craemer at 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 b9e924a..48201f1 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 at oracle.com
+'* owner : oliver.craemer at 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 f98b8db..ddaf8fb 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 at oracle.com
+'* owner : oliver.craemer at 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 d32b7b3..0dace41 100755
--- a/testautomation/xml/optional/includes/sxc7_01.inc
+++ b/testautomation/xml/optional/includes/sxc7_01.inc
@@ -25,7 +25,7 @@
'
'/************************************************************************
'*
-'* owner : oliver.creamer at oracle.com
+'* owner : oliver.craemer at 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 304a15b..8696cb3 100755
--- a/testautomation/xml/optional/includes/sxc7_02.inc
+++ b/testautomation/xml/optional/includes/sxc7_02.inc
@@ -25,7 +25,7 @@
'
'/************************************************************************
'*
-'* owner : oliver.creamer at oracle.com
+'* owner : oliver.craemer at 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 e6c4d99..5c86613 100755
--- a/testautomation/xml/optional/includes/sxc7_03.inc
+++ b/testautomation/xml/optional/includes/sxc7_03.inc
@@ -25,7 +25,7 @@
'
'/************************************************************************
'*
-'* owner : oliver.creamer at oracle.com
+'* owner : oliver.craemer at oracle.com
'*
'* short description : XML Calc Include File
'*
commit 0eabe6cf78f5aadefdfba1d9761914a0add66068
Author: Thorsten Bosbach <tbo at OpenOffice.org>
Date: Tue Oct 12 15:11:14 2010 +0200
#i114831# fix outcome from tl83 cws
diff --git a/testautomation/math/optional/includes/m_105.inc b/testautomation/math/optional/includes/m_105.inc
index 9d35f36..e7b97e7 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
@@ -448,12 +448,12 @@ testcase tToolsCatalog
'///+ insert the copied text into the document ///'
DocumentWriter.typeKeys "<Mod1 End> - " + sTemp + ": " + j + "<Tab>"
sAllSymbols = sAllSymbols + sTemp
- listAppend(lAllSymbols(), sTemp)
+ listAppend(lAllSymbols(), rTrim(sTemp))
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
More information about the Libreoffice-commits
mailing list