[ooo-build-commit] .: 70 commits - testautomation/dbaccess testautomation/extensions testautomation/framework testautomation/global testautomation/graphics testautomation/writer
Jan Holesovsky
kendy at kemper.freedesktop.org
Wed Sep 8 08:38:05 PDT 2010
testautomation/dbaccess/optional/includes/db_Mozilla.inc | 34
testautomation/dbaccess/optional/includes/frm_FormFilter.inc | 10
testautomation/dbaccess/optional/includes/frm_Forms.inc | 10
testautomation/dbaccess/optional/includes/xf_Submission.inc | 9
testautomation/extensions/optional/includes/extensions.inc | 10
testautomation/extensions/optional/includes/location.inc | 22
testautomation/framework/optional/includes/extras_modify_objects.inc | 4
testautomation/framework/optional/includes/security_certification_dialogs.inc | 2
testautomation/framework/optional/includes/security_macrosecurity.inc | 26
testautomation/framework/required/f_programmability_dialogs.bas | 7
testautomation/framework/required/includes/basic_dialog_i18n.inc | 1
testautomation/framework/required/includes/script_organizers.inc | 207 +--
testautomation/framework/required/includes/smoketest.inc | 4
testautomation/framework/required/includes/topten.inc | 46
testautomation/framework/required/includes/window_functions.inc | 27
testautomation/framework/required/includes/wizard_agenda.inc | 13
testautomation/framework/required/includes/wizard_documentconverter.inc | 15
testautomation/framework/required/includes/wizard_euroconverter.inc | 9
testautomation/framework/required/includes/wizard_fax.inc | 11
testautomation/framework/required/includes/wizard_firsttime.inc | 14
testautomation/framework/required/includes/wizard_letter.inc | 20
testautomation/framework/required/includes/wizard_presentation.inc | 5
testautomation/framework/required/input/scripts/OpenOffice.org_en-US_BasicOrganizer.txt | 657 +++++++++
testautomation/framework/required/input/scripts/OpenOffice.org_en-US_BeanShell.txt | 14
testautomation/framework/required/input/scripts/OpenOffice.org_en-US_JavaScript.txt | 10
testautomation/framework/required/input/scripts/OpenOffice.org_en-US_Python.txt | 10
testautomation/framework/required/input/scripts/OpenOffice.org_en-US_RunMacro.txt | 681 +++++++++
testautomation/framework/required/input/scripts/OpenOffice.org_en-US_osx_BasicOrganizer.txt | 657 +++++++++
testautomation/framework/required/input/scripts/OpenOffice.org_en-US_osx_BeanShell.txt | 14
testautomation/framework/required/input/scripts/OpenOffice.org_en-US_osx_JavaScript.txt | 10
testautomation/framework/required/input/scripts/OpenOffice.org_en-US_osx_Python.txt | 8
testautomation/framework/required/input/scripts/OpenOffice.org_en-US_osx_RunMacro.txt | 679 +++++++++
testautomation/framework/required/input/scripts/OpenOffice.org_en-US_win_BasicOrganizer.txt | 657 +++++++++
testautomation/framework/required/input/scripts/OpenOffice.org_en-US_win_BeanShell.txt | 14
testautomation/framework/required/input/scripts/OpenOffice.org_en-US_win_JavaScript.txt | 10
testautomation/framework/required/input/scripts/OpenOffice.org_en-US_win_Python.txt | 10
testautomation/framework/required/input/scripts/OpenOffice.org_en-US_win_RunMacro.txt | 681 +++++++++
testautomation/framework/required/input/scripts/Oracle-Open-Office_en-US_BasicOrganizer.txt | 663 +++++++++
testautomation/framework/required/input/scripts/Oracle-Open-Office_en-US_BeanShell.txt | 14
testautomation/framework/required/input/scripts/Oracle-Open-Office_en-US_JavaScript.txt | 10
testautomation/framework/required/input/scripts/Oracle-Open-Office_en-US_Python.txt | 10
testautomation/framework/required/input/scripts/Oracle-Open-Office_en-US_RunMacro.txt | 687 ++++++++++
testautomation/framework/required/input/scripts/Oracle-Open-Office_en-US_osx_BasicOrganizer.txt | 660 +++++++++
testautomation/framework/required/input/scripts/Oracle-Open-Office_en-US_osx_BeanShell.txt | 14
testautomation/framework/required/input/scripts/Oracle-Open-Office_en-US_osx_JavaScript.txt | 10
testautomation/framework/required/input/scripts/Oracle-Open-Office_en-US_osx_Python.txt | 8
testautomation/framework/required/input/scripts/Oracle-Open-Office_en-US_osx_RunMacro.txt | 682 +++++++++
testautomation/framework/required/input/scripts/Oracle-Open-Office_en-US_win_BasicOrganizer.txt | 657 +++++++++
testautomation/framework/required/input/scripts/Oracle-Open-Office_en-US_win_BeanShell.txt | 14
testautomation/framework/required/input/scripts/Oracle-Open-Office_en-US_win_JavaScript.txt | 10
testautomation/framework/required/input/scripts/Oracle-Open-Office_en-US_win_Python.txt | 10
testautomation/framework/required/input/scripts/Oracle-Open-Office_en-US_win_RunMacro.txt | 681 +++++++++
testautomation/framework/tools/includes/toolbar_tools.inc | 18
testautomation/framework/tools/includes/wizards.inc | 322 ----
testautomation/framework/tools/input/menuentries.txt | 50
testautomation/global/required/includes/g_findbar.inc | 2
testautomation/global/sid/e_all.sid | 2
testautomation/global/tools/includes/optional/t_listfuncs.inc | 45
testautomation/global/tools/includes/optional/t_treelist_tools.inc | 9
testautomation/global/tools/includes/required/t_filters.inc | 15
testautomation/graphics/required/includes/impress/im_003_.inc | 3
testautomation/graphics/required/includes/impress/im_004_.inc | 1
testautomation/writer/optional/includes/autocorrection/w_autocorrect1.inc | 2
testautomation/writer/optional/includes/fields/w_fields5.inc | 4
testautomation/writer/optional/includes/formatpage/w_formatpage1.inc | 114 -
testautomation/writer/optional/includes/formatpage/w_formatpage3.inc | 24
testautomation/writer/optional/includes/formatpage/w_formatpage4.inc | 121 -
testautomation/writer/optional/includes/loadsave/w_loadsave.inc | 7
testautomation/writer/optional/includes/number/w_206_.inc | 24
testautomation/writer/optional/includes/regression/issuezilla/w_issuezilla_regression.inc | 6
testautomation/writer/optional/includes/spellcheck/w_spellcheck.inc | 106 -
testautomation/writer/optional/input/linguistik/050.odt |binary
testautomation/writer/optional/input/spellcheck/Language_Guessing_Sample_Texts.odt |binary
testautomation/writer/optional/input/spellcheck/spellcheck_50.odt |binary
testautomation/writer/optional/input/spellcheck/st1_2_50.odt |binary
testautomation/writer/required/includes/w_020_.inc | 2
testautomation/writer/required/w_updt.bas | 1
77 files changed, 8813 insertions(+), 813 deletions(-)
New commits:
commit a5bb7c0e0edea0fe3b7ac93103ab4687ab12236c
Merge: 93de5db... fcf1d5f...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Wed Sep 8 11:34:16 2010 +0200
Merge commit 'ooo/OOO330_m7'
commit 93de5db112e44e18dcf4903e5f7813331c8c8f0d
Merge: 6903112... 80db537...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Tue Sep 7 09:33:09 2010 +0200
Merge commit 'ooo/OOO330_m6'
commit fcf1d5f09ef03b29295858bf151c82edf3f46da6
Merge: 80db537... 507ac22...
Author: Kurt Zenker <kz at openoffice.org>
Date: Fri Sep 3 14:39:55 2010 +0200
CWS-TOOLING: integrate CWS fs33a
commit 507ac228c6bf71f1ff4254fb88102ff95c258ad0
Author: Marc Neumann [msc] <Marc.Neumann at oracle.com>
Date: Thu Sep 2 11:22:08 2010 +0200
fs33a: #114249# fix testscript to work better
diff --git a/testautomation/dbaccess/optional/includes/frm_FormFilter.inc b/testautomation/dbaccess/optional/includes/frm_FormFilter.inc
index bdcf1c4..74edeb1 100755
--- a/testautomation/dbaccess/optional/includes/frm_FormFilter.inc
+++ b/testautomation/dbaccess/optional/includes/frm_FormFilter.inc
@@ -47,7 +47,9 @@ testcase tLoadForm
Kontext "DocumentWriter"
'/// press CTRL + F5 to get into the first textbox
printlog "press CTRL + F5 to get into the first textbox"
- DocumentWriter.TypeKeys "<MOD1 F5>" , true
+ DocumentWriter.TypeKeys "<MOD1 F6>" , true
+ wait(1000)
+ DocumentWriter.TypeKeys "<MOD1 F5>" , true
'sleep(1)
'DocumentWriter.TypeKeys "<MOD1 C>" , true
'sleep(1)
@@ -59,6 +61,8 @@ testcase tLoadForm
wait(1000)
'/// insert 2 in the first textbox
printlog "insert 2 in the first textbox"
+ DocumentWriter.TypeKeys "<MOD1 F6>" , true
+ wait(1000)
DocumentWriter.TypeKeys "<MOD1 F5>" , true
sleep(1)
DocumentWriter.TypeKeys "2" , true
@@ -69,7 +73,7 @@ testcase tLoadForm
FM_FF_Execute
wait(1000)
printlog "workaround issue 102010"
- DocumentWriter.TypeKeys "<MOD1 F6>" , true
+ DocumentWriter.TypeKeys "<MOD1 F6>" , true
sleep(1)
DocumentWriter.TypeKeys "<MOD1 F5>" , true
sleep(1)
@@ -94,6 +98,8 @@ testcase tLoadForm
wait(1000)
'/// insert into the second textbox like '%2'
printlog "insert into the second textbox like '%2'"
+ DocumentWriter.TypeKeys "<MOD1 F6>" , true
+ wait(1000)
DocumentWriter.TypeKeys "<MOD1 F5>" , true
sleep(1)
DocumentWriter.TypeKeys "<TAB>" , true
diff --git a/testautomation/dbaccess/optional/includes/frm_Forms.inc b/testautomation/dbaccess/optional/includes/frm_Forms.inc
index b31a064..630e192 100755
--- a/testautomation/dbaccess/optional/includes/frm_Forms.inc
+++ b/testautomation/dbaccess/optional/includes/frm_Forms.inc
@@ -173,7 +173,7 @@ testcase tCreateForm
'/// insert a textfield
printlog "insert a textfield"
Edit.Click
- call hDrawingWithSelection ( 50, 20, 60, 30 )
+ call hDrawingWithSelection ( 50, 30, 60, 40 )
sleep(1)
Kontext "FormControls"
@@ -543,7 +543,7 @@ testcase tCreateSubForms
'/// insert a textfield
printlog "insert a textfield"
Edit.Click
- call hDrawingWithSelection ( 50, 20, 60, 30 )
+ call hDrawingWithSelection ( 50, 30, 60, 40 )
sleep(1)
Kontext "FormControls"
@@ -638,7 +638,7 @@ testcase tCreateSubForms
'/// insert a textfield
printlog "insert a textfield"
'Edit.Click
- call hDrawingWithSelection ( 50, 40, 60, 50 )
+ call hDrawingWithSelection ( 50, 50, 60, 60 )
sleep(1)
Kontext "FormControls"
@@ -672,6 +672,8 @@ testcase tCheckSubForm
'/// set cursor into the first control
printlog "set cursor into the first control"
Kontext "DocumentWriter"
+ DocumentWriter.TypeKeys "<MOD1 F6>" , true
+ wait(1000)
DocumentWriter.TypeKeys "<MOD1 F5>" , true
sleep(1)
@@ -749,7 +751,7 @@ testcase tCreateSubFormsNewMethod
'/// insert a textfield
printlog "insert a textfield"
Edit.Click
- call hDrawingWithSelection ( 50, 20, 60, 30 )
+ call hDrawingWithSelection ( 50, 30, 60, 40 )
sleep(1)
Kontext "FormControls"
diff --git a/testautomation/dbaccess/optional/includes/xf_Submission.inc b/testautomation/dbaccess/optional/includes/xf_Submission.inc
index ad24c62..05f0da7 100755
--- a/testautomation/dbaccess/optional/includes/xf_Submission.inc
+++ b/testautomation/dbaccess/optional/includes/xf_Submission.inc
@@ -41,6 +41,8 @@ end sub
'-------------------------------------------------------------------------
testcase tDataNavigatorSubmission
+ Dim sSubmitPath as string
+
'/// open new XML Form
printlog "open new XML Form"
@@ -101,11 +103,8 @@ testcase tDataNavigatorSubmission
'/// add a submission
Kontext "XFormAddSubmission"
SubmitName.setText("submission1")
- if ( gPlatgroup = "w95" ) then
- SubmitAction.setText("file:///" + ConvertPath(gOfficePath,"lin") + "user/work/test.xml")
- else
- SubmitAction.setText("file://" + gOfficePath + "user/work/test.xml")
- endif
+ sSubmitPath = "file:///" + gOfficePath + "user/work/test.xml"
+ SubmitAction.setText( hStringReplaceChar( sSubmitPath, "\", "/" ) )
SubmitMethod.select 2
'/// close the add submission dialog
commit 06f28426fee151264c53cac612b16c22d19d13cb
Author: Marc Neumann [msc] <Marc.Neumann at oracle.com>
Date: Thu Sep 2 11:19:10 2010 +0200
fs33a: #111181# fix testscript to work with the correct message box
diff --git a/testautomation/framework/optional/includes/security_certification_dialogs.inc b/testautomation/framework/optional/includes/security_certification_dialogs.inc
index ee7605a..c367285 100755
--- a/testautomation/framework/optional/includes/security_certification_dialogs.inc
+++ b/testautomation/framework/optional/includes/security_certification_dialogs.inc
@@ -86,7 +86,7 @@ testcase tCertificationDialogs
kontext "DigitalSignature"
if ( DigitalSignature.exists( 2 ) ) then
printlog( CFN & "Digital signatures is open" )
- DigitalSignature.cancel()
+ DigitalSignature.close()
else
if ( gApplication <> "MASTERDOCUMENT" ) then
warnlog( CFN & "Digital Signatures Dialog is not open" )
commit 80db5377a1a79094079408b6a75087fa4f104d96
Merge: c709b22... 489f574...
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Thu Aug 26 13:56:27 2010 +0200
CWS-TOOLING: integrate CWS automationooo330m5
commit 29ef16907325c014fd8cc1757db7ade62c908ad3
Merge: a759c37... c709b22...
Author: Frank Schoenheit [fs] <frank.schoenheit at oracle.com>
Date: Wed Aug 25 16:07:39 2010 +0200
fs33a: merge after pulling OOO330.m5's changes
commit 489f574ebf6bfe148f2423d2450358eef59b10e6
Author: Marc Neumann [msc] <Marc.Neumann at oracle.com>
Date: Mon Aug 23 15:30:19 2010 +0200
automationooo330m5: #113492# clear the layout and add one sleep
diff --git a/testautomation/graphics/required/includes/impress/im_003_.inc b/testautomation/graphics/required/includes/impress/im_003_.inc
index 685a9d7..0eec593 100644
--- a/testautomation/graphics/required/includes/impress/im_003_.inc
+++ b/testautomation/graphics/required/includes/impress/im_003_.inc
@@ -216,6 +216,9 @@ testcase tiViewToolbar_1
printlog "open application "
Call hNewDocument
+
+ printlog "use the empty layout"
+ call sSelectEmptyLayout
printlog "Insert->Graphic... : global\input\graf_inp\desp.bmp "
hUseAsyncSlot( "InsertGraphicsFromFile" )
diff --git a/testautomation/graphics/required/includes/impress/im_004_.inc b/testautomation/graphics/required/includes/impress/im_004_.inc
index 02587ea..2c55bc4 100644
--- a/testautomation/graphics/required/includes/impress/im_004_.inc
+++ b/testautomation/graphics/required/includes/impress/im_004_.inc
@@ -49,6 +49,7 @@ testcase tiInsertSlideExpandSummary
Kontext "DocumentImpressOutlineView"
printlog "Type 2 rows "
DocumentImpressOutlineView.TypeKeys "Herbert<Return>Rudi"
+ sleep(1)
printlog "View->Master View->Drawing View "
ViewWorkspaceDrawingView
WaitSlot()
commit c48e35b8155e5656b75c1edb2aad79dbb0714f95
Author: Marc Neumann [msc] <Marc.Neumann at oracle.com>
Date: Mon Aug 23 15:27:44 2010 +0200
automationooo330m5: #114064# testcases did not work under mac osx
diff --git a/testautomation/dbaccess/optional/includes/db_Mozilla.inc b/testautomation/dbaccess/optional/includes/db_Mozilla.inc
index 45cf945..236b6a5 100755
--- a/testautomation/dbaccess/optional/includes/db_Mozilla.inc
+++ b/testautomation/dbaccess/optional/includes/db_Mozilla.inc
@@ -32,22 +32,35 @@
'\***********************************************************************
sub db_Mozilla
- ' Information for this test under
- ' http://wiki.services.openoffice.org/wiki/Database_Automatic_Testing#Testing_the_mozilla_Address_book
-
- if fCreateMozillaAddressbookDatasource(gOfficePath + ConvertPath("user/work/TT_Mozilla.odb")) then
-
- tQueryAddressbook(gOfficePath + ConvertPath("user/work/TT_Mozilla.odb"))
- tSortAddressbook(gOfficePath + ConvertPath("user/work/TT_Mozilla.odb"))
- else
+ if(gPlatform = "osx") then
+ ' on Mac platform the Mozilla address book is not available
+ ' so I call only the testcases to satisfied the database
tQueryAddressbook("")
tSortAddressbook("")
+ else
+
+ ' Information for this test under
+ ' http://wiki.services.openoffice.org/wiki/Database_Automatic_Testing#Testing_the_mozilla_Address_book
+
+ if fCreateMozillaAddressbookDatasource(gOfficePath + ConvertPath("user/work/TT_Mozilla.odb")) then
+
+ tQueryAddressbook(gOfficePath + ConvertPath("user/work/TT_Mozilla.odb"))
+ tSortAddressbook(gOfficePath + ConvertPath("user/work/TT_Mozilla.odb"))
+ else
+ tQueryAddressbook("")
+ tSortAddressbook("")
+ endif
endif
end sub
'-------------------------------------------------------------------------
testcase tQueryAddressbook( sFileName )
+ if(gPlatform = "osx") then
+ printlog "mozilla address book not available on Mac"
+ goto endsub
+ endif
+
if ( not fOpenDatabase(sFileName) ) then
warnlog "Database can't be open"
printlog "May be you find a solution under http://wiki.services.openoffice.org/wiki/Database_Automatic_Testing#Testing_the_mozilla_Address_book"
@@ -86,6 +99,11 @@ endcase
'-------------------------------------------------------------------------
testcase tSortAddressbook( sFileName )
+ if(gPlatform = "osx") then
+ printlog "mozilla address book not available on Mac"
+ goto endsub
+ endif
+
Dim sRecordCount as String
'/// open the database file created in the bas file
commit b41788e358841179335c871422c385d455a1eefd
Author: Helge Delfs [hde] <hde at openoffice.org>
Date: Mon Aug 23 12:53:51 2010 +0200
automationooo330m5#i113978#added exception loading file swdos.txt
diff --git a/testautomation/writer/optional/includes/loadsave/w_loadsave.inc b/testautomation/writer/optional/includes/loadsave/w_loadsave.inc
index 7454f73..e4871e7 100644
--- a/testautomation/writer/optional/includes/loadsave/w_loadsave.inc
+++ b/testautomation/writer/optional/includes/loadsave/w_loadsave.inc
@@ -52,6 +52,7 @@ testcase tExportAllReadableFormatsIntoODF
Dim SavedCorrectly as Boolean
Dim sExportFilter as string
Dim sExportFile as string
+ Dim sExceptionFile as string
Dim i as Integer
WorkDirectory = ( ConvertPath ( gOfficePath + "user\work\" + gPlatgroup + "\export\"))
@@ -77,8 +78,12 @@ testcase tExportAllReadableFormatsIntoODF
For i = 1 to listCount(ImportFileList())
printlog "- " & i & ". load: " & ImportFileList(i)
sExportFile = ImportFileList(i)
+ sExceptionFile = DateiExtract ( sExportFile )
+ printlog sExceptionFile
if GetExtention ( sExportFile ) = "psw" then
- QAErrorlog "#i102221#Pocket Word filter puts General I/O Error"
+ QAErrorlog "#i102221#Pocket Word filter puts General I/O Error"
+ elseif LCase( sExceptionFile ) = "swdos.txt" then
+ QAErrorlog "#i114062#General I/O error loading StarWriter DOS file"
else
Call hFileOpen ( ImportFileList(i) )
printlog "- done"
commit 7a385baa1cf7b4490af7dfd84c9e145394634f18
Author: Marc Neumann [msc] <Marc.Neumann at oracle.com>
Date: Mon Aug 23 09:23:55 2010 +0200
automationooo330m5: #114058# fix error in window_functions.inc
diff --git a/testautomation/framework/required/includes/window_functions.inc b/testautomation/framework/required/includes/window_functions.inc
index 6917639..008248a 100755
--- a/testautomation/framework/required/includes/window_functions.inc
+++ b/testautomation/framework/required/includes/window_functions.inc
@@ -196,9 +196,6 @@ end sub
testcase tCheckWindowTitle( sApplication as string, sReference as string )
- if ( sApplication = "soffice" ) then
-
-
printlog( "Update test for the office window titles" )
' This is a Testtool-only problem that the product name is not displayed
commit c709b2226d41e3e6f2b60f3544a219929189f651
Merge: 5f639d9... da3ffcb...
Author: Kurt Zenker <kz at openoffice.org>
Date: Wed Aug 18 13:53:23 2010 +0200
CWS-TOOLING: integrate CWS automationooo330m4
commit 5f639d9f2ada0416978d79ccb3e2e3b71f5f685a
Merge: 71d13e2... 24b4066...
Author: Kurt Zenker <kz at openoffice.org>
Date: Wed Aug 18 12:17:07 2010 +0200
CWS-TOOLING: integrate CWS automationooo330m3
commit 71d13e2ad9da212e726215cc2191ae17ceb06d89
Merge: c4b994d... 8bb91b1...
Author: Kurt Zenker <kz at openoffice.org>
Date: Wed Aug 18 12:00:05 2010 +0200
CWS-TOOLING: integrate CWS jl154
commit da3ffcb831cb64e87b9ee2bf8fb1c89ce9113252
Author: Helge Delfs [hde] <hde at openoffice.org>
Date: Wed Aug 18 10:59:59 2010 +0200
#automationooo330m4#i113928#adding SL language (50) to writer testscripts
diff --git a/testautomation/writer/optional/includes/formatpage/w_formatpage1.inc b/testautomation/writer/optional/includes/formatpage/w_formatpage1.inc
old mode 100755
new mode 100644
index 0bd255e..84a5c52
--- a/testautomation/writer/optional/includes/formatpage/w_formatpage1.inc
+++ b/testautomation/writer/optional/includes/formatpage/w_formatpage1.inc
@@ -53,18 +53,18 @@ testcase tFormatPage_1
PrintLog "- Open format/page dialog"
'/// <b> Open format/page dialog </b> ///
-
+
Call hNewDocument
-
+
'/// 1. via Mouse clicks in Menu: Format-Page
try
fFormatPageWriter("TabSeite")
TabSeite.Cancel
catch
endcatch
-
+
'/// 2. via shortcuts in menu (manual test is needed)
-
+
'/// 3. via Context menu when Cursor is in the document
try
hMenuSelectNr(5)
@@ -77,7 +77,7 @@ testcase tFormatPage_1
TabSeite.Cancel
catch
endcatch
-
+
Call hCloseDocument
endcase
@@ -125,21 +125,21 @@ endcase
testcase tFormatPage_3
Dim iTextLength as integer
-
+
PrintLog "- Test Landscape in tabpage Page"
'/// Test Landscape in tabpage Page
-
+
Call hNewDocument
Call wOptionsUndo( "Grundschriften" )
-
+
'/// Input a long test string
Call wTypeKeys "ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQ"
Call wTypeKeys "<Mod1 Home>"
Call wTypeKeys "<Shift End>"
EditCopy
iTextLength = Len(GetClipBoardtext)
-
+
'/// Format/Page , tabpage page , check 'Landscape'
fFormatPageWriter("TabSeite")
Papierformat.Select 2 ' A4 Paper
@@ -147,14 +147,14 @@ testcase tFormatPage_3
Quer.Check
Wait 500
TabSeite.OK
-
+
'/// Check if Checkbox -- Landscape works fine
Call wTypeKeys "<Mod1 Home>"
Call wTypeKeys "<Shift End>"
EditCopy
wait 500
if Len(GetClipboardText) <= iTextLength then Warnlog "Checkbox Landscape doesn't work fine!"
-
+
Call hCloseDocument
endcase
@@ -166,14 +166,14 @@ testcase tFormatPage_4
Dim iFormat as Integer
Dim sWidth as String
Dim sHeight as String
-
+
iFormat = 2 'A4 paper
-
+
PrintLog "- Width and Height boxes must change after changing between Portrait and Landscape"
'/// Width and Height boxes must change after changing between Portrait and Landscape
-
+
Call hNewDocument
-
+
'/// Format/Page tabpage page ,
'/// + check 'Portrait' first and get width and height ,
'/// + then change from Portrait to Landscape
@@ -185,13 +185,13 @@ testcase tFormatPage_4
Sleep 1
sWidth = Breite.GetText
sHeight = Hoehe.GetText
-
+
Quer.Check
Sleep 1
if Breite.GetText <> sHeight then Warnlog "Width isn't changed when changing from Portrait to Landscape !"
if Hoehe.GetText <> sWidth then Warnlog "Height isn't changed when changing from Portrait to Landscape !"
TabSeite.Cancel
-
+
'/// Format/Page tabpage page ,
'/// + check 'Landscape' first and get width and height ,
'/// + then change from Landscape to Portrait
@@ -203,13 +203,13 @@ testcase tFormatPage_4
Sleep 1
sWidth = Breite.GetText
sHeight = Hoehe.GetText
-
+
Hoch.Check
Sleep 1
if Breite.GetText <> sHeight then Warnlog "Width isn't changed when changing from Landscape to Portrait !"
if Hoehe.GetText <> sWidth then Warnlog "Height isn't changed when changing from Landscape to Portrait !"
TabSeite.Cancel
-
+
Call hCloseDocument
endcase
@@ -222,28 +222,28 @@ testcase tFormatPage_5
Dim sWidth as String , sHeight as String
Dim sLeft as String , sRight as String , sUp as String , sBottom as String ' set page size
Dim sLeft1 as String , sRight1 as String , sUp1 as String , sBottom1 as String ' get page size
-
+
iFormat = 2 'A4 paper
sWidth = "20" + gSeperator + "00" + gMeasurementUnit
sHeight = "25" + gSeperator + "00" + gMeasurementUnit
-
+
sLeft = "15" + gSeperator + "00" + gMeasurementUnit
sRight = "15" + gSeperator + "00" + gMeasurementUnit
sUp = "15" + gSeperator + "00" + gMeasurementUnit
sBottom = "15" + gSeperator + "00" + gMeasurementUnit
-
+
sLeft1 = "15" + gSeperator + "00" + gMeasurementUnit
sRight1 = "4" + gSeperator + "50" + gMeasurementUnit
sUp1 = "15" + gSeperator + "00" + gMeasurementUnit
sBottom1 = "9" + gSeperator + "50" + gMeasurementUnit
-
+
PrintLog "- The sum of 'Left margin' and 'Right margin' must always stay below the Paper width."
PrintLog " (Same for top/bottom and height)"
'/// The sum of "Left margin" and "Right margin" must always stay below the Paper width.
'/// (Same for top/bottom and height)
-
+
Call hNewDocument
-
+
'/// Format/Page , tabpage Page , set width and height , close the dialog
fFormatPageWriter("TabSeite")
Papierformat.Select iFormat
@@ -255,7 +255,7 @@ testcase tFormatPage_5
Hoehe.SetText sHeight
Wait 500
TabSeite.OK
-
+
'/// Format/Page , tabpage Page ,
'/// + Set the sum of "Left margin" and "Right margin" more than Width
fFormatPageWriter("TabSeite")
@@ -264,13 +264,13 @@ testcase tFormatPage_5
Rechts.SetText sRight
Wait 500
TabSeite.OK
-
+
'/// Check if the setting is OK
fFormatPageWriter("TabSeite")
if Left$(Links.GetText,5) <> Left$(sLeft1,5) then Warnlog "The Margin(left) is wrong!"
if Left$(Rechts.GetText,4) <> Left$(sRight1,4) then Warnlog "The Margin(right) is wrong!"
TabSeite.Cancel
-
+
'/// Format/Page , tabpage Page ,
'/// + Set the sum of "Up margin" and "Bottom margin" more than Heigth
fFormatPageWriter("TabSeite")
@@ -279,13 +279,13 @@ testcase tFormatPage_5
Unten.SetText sBottom
Wait 500
TabSeite.OK
-
+
'/// Check if the setting is OK
fFormatPageWriter("TabSeite")
if Left$(Oben.GetText,5) <> Left$(sUp1,5) then Warnlog "The Margin(Up) is wrong!"
if Left$(Unten.GetText,4) <> Left$(sBottom1,4) then Warnlog "The Margin(Bottom) is wrong!"
TabSeite.Cancel
-
+
Call hCloseDocument
endcase
@@ -298,22 +298,22 @@ testcase tFormatPage_6
Dim iFormatLayout as Integer , iReferenceStyle as Integer
Dim sWidth as String, sHeight as String
Dim sLeft as String , sRight as String , sUp as String , sBottom as String
-
+
iPaperTray = 1 : iPageLayout = 2
iFormatLayout = 2 : iReferenceStyle = 5
-
+
sWidth = "20" + gSeperator + "00" + gMeasurementUnit
sHeight = "25" + gSeperator + "00" + gMeasurementUnit
sLeft = "2" + gSeperator + "00" + gMeasurementUnit
sRight = "2" + gSeperator + "00" + gMeasurementUnit
sUp = "2" + gSeperator + "00" + gMeasurementUnit
sBottom = "2" + gSeperator + "00" + gMeasurementUnit
-
+
PrintLog "- Test Pre-defined formats"
'/// Test Pre-defined formats
-
+
Call hNewDocument
-
+
'/// Format/Page , tabpage page , do some configuration
fFormatPageWriter("TabSeite")
Hoch.Check
@@ -341,15 +341,15 @@ testcase tFormatPage_6
AbsatzVorlage.Select iReferenceStyle
Wait 500
TabSeite.OK
-
+
'/// Save the file , close the file and reload the file
Call hFileSaveAsWithFilterKill (gOfficepath + "user\work\tFormatPage_6.odt", "writer8")
Call hCloseDocument
-
+
Call hNewDocument
-
+
Call hFileOpen(gOfficepath + "user\work\tFormatPage_6.odt")
-
+
'/// Check if Pre-defined formats are correct
fFormatPageWriter("TabSeite")
if Hoch.IsChecked <> TRUE then Warnlog "Portrait should be checked!"
@@ -365,7 +365,7 @@ testcase tFormatPage_6
if Einschalten.IsChecked <> TRUE then Warnlog "Portrait should be checked!"
if AbsatzVorlage.GetSelIndex <> iReferenceStyle then Warnlog "The reference style is wrong!"
TabSeite.Cancel
-
+
Call hCloseDocument
endcase
@@ -378,22 +378,22 @@ testcase tFormatPage_7
Dim iFormatLayout as Integer , iReferenceStyle as Integer
Dim sWidth as String , sHeight as String
Dim sLeft as String , sRight as String , sUp as String , sBottom as String
-
+
iPaperTray = 1 : iPageLayout = 2
iFormatLayout = 2 : iReferenceStyle = 5
-
+
sWidth = "20" + gSeperator + "00" + gMeasurementUnit
sHeight = "25" + gSeperator + "00" + gMeasurementUnit
sLeft = "2" + gSeperator + "00" + gMeasurementUnit
sRight = "2" + gSeperator + "00" + gMeasurementUnit
sUp = "2" + gSeperator + "00" + gMeasurementUnit
sBottom = "2" + gSeperator + "00" + gMeasurementUnit
-
+
PrintLog "- Test user defined formats"
'/// Test user defined formats
-
+
Call hNewDocument
-
+
'/// Format/Page , tabpage page , do some configuration
fFormatPageWriter("TabSeite")
Hoch.Check
@@ -421,7 +421,7 @@ testcase tFormatPage_7
AbsatzVorlage.Select iReferenceStyle
Wait 500
TabSeite.OK
-
+
'/// Check if user defined formats are correct
fFormatPageWriter("TabSeite")
if Hoch.IsChecked <> TRUE then Warnlog "Portrait should be checked!"
@@ -437,7 +437,7 @@ testcase tFormatPage_7
if Einschalten.IsChecked <> TRUE then Warnlog "Portrait should be checked!"
if AbsatzVorlage.GetSelIndex <> iReferenceStyle then Warnlog "The reference style is wrong!"
TabSeite.Cancel
-
+
Call hCloseDocument
endcase
@@ -479,7 +479,7 @@ testcase tFormatPage_8
Warnlog "Listbox 'Text Direction' is visible though asian support is disabled"
end if
TabSeite.Cancel
-
+
if RecheckCTLSupport = True then
Call ActiveDeactivateCTLSupport(TRUE)
else
@@ -551,16 +551,16 @@ testcase tFormatPage_10
Dim RecheckAsianSupport as string
RecheckCTLSupport = gCTLSup
RecheckAsianSupport = gAsianSup
-
+
PrintLog "- when Asian support and CTL are all enabled , 3 entries should be in Text Direction listbox"
'/// when Asian support and CTL are all enabled , 3 entries should be in Text Direction listbox
-
+
Call hNewDocument
-
+
'/// Set Asian support enabled and Set CTL enabled
Call ActiveDeactivateAsianSupport(TRUE)
Call ActiveDeactivateCTLSupport(TRUE)
-
+
'/// Check if there are 3 entires in Text Direction listbox
fFormatPageWriter("TabSeite")
if Textfluss.GetItemCount <> 3 then
@@ -578,7 +578,7 @@ testcase tFormatPage_10
else
Call ActiveDeactivateAsianSupport(FALSE)
end if
-
+
Call hCloseDocument
endcase
@@ -843,6 +843,8 @@ testcase tFormatPage_15
sFormat = "Som sidformatmall"
case 49: sType = "Seite"
sFormat = "Wie Seitenvorlage"
+ case 50: sType = "Stran"
+ sFormat = "Kot predloga za stran"
case 55 : sType = "EstatÃsticas"
sFormat = "Como Estilo de Página"
case 81 : sType = "ページ"
@@ -856,12 +858,12 @@ testcase tFormatPage_15
case else : QAErrorLog "The test does not support the language " + iSprache
Goto endsub
end select
-
+
PrintLog "- Insertfields / other / Document / Type/Page -> As page Style must be set."
'/// Insertfield / other / Document / Type/Page -> As page Style must be set.
-
+
Call hNewDocument
-
+
'/// InsertFields / other , tabpage document , select page ,
'/// + check if Page format is right
Call fInsertFieldsOther("TabDokumentFeldbefehle")
diff --git a/testautomation/writer/optional/includes/formatpage/w_formatpage3.inc b/testautomation/writer/optional/includes/formatpage/w_formatpage3.inc
old mode 100755
new mode 100644
index 2d34c23..784f6da
--- a/testautomation/writer/optional/includes/formatpage/w_formatpage3.inc
+++ b/testautomation/writer/optional/includes/formatpage/w_formatpage3.inc
@@ -641,6 +641,7 @@ testcase tFormatPage_37
case 39 : sHeader = "Riga d'intestazione"
case 46 : sHeader = "Sidhuvud"
case 49 : sHeader = "Kopfzeile"
+ case 50 : sHeader = "Glava"
case 55 : sHeader = "Cabeçalho"
case 81 : sHeader = "ヘッダ"
case 82 : sHeader = "머리글"
@@ -689,6 +690,7 @@ testcase tFormatPage_38
case 39 : sFooter = "Piè di pagina"
case 46 : sFooter = "Sidfot"
case 49 : sFooter = "Fußzeile"
+ case 50 : sFooter = "Noga"
case 55 : sFooter = "Rodapé"
case 81 : sFooter = "フッタ"
case 82 : sFooter = "바닥글"
@@ -866,23 +868,23 @@ testcase tFormatPage_41
Dim sWidthColumn1 as String
Dim sWidthColumn2 as String
Dim sWidthColumn3 as String
-
+
sTestFile = Convertpath (gTesttoolpath + "writer\optional\input\formatpage\testColumnInPage2.sxw")
sColumn = "3"
sWidthColumn1 = "2" + gSeperator + "00"
sWidthColumn2 = "4" + gSeperator + "00"
-
+
PrintLog "- create columns with different width "
'/// create columns with different width
-
+
Call hNewDocument
-
+
'/// Open test file testColumnInPage2.sxw
'/// + (The test file includes 2 pages , some text is
'/// + in 1st page and another is in 2nd page)
Call hFileOpen(sTestFile)
Call sMakeReadOnlyDocumentEditable
-
+
'/// Create 3 with different columns . formatPage ,
'/// + tabpage columns , set 3 columns
Call fFormatPageWriter("TabSpalten")
@@ -899,14 +901,14 @@ testcase tFormatPage_41
sWidthColumn3 = Spaltenbreite3.GetText
wait 500
TabSpalten.OK
-
+
'/// Check if columns' width is right
fFormatPageWriter("TabSpalten")
if Left$(Spaltenbreite1.GetText,4) <> sWidthColumn1 then Warnlog "the column1's width isn't set correctly !"
if Left$(Spaltenbreite2.GetText,4) <> sWidthColumn2 then Warnlog "the column2's width isn't set correctly !"
if Spaltenbreite3.GetText <> sWidthColumn3 then Warnlog "the column3's width isn't set correctly !"
TabSpalten.Cancel
-
+
'detailed check for column1
Kontext
EditSearchAndReplace
@@ -916,12 +918,12 @@ testcase tFormatPage_41
SearchAll.Click
Sleep 1
FindAndReplace.Close
-
+
Call wTypeKeys "<Home>"
Call wTypeKeys "<Shift End>"
EditCopy
if Len(GetClipboardText) > 8 then Warnlog "Something wrong in the column1"
-
+
'detailed check for column2
Kontext
EditSearchAndReplace
@@ -931,12 +933,12 @@ testcase tFormatPage_41
SearchAll.Click
Sleep 1
FindAndReplace.Close
-
+
Call wTypeKeys "<Home>"
Call wTypeKeys "<Shift End>"
EditCopy
if Len(GetClipboardText) > 14 then Warnlog "Something wrong in the column2"
-
+
printlog " Close active document "
Do Until GetDocumentCount = 0
Call hCloseDocument
diff --git a/testautomation/writer/optional/includes/formatpage/w_formatpage4.inc b/testautomation/writer/optional/includes/formatpage/w_formatpage4.inc
old mode 100755
new mode 100644
index 60b8182..9b800e3
--- a/testautomation/writer/optional/includes/formatpage/w_formatpage4.inc
+++ b/testautomation/writer/optional/includes/formatpage/w_formatpage4.inc
@@ -58,32 +58,32 @@ testcase tFormatPage_48
printlog "No test with asian lovale, because checkbox 'Asian language support' is disabled by default!"
goto endsub
end select
-
+
sTestText1 = "This is the test!"
sTestText2 = "That isn't a test!"
-
+
PrintLog "- Text flow direction test Right to Left (Vertical) - Paragraph"
'/// Text flow direction test Right to Left (Vertical) - Paragraph
-
+
Call hNewDocument
-
+
'/// Set Asian language support enabled
Call ActiveDeactivateCTLSupport(FALSE)
Call ActiveDeactivateAsianSupport(TRUE)
-
+
'/// Input some test words
Call wTypeKeys sTestText1
Call wTypeKeys "<Return>"
Call wTypeKeys sTestText2
Sleep 1
-
+
'/// formatPage , tabpage page, select right to left (vertical)
fFormatPageWriter("TabSeite")
Textfluss.Select 2
Sleep 1
TabSeite.OK
Sleep 2
-
+
'/// Check if the direction of the test words is changed
Call wTypeKeys "<MOD1 Home>"
Call wTypeKeys "<Shift Down>", 4
@@ -92,7 +92,7 @@ testcase tFormatPage_48
if GetClipboardText <> "This" then
Warnlog "Something wrong in first word - get " &GetClipboardText
end if
-
+
Call wTypeKeys "<Home><Left>"
Call wTypeKeys "<Shift Down>" , 4
Sleep 1
@@ -100,11 +100,11 @@ testcase tFormatPage_48
if GetClipboardText <> "That" then
Warnlog "Something wrong in second word - get " &GetClipboardText
end if
-
+
if RecheckAsianSupport = False then
Call ActiveDeactivateAsianSupport(FALSE)
end if
-
+
Call hCloseDocument
endcase
@@ -116,32 +116,32 @@ testcase tFormatPage_49
Dim sTestText as String
Dim RecheckAsianSupport as boolean
RecheckAsianSupport = gAsianSup
-
+
sTestText = "This is the test!"
-
+
PrintLog "- Text flow direction test Right to Left (Vertical) - Section"
'/// Text flow direction test Right to Left (Vertical) - Section
-
+
Call hNewDocument
-
+
'/// Set Asian language support enabled
Call ActiveDeactivateAsianSupport(TRUE)
-
+
'/// Insert a section
fInsertSection("TabBereiche")
TabBereiche.OK
-
+
'/// insert something in the section
Call wTypeKeys "<Up>"
Call wTypeKeys sTestText
-
+
'/// formatPage , tabpage page, select right to left (vertical)
fFormatPageWriter("TabSeite")
Textfluss.Select 2
Sleep 1
TabSeite.OK
Sleep 2
-
+
'/// Check if the direction of the test words is changed
Call wTypeKeys "<Home>"
Call wTypeKeys "<Shift Down>" , 4
@@ -151,7 +151,7 @@ testcase tFormatPage_49
if RecheckAsianSupport = False then
Call ActiveDeactivateAsianSupport(FALSE)
end if
-
+
Call hCloseDocument
endcase
@@ -165,12 +165,12 @@ testcase tFormatPage_50
PrintLog "- Text flow direction test Right to Left (Vertical) - Footnotes"
'/// Text flow direction test Right to Left (Vertical) - Footnotes
-
+
Call hNewDocument
-
+
'/// Set Asian language support enabled
Call ActiveDeactivateAsianSupport(TRUE)
-
+
'/// Insert a footnotes
InsertFootnote
Kontext "FussnoteEinfuegen"
@@ -179,17 +179,17 @@ testcase tFormatPage_50
Sleep 1
FussnoteEinfuegen.OK
Sleep 1
-
+
Call wTypeKeys "<PageUp>"
Sleep 1
-
+
'/// formatPage , tabpage page, select right to left (vertical)
Call fFormatPageWriter("TabSeite")
Textfluss.Select 2
Sleep 1
TabSeite.OK
Sleep 2
-
+
'/// Check if the direction of the footnote is changed
Call wTypeKeys "<Down>"
try
@@ -199,7 +199,7 @@ testcase tFormatPage_50
Warnlog "Should NOT execute edit/footnote when focus is under the footnote"
catch
endcatch
-
+
Call wTypeKeys "<Up>"
try
EditFootnote
@@ -212,7 +212,7 @@ testcase tFormatPage_50
if RecheckAsianSupport = False then
Call ActiveDeactivateAsianSupport(FALSE)
end if
-
+
Call hCloseDocument
endcase
@@ -223,15 +223,15 @@ testcase tFormatPage_51
Dim RecheckAsianSupport as boolean
RecheckAsianSupport = gAsianSup
-
+
PrintLog "- Text flow direction test Right to Left (Vertical) - Endnotes"
'/// Text flow direction test Right to Left (Vertical) - Endnotes
-
+
Call hNewDocument
-
+
'/// Set Asian language support enabled
Call ActiveDeactivateAsianSupport(TRUE)
-
+
'/// Insert a endnotes
InsertFootnote
Kontext "FussnoteEinfuegen"
@@ -240,17 +240,17 @@ testcase tFormatPage_51
Sleep 1
FussnoteEinfuegen.OK
Sleep 1
-
+
Call wTypeKeys "<PageUp>"
Sleep 1
-
+
'/// formatPage , tabpage page, select right to left (vertical)
Call fFormatPageWriter("TabSeite")
Textfluss.Select 2
Sleep 1
TabSeite.OK
Sleep 2
-
+
'/// Check if the direction of the endnote is changed
Call wTypeKeys "<Down>"
try
@@ -260,7 +260,7 @@ testcase tFormatPage_51
Warnlog "Should NOT execute edit/footnote when focus is under the endnote"
catch
endcatch
-
+
Call wTypeKeys "<Up>"
try
EditFootnote
@@ -273,7 +273,7 @@ testcase tFormatPage_51
if RecheckAsianSupport = False then
Call ActiveDeactivateAsianSupport(FALSE)
end if
-
+
Call hCloseDocument
endcase
@@ -285,20 +285,20 @@ testcase tFormatPage_52
Dim sTest1 as String , sTest2 as String , sTest3 as String
Dim RecheckAsianSupport as boolean
RecheckAsianSupport = gAsianSup
-
+
sTest1 = "A1" : sTest2 = "B1" : sTest3 = "A2"
-
+
PrintLog "- Text flow direction test Right to Left (Vertical) - Table"
'/// Text flow direction test Right to Left (Vertical) - Table
-
+
Call hNewDocument
-
+
'/// Set Asian language support enabled
Call ActiveDeactivateAsianSupport(TRUE)
-
+
'/// Insert a table
Call hTabelleEinfuegen
-
+
'/// + input some string in the table , like
'/// a1 b1
'/// a2
@@ -312,14 +312,14 @@ testcase tFormatPage_52
wait 500
Call wTypeKeys sTest3
Call wTypeKeys "<Up><Home>" 'so far, the focus should be in front of A1
-
+
'/// formatPage , tabpage page, select right to left (vertical)
Call fFormatPageWriter("TabSeite")
Textfluss.Select 2
Sleep 1
TabSeite.OK
Sleep 2
-
+
'/// Check if the direction of the table is changed
Call wTypeKeys "<Shift Down>" , 2
Sleep 1
@@ -327,7 +327,7 @@ testcase tFormatPage_52
if GetClipboardText <> sTest1 then
Warnlog "1st word in table is wrong!"
end if
-
+
Call wTypeKeys "<Down>"
Call wTypeKeys "<Shift Down>" , 2
Sleep 1
@@ -335,7 +335,7 @@ testcase tFormatPage_52
if GetClipboardText <> sTest2 then
Warnlog "2nd word in table is wrong!"
end if
-
+
Call wTypeKeys "<Left><Up>"
Call wTypeKeys "<Shift Home>"
Sleep 1
@@ -347,7 +347,7 @@ testcase tFormatPage_52
if RecheckAsianSupport = False then
Call ActiveDeactivateAsianSupport(FALSE)
end if
-
+
Call hCloseDocument
endcase
@@ -355,36 +355,36 @@ endcase
'-------------------------------------------------------------------------------------------
testcase tFormatPage_53
-
+
Dim sTest as String
Dim sTestFile as String
Dim RecheckAsianSupport as boolean
RecheckAsianSupport = gAsianSup
-
+
sTest = "Test"
sTestFile = Convertpath (gTesttoolpath + "writer\optional\input\formatpage\testColumnVertical.sxw")
-
+
PrintLog "- Text flow direction test Right to Left (Vertical) - Column"
'/// Text flow direction test Right to Left (Vertical) - Column
-
+
Call hNewDocument
-
+
'/// Set Asian language support enabled
Call ActiveDeactivateAsianSupport(TRUE)
-
+
'/// Open test file testColumnVertical.sxw
'/// + There are 8 columns in the page , and a test
'/// + word is in 3rd column
Call hFileOpen(sTestFile)
Call sMakeReadOnlyDocumentEditable
-
+
'/// formatPage , tabpage page, select right to left (vertical)
Call fFormatPageWriter("TabSeite")
Textfluss.Select 2
Sleep 1
TabSeite.OK
Sleep 2
-
+
'/// Check if the direction of the column is changed
Kontext
EditSearchAndReplace
@@ -395,20 +395,20 @@ testcase tFormatPage_53
Sleep 1
FindAndReplace.Close
Sleep 1
-
+
Call wTypeKeys "<Down>"
Sleep 1
-
+
Call wTypeKeys "<Shift Up>" , 4
EditCopy
if GetClipboardText <> sTest then
Warnlog "the test word is wrong!"
end if
-
+
if RecheckAsianSupport = False then
Call ActiveDeactivateAsianSupport(FALSE)
end if
-
+
printlog " Close active document "
Do Until GetDocumentCount = 0
Call hCloseDocument
@@ -626,6 +626,7 @@ testcase tFormatPage_58
case 39 : sDefaultShadowColor = "Grigio"
case 46 : sDefaultShadowColor = "Grått"
case 49 : sDefaultShadowColor = "Grau"
+ case 50 : sDefaultShadowColor = "Siva"
case 55 : sDefaultShadowColor = "Cinza"
case 81 : sDefaultShadowColor = "ç°è‰²"
case 82 : sDefaultShadowColor = "회색"
@@ -749,7 +750,7 @@ testcase tFormatPage_60
Oben.SetText sSpacingToContentsU
Unten.SetText sSpacingToContentsB
StilFarbe.Select iBorderColor 'set border color
-
+
Position.TypeKeys "<Right>" , 4
Sleep 2
Groesse.SetText sShadowDistance
commit 9e533cc91d31304945d676e0e1ea31ec9191013b
Author: Helge Delfs [hde] <hde at openoffice.org>
Date: Wed Aug 18 10:35:51 2010 +0200
automationooo330m4#i113928#adding SL language (50) to writer testscripts
diff --git a/testautomation/writer/optional/includes/spellcheck/w_spellcheck.inc b/testautomation/writer/optional/includes/spellcheck/w_spellcheck.inc
old mode 100755
new mode 100644
index b1576b4..886f7fa
--- a/testautomation/writer/optional/includes/spellcheck/w_spellcheck.inc
+++ b/testautomation/writer/optional/includes/spellcheck/w_spellcheck.inc
@@ -57,7 +57,7 @@ testcase tToolsSpellcheckWithShortcut
Warnlog "Found no Document for the language you're testing in, Please inform the Test-Developer."
exit sub
end if
-
+
call hFileOpen (TheFile,false)
Call sMakeReadOnlyDocumentEditable
@@ -69,12 +69,13 @@ testcase tToolsSpellcheckWithShortcut
case 39 : Call wTypeKeys ("Don Cara Mio, capitoliooo?<Home>")
case 49 : Call wTypeKeys ("Dies ist ein Rechtschreibtexxxxt<Home>")
case 46 : Call wTypeKeys ("Det här är en rättstavningstexxxxt<Home>")
+ case 50 : Call wTypeKeys ("To je test Ärkvana<Home>")
case 07 : Printlog "- No Spellcheck in Russian!"
goto endsub
case 48 : Printlog "- No Spellcheck in Polish!"
goto endsub
case 55 : Printlog "- No Spellcheck in Brazilian!"
- goto endsub
+ goto endsub
case 81 : Printlog "- No Spellcheck in Japanese!"
goto endsub
case 82 : Printlog "- No Spellcheck in Korean!"
@@ -92,10 +93,10 @@ testcase tToolsSpellcheckWithShortcut
Call wTypeKeys "<HOME>" 'Setting cursor to beginning
Call wTypeKeys "<F7>" 'Calling spellchecker with shortcut
sleep (1)
-
+
Kontext "Active"
if Active.Exists(1) then 'checking if messagebox comes up
- if Active.getRT = 304 then 'checking ressource type
+ if Active.getRT = 304 then 'checking ressource type
Active.OK
else
printlog "No message Box!"
@@ -178,6 +179,7 @@ testcase tToolsSpellcheckCorrect
case 46 : FFText = "Den här filen innehåller viktig programinformation.<Return>"
case 48 : FFText = "Nie wolno w zadnim wypadku przerywa uruchomionego serwisu !<Return>"
case 49 : FFText = "Dies ist ein Text ohne Fehler.<Return>"
+ case 50 : FFText = "To je besedilo brez napake.<Return>"
case 55 : FFText = "Ele ouviu passos silenciosos atrás dele. Isso não estava certo.<Return>"
case else : QAErrorLog " - The language " + iSprache +" has no defined language text. No Test !"
exit Sub
@@ -263,6 +265,9 @@ testcase tToolsSpellcheck1Mistake
case 49 : sErrorSampleText = "Diees ist ein Fehler."
sWordToBeChecked = "Diees"
sLanguageName = "Deutsch (Deutschland)"
+ case 50 : sErrorSampleText = "Tuki je nekaj narobe."
+ sWordToBeChecked = "Tuki"
+ sLanguageName = "SlovenÅ¡Äina"
case 55 : sErrorSampleText = "Esta poderia ser a respista para suas preces?"
sWordToBeChecked = "respista"
sLanguageName = "Português (Brasil)"
@@ -305,13 +310,13 @@ testcase tToolsSpellcheck1Mistake
Call hCloseDocument
goto endsub
end if
- printlog "Current selected dictionary language is: " & DictionaryLanguage.GetSelText
+ printlog "Current selected dictionary language is: " & DictionaryLanguage.GetSelText
' Dictionary Language is language dependend. Function to be created
printlog " - check language"
'if DictionaryLanguage.GetSelText <> gLanguage then Warnlog "Dictionary language " + DictionaryLanguage.GetSelText +" selected"
printlog " - replace wrong word with a suggestion"
'/// replace wrong word with a suggestion ///
-
+
if trim$(NotInDictionary.GetText) <> trim(sErrorSampleText) then
warnlog " " & sErrorSampleText & " has not been detected as mistake. Detected mistake is:" & NotInDictionary.GetText
end if
@@ -343,7 +348,7 @@ testcase tToolsSpellcheck1Mistake
Active.No
endcatch
end if
-
+
Kontext "Spellcheck"
if Spellcheck.Exists then SpellcheckClose.Click
@@ -377,7 +382,7 @@ testcase tToolsSpellcheckForward
QAErrorLog "The language " + iSprache +" has no defined Errortext. No test!" 'iSystemSprache
goto endsub
end select
-
+
if gApplication = "MASTERDOCUMENT" then
if wInsertDocumentinMasterDoc(InsFile) = False then goto endsub
EditPaste
@@ -387,7 +392,7 @@ testcase tToolsSpellcheckForward
end if
'/// point cursor to beginning of document and execute spellcheck ///
Call wTypeKeys "<Mod1 Home>"
-
+
select case iSprache
case 01 : sDummy = "exprass" : sWordToBeAdded = "pablischer"
case 07 : sDummy = "решаaт" : sWordToBeAdded = "кaнкретных"
@@ -401,6 +406,7 @@ testcase tToolsSpellcheckForward
case 46 : sDummy = "handbroken" : sWordToBeAdded = "viktikt"
case 48 : sDummy = "znajdujacej" : sWordToBeAdded = "usuniete"
case 49 : sDummy = "reichtt" : sWordToBeAdded = "viierter"
+ case 50 : sDummy = "Paglejmo" : sWordToBeAdded = "Ätrto"
case 55 : sDummy = "horat" : sWordToBeAdded = "dpa"
end select
@@ -537,7 +543,7 @@ testcase tToolsSpellcheckOnlyOneWord
Dim InsFile as string
Dim ReplacedWith as String
Dim i as integer
-
+
'/// Open specified document depending on language to check spellcheck ///
'/// document has 1 defined wrong word ///
PrintLog "- Tools / Spellchecking / Check only one word"
@@ -550,7 +556,7 @@ testcase tToolsSpellcheckOnlyOneWord
QAErrorLog "The language " + iSprache +" has no defined Errortext. No test!"
goto endsub
end select
-
+
if gApplication = "MASTERDOCUMENT" then
if wInsertDocumentinMasterDoc(InsFile) = False then goto endsub
EditPaste
@@ -559,7 +565,7 @@ testcase tToolsSpellcheckOnlyOneWord
Call sMakeReadOnlyDocumentEditable
end if
Call wTypeKeys "<Mod1 Home>"
-
+
select case iSprache
case 01 : sWordToBeChecked = "excetionally" ' this word is wrong
case 07 : sWordToBeChecked = "КaнÑтитуции"
@@ -573,6 +579,7 @@ testcase tToolsSpellcheckOnlyOneWord
case 46 : sWordToBeChecked = "avrttades" ' this word is wrong
case 48 : sWordToBeChecked = "stosowanei" ' this word is wrong
case 49 : sWordToBeChecked = "georaphischen" ' this word is wrong
+ case 50 : sWordToBeChecked = "ssmo" ' this word is wrong
case 55 : sWordToBeChecked = "Veigo" ' this word is wrong
end select
@@ -613,7 +620,7 @@ testcase tToolsSpellcheckOnlyOneWord
ToolsSpellcheckWriter
Kontext "Active"
if Active.Exists then
- if Active.GetRT = 304 then
+ if Active.GetRT = 304 then
Warnlog "Spellcheck doesn't work correctly:" & Active.Gettext
try
Active.Ok
@@ -659,11 +666,11 @@ testcase tToolsSpellcheckOnlyOneWord
Warnlog Active.Gettext
endcatch
end if
- end if
-
+ end if
+
Kontext "Spellcheck"
if Spellcheck.Exists then SpellcheckClose.Click
-
+
Call wTypeKeys "<Mod1 Shift Left>"
try
EditCopy
@@ -705,10 +712,10 @@ testcase tToolsSpellcheckOnlyOneWord
Spellcheck.Close
end if
end if
-
+
Kontext "Spellcheck"
if Spellcheck.Exists then Spellcheck.Close
-
+
'/// Close document ///
Call hCloseDocument
endcase
@@ -738,8 +745,8 @@ testcase tToolsSpellcheckAutomatic
Call sMakeReadOnlyDocumentEditable
'/// Enable Auto-Spellcheck in options
- Call wEnableAutoSpellcheck ( true )
-
+ Call wEnableAutoSpellcheck ( true )
+
'/// Check Auto-Spellcheck and insert a sentence with 2 mistakes ///
printlog " - write text"
select case iSprache
@@ -766,7 +773,7 @@ testcase tToolsSpellcheckAutomatic
case 36 : wTypeKeys "A hétezres koszovói amerikai kontingens jelentos részét is a magyarországi bázison helyezi majd el."
iError1 = 1 : iError2 = 4
sError1 = "hétezres" : sError1 = "jelentos"
- sDefaultFormat = "Alapértelmezett"
+ sDefaultFormat = "Alapértelmezett"
case 39 : wTypeKeys "La sfumaturar è statsi modificata senza salvare "
iError1 = 1 : iError2 = 2
sError1 = "sfumaturar" : sError1 = "statsi"
@@ -787,10 +794,14 @@ testcase tToolsSpellcheckAutomatic
iError1 = 1 : iError2 = 2
sError1 = "hiaer" : sError1 = "swei"
sDefaultFormat = "Standard"
+ case 50 : wTypeKeys "Tuki sta dve napki"
+ iError1 = 1 : iError2 = 2
+ sError1 = "Tuki" : sError1 = "napki"
+ sDefaultFormat = "Standard"
case 55 : wTypeKeys "Aqui poderá elimitnar componentes já instalados ou instalar novos compotentes numa "
iError1 = 2 : iError2 = 7
sError1 = "elimitnar" : sError1 = "compotentes"
- sDefaultFormat = "Padrão"
+ sDefaultFormat = "Padrão"
case 81 : Printlog "- No Spellcheck in Japanese!"
Call hCloseDocument
goto endsub
@@ -809,7 +820,7 @@ testcase tToolsSpellcheckAutomatic
end select
Call wTypeKeys "<Space><Return>"
-
+
printlog " - relieve mistake"
Call wTypeKeys "<Up><Home>"
Call wTypeKeys "<Mod1 Right>", iError1
@@ -921,7 +932,7 @@ testcase tToolsSpellcheckChangeLanguageAttribute
QAErrorLog "The language " + iSprache +" has no defined Errortext. No test!" 'iSystemSprache
goto endsub
end select
-
+
if gApplication = "MASTERDOCUMENT" then
if wInsertDocumentinMasterDoc(InsFile) = False then goto endsub
EditPaste
@@ -930,7 +941,7 @@ testcase tToolsSpellcheckChangeLanguageAttribute
Call sMakeReadOnlyDocumentEditable
end if
Call wTypeKeys "<Mod1 Home>"
-
+
select case iSprache
case 01 : sWordToBeChecked = "excetionally" ' this word is wrong
case 03 : sWordToBeChecked = "semstre" ' this word is wrong
@@ -944,6 +955,7 @@ testcase tToolsSpellcheckChangeLanguageAttribute
case 46 : sWordToBeChecked = "avrttades" ' this word is wrong
case 48 : sWordToBeChecked = "stosowanei" ' this word is wrong
case 49 : sWordToBeChecked = "georaphischen" ' this word is wrong
+ case 50 : sWordToBeChecked = "ssmo" ' this word is wrong
case 55 : sWordToBeChecked = "Veigo" ' this word is wrong
end select
@@ -1011,7 +1023,7 @@ testcase tToolsSpellcheckChangeLanguageAttribute
Suggestions.Select 1
ReplacedWith = Suggestions.GetSelText
printlog "- replace with word: " & ReplacedWith
- i = DictionaryLanguage.GetItemCount + 1
+ i = DictionaryLanguage.GetItemCount + 1
end if
end if
next i
@@ -1045,7 +1057,7 @@ testcase tToolsSpellcheckChangeLanguageAttribute
wait 500
Call wTypeKeys "<Mod1 Home>"
printlog "- find replaced word"
-
+
EditSearchAndReplace
Kontext "FindAndReplace"
try
@@ -1073,7 +1085,7 @@ testcase tToolsSpellcheckChangeLanguageAttribute
Kontext
Active.Setpage TabFont
Kontext "TabFont"
- try
+ try
if Language.GetSelText <> CurrentLanguage then
if Language.GetSelText = PriorLanguage then
Warnlog "Language Attributes has not been set to" & CurrentLanguage
@@ -1118,7 +1130,7 @@ testcase tToolsSpellcheckButtonChange
QAErrorLog "The language " + iSprache +" has no defined Errortext. No test!" 'iSystemSprache
goto endsub
end select
-
+
if gApplication = "MASTERDOCUMENT" then
if wInsertDocumentinMasterDoc(InsFile) = False then goto endsub
EditPaste
@@ -1185,7 +1197,7 @@ testcase tToolsSpellcheckButtonChangeAll
QAErrorLog "The language " + iSprache +" has no defined Errortext. No test!" 'iSystemSprache
goto endsub
end select
-
+
if gApplication = "MASTERDOCUMENT" then
if wInsertDocumentinMasterDoc(InsFile) = False then goto endsub
EditPaste
@@ -1222,7 +1234,7 @@ testcase tToolsSpellcheckButtonChangeAll
end if
'/// Close document
Call hCloseDocument
-
+
endcase
' *******************************************************************
@@ -1257,6 +1269,7 @@ testcase tToolsThesaurus
case 46 : sWordInitial = "Däng"
case 48 : sWordInitial = "wypowiedź"
case 49 : sWordInitial = "Mann"
+ case 50 : sWordInitial = "smisel"
case 55 : Printlog "- No Thesaurus in Portuguese (Brazil) !"
goto endsub
case 81 : Printlog "- No Thesaurus in Japanese!"
@@ -1282,7 +1295,7 @@ testcase tToolsThesaurus
'/// Call Thesaurus without a written word ///
ToolsLanguageThesaurus
Kontext "Thesaurus"
- if CurrentWord.GetSelText <> "" then Warnlog "- Though no word has been selected Current Word textfield is filled !"
+ if CurrentWord.GetSelText <> "" then Warnlog "- Though no word has been selected Current Word textfield is filled !"
if ReplaceWith.GetText <> "" then Warnlog "- Though no word has been selected there is a replacetext in the textfield!"
printlog "Set language dependent word in textfield Current Word"
CurrentWord.Settext sWordInitial
@@ -1307,11 +1320,11 @@ testcase tToolsThesaurus
end if
Call hCloseDocument
wait 500
-
+
printlog " Open new preformatted-document where the formatting is set to the language we wish to test."
call hFileOpen (TheFile,false)
- Call sMakeReadOnlyDocumentEditable
-
+ Call sMakeReadOnlyDocumentEditable
+
Call wTypeKeys sWordInitial
Call wTypeKeys "<Home><Right><Right>"
@@ -1320,12 +1333,12 @@ testcase tToolsThesaurus
Kontext "Thesaurus"
wait 500
if CurrentWord.GetSeltext = sWordInitial then
- sWordToBeFound = ReplaceWith.Gettext
+ sWordToBeFound = ReplaceWith.Gettext
if Alternatives.GetItemCount > 0 then
printlog "Select last entry in alternatives list"
Alternatives.Select Alternatives.GetItemCount
Alternatives.TypeKeys "<Space>"
- if ReplaceWith.Gettext = sWordToBeFound then
+ if ReplaceWith.Gettext = sWordToBeFound then
Warnlog "Though alternative was selected replace with was not changed"
else
sWordToBeFound = ReplaceWith.Gettext
@@ -1344,21 +1357,22 @@ testcase tToolsThesaurus
end if
Call wTypeKeys "<Home><Shift End><Delete>"
- Call wTypeKeys sWordInitial
-
+ Call wTypeKeys sWordInitial
+
printlog "- Replace unchecked ( Cursor at words end )"
ToolsLanguageThesaurus
Kontext "Thesaurus"
wait 500
if CurrentWord.GetSeltext = sWordInitial then
- sWordToBeFound = ReplaceWith.Gettext
- if Alternatives.GetItemCount > 0 then
+ sWordToBeFound = ReplaceWith.Gettext
+ if Alternatives.GetItemCount > 0 then
printlog "Select last entry in alternatives list"
Alternatives.Select Alternatives.GetItemCount
- Alternatives.TypeKeys "<Space>"
- if ReplaceWith.Gettext = sWordToBeFound then
+
+ if ReplaceWith.Gettext = sWordToBeFound then
Warnlog "Though alternative was selected replace with was not changed"
else
+ Alternatives.TypeKeys "<Space>"
sWordToBeFound = ReplaceWith.Gettext
end if
Thesaurus.OK
@@ -1373,7 +1387,7 @@ testcase tToolsThesaurus
else
Warnlog "Current word is not selected word !"
end if
-
+
'/// Close thesaurus and writerdocument ///
Call hCloseDocument
endcase
@@ -1411,6 +1425,7 @@ testcase tToolsThesaurusSynonyms
case 46 : sWordInitial = "Däng"
case 48 : sWordInitial = "wypowiedź"
case 49 : sWordInitial = "Mann"
+ case 50 : sWordInitial = "smisel"
case 55 : Printlog "- No Thesaurus in Portuguese (Brazil) !"
goto endsub
case 81 : Printlog "- No Thesaurus in Japanese!"
@@ -1460,6 +1475,3 @@ testcase tToolsThesaurusSynonyms
Call hCloseDocument
endcase
-
-
-
commit 95ad690fc4cabf4e104dc7125f9f81067899b30a
Author: Helge Delfs [hde] <hde at openoffice.org>
Date: Wed Aug 18 10:25:38 2010 +0200
automationooo330m4#i113928#adding SL language (50) to writer testscripts
diff --git a/testautomation/writer/optional/input/linguistik/050.odt b/testautomation/writer/optional/input/linguistik/050.odt
new file mode 100755
index 0000000..3a90c03
Binary files /dev/null and b/testautomation/writer/optional/input/linguistik/050.odt differ
commit 6c9e92a8fb6d5ae4117ef2320aec0f6b4cb1e2c7
Author: Helge Delfs [hde] <hde at openoffice.org>
Date: Wed Aug 18 10:25:09 2010 +0200
automationooo330m4#i113928#adding SL language (50) to writer testscripts
diff --git a/testautomation/writer/optional/input/spellcheck/Language_Guessing_Sample_Texts.odt b/testautomation/writer/optional/input/spellcheck/Language_Guessing_Sample_Texts.odt
index e66f7a3..ae765bd 100755
Binary files a/testautomation/writer/optional/input/spellcheck/Language_Guessing_Sample_Texts.odt and b/testautomation/writer/optional/input/spellcheck/Language_Guessing_Sample_Texts.odt differ
diff --git a/testautomation/writer/optional/input/spellcheck/spellcheck_50.odt b/testautomation/writer/optional/input/spellcheck/spellcheck_50.odt
new file mode 100755
index 0000000..30f9d7c
Binary files /dev/null and b/testautomation/writer/optional/input/spellcheck/spellcheck_50.odt differ
diff --git a/testautomation/writer/optional/input/spellcheck/st1_2_50.odt b/testautomation/writer/optional/input/spellcheck/st1_2_50.odt
new file mode 100755
index 0000000..7402e85
Binary files /dev/null and b/testautomation/writer/optional/input/spellcheck/st1_2_50.odt differ
commit ebb6814df9bffe5731ea401c39b4b05863104819
Author: Helge Delfs [hde] <hde at openoffice.org>
Date: Wed Aug 18 09:34:37 2010 +0200
#automationooo330m4#i113911#warning corrected
diff --git a/testautomation/writer/optional/includes/fields/w_fields5.inc b/testautomation/writer/optional/includes/fields/w_fields5.inc
index 067366d..334d019 100755
--- a/testautomation/writer/optional/includes/fields/w_fields5.inc
+++ b/testautomation/writer/optional/includes/fields/w_fields5.inc
@@ -667,7 +667,7 @@ endcase
'-----------------------------------------------------------------
testcase tVariablesDDEFieldManual
- warnlog "#i112079#testcase must be reworked"
+ qaerrorlog "#i112079#testcase must be reworked"
goto endsub
Dim sDDEFile as String
@@ -759,7 +759,7 @@ endcase
'-----------------------------------------------------------------
testcase tVariablesDDEFieldAutomatic
- warnlog "#i112079#testcase must be reworked"
+ qaerrorlog "#i112079#testcase must be reworked"
goto endsub
qaerrorlog "#i102792# - tVariablesDDEFieldAutomatic outcommented. Fields not updated."
commit a4c4dfc14c78c6e870c52d1d89a19707f8b9775a
Author: Helge Delfs [hde] <hde at openoffice.org>
Date: Wed Aug 18 08:22:52 2010 +0200
#automationooo330m4#i113911#warning corrected
diff --git a/testautomation/writer/optional/includes/number/w_206_.inc b/testautomation/writer/optional/includes/number/w_206_.inc
index 70d47bd..ae76980 100755
--- a/testautomation/writer/optional/includes/number/w_206_.inc
+++ b/testautomation/writer/optional/includes/number/w_206_.inc
@@ -358,11 +358,11 @@ testcase tToolsNumbering6
Warnlog "First paragraph not 'This is the first' but: " & sClipBrd(0)
end if
Case 2
- if sClipBrd(1) <> "1.This is the second" then
+ if sClipBrd(1) <> "1. This is the second" then
Warnlog "First paragraph not '1.This is the second' but: " & sClipBrd(1)
end if
Case 3
- if sClipBrd(2) <> "2.This is the third" then
+ if sClipBrd(2) <> "2. This is the third" then
Warnlog "First paragraph not '2.This is the third' but: " & sClipBrd(2)
end if
end select
@@ -472,12 +472,12 @@ testcase tToolsNumbering7
end if
end if
Case 2
- if sClipBrd(1) <> "1.1.My second number" then
- Warnlog "#128041#First paragraph not '1.1.My second number' but: " & sClipBrd(1)
+ if sClipBrd(1) <> "1. 1.My second number" then
+ Warnlog "#128041#Second paragraph not '1. 1.My second number' but: " & sClipBrd(1)
end if
Case 3
- if sClipBrd(2) <> "2.2.My third number" then
- Warnlog "#128041#First paragraph not '2.2.My third number' but: " & sClipBrd(2)
+ if sClipBrd(2) <> "2. 2.My third number" then
+ Warnlog "#128041#Third paragraph not '2. 2.My third number' but: " & sClipBrd(2)
end if
end select
next i
@@ -707,16 +707,16 @@ testcase tToolsNumbering11
For i = 1 to 3
Select Case i
Case 1
- if sClipBrd(0) <> "11A new first paragraph" then
- Warnlog "First Heading not: '11A new first paragraph' but: " & sClipBrd(0)
+ if sClipBrd(0) <> "1 1A new first paragraph" then
+ Warnlog "First Heading not: '1 1A new first paragraph' but: " & sClipBrd(0)
end if
Case 2
- if sClipBrd(1) <> "22" then
- Warnlog "First paragraph not '22' but: " & sClipBrd(1)
+ if sClipBrd(1) <> "2 2" then
+ Warnlog "First paragraph not '2 2' but: " & sClipBrd(1)
end if
Case 3
- if sClipBrd(2) <> "33A new third paragraph" then
- Warnlog "First paragraph not '33A new third paragraph' but: " & sClipBrd(2)
+ if sClipBrd(2) <> "3 3A new third paragraph" then
+ Warnlog "First paragraph not '3 3A new third paragraph' but: " & sClipBrd(2)
end if
end select
next i
commit cdbbe882780ed9265ccd32d283086a065dd41af3
Author: Helge Delfs [hde] <hde at openoffice.org>
Date: Tue Aug 17 15:32:15 2010 +0200
#automationooo330m4#i112568#warning corrected
diff --git a/testautomation/writer/optional/includes/regression/issuezilla/w_issuezilla_regression.inc b/testautomation/writer/optional/includes/regression/issuezilla/w_issuezilla_regression.inc
index 8412302..5e13f93 100755
--- a/testautomation/writer/optional/includes/regression/issuezilla/w_issuezilla_regression.inc
+++ b/testautomation/writer/optional/includes/regression/issuezilla/w_issuezilla_regression.inc
@@ -467,11 +467,11 @@ testcase i103265
end if
Case 2:
if GetClipboardText <> "1. Test" then
- Warnlog "First hyperlink not correctly jumped to. Not '# 1. Test' but " & GetClipboardtext
+ Warnlog "Second hyperlink not correctly jumped to. Not '# 1. Test' but " & GetClipboardtext
end if
Case 3:
- if GetClipboardText <> "Test " then
- Warnlog "First hyperlink not correctly jumped to. Not 'Test' but " & GetClipboardtext
+ if GetClipboardText <> "1 Test " then
+ Warnlog "Third hyperlink not correctly jumped to. Not '1 Test' but " & GetClipboardtext
end if
end select
next i
commit 407625d428d22320e165aae3fe0dd2cd585af5d9
Author: Helge Delfs [hde] <hde at openoffice.org>
Date: Tue Aug 17 15:31:17 2010 +0200
#automationooo330m4#i113602#warning corrected
diff --git a/testautomation/writer/optional/includes/autocorrection/w_autocorrect1.inc b/testautomation/writer/optional/includes/autocorrection/w_autocorrect1.inc
index f360034..694c3de 100755
--- a/testautomation/writer/optional/includes/autocorrection/w_autocorrect1.inc
+++ b/testautomation/writer/optional/includes/autocorrection/w_autocorrect1.inc
@@ -1049,7 +1049,7 @@ testcase tToolsAutocorrectOptions_8
firstLine = "1. FirstLine"
testContent = "Test1"
- hopeResult = "1.Test1"
+ hopeResult = "2. Test1"
Call wTypeKeys firstLine
Call wTypeKeys "<Return>"
commit a759c377540326db0c6e247ca9e3fb54af4c4728
Merge: 72759a9... c4b994d...
Author: Frank Schoenheit [fs] <frank.schoenheit at oracle.com>
Date: Fri Aug 13 12:04:35 2010 +0200
fs33a: merge after pulling OOO330.m4's change sets
commit 24b4066e40ce5c1c8ee6818c0f6c96a6bcb5c9f3
Author: Joerg Skottke [jsk] <jsk at openoffice.org>
Date: Fri Aug 13 11:36:13 2010 +0200
automationooo330m3: #i113680# - Cannot do without wait-statement. Bad, that is.
diff --git a/testautomation/framework/required/includes/basic_dialog_i18n.inc b/testautomation/framework/required/includes/basic_dialog_i18n.inc
index 3c95be0..162f0cc 100755
--- a/testautomation/framework/required/includes/basic_dialog_i18n.inc
+++ b/testautomation/framework/required/includes/basic_dialog_i18n.inc
@@ -49,6 +49,7 @@ testcase tUpdtBasicDialogI18n
printlog( "Click Manage Languages on ToolsCollectionBar")
kontext "ToolsCollectionBar"
if ( ToolsCollectionBar.exists( DIALOG_DEFAULT_TIMEOUT ) ) then
+ wait( 500 )
hClickButton( ManageLanguage )
else
warnlog( "<ToolsCollectionBar> is not open, is the test environment dirty?" )
commit de366323d50b38131d5b4d2851011cf7f4d8330f
Author: Joerg Skottke [jsk] <jsk at openoffice.org>
Date: Fri Aug 13 10:15:53 2010 +0200
automationooo330m3: #i112026# - Findbar integrated into w_updt.bas (w_020_.inc)
diff --git a/testautomation/global/required/includes/g_findbar.inc b/testautomation/global/required/includes/g_findbar.inc
index 38af3ed..dd8e906 100644
--- a/testautomation/global/required/includes/g_findbar.inc
+++ b/testautomation/global/required/includes/g_findbar.inc
@@ -87,7 +87,7 @@ testcase tUpdtFindBar()
warnlog( "Messagebox missing <No matches found>" )
endif
- warnlog( "#i111984 - exclude <SearchDialog> button from testing" )
+ qaerrorlog( "#i111984 - exclude <SearchDialog> button from testing" )
goto skip_SearchDialog
printlog( "Search dialog button may not be visible by default" )
diff --git a/testautomation/writer/required/includes/w_020_.inc b/testautomation/writer/required/includes/w_020_.inc
index d5f4709..9235d1b 100755
--- a/testautomation/writer/required/includes/w_020_.inc
+++ b/testautomation/writer/required/includes/w_020_.inc
@@ -54,6 +54,8 @@ sub w_020_
Call tHtmlDoc_TB_Rest
gApplication = "WRITER"
+ Call tUpdtFindBar()
+
end sub
'-----------------------------------------------------------
diff --git a/testautomation/writer/required/w_updt.bas b/testautomation/writer/required/w_updt.bas
index e9fc5aa..b877964 100755
--- a/testautomation/writer/required/w_updt.bas
+++ b/testautomation/writer/required/w_updt.bas
@@ -86,6 +86,7 @@ sub LoadIncludeFiles
use "global\required\includes\g_001.inc"
use "global\required\includes\g_option.inc" ' global subroutines for Tools / Options
use "global\required\includes\g_printing.inc"
+ use "global\required\includes\g_findbar.inc"
use "global\tools\includes\optional\t_xml_filter1.inc" ' global routines for XML-functionality
use "global\tools\includes\optional\t_docfuncs.inc"
use "global\tools\includes\optional\t_control_objects.inc"
commit 8bb91b1252ca777224d8485dd275e5d0a314805c
Author: Joerg Skottke [jsk] <jsk at openoffice.org>
Date: Fri Aug 13 09:43:05 2010 +0200
jl154: #i113786# - Extension Manager is even slower. Inserted Wait( 2000 )
diff --git a/testautomation/extensions/optional/includes/extensions.inc b/testautomation/extensions/optional/includes/extensions.inc
index 666db38..db11527 100755
--- a/testautomation/extensions/optional/includes/extensions.inc
+++ b/testautomation/extensions/optional/includes/extensions.inc
@@ -629,6 +629,8 @@ testcase tExtensionsFunction
ii = 1
while (ii < BrowsePackages.getItemCount +1)
+
+ wait( 2000 ) ' Required, Extension Manager needs time to populate
kontext "PackageManager"
'BrowsePackages.typeKeys("+")
'BrowsePackages.typeKeys("<down>")
commit 7cd7454efd258ce52cdcd694958aa9c344e767db
Author: Joerg Skottke [jsk] <jsk at openoffice.org>
Date: Fri Aug 13 09:29:00 2010 +0200
automationooo330m3: #i107408# - Number of samples has changed: Old 60, new: 56
diff --git a/testautomation/framework/optional/includes/extras_modify_objects.inc b/testautomation/framework/optional/includes/extras_modify_objects.inc
index f2e4717..964d28a 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
commit 64e578d7fec1f593284de8e40bfb628c21353f4d
Author: Joerg Skottke [jsk] <jsk at openoffice.org>
Date: Fri Aug 13 09:09:37 2010 +0200
automationooo330m3: #i110184#/#i113761# - Changed handling of messageboxes, made QA-ErrorLogs from Warnlogs, the test is now again functional.
diff --git a/testautomation/framework/optional/includes/security_macrosecurity.inc b/testautomation/framework/optional/includes/security_macrosecurity.inc
index 220e882..3df134d 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
commit 4a08a4c137c5ed160c672daf70536729fbf4c5c2
Author: Joerg Skottke [jsk] <jsk at openoffice.org>
Date: Fri Aug 13 08:28:20 2010 +0200
automationooo330m3: #ii113764# - Moved check for binfilters to external function, too much duplication otherwise
diff --git a/testautomation/framework/required/includes/smoketest.inc b/testautomation/framework/required/includes/smoketest.inc
index 24ef362..d4e327a 100755
--- a/testautomation/framework/required/includes/smoketest.inc
+++ b/testautomation/framework/required/includes/smoketest.inc
@@ -33,6 +33,10 @@
testcase tSmokeTest
+ if ( not hCheckForBinfilters() ) then
+ goto endsub
+ endif
+
printlog( "Smoketest (10er-Test) from Release Engineering" )
dim sLocation as string
dim i,x,a as integer
diff --git a/testautomation/framework/required/includes/topten.inc b/testautomation/framework/required/includes/topten.inc
index 8f5cb30..fdfdb49 100755
--- a/testautomation/framework/required/includes/topten.inc
+++ b/testautomation/framework/required/includes/topten.inc
@@ -35,35 +35,28 @@ sub topten
' we need the binary filters (.sxw etc.) for this test but beginning with
' OOo 3.3 these are optional
- try
- hGetSuffix( "569" )
- catch
- warnlog( "Optional legacy filters package is not installed" )
- printlog( "Please restart the setup to install the missing filters" )
- exit sub
- endcatch
-
- gApplication = "WRITER"
- call Top_ten_test
-
- gApplication = "CALC"
- call Top_ten_test
-
- gApplication = "IMPRESS"
- call Top_ten_test
-
- gApplication = "DRAW"
- call Top_ten_test
-
- gApplication = "MATH"
- call Top_ten_test
-
- gApplication = "HTML"
- call Top_ten_test
-
- gApplication = "MASTERDOCUMENT"
- call Top_ten_test
+ if ( hCheckForBinfilters() ) then
+ gApplication = "WRITER"
+ call Top_ten_test
+ gApplication = "CALC"
+ call Top_ten_test
+
+ gApplication = "IMPRESS"
+ call Top_ten_test
+
+ gApplication = "DRAW"
+ call Top_ten_test
+
+ gApplication = "MATH"
+ call Top_ten_test
+
+ gApplication = "HTML"
+ call Top_ten_test
+
+ gApplication = "MASTERDOCUMENT"
+ call Top_ten_test
+ endif
end sub
'*******************************************************************************
diff --git a/testautomation/global/tools/includes/required/t_filters.inc b/testautomation/global/tools/includes/required/t_filters.inc
index afb1bf9..243483b 100755
--- a/testautomation/global/tools/includes/required/t_filters.inc
+++ b/testautomation/global/tools/includes/required/t_filters.inc
@@ -34,6 +34,21 @@
private const LENGTH_OF_FILTERFILE = 100
private const FILE_DATA_SIZE = 300
+function hCheckForBinfilters() as boolean
+
+ try
+ hGetSuffix( "569" )
+ hCheckForBinfilters() = true
+ catch
+ warnlog( "Optional legacy filters package is not installed" )
+ printlog( "Please restart the setup to install the missing filters" )
+ hCheckForBinfilters() = false
+ endcatch
+
+end function
+
+'*******************************************************************************
+
function hGetSuffix( optional cBuildId as string ) as string
' This function retrieves the suffix depending on the build id (e.g. 680)
commit 24a35c0e03ce3ab68230cfa01c2044940d5509fa
Merge: 672c69b... c3aeab2...
Author: Joerg Skottke [jsk] <jsk at openoffice.org>
Date: Fri Aug 13 07:28:35 2010 +0200
jl154: Local merge
diff --cc testautomation/framework/required/includes/window_functions.inc
index 1011624,7afbdb6..6917639
--- a/testautomation/framework/required/includes/window_functions.inc
+++ b/testautomation/framework/required/includes/window_functions.inc
@@@ -196,11 -196,15 +196,18 @@@ end su
testcase tCheckWindowTitle( sApplication as string, sReference as string )
+ if ( sApplication = "soffice" ) then
+
+
printlog( "Update test for the office window titles" )
+ ' This is a Testtool-only problem that the product name is not displayed
+ ' after calling hCloseDocument() on the last document.
+ if ( sApplication = "soffice" ) then
+ qaerrorlog( "#i113760# - Product name missing for backing window" )
+ goto endsub
+ endif
+
const BASIC_MODULE = "tCheckWindowTitle"
const STRING_NOT_FOUND = 0
const STRING_LEFTMOST = 1
commit 672c69b6200defb0de8a81651296786ce8030b53
Author: Joerg Skottke [jsk] <jsk at openoffice.org>
Date: Fri Aug 13 07:27:24 2010 +0200
#i113761# - Used opportunity for minor refactoring
diff --git a/testautomation/framework/required/includes/window_functions.inc b/testautomation/framework/required/includes/window_functions.inc
index acc5e7a..1011624 100755
--- a/testautomation/framework/required/includes/window_functions.inc
+++ b/testautomation/framework/required/includes/window_functions.inc
@@ -196,6 +196,9 @@ end sub
testcase tCheckWindowTitle( sApplication as string, sReference as string )
+ if ( sApplication = "soffice" ) then
+
+
printlog( "Update test for the office window titles" )
const BASIC_MODULE = "tCheckWindowTitle"
@@ -217,21 +220,12 @@ testcase tCheckWindowTitle( sApplication as string, sReference as string )
printlog( "Application: " & sApplication & "; Title should be: " & sReference )
printlog( "Open the work windows (documents)" )
hInitSingleDoc()
- hCreateDocument()
printlog( "Verify that the correct window is open" )
select case sApplication
- case "swriter" :
- case "sglobal" :
- case "sweb" :
- case "scalc" :
- case "simpress":
- case "sdraw" :
- case "smath" :
case "basic" : hInitBasicIDE( BASIC_MODULE )
- case "chart" :
- case "database":
case "soffice" : hFileCloseAll()
+ case else : hCreateDocument()
end select
' Note: The Testtool connection string does not belong to the window caption
@@ -290,16 +284,7 @@ testcase tCheckWindowTitle( sApplication as string, sReference as string )
printlog( "Cleanup after test" )
select case sApplication
- case "swriter" :
- case "sglobal" :
- case "sweb" :
- case "scalc" :
- case "simpress":
- case "sdraw" :
- case "smath" :
case "basic" : hDestroyDocument()
- case "chart" :
- case "database":
case "soffice" : hCreateDocument()
end select
commit fe3c2b1418c5ffa4cf636b37902d1d3fae8736f5
Author: Joerg Skottke [jsk] <jsk at openoffice.org>
Date: Thu Aug 12 16:07:32 2010 +0200
jl154: #i113786# - Removing installed extensions fails because the extension manager has become somewhat slower. Use hCloseDialog() to close the extensionmanager and use a few waitslots should fix the problem.
diff --git a/testautomation/extensions/optional/includes/extensions.inc b/testautomation/extensions/optional/includes/extensions.inc
index 90a7e17..666db38 100755
--- a/testautomation/extensions/optional/includes/extensions.inc
+++ b/testautomation/extensions/optional/includes/extensions.inc
@@ -620,9 +620,13 @@ testcase tExtensionsFunction
' uninstall all components, that were installed
a = listCount(aRemovePackages())
ToolsPackageManager
+
kontext "PackageManager"
If PackageManager.exists(10) then
+
BrowsePackages.typeKeys("<home>")
+ waitslot()
+
ii = 1
while (ii < BrowsePackages.getItemCount +1)
kontext "PackageManager"
@@ -630,6 +634,8 @@ testcase tExtensionsFunction
'BrowsePackages.typeKeys("<down>")
sTemp2 = sTemp
BrowsePackages.select ii
+ waitslot()
+
sTemp = BrowsePackages.getItemText (ii,1)
if right(sTemp,3) = "oxt" then
for x = 1 to a
@@ -665,7 +671,7 @@ testcase tExtensionsFunction
ii = ii+1
wend
kontext "PackageManager"
- PackageManager.close
+ hCloseDialog( PackageManager, "close" )
else
qaErrorLog "disabling installed extensions failed;"
endif
commit 3178ae304383a1dbfef2c1baf33057a4394ea216
Author: Joerg Skottke [jsk] <jsk at openoffice.org>
Date: Wed Aug 11 14:32:42 2010 +0200
automationooo330m3: #i110184# - Re-enable autotest, need to check problem with unexpected messagebox though.
diff --git a/testautomation/framework/optional/includes/security_macrosecurity.inc b/testautomation/framework/optional/includes/security_macrosecurity.inc
index 8d96cd0..220e882 100755
--- a/testautomation/framework/optional/includes/security_macrosecurity.inc
+++ b/testautomation/framework/optional/includes/security_macrosecurity.inc
@@ -51,8 +51,6 @@ 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\"
commit c3aeab25e9e57e1e06b07846121fe549c54ad55a
Author: Joerg Skottke [jsk] <jsk at openoffice.org>
Date: Wed Aug 11 14:08:34 2010 +0200
jl154: #i113786# - Inverted logic
diff --git a/testautomation/extensions/optional/includes/location.inc b/testautomation/extensions/optional/includes/location.inc
index 9b5daeb..2624956 100755
--- a/testautomation/extensions/optional/includes/location.inc
+++ b/testautomation/extensions/optional/includes/location.inc
@@ -65,11 +65,11 @@ testcase tExtensionLocation
kontext "Makro"
if ( Makro.exists( 1 ) ) then
- printlog( "Macro was executed")
- Makro.close()
- else
warnlog( "Macro was not executed")
+ Makro.close()
goto endsub
+ else
+ printlog( "Macro was executed")
endif
kontext "active"
commit 8ebf3c83f00b00fa5636d5d26152b211ca45209c
Author: Joerg Skottke [jsk] <jsk at openoffice.org>
Date: Wed Aug 11 13:50:19 2010 +0200
jl154: #i113786# - Fix incorrect warning for non-executed basic script.
diff --git a/testautomation/extensions/optional/includes/location.inc b/testautomation/extensions/optional/includes/location.inc
index c23fdfd..9b5daeb 100755
--- a/testautomation/extensions/optional/includes/location.inc
+++ b/testautomation/extensions/optional/includes/location.inc
@@ -61,13 +61,14 @@ testcase tExtensionLocation
warnlog( "Macro execution warning is missing" )
endif
- irc = hMacroOrganizerRunMacro( MACRO_NAME )
- if ( irc = 0 ) then
- warnlog( "No macro with the given name could be found, aborting" )
- kontext "Makro"
- if ( Makro.exists() ) then
- Makro.close()
- endif
+ hMacroOrganizerRunMacro( MACRO_NAME )
+
+ kontext "Makro"
+ if ( Makro.exists( 1 ) ) then
+ printlog( "Macro was executed")
+ Makro.close()
+ else
+ warnlog( "Macro was not executed")
goto endsub
endif
@@ -84,11 +85,8 @@ testcase tExtensionLocation
warnlog( "No messagebox displayed, please check that the macro is executed" )
endif
- irc = hExtensionAddGUI( cWorkPath & EXTENSION_NAME , "verbose,InstallForUser" )
- irc = hMacroOrganizerRunMacro( MACRO_NAME )
- if ( irc = 0 ) then
- warnlog( "No macro with the given name could be found" )
- endif
+ hExtensionAddGUI( cWorkPath & EXTENSION_NAME , "verbose,InstallForUser" )
+ hMacroOrganizerRunMacro( MACRO_NAME )
kontext "active"
if ( active.exists( 2 ) ) then
commit 1508081a23b453cbade8e6cd435824bc7afc42d7
Author: Joerg Skottke [jsk] <jsk at openoffice.org>
Date: Wed Aug 11 13:11:35 2010 +0200
jl154: #i113764# - Check for binfilter, fix syntax error
diff --git a/testautomation/framework/required/includes/topten.inc b/testautomation/framework/required/includes/topten.inc
index 0d0157e..8f5cb30 100755
--- a/testautomation/framework/required/includes/topten.inc
+++ b/testautomation/framework/required/includes/topten.inc
@@ -40,7 +40,7 @@ sub topten
catch
warnlog( "Optional legacy filters package is not installed" )
printlog( "Please restart the setup to install the missing filters" )
- end sub
+ exit sub
endcatch
gApplication = "WRITER"
commit 166956fb79abf4472bd130c8b3c968d25a42d5bb
Author: Joerg Skottke [jsk] <jsk at openoffice.org>
Date: Wed Aug 11 13:09:14 2010 +0200
automationooo330m3: #i113764# - Check for binfilter, fix syntax error
diff --git a/testautomation/framework/required/includes/topten.inc b/testautomation/framework/required/includes/topten.inc
index 0d0157e..8f5cb30 100755
--- a/testautomation/framework/required/includes/topten.inc
+++ b/testautomation/framework/required/includes/topten.inc
@@ -40,7 +40,7 @@ sub topten
catch
warnlog( "Optional legacy filters package is not installed" )
printlog( "Please restart the setup to install the missing filters" )
- end sub
+ exit sub
endcatch
gApplication = "WRITER"
commit b54b098b4584f30fd9b324c32a55ec34d9eeb900
Merge: ee5edff... 789aaf3...
Author: Joerg Skottke [jsk] <jsk at openoffice.org>
Date: Wed Aug 11 08:57:13 2010 +0200
jl154: Local merge
commit 72759a9b9addc45097e7b9a72b8cdcd88606fc70
Merge: 71beddb... 459862c...
Author: Frank Schoenheit [fs] <frank.schoenheit at oracle.com>
Date: Tue Aug 10 14:53:21 2010 +0200
merging in latest changes from OOO330(m3)
diff --cc testautomation/extensions/optional/input/dependencies/version30.oxt
index 8750e71,59b8dc5..59b8dc5
mode 100755,100644..100755
--- a/testautomation/extensions/optional/input/dependencies/version30.oxt
+++ b/testautomation/extensions/optional/input/dependencies/version30.oxt
diff --cc testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/genfiles.properties
index e4e5fc1,2f144fe..2f144fe
mode 100755,100644..100755
--- a/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/genfiles.properties
+++ b/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/genfiles.properties
diff --cc testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/private/private.properties
index c090eb0,1b26762..1b26762
mode 100755,100644..100755
--- a/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/private/private.properties
+++ b/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/private/private.properties
diff --cc testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/project-uno.properties
index 35a0535,8abadd2..8abadd2
mode 100755,100644..100755
--- a/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/project-uno.properties
+++ b/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/project-uno.properties
diff --cc testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/project.properties
index b6059cf,7ca12de..7ca12de
mode 100755,100644..100755
--- a/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/project.properties
+++ b/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/nbproject/project.properties
diff --cc testautomation/framework/optional/input/help_browser/Oracle_Open_Office_help_applications_en-US.txt
index 0000000,7a97fdb..7a97fdb
mode 000000,100755..100644
--- a/testautomation/framework/optional/input/help_browser/Oracle_Open_Office_help_applications_en-US.txt
+++ b/testautomation/framework/optional/input/help_browser/Oracle_Open_Office_help_applications_en-US.txt
diff --cc testautomation/framework/optional/input/help_browser/Oracle_Open_Office_help_content_en-US.txt
index 0000000,6f11d8f..6f11d8f
mode 000000,100755..100644
--- a/testautomation/framework/optional/input/help_browser/Oracle_Open_Office_help_content_en-US.txt
+++ b/testautomation/framework/optional/input/help_browser/Oracle_Open_Office_help_content_en-US.txt
diff --cc testautomation/framework/optional/input/help_browser/Oracle_Open_Office_help_topics_en-US.txt
index 0000000,24c206d..24c206d
mode 000000,100755..100644
--- a/testautomation/framework/optional/input/help_browser/Oracle_Open_Office_help_topics_en-US.txt
+++ b/testautomation/framework/optional/input/help_browser/Oracle_Open_Office_help_topics_en-US.txt
diff --cc testautomation/framework/optional/input/help_browser/Oracle_Open_Office_search_headings_and_whole_words_en-US.txt
index 0000000,5c04d79..5c04d79
mode 000000,100755..100644
--- a/testautomation/framework/optional/input/help_browser/Oracle_Open_Office_search_headings_and_whole_words_en-US.txt
+++ b/testautomation/framework/optional/input/help_browser/Oracle_Open_Office_search_headings_and_whole_words_en-US.txt
diff --cc testautomation/framework/optional/input/help_browser/Oracle_Open_Office_search_headings_only_en-US.txt
index 0000000,4ad0092..4ad0092
mode 000000,100755..100644
--- a/testautomation/framework/optional/input/help_browser/Oracle_Open_Office_search_headings_only_en-US.txt
+++ b/testautomation/framework/optional/input/help_browser/Oracle_Open_Office_search_headings_only_en-US.txt
diff --cc testautomation/framework/optional/input/help_browser/Oracle_Open_Office_search_whole_words_only_en-US.txt
index 0000000,5300653..5300653
mode 000000,100755..100644
--- a/testautomation/framework/optional/input/help_browser/Oracle_Open_Office_search_whole_words_only_en-US.txt
+++ b/testautomation/framework/optional/input/help_browser/Oracle_Open_Office_search_whole_words_only_en-US.txt
diff --cc testautomation/framework/optional/input/help_browser/Oracle_Open_Office_search_without_filter_en-US.txt
index 0000000,8016777..8016777
mode 000000,100755..100644
--- a/testautomation/framework/optional/input/help_browser/Oracle_Open_Office_search_without_filter_en-US.txt
+++ b/testautomation/framework/optional/input/help_browser/Oracle_Open_Office_search_without_filter_en-US.txt
commit ee5edffab22181544008820cf10ec7ced2ae02fb
Author: Joerg Skottke [jsk] <jsk at openoffice.org>
Date: Tue Aug 10 10:23:03 2010 +0200
automationooo330m3: #i110184# - Document load fails when loaded via API. Real problem is that ConvertToURL is called twice which adds another two slashes to the URL which then again cannot be resolved by the API call. Another issue has been filed for the root cause.
diff --git a/testautomation/framework/optional/includes/security_macrosecurity.inc b/testautomation/framework/optional/includes/security_macrosecurity.inc
index 2b6a05d..8d96cd0 100755
--- a/testautomation/framework/optional/includes/security_macrosecurity.inc
+++ b/testautomation/framework/optional/includes/security_macrosecurity.inc
@@ -57,8 +57,6 @@ testcase tMacroSecurityLevels( cFileFormat )
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
commit a5c692981d23e33fd82f36f85f3895cae9fa2bc3
Author: Joerg Skottke [jsk] <jsk at openoffice.org>
Date: Tue Aug 10 10:14:26 2010 +0200
automationooo330m3: #i113764# - Check for binfilter
diff --git a/testautomation/framework/required/includes/topten.inc b/testautomation/framework/required/includes/topten.inc
index a08d59c..0d0157e 100755
--- a/testautomation/framework/required/includes/topten.inc
+++ b/testautomation/framework/required/includes/topten.inc
@@ -33,6 +33,16 @@
sub topten
+ ' we need the binary filters (.sxw etc.) for this test but beginning with
+ ' OOo 3.3 these are optional
+ try
+ hGetSuffix( "569" )
+ catch
+ warnlog( "Optional legacy filters package is not installed" )
+ printlog( "Please restart the setup to install the missing filters" )
+ end sub
+ endcatch
+
gApplication = "WRITER"
call Top_ten_test
@@ -59,7 +69,8 @@ end sub
'*******************************************************************************
testcase Top_ten_test
-
dim sUserWorkDirectory as string
+
+ dim sUserWorkDirectory as string
dim sFilename_native as String
dim sFilename_export as String
dim sFilter_native as string
commit bf0dc78d1e1ecc6f3e208f642c303884c0b12b97
Author: Joerg Skottke [jsk] <jsk at openoffice.org>
Date: Tue Aug 10 09:57:22 2010 +0200
automationooo330m3: #i113761# - Product name missing for backing window (#i113760#)
diff --git a/testautomation/framework/required/includes/window_functions.inc b/testautomation/framework/required/includes/window_functions.inc
index acc5e7a..7afbdb6 100755
--- a/testautomation/framework/required/includes/window_functions.inc
+++ b/testautomation/framework/required/includes/window_functions.inc
@@ -198,6 +198,13 @@ testcase tCheckWindowTitle( sApplication as string, sReference as string )
printlog( "Update test for the office window titles" )
+ ' This is a Testtool-only problem that the product name is not displayed
+ ' after calling hCloseDocument() on the last document.
+ if ( sApplication = "soffice" ) then
+ qaerrorlog( "#i113760# - Product name missing for backing window" )
+ goto endsub
+ endif
+
const BASIC_MODULE = "tCheckWindowTitle"
const STRING_NOT_FOUND = 0
const STRING_LEFTMOST = 1
@@ -221,16 +228,7 @@ testcase tCheckWindowTitle( sApplication as string, sReference as string )
printlog( "Verify that the correct window is open" )
select case sApplication
- case "swriter" :
- case "sglobal" :
- case "sweb" :
- case "scalc" :
- case "simpress":
- case "sdraw" :
- case "smath" :
case "basic" : hInitBasicIDE( BASIC_MODULE )
- case "chart" :
- case "database":
case "soffice" : hFileCloseAll()
end select
@@ -290,16 +288,7 @@ testcase tCheckWindowTitle( sApplication as string, sReference as string )
printlog( "Cleanup after test" )
select case sApplication
- case "swriter" :
- case "sglobal" :
- case "sweb" :
- case "scalc" :
- case "simpress":
- case "sdraw" :
- case "smath" :
case "basic" : hDestroyDocument()
- case "chart" :
- case "database":
case "soffice" : hCreateDocument()
end select
commit 789aaf328787e321b3fb409c20ee3fbae248b11a
Merge: d825039... 0f8bd51...
Author: Joachim Lingner <jl at openoffice.org>
Date: Mon Aug 2 15:39:29 2010 +0200
jl154 merging with OOO330m2
diff --cc testautomation/framework/required/f_programmability_dialogs.bas
index 492a61d,9253340..7965a84
mode 100755,100644..100644
--- a/testautomation/framework/required/f_programmability_dialogs.bas
+++ b/testautomation/framework/required/f_programmability_dialogs.bas
commit d8250398703575cd55adcdcdf4c3d0eeb4bd211b
Merge: 8db5176... 5b52bf6...
Author: Joerg Skottke [jsk] <jsk at openoffice.org>
Date: Thu Jul 29 13:55:23 2010 +0200
jl154: Local merge
commit 8db5176aa54b7e00540a4e54549e5715aa734320
Author: Joerg Skottke [jsk] <jsk at openoffice.org>
Date: Thu Jul 29 13:52:12 2010 +0200
jl154: #i113520# - Made icon counting a little fuzzy by adding two more optional items to the count for the Weblog Publisher extension.
diff --git a/testautomation/framework/tools/includes/toolbar_tools.inc b/testautomation/framework/tools/includes/toolbar_tools.inc
index 8d0b198..8176a7b 100755
--- a/testautomation/framework/tools/includes/toolbar_tools.inc
+++ b/testautomation/framework/tools/includes/toolbar_tools.inc
@@ -200,7 +200,8 @@ function hStandardbarItemGetCount() as integer
'///<ul>
dim iToolbarItemsCurrent as integer
- const EXPECTED_TOOLBAR_ITEMCOUNT = 30
+ const DEFAULT_TOOLBAR_ITEMCOUNT = 30
+ const WEBLOG_PUBLISHER = 2
const CFN = "hStandardbarItemGetCount::"
@@ -226,13 +227,14 @@ function hStandardbarItemGetCount() as integer
' violate Sun's patching policy. So StarSuite/StarOffice now have 30 or 31
' items on the standardbar, OOo and its spinoffs have 30.
-
- if ( iToolbarItemsCurrent = EXPECTED_TOOLBAR_ITEMCOUNT ) then
- printlog( CFN & "Correct number of items on the StandardBar. Good" )
- else
- warnlog( CFN & "Expected: " & EXPECTED_TOOLBAR_ITEMCOUNT & _
- " entries, found: " & iToolbarItemsCurrent )
- endif
+ select case ( iToolbarItemsCurrent )
+ case DEFAULT_TOOLBAR_ITEMCOUNT
+ printlog( CFN & "Default number of items found" )
+ case DEFAULT_TOOLBAR_ITEMCOUNT + WEBLOG_PUBLISHER
+ printlog( CFN & "Default icons + Weblog publisher icons found" )
+ case else
+ warnlog( CFN & "Number of icons is unexpected: " & iToolbarItemsCurrent )
+ end select
'///+<li>close the context menu</li>
hMenuClose()
commit 5b52bf66ec219e65a1a606c9fd893b61554528f7
Author: Joerg Skottke [jsk] <jsk at openoffice.org>
Date: Wed Jul 28 11:00:19 2010 +0200
jl154: #i113234# - reference list for OOo/Windows
diff --git a/testautomation/framework/optional/includes/security_macrosecurity.inc b/testautomation/framework/optional/includes/security_macrosecurity.inc
index 1c9d360..ed588b8 100755
--- a/testautomation/framework/optional/includes/security_macrosecurity.inc
+++ b/testautomation/framework/optional/includes/security_macrosecurity.inc
@@ -51,6 +51,8 @@ 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\"
diff --git a/testautomation/framework/required/input/scripts/OpenOffice.org_en-US_win_BasicOrganizer.txt b/testautomation/framework/required/input/scripts/OpenOffice.org_en-US_win_BasicOrganizer.txt
new file mode 100755
index 0000000..4940034
--- /dev/null
+++ b/testautomation/framework/required/input/scripts/OpenOffice.org_en-US_win_BasicOrganizer.txt
@@ -0,0 +1,657 @@
+My Macros
+Standard
+Module1
+Module1:Main
+OpenOffice.org Macros
+Depot
+CommonLang
+CommonLang:LoadLanguage
+CommonLang:CompleteMarketList
+CommonLang:LocalizedCurrencies
+CommonLang:LoadDepotDialogs
+CommonLang:InitializeStartUpModel
+Currency
+Currency:Startup
+Currency:EnableGoOnButton
+Currency:CloseStartUpDialog
+Currency:DisposeDocument
+Currency:ChooseMarket
+Currency:ConvertStylesCurrencies
+Currency:SwitchNumberFormat
+Currency:Numberformat
+Currency:CheckFormatType
+Depot
+Depot:Initialize
+Depot:Buy
+Depot:Sell
+Depot:Reset
+Depot:TransactionOk
+Depot:SelectStockname
+Depot:HandleStocks
+Depot:CancelStockRate
+Depot:CancelTransaction
+Depot:CommitStockRate
+Depot:EnableTransactionControls
+Depot:SetupTransactionControls
+Depot:AddShortCuttoControl
+Depot:OpenStockRatePage
+Depot:SelectStockNameForRates
+Depot:ToggleStockRateControls
+Depot:InitializeStockRatesControls
+Internet
+Internet:CheckHistoryControls
+Internet:InsertCompanyHistory
+Internet:InternetUpdate
+Internet:GetCurrentRate
+Internet:UpdateValue
+Internet:StringToDate
+Internet:UpdateChart
+Internet:CalculateChartafterSplit
+Lang_de
+Lang_de:LoadGermanLanguage
+Lang_en
+Lang_en:LoadEnglishLanguage
+Lang_es
+Lang_es:LoadSpanishLanguage
+Lang_fr
+Lang_fr:LoadFrenchLanguage
+Lang_it
+Lang_it:LoadItalianLanguage
+Lang_ja
+Lang_ja:LoadJapaneseLanguage
+Lang_ko
+Lang_ko:LoadKoreanLanguage
+Lang_sv
+Lang_sv:LoadSwedishLanguage
+Lang_tw
+Lang_tw:LoadChineseTradLanguage
+Lang_zh
+Lang_zh:LoadChineseSimpleLanguage
+tools
+tools:RemoveSheet
+tools:InitializeStatusLine
+tools:MakeRangeVisible
+tools:GetRowIndex
+tools:GetTransactionCount
+tools:GetStocksCount
+tools:FillListbox
+tools:CellValuetoControl
+tools:RemoveStockRows
+tools:AddValueToCellContent
+tools:CheckInputDate
+tools:InsertCurrentValue
+tools:SplitCellValue
+tools:GetStockRowIndex
+tools:GetStockID
+tools:CheckDocLocale
+Euro
+AutoPilotRun
+AutoPilotRun:StartAutoPilot
+AutoPilotRun:ConvertDocuments
+AutoPilotRun:InitializeDocument
+AutoPilotRun:ChangeToNextProgressStep
+AutoPilotRun:StoreDocument
+AutoPilotRun:SwapExtent
... etc. - the rest is truncated
More information about the ooo-build-commit
mailing list