[ooo-build-commit] Branch 'ooo/OOO320' - testautomation/chart2 testautomation/dbaccess testautomation/extensions testautomation/framework testautomation/global testautomation/graphics testautomation/spreadsheet testautomation/writer testautomation/xml
Jan Holesovsky
kendy at kemper.freedesktop.org
Tue Oct 27 03:12:34 PDT 2009
testautomation/chart2/optional/includes/loadsave/ch2_xml_format.inc | 4
testautomation/dbaccess/optional/includes/ctrl_Clipboard.inc | 24 -
testautomation/dbaccess/optional/includes/ctrl_General.inc | 4
testautomation/dbaccess/optional/includes/ctrl_Wizards.inc | 2
testautomation/dbaccess/tools/controltools.inc | 2
testautomation/extensions/optional/input/dependencies/version31.oxt |binary
testautomation/extensions/optional/input/files.txt | 4
testautomation/framework/optional/includes/basic_package_export.inc | 209 +++++-----
testautomation/framework/optional/includes/extras_file_open.inc | 67 ++-
testautomation/framework/optional/includes/extras_modify_objects.inc | 5
testautomation/framework/optional/includes/filedlg_autocomplete.inc | 56 +-
testautomation/framework/optional/includes/filedlg_cjk_files.inc | 30 -
testautomation/framework/optional/includes/filedlg_filternames.inc | 10
testautomation/framework/optional/includes/filedlg_multiselection.inc | 3
testautomation/framework/optional/includes/filedlg_reserved_names_unix.inc | 4
testautomation/framework/optional/includes/security_macrosecurity.inc | 17
testautomation/framework/required/f_first.bas | 10
testautomation/framework/required/includes/basic_dialog_export.inc | 2
testautomation/framework/required/includes/basic_dialog_i18n.inc | 3
testautomation/framework/required/includes/basic_dialog_i18n_import.inc | 2
testautomation/framework/required/includes/wizard_documentconverter.inc | 7
testautomation/global/required/includes/g_customize.inc | 9
testautomation/global/required/includes/g_option.inc | 6
testautomation/global/tools/includes/optional/t_filetools.inc | 30 +
testautomation/graphics/optional/g_insert.bas | 2
testautomation/graphics/optional/includes/global/export_graphic_2.inc | 25 -
testautomation/graphics/optional/includes/global/g_insert.inc | 54 --
testautomation/graphics/optional/includes/global/g_spellcheck.inc | 12
testautomation/graphics/optional/includes/global/g_tables.inc | 8
testautomation/graphics/optional/includes/global/g_tools.inc | 2
testautomation/graphics/optional/includes/impress/i_us_present.inc | 5
testautomation/spreadsheet/required/includes/c_upd_editmenu2.inc | 2
testautomation/writer/optional/includes/clipboard/w_216_.inc | 42 +-
testautomation/writer/optional/includes/formatcharacter/w_format_character1.inc | 28 -
testautomation/writer/optional/includes/formatparagraph/w_formatparagraph1.inc | 105 ++---
testautomation/writer/optional/includes/navigator/w_navigator.inc | 2
testautomation/writer/optional/includes/undo/w_undo_history_3.inc | 14
testautomation/writer/required/includes/w_004_.inc | 12
testautomation/writer/tools/includes/w_tools_undo.inc | 10
testautomation/xml/optional/includes/f_xml_save_ms_ole.inc | 2
testautomation/xml/optional/includes/sxc7_01.inc | 2
testautomation/xml/optional/includes/sxc7_03.inc | 3
42 files changed, 445 insertions(+), 395 deletions(-)
New commits:
commit 67e5be87da146fef61415a3ae3f45d66079dbc3e
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Mon Oct 26 15:58:16 2009 +0000
CWS-TOOLING: integrate CWS automation320m2
2009-10-23 13:38:01 +0200 wg r277161 : i106036
2009-10-22 13:07:07 +0200 oc r277115 : #i106187# f_xml_save_ms_ole.bas has warnings because of changed Math-XML
2009-10-21 15:54:24 +0200 hde r277098 : made qaerrorlog from warnlog
2009-10-21 14:50:30 +0200 tbo r277094 : #i106001# tToolsOptionsImprovementProgram fails with OOo contributed builds
2009-10-21 13:12:51 +0200 wg r277086 : i106036
2009-10-20 19:06:25 +0200 tbo r277070 : #i106002# f_wizards.bas fails for locale=de or platform Mac OS X PPC
2009-10-20 18:46:23 +0200 tbo r277069 : #i105987# e_extensions.bas does not run till end
2009-10-20 15:27:13 +0200 tbo r277056 : #i105962# f_first.bas is rejected by Quaste
2009-10-20 14:55:00 +0200 wg r277055 : i106036
2009-10-20 13:40:54 +0200 msc r277050 : #106089#
2009-10-20 13:36:30 +0200 msc r277048 : #106016#
2009-10-20 13:35:40 +0200 msc r277047 : #106016#
2009-10-20 09:47:15 +0200 jsk r277038 : #i106016# - More minor fixes. It becomes clear that the functin hHandleActivesOnLoad shows age and should be replaced using an approach like in hFileWait. Still the extras-tests might fail if updating links over the internet takes too long
2009-10-20 09:40:13 +0200 hde r277037 : close all active documents and check if more than 1 document is opened
2009-10-19 16:17:18 +0200 wg r277032 : i106036
2009-10-19 16:00:12 +0200 wg r277031 : i106036
2009-10-19 15:59:09 +0200 wg r277030 : i106036
2009-10-19 15:47:26 +0200 wg r277029 : i106036
2009-10-19 15:34:15 +0200 wg r277028 : i106036
2009-10-19 15:03:49 +0200 wg r277027 : i106036
2009-10-19 14:32:46 +0200 hde r277026 : Renamed Note to Comment
2009-10-19 14:32:14 +0200 hde r277025 : Renamed Note to Comment
2009-10-19 14:31:08 +0200 hde r277024 : Renamed Note to Comment
2009-10-19 13:26:37 +0200 jsk r277021 : #i106016# - Make test more stable (using .exists()-method), removed one warning (there were two for the same issue)
2009-10-19 11:49:22 +0200 jsk r277016 : #i106016# - Documentation update for QUASTe, fixed uninitialized variable cRight (removed), disabled sleep() statements using GLOBAL_USE_NEW_SLEEP = TRUE
2009-10-19 11:21:19 +0200 oc r277015 : #i105967 Warnlogs changed to qaerrorlogs due to 3.2 greenstate
2009-10-19 11:19:32 +0200 oc r277014 : #i105967 Warnlogs changed to qaerrorlogs due to 3.2 greenstate
2009-10-19 11:18:15 +0200 oc r277013 : #i105967 Warnlogs changed to qaerrorlogs due to 3.2 greenstate
2009-10-19 11:05:23 +0200 jsk r277012 : #i106016# - Documentation update for QUASTe, fixed documentation error
2009-10-19 10:58:14 +0200 jsk r277011 : #i106016# - Documentation update for QUASTe
2009-10-19 10:48:50 +0200 jsk r277010 : #i106016# - Documentation update for QUASTe
2009-10-19 10:05:34 +0200 jsk r277004 : #i106016# - adjust qaerrologs/warnlogs
2009-10-19 09:59:51 +0200 jsk r277003 : #i106016# - supply missing documentation required for QUASTe, adjust qaerrologs/warnlogs
2009-10-19 09:14:11 +0200 jsk r277001 : #i106016# - supply missing documentation required for QUASTe
2009-10-19 08:44:45 +0200 hde r277000 : close all active documents
2009-10-19 08:40:23 +0200 hde r276999 : changed warnlog to qaerrorlog
2009-10-16 14:48:06 +0200 tbo r276969 : #i105962# reset include to former state
diff --git a/testautomation/chart2/optional/includes/loadsave/ch2_xml_format.inc b/testautomation/chart2/optional/includes/loadsave/ch2_xml_format.inc
index cbe14ee..5802f13 100644
--- a/testautomation/chart2/optional/includes/loadsave/ch2_xml_format.inc
+++ b/testautomation/chart2/optional/includes/loadsave/ch2_xml_format.inc
@@ -230,7 +230,7 @@ testcase tCompareXMLFormatLoad
if SAXGetAttributeValue("table:cell-range-address") = "Sheet1.A1:B2" then
printlog "The cell range for chart:plot-area is correct"
else
- warnlog "#i100780#: The cell range is not Sheet1.A1:B2, it is " & SaxGetAttributeValue("table:cell-range-address")
+ QaErrorLog "#i100780#: The cell range is not Sheet1.A1:B2, it is " & SaxGetAttributeValue("table:cell-range-address")
endif
printlog "Seek for chart:series"
printlog " |-chart:series"
@@ -241,7 +241,7 @@ testcase tCompareXMLFormatLoad
if SAXGetAttributeValue("chart:values-cell-range-address") = "Sheet1.A1:A2" then
printlog "The cell range for chart:series is correct"
else
- warnlog "#i100780#: The cell range is not Sheet1.A1:A2, it is " & SaxGetAttributeValue("chart:values-cell-range-address")
+ QaErrorLog "#i100780#: The cell range is not Sheet1.A1:A2, it is " & SaxGetAttributeValue("chart:values-cell-range-address")
endif
' DEBUG: printlog "I'm here: " & SAXGetElementName
'/// Close the XML editor.
diff --git a/testautomation/dbaccess/optional/includes/ctrl_Clipboard.inc b/testautomation/dbaccess/optional/includes/ctrl_Clipboard.inc
index 7265a53..11d48db 100755
--- a/testautomation/dbaccess/optional/includes/ctrl_Clipboard.inc
+++ b/testautomation/dbaccess/optional/includes/ctrl_Clipboard.inc
@@ -76,8 +76,10 @@ testcase tFromText
printlog "set control property"
Kontext "TabGeneralControl"
if TabGeneralControl.exists(3) then
- NameText.setText("FromText")
- else warnlog "control property browser could not be opend"
+ NameText.setText("FromText")
+ NameText.TypeKeys("<RETURN>")
+ else
+ warnlog "control property browser could not be opend"
endif
sleep (1)
'/// copy control to clipboard
@@ -189,8 +191,10 @@ testcase tFromCalc
printlog "set control property"
Kontext "TabGeneralControl"
if TabGeneralControl.exists(3) then
- NameText.setText("FromCalc")
- else warnlog "control property browser could not be opend"
+ NameText.setText("FromCalc")
+ NameText.TypeKeys("<RETURN>")
+ else
+ warnlog "control property browser could not be opend"
endif
sleep (1)
'/// copy control to clipboard
@@ -303,8 +307,10 @@ testcase tFromDraw
printlog "set control property"
Kontext "TabGeneralControl"
if TabGeneralControl.exists(3) then
- NameText.setText("FromDraw")
- else warnlog "control property browser could not be opend"
+ NameText.setText("FromDraw")
+ NameText.TypeKeys("<RETURN>")
+ else
+ warnlog "control property browser could not be opend"
endif
sleep (1)
'/// copy control to clipboard
@@ -416,8 +422,10 @@ testcase tFromImpress
printlog "set control property"
Kontext "TabGeneralControl"
if TabGeneralControl.exists(3) then
- NameText.setText("FromImpress")
- else warnlog "control property browser could not be opend"
+ NameText.setText("FromImpress")
+ NameText.TypeKeys("<RETURN>")
+ else
+ warnlog "control property browser could not be opend"
endif
sleep (1)
'/// copy control to clipboard
diff --git a/testautomation/dbaccess/optional/includes/ctrl_General.inc b/testautomation/dbaccess/optional/includes/ctrl_General.inc
index 5fc684f..80fc173 100755
--- a/testautomation/dbaccess/optional/includes/ctrl_General.inc
+++ b/testautomation/dbaccess/optional/includes/ctrl_General.inc
@@ -884,6 +884,8 @@ testcase tActivationOrder
endif
DocumentWriter.TypeKeys "<TAB>" , true
sleep(1)
+ DocumentWriter.TypeKeys "<MOD1 HOME>" , true
+ sleep(1)
DocumentWriter.TypeKeys "<MOD1 SHIFT END>" , true
sleep(1)
DocumentWriter.TypeKeys "<MOD1 C>" , true
@@ -896,6 +898,8 @@ testcase tActivationOrder
DocumentWriter.TypeKeys "<TAB>" , true
sleep(1)
+ DocumentWriter.TypeKeys "<MOD1 HOME>" , true
+ sleep(1)
DocumentWriter.TypeKeys "<MOD1 SHIFT END>" , true
sleep(1)
DocumentWriter.TypeKeys "<MOD1 C>" , true
diff --git a/testautomation/dbaccess/optional/includes/ctrl_Wizards.inc b/testautomation/dbaccess/optional/includes/ctrl_Wizards.inc
index 4ce62f2..b7e93ba 100755
--- a/testautomation/dbaccess/optional/includes/ctrl_Wizards.inc
+++ b/testautomation/dbaccess/optional/includes/ctrl_Wizards.inc
@@ -581,7 +581,7 @@ testcase tListBox
Kontext "FormControls"
Listbox.Click
- call hDrawingWithSelection ( 50, 20, 60, 30 )
+ call hDrawingWithSelection ( 50, 20, 60, 25 )
sleep(3)
Kontext "AutoPilotListComboBox"
AutoPilotListComboBox.MouseDown(10,10)
diff --git a/testautomation/dbaccess/tools/controltools.inc b/testautomation/dbaccess/tools/controltools.inc
index cd73e5f..d7f8dce 100755
--- a/testautomation/dbaccess/tools/controltools.inc
+++ b/testautomation/dbaccess/tools/controltools.inc
@@ -249,6 +249,7 @@ function fSetControlProperty(sControlType, sPropertyName, sPropertyValue as stri
ControlPropertiesTabControl.setPage TabDataControl
Kontext "TabDataControl"
ReferenceValue.setText(sPropertyValue)
+ ReferenceValue.TypeKeys("<RETURN>",true)
Kontext "ControlPropertiesTabControl"
ControlPropertiesTabControl.setPage TabGeneralControl
elseif sPropertyName = "Repeat" then
@@ -266,6 +267,7 @@ function fSetControlProperty(sControlType, sPropertyName, sPropertyValue as stri
ControlPropertiesTabControl.setPage TabDataControl
Kontext "TabDataControl"
ReferenceValueOff.setText(sPropertyValue)
+ ReferenceValueOff.TypeKeys("<RETURN>",true)
Kontext "ControlPropertiesTabControl"
ControlPropertiesTabControl.setPage TabGeneralControl
elseif sPropertyName = "Readonly" then
diff --git a/testautomation/extensions/optional/input/dependencies/version31.oxt b/testautomation/extensions/optional/input/dependencies/version31.oxt
index ccc067c..870b4cc 100644
Binary files a/testautomation/extensions/optional/input/dependencies/version31.oxt and b/testautomation/extensions/optional/input/dependencies/version31.oxt differ
diff --git a/testautomation/extensions/optional/input/files.txt b/testautomation/extensions/optional/input/files.txt
index f4ba428..5e37bbd 100755
--- a/testautomation/extensions/optional/input/files.txt
+++ b/testautomation/extensions/optional/input/files.txt
@@ -26,11 +26,11 @@ dependencies\version10000.oxt;1,0,0,0,0
dependencies\version21ns.oxt;0,0,1,0,0
dependencies\version21other.oxt;1,0,0,0,0
dependencies\version25.oxt;0,0,1,0,0
-dependencies\version30b.oxt;0,0,1,0,0
+dependencies\version30.oxt;0,0,1,0,0
dependencies\version300.oxt;0,0,1,0,0
dependencies\version301.oxt;0,0,1,0,0
dependencies\versionempty.oxt;0,0,1,0,0
-dependencies\version31b.oxt;1,0,0,0,0
+dependencies\version31.oxt;1,0,0,0,0
dependencies\version937.oxt;1,0,0,0,0
dependencies\versionnone.oxt;0,0,1,0,0
versions/plain.oxt;0,0,1,0,0
diff --git a/testautomation/framework/optional/includes/basic_package_export.inc b/testautomation/framework/optional/includes/basic_package_export.inc
index f02e60c..19784c2 100755
--- a/testautomation/framework/optional/includes/basic_package_export.inc
+++ b/testautomation/framework/optional/includes/basic_package_export.inc
@@ -40,9 +40,7 @@
testcase tBasicPackageExport
' Assumption: All actions take place in the user/work directory
- ' macro taken from framework/tools/input/macros.txt::tBasicLibraryExport
-
- printlog( "Export BASIC libraries as package" )
+ printlog( "Export BASIC libraries as package/extension" )
const PACKAGE_NAME = "tBasicExport.oxt"
const LIBRARY_NAME = "tBasicExport"
@@ -51,14 +49,11 @@ testcase tBasicPackageExport
dim cDocumentName as string
dim cLibraryName as string
-
+
dim iNodeCount as integer
-
dim iCurrentLib as integer
- dim cFile as string
- cFile = hGetWorkPath() & PACKAGE_NAME
-
+ dim cFile as string : cFile = hGetWorkPath() & PACKAGE_NAME
dim cPackageFileName as string
@@ -80,97 +75,123 @@ testcase tBasicPackageExport
printlog( "Select the second document" )
kontext "Makro"
- iNodeCount = hGetNodeCount( MakroAus )
- cDocumentName = hSelectNode( MakroAus, iNodeCount )
+ if ( Makro.exists( 1 ) ) then
+ iNodeCount = hGetNodeCount( MakroAus )
+ cDocumentName = hSelectNode( MakroAus, iNodeCount )
- printlog( "Click <Manage...>" )
- Verwalten.click()
-
- printlog( "Go to the libraries tabpage" )
- hSelectBasicObjectOrganizerTab( 3 )
-
- kontext "TabBibliotheken"
- printlog( "Select the document at pos. " & DOCUMENT_POSITION )
- Bibliothek.select( DOCUMENT_POSITION )
-
- printlog( "Verify that the correct document has been selected" )
- if ( Bibliothek.getSelText() <> cDocumentName ) then
- warnlog( "Incorrect document selected on libraries tab, aborting" )
- goto endsub
- endif
-
- printlog( "Click <New...>" )
- Neu.click()
-
- kontext "NeueBibliothek"
- printlog( "Name the new library: " & LIBRARY_NAME )
- BibliotheksName.setText( LIBRARY_NAME )
- NeueBibliothek.ok()
-
- kontext "TabBibliotheken"
- cLibraryName = BibliotheksListe.getSelText()
- if ( cLibraryName <> LIBRARY_NAME ) then
- warnlog( "The new library is not selected in the libraries list" )
+ printlog( "Click <Manage...>" )
+ Verwalten.click()
+
+ printlog( "Go to the libraries tabpage" )
+ hSelectBasicObjectOrganizerTab( 3 )
+
+ kontext "TabBibliotheken"
+ printlog( "Select the document at pos. " & DOCUMENT_POSITION )
+ Bibliothek.select( DOCUMENT_POSITION )
+
+ printlog( "Verify that the correct document has been selected" )
+ if ( Bibliothek.getSelText() <> cDocumentName ) then
+ warnlog( "Incorrect document selected on libraries tab, aborting test" )
+ goto endsub
+ endif
+
+ printlog( "Click <New...>" )
+ Neu.click()
+
+ kontext "NeueBibliothek"
+ if ( NeueBibliothek.exists( 1 ) ) then
+ printlog( "Name the new library: " & LIBRARY_NAME )
+ BibliotheksName.setText( LIBRARY_NAME )
+ NeueBibliothek.ok()
+ else
+ warnlog( "Dialog <NeueBibliothek> did not open" )
+ goto endsub
+ endif
+
+ kontext "TabBibliotheken"
+ cLibraryName = BibliotheksListe.getSelText()
+ if ( cLibraryName <> LIBRARY_NAME ) then
+ warnlog( "The new library is not selected in the libraries list" )
+ else
+ printlog( "The correct library is selected in the libraries list" )
+ endif
+
+ printlog( "Click <Edit...>" )
+ Bearbeiten.click()
+
+ printlog( "Insert a test macro (something simple, e.g. a messagebox" )
+ hInsertMacroFromFile( LIBRARY_NAME )
+
+ printlog( "Close the BASIC IDE" )
+ hCloseBasicIDE()
else
- printlog( "The correct library is selected in the libraries list" )
+ warnlog( "Dialog <Makro> did not open, aborting test" )
+ goto endsub
endif
- printlog( "Click <Edit...>" )
- Bearbeiten.click()
-
- printlog( "Insert a test macro (something simple, e.g. a messagebox" )
- hInsertMacroFromFile( LIBRARY_NAME )
-
- printlog( "Close the BASIC IDE" )
- hCloseBasicIDE()
-
printlog( "Open the BASIC organizer" )
ToolsMacro_uno
printlog( "Select the work document" )
kontext "Makro"
- iNodeCount = hGetNodeCount( MakroAus )
- hSelectNode( MakroAus, iNodeCount )
-
- printlog( "Manage..." )
- Verwalten.click()
-
- printlog( "Libraries tab" )
- hSelectBasicObjectOrganizerTab( 3 )
-
- kontext "TabBibliotheken"
- Bibliothek.select( DOCUMENT_POSITION )
-
- printlog( "Select the new library" )
- kontext "TabBibliotheken"
- for iCurrentLib = 1 to Bibliotheksliste.getItemCount()
- Bibliotheksliste.select( iCurrentLib )
- if ( Bibliotheksliste.getSelText() = LIBRARY_NAME ) then
- exit for
+ if ( Makro.exists( 1 ) ) then
+ iNodeCount = hGetNodeCount( MakroAus )
+ hSelectNode( MakroAus, iNodeCount )
+
+ printlog( "Manage..." )
+ Verwalten.click()
+
+ printlog( "Libraries tab" )
+ hSelectBasicObjectOrganizerTab( 3 )
+
+ kontext "TabBibliotheken"
+ if ( TabBibliotheken.exists( 1 ) and TabBibliotheken.isVisible() ) then
+ Bibliothek.select( DOCUMENT_POSITION )
+
+ printlog( "Select the new library" )
+ kontext "TabBibliotheken"
+ for iCurrentLib = 1 to Bibliotheksliste.getItemCount()
+ Bibliotheksliste.select( iCurrentLib )
+ if ( Bibliotheksliste.getSelText() = LIBRARY_NAME ) then
+ exit for
+ endif
+ next iCurrentLib
+
+ kontext "TabBibliotheken"
+ printlog( "Export the package, close the document afterwards" )
+ Export.click()
+
+ kontext "ExportBasicLibraryDlg"
+ if ( ExportBasicLibraryDlg.exists( 1 ) ) then
+ printlog( "Select to export as package" )
+ ExportAsPackage.check()
+ ExportBasicLibraryDlg.ok()
+
+ kontext "SpeichernDlg"
+ if ( SpeichernDlg.exists( 1 ) ) then
+ printlog( "Save the file, automatic filename extension must be checked" )
+ DateiName.setText( hGetWorkPath() & LIBRARY_NAME ) ' automatic filename extension/uno-pkg is default
+ Speichern.click()
+ else
+ warnlog( "Dialog <File Save> did not open" )
+ endif
+ else
+ warnlog( "Dialog <Export Basic Library> did not open" )
+ endif
+
+ kontext "TabBibliotheken"
+ printlog( "Close libraires tabpage" )
+ TabBibliotheken.cancel()
+ else
+ warnlog( "Dialog <TabBibliotheken> is not available" )
endif
- next iCurrentLib
-
- kontext "TabBibliotheken"
- printlog( "Export the package, close the document afterwards" )
- Export.click()
-
- kontext "ExportBasicLibraryDlg"
- printlog( "Select to export as package" )
- ExportAsPackage.check()
- ExportBasicLibraryDlg.ok()
-
- kontext "SpeichernDlg"
- printlog( "Save the file, automatic filename extension must be checked" )
- DateiName.setText( hGetWorkPath() & LIBRARY_NAME ) ' automatic filename extension/uno-pkg is default
- Speichern.click()
-
- kontext "TabBibliotheken"
- printlog( "Close libraires tabpage" )
- TabBibliotheken.cancel()
-
- kontext "Makro"
- printlog( "Close BASIC organizer" )
- Makro.cancel()
+
+ kontext "Makro"
+ printlog( "Close BASIC organizer" )
+ Makro.cancel()
+ else
+ warnlog( "Dialog <Makro> did not open" )
+ endif
printlog( "Close all files" )
hFileCloseAll()
@@ -190,17 +211,17 @@ testcase tBasicPackageExport
endif
printlog( "Verify file size" )
- if ( FileLen( cPackageFileName ) <> PACKAGE_SIZE ) then
- warnlog( "#i105719# - The exported test-package has an incorrect file size." )
+' if ( FileLen( cPackageFileName ) <> PACKAGE_SIZE ) then
+' warnlog( "#i105719# - The exported test-package has an incorrect file size." )
if ( FileLen( cPackageFileName ) = 0 ) then
printlog( "File has zero bytes, it is empty." )
else
printlog( "Size is.: " & FileLen( cPackageFileName ) )
printlog( "Expected: " & PACKAGE_SIZE )
endif
- else
- printlog( "File has correct size" )
- endif
+' else
+' printlog( "File has correct size" )
+' endif
endcase
diff --git a/testautomation/framework/optional/includes/extras_file_open.inc b/testautomation/framework/optional/includes/extras_file_open.inc
index dd2f314..62ad0b7 100755
--- a/testautomation/framework/optional/includes/extras_file_open.inc
+++ b/testautomation/framework/optional/includes/extras_file_open.inc
@@ -45,6 +45,8 @@ private const MAX_FILE_COUNT = 3000 ' the max number of templates or samples
testcase tOpenObjectsWithFileDialog( cCategory as string )
+ printlog( "Open templates and samples using the file open dialog" )
+
const CFN = "tOpenObjectsWithFileDialog::"
@@ -75,9 +77,15 @@ testcase tOpenObjectsWithFileDialog( cCategory as string )
cOfficePath = gOfficeBasisPath
else
cOfficePath = mid( gOfficeBasisPath, len( gNetzOfficePath ) + 1 )
+ if ( FileExists( cOfficePath ) ) then
+ printlog( "Using: " & cOfficePath )
+ else
+ warnlog( "Test script error: Invalid Office path: " & cOfficePath )
+ goto endsub
+ endif
endif
- printlog( "Using: " & cOfficePath )
+ printlog( "Build path to templates/samples directory" )
select case cCategory
case "SAMPLES" : sRootPath = cOfficePath & "share\samples\" & gISOLang
sRootPathFallback = "/opt/openoffice.org/basis3.0/share/samples/" & gISOLang
@@ -92,10 +100,10 @@ testcase tOpenObjectsWithFileDialog( cCategory as string )
sRootPath = convertpath( sRootPath )
- if ( dir( sRootPath ) = "" ) then
+ if ( NOT FileExists( sRootPath ) ) then
qaerrorlog( "Root Path does not exist: " & sRootPath )
sRootPath = sRootPathFallback
- if ( dir( sRootPathFallback ) = "" ) then
+ if ( NOT FileExists( sRootPathFallback ) ) then
warnlog( "No usable office root path found. Aborting test" )
goto endsub
printlog( "Using hard coded fallback" )
@@ -104,10 +112,12 @@ testcase tOpenObjectsWithFileDialog( cCategory as string )
printlog( "Using path..: " & sRootPath )
printlog( "Using filter: " & sFilter )
+
+ printlog( "Retrieve filelist from directory" )
GetAllFileList ( sRootPath, sFilter, lsFile() )
hListDelete( lsFile(), 1 )
- ' Remove .lock-files
+ printlog( "Remove posible .lock-files from list" )
iTemplateCount = listCount( lsFile() )
iCurrentTemplate = 1
while( iCurrentTemplate <= iTemplateCount )
@@ -119,7 +129,7 @@ testcase tOpenObjectsWithFileDialog( cCategory as string )
endif
wend
- ' do not test wizard related files
+ printlog( "Remove Wizard related files from list" )
iTemplateCount = listCount( lsFile() )
iCurrentTemplate = 1
while( iCurrentTemplate <= iTemplateCount )
@@ -131,6 +141,7 @@ testcase tOpenObjectsWithFileDialog( cCategory as string )
endif
wend
+ printlog( "Files to be loaded:" )
hListPrint ( lsFile() , "" , "" )
if ( listcount( lsfile() ) = 1 ) then
if ( gProductName = "OpenOffice.org" ) then
@@ -140,6 +151,8 @@ testcase tOpenObjectsWithFileDialog( cCategory as string )
warnlog( "Filelist seems to be incomplete. GetAllFileList() failed!" )
goto endsub
endif
+ else
+ printlog( "List of samples/templates appears to be valid" )
endif
iTemplateCount = listCount( lsFile() )
@@ -151,41 +164,53 @@ testcase tOpenObjectsWithFileDialog( cCategory as string )
' sFileIn holds the file we currently work with
sFileIn = lsFile( iCurrentTemplate )
- brc = hFileOpen( sFileIn )
- brc = hHandleActivesOnLoad( 0 , 2 )
+ printlog( "Load: " & sFileIn )
+ hFileOpen( sFileIn )
+ printlog( "Handle known dialogs" )
+ hHandleActivesOnLoad( 0 , 2 )
+
+ printlog( "Check for Filter Selection dialog" )
Kontext "FilterAuswahl"
if ( FilterAuswahl.exists( 1 ) ) then
warnlog( "Loading failed, ASCII filter dialog present" )
FilterAuswahl.cancel()
- while( getDocumentCount > 0 )
- hDestroyDocument()
- wend
+ hFileCloseAll()
else
- brc = hCloseNavigator()
+ printlog( "Close navigator, if open" )
+ hCloseNavigator()
- ' Build the filename
sFileOut = cCategory & "_" & iCurrentTemplate
sFileOut = convertpath( sPathOut & sFileOut )
-
- brc = hFileSaveAsKill( sFileOut )
+
+ printlog( "Saving file to: " & sFileOut )
+ hFileSaveAsKill( sFileOut )
' note: this is delayed, because the dialogs take time to pop up
' even while the dialog is visible, we can work with the doc.
- brc = hHandleInitialDialogs()
+ printlog( "Handle known dialogs" )
+ hHandleInitialDialogs()
- brc = hDestroyDocument()
+ printlog( "Close document" )
+ hDestroyDocument()
- brc = hFileOpen( sFileOut )
- brc = hHandleActivesOnLoad( 0 , 2 )
- brc = hCloseNavigator()
+ printlog( "Load document again" )
+ hFileOpen( sFileOut )
+
+ printlog( "Handle known dialogs" )
+ hHandleActivesOnLoad( 0 , 2 )
+
+ printlog( "Close navigator, if open" )
+ hCloseNavigator()
- brc = hDestroyDocument()
+ printlog( "Close document" )
+ hDestroyDocument()
endif
- brc = hDeleteFile( sFileOut )
+ printlog( "Delete file" )
+ hDeleteFile( sFileOut )
next iCurrentTemplate
diff --git a/testautomation/framework/optional/includes/extras_modify_objects.inc b/testautomation/framework/optional/includes/extras_modify_objects.inc
index a2593b3..746ba09 100755
--- a/testautomation/framework/optional/includes/extras_modify_objects.inc
+++ b/testautomation/framework/optional/includes/extras_modify_objects.inc
@@ -58,6 +58,7 @@ testcase tModifyObjects( iMode as integer, cCategory as string, sVer as string )
dim iObjectCount( 20 ) as integer
dim iObjectSum as integer : iObjectSum = 0
dim iObjectCountExpected as integer
+ dim iObjectNumber as integer
dim sFile as string
dim sPath as string
@@ -112,9 +113,11 @@ testcase tModifyObjects( iMode as integer, cCategory as string, sVer as string )
for iObject = 1 to iObjectCount( iObjectFolder )
gApplication = "WRITER"
+ iObjectNumber = iObjectNumber + 1
printlog( "" )
- printlog( "Folder index = " & iObjectFolder & ", Object index = " & iObject )
+ printlog( "Folder index = " & iObjectFolder & ", Object index = " & _
+ iObject & " (" & iObjectNumber & " of " & iObjectSum & ")" )
hFileCloseAll()
diff --git a/testautomation/framework/optional/includes/filedlg_autocomplete.inc b/testautomation/framework/optional/includes/filedlg_autocomplete.inc
index 264685d..94d0db4 100755
--- a/testautomation/framework/optional/includes/filedlg_autocomplete.inc
+++ b/testautomation/framework/optional/includes/filedlg_autocomplete.inc
@@ -39,17 +39,18 @@
testcase tAutocomplete
-
+ printlog( "Autocompletion in the OpenOffice.org file picker" )
' IMPORTANT NOTE: Autocompletion is asynchronous. This means that no rule
' exists when exactly it is going to strike. If you are
' using a networked environment you have to make sure that
' all network ressources deliver a decent performance as
' this seriously influences the speed of the autocompletion.
-
- dim cBasePath as string
-
+
+ ' Assemble a work directory path
const WORKDIR = "autocomplete"
+ dim cBasePath as string : cBasePath = hGetWorkPath()
+ dim cWorkDir as string : cWorkDir = cBasePath & WORKDIR
' These are the files we create in the users homedirectory
dim aWorkFile( 3 ) as string
@@ -65,7 +66,6 @@ testcase tAutocomplete
aWildCard( 1 ) = "autocomplete_?.odt"
aWildCard( 2 ) = "autocomplete_b?.odt"
aWildCard( 3 ) = "autocomplete_*.odt"
-
dim cCurrentPath as string
dim cAutocomplete as string
@@ -80,41 +80,46 @@ testcase tAutocomplete
dim slot
- do while( getDocumentCount > 0 )
- call hCloseDocument()
- loop
-
- cBasePath = hGetWorkPath()
- aFullPath( 1 ) = cBasePath & WORKDIR & gPathSigne & aWorkFile( 1 )
- aFullPath( 2 ) = cBasePath & WORKDIR & gPathSigne & aWorkFile( 2 )
- aFullPath( 3 ) = cBasePath & WORKDIR & gPathSigne & aWorkFile( 3 )
+ printlog( "Close all open documents" )
+ hFileCloseAll()
+
+ printlog( "Assemble 3 filenames for workfiles" )
+ aFullPath( 1 ) = cWorkDir & gPathSigne & aWorkFile( 1 )
+ aFullPath( 2 ) = cWorkDir & gPathSigne & aWorkFile( 2 )
+ aFullPath( 3 ) = cWorkDir & gPathSigne & aWorkFile( 3 )
+
+ printlog( "Delete the 3 workfiles if they exist" )
hDeleteFile( aFullPath( 1 ) )
hDeleteFile( aFullPath( 2 ) )
hDeleteFile( aFullPath( 3 ) )
+
+ printlog( "Try to remove conflicting work directories" )
if ( dir( cBasePath & WORKDIR ) <> "" ) then
- rmdir( cBasePath & WORKDIR )
+ rmdir( cWorkDir )
endif
- mkdir( cBasePath & WORKDIR )
- if ( dir( cBasePath & WORKDIR ) = "" ) then
+ printlog( "Create workdirectory: " & cWorkDir )
+ mkdir( cWorkDir )
+ if ( NOT FileExists( cWorkDir ) ) then
warnlog( "Failed to create work directory, aborting" )
goto endsub
endif
gApplication = "WRITER"
+ printlog( "Create the workfiles - 3 writer files with minimum content" )
for iCurrentDocument = 1 to 3
- call hNewDocument()
+ call hCreateDocument()
kontext "DocumentWriter"
DocumentWriter.typeKeys( aWorkFile( iCurrentDocument ) )
hFileSaveAs( aFullPath( iCurrentDocument ) )
- FileClose
+ hUseAsyncSlot( "FileClose" )
next iCurrentDocument
-
- printlog( "open the File Open dialog" )
- FileOpen
-
+ printlog( "Open the File Open dialog" )
+ hUseAsyncSlot( "FileOpen" )
+
kontext "OeffnenDlg"
+ printlog( "Click the <Standard> button to get to the default work directory" )
Standard.click()
cLeft = left( WORKDIR, iLeft )
@@ -131,7 +136,7 @@ testcase tAutocomplete
printlog( "Autocompletion succeeded for workdirectory" )
else
warnlog( "Autocompletion failed" )
- printlog( "Expected: " & cRight )
+ printlog( "Expected: " & cEFString )
printlog( "Found...: " & cAutocomplete )
endif
@@ -149,7 +154,7 @@ testcase tAutocomplete
printlog( "Autocompletion succeeded for first file" )
else
warnlog( "Autocompletion failed" )
- printlog( "Expected: " & cRight )
+ printlog( "Expected: " & cEFString )
printlog( "Found...: " & cAutocomplete )
endif
@@ -162,7 +167,7 @@ testcase tAutocomplete
printlog( "Autocompletion succeeded for second file" )
else
warnlog( "Autocompletion failed" )
- printlog( "Expected: " & cRight )
+ printlog( "Expected: " & cEFString )
printlog( "Found...: " & cAutocomplete )
endif
@@ -198,6 +203,7 @@ testcase tAutocomplete
kontext "OeffnenDlg"
OeffnenDlg.cancel()
+ printlog( "Delete workfiles and -directory" )
hDeleteFile( aFullPath( 1 ) )
hDeleteFile( aFullPath( 2 ) )
hDeleteFile( aFullPath( 3 ) )
diff --git a/testautomation/framework/optional/includes/filedlg_cjk_files.inc b/testautomation/framework/optional/includes/filedlg_cjk_files.inc
index 0c69736..f616c6d 100755
--- a/testautomation/framework/optional/includes/filedlg_cjk_files.inc
+++ b/testautomation/framework/optional/includes/filedlg_cjk_files.inc
@@ -39,27 +39,21 @@
testcase tSaveLoadDelFilesCJK()
+ printlog( "Save, load and delete files from the hight UTF-8 characters list" )
+
if ( not hTestLocale() ) then
- warnlog( "Test requires UTF-8 locale" )
- goto endsub
+ qaerrorlog( "Could not verify UTF-8 locale. Make sure an UTF-8 locale is used!" )
endif
-
dim cStrangeName as string
dim iCounter as integer ' iterator
- dim iRandom as long ' random number.(needs long for cjk chars)
+ dim iRandom as long ' random number
dim brc as boolean
- printlog( CHR$(13) )
- printlog( "Check if CJK-filenames are loaded/saved/deleted" )
- printlog( CHR$(13) )
-
- printlog( CHR$(13) + "Names with CJK-chars" )
- printlog( "" )
-
- ' Invoke randomizer
+ printlog( "Invoke randomizer" )
call randomize()
+ printlog( "Generate filenames, run tests" )
for iCounter = 1 to 2
iRandom = int( 19968 + ( 20911 * rnd ) )
@@ -67,10 +61,10 @@ testcase tSaveLoadDelFilesCJK()
printlog( " * Using decimal char: " & iRandom )
cStrangeName = hNameGen_append( iRandom )
- brc = hSaveLoadDelSuccess( cStrangeName )
+ hSaveLoadDelSuccess( cStrangeName )
cStrangeName = hNameGen_lead( iRandom )
- brc = hSaveLoadDelSuccess( cStrangeName )
+ hSaveLoadDelSuccess( cStrangeName )
kontext "active"
if( active.exists() ) then
@@ -78,17 +72,17 @@ testcase tSaveLoadDelFilesCJK()
printlog( active.gettext() )
active.ok()
endif
-
+
+ printlog( "Delete the file" )
hDeleteFile( hGetWorkPath() & cStrangeName )
+ printlog( "Close navigator, if it exists" )
hCloseNavigator()
-
next iCounter
printlog( "Close the document" )
- brc = hDestroyDocument()
-
+ hDestroyDocument()
endcase
diff --git a/testautomation/framework/optional/includes/filedlg_filternames.inc b/testautomation/framework/optional/includes/filedlg_filternames.inc
index ce0b723..e524f40 100755
--- a/testautomation/framework/optional/includes/filedlg_filternames.inc
+++ b/testautomation/framework/optional/includes/filedlg_filternames.inc
@@ -39,6 +39,7 @@
testcase tVerifyFilterNames
+ printlog( "Verify filternames listed in the file open dialog" )
if ( gIsoLang <> "en-US" ) then
qaerrorlog( "No testing for non-US languages" )
@@ -77,12 +78,14 @@ testcase tVerifyFilterNames
dim cFileOut as string
cFileOut = hGetWorkPath() & cFile
-
+ printlog( "Create a new document" )
hCreateDocument()
+ printlog( "Open the File Open dialog" )
FileOpen
Kontext "OeffnenDlg"
+ printlog( "Read the filterlist (en_US only), compare against a reference" )
if ( OeffnenDlg.exists( 1 ) ) then
iFilterCount = DateiTyp.getItemCount()
@@ -101,7 +104,7 @@ testcase tVerifyFilterNames
try
asFilterNames( iCurrentItem ) = DateiTyp.getItemText( iCurrentItem )
catch
- printlog( "Test broke at pos: " & iCurrentItem )
+ printlog( "Problem encountered at pos: " & iCurrentItem )
endcatch
next iCurrentItem
@@ -113,7 +116,8 @@ testcase tVerifyFilterNames
else
warnlog( "File Open dialog not present." )
endif
-
+
+ printlog( "Close the document" )
hDestroyDocument()
if ( iErr <> 0 ) then
diff --git a/testautomation/framework/optional/includes/filedlg_multiselection.inc b/testautomation/framework/optional/includes/filedlg_multiselection.inc
index d95ae9e..00deab8 100755
--- a/testautomation/framework/optional/includes/filedlg_multiselection.inc
+++ b/testautomation/framework/optional/includes/filedlg_multiselection.inc
@@ -157,7 +157,8 @@ testcase tFiledlgMultiselection1()
wend
if ( iCurrentTime > 120000 ) then
- warnlog( "#i105289# Slow loading of files, should be less than 120 seconds on all platforms" )
+ 'Closed issue: qaerrorlog( "#i105289# Slow loading of files, should be less than 120 seconds on all platforms" )
+ printlog( "Slow file loading (exceeds 120 seconds)" )
endif
lWait = getSystemTicks - lTime ' time diff
diff --git a/testautomation/framework/optional/includes/filedlg_reserved_names_unix.inc b/testautomation/framework/optional/includes/filedlg_reserved_names_unix.inc
index a414101..e84eff3 100755
--- a/testautomation/framework/optional/includes/filedlg_reserved_names_unix.inc
+++ b/testautomation/framework/optional/includes/filedlg_reserved_names_unix.inc
@@ -39,9 +39,10 @@
testcase tSaveReservedNamesUNIX()
+ printlog( "Names that are reserved on WINDOWS but are OK on UNIX" )
if ( gPlatGroup = "w95" ) then
- printlog( "Test not relevant for Unix(like)"
+ printlog( "Test not relevant for Windows/DOS family of OSes" )
goto endsub
endif
@@ -53,7 +54,6 @@ testcase tSaveReservedNamesUNIX()
printlog( "" )
printlog( "Document Type is: " & hNumericDocType( iCurrentDocType ) )
- printlog( "Names that are reserved on WINDOWS but are OK on UNIX" )
irc = hSaveLoadDelSuccess( "NUL" , true )
if ( irc <> 0 ) then warnlog( "failed" )
diff --git a/testautomation/framework/optional/includes/security_macrosecurity.inc b/testautomation/framework/optional/includes/security_macrosecurity.inc
index 4c69aa0..c9083ff 100755
--- a/testautomation/framework/optional/includes/security_macrosecurity.inc
+++ b/testautomation/framework/optional/includes/security_macrosecurity.inc
@@ -56,6 +56,7 @@ end sub
testcase tMacroSecurityLevels( cFileFormat )
+ printlog( "Check macro execution behavior for all macro security levels" )
dim cWorkFile as string
cWorkFile = gTesttoolPath & "framework\optional\input\BasicDocs\"
@@ -80,18 +81,23 @@ testcase tMacroSecurityLevels( cFileFormat )
' |---------------------------------------------------------|
' *) Covered by test "f_sec_trusted_path.bas"
+ printlog( "Load a document with macro for each of the four security levels" )
for iSecLevel = 0 to 3
- printlog( "" )
+ printlog( "Set macro security level to " & iSecLevel )
hSetMacroSecurityAPI( iSecLevel )
- FileOpen( "URL", cWorkFile, "FrameName", "_default" )
+
+ printlog( "Load document..." )
+ hFileOpen( cWorkFile )
+
+ printlog( "Check security level dependent behavior" )
select case iSecLevel
case 0 : brc = hIdentifyExecutedMacro()
if ( not brc ) then
if ( gApplication = "MATH" ) then
qaerrorlog( "#i68291# Math document forgets eventbinding" )
else
- qaerrorlog( "#i53711# Macro was not found/executed" )
+ warnlog( "#i53711# Macro was not found/executed" )
endif
endif
@@ -104,8 +110,7 @@ testcase tMacroSecurityLevels( cFileFormat )
if ( gApplication = "MATH" ) then
qaerrorlog( "#i68291# Math document forgets eventbinding" )
else
- qaerrorlog( "#i53711# Macro was not found/executed" )
- 'warnlog( "#i65885# - CWS Warnings01/Macro not executed on load" )
+ warnlog( "#i53711# Macro was not found/executed" )
endif
endif
@@ -125,10 +130,12 @@ testcase tMacroSecurityLevels( cFileFormat )
endif
end select
+ printlog( "Close document" )
brc = hDestroyDocument()
next iSecLevel
+ printlog( "Reset security level to default" )
hSetMacroSecurityAPI( GC_MACRO_SECURITY_LEVEL_DEFAULT )
endcase
diff --git a/testautomation/framework/required/f_first.bas b/testautomation/framework/required/f_first.bas
index a661ed5..6f9ed93 100755
--- a/testautomation/framework/required/f_first.bas
+++ b/testautomation/framework/required/f_first.bas
@@ -39,7 +39,6 @@
sub main
-
' Disable sleep() calls. If you encounter unexpected test interruptions
' you should try to outcomment this or set the value to FALSE.
GLOBAL_USE_NEW_SLEEP = TRUE
@@ -58,22 +57,16 @@ sub main
gApplication = "WRITER"
call tToolsOptionsTestFirst
- call tToolsOptionsImprovementProgram
call tDatabaseCheck
call tHelpRegistration
call hStatusOut
-
end sub
'*******************************************************************************
sub LoadIncludeFiles
-
use "global\system\includes\master.inc"
use "global\system\includes\gvariabl.inc"
-
- use "global\required\includes\g_option.inc"
-
use "global\tools\includes\optional\t_ui_filters.inc"
use "global\tools\includes\optional\t_filetools.inc"
use "global\tools\includes\optional\t_docfuncs.inc"
@@ -81,8 +74,5 @@ sub LoadIncludeFiles
gApplication = "WRITER"
call GetUseFiles()
-
end sub
-'-------------------------------------------------------------------------
-
diff --git a/testautomation/framework/required/includes/basic_dialog_export.inc b/testautomation/framework/required/includes/basic_dialog_export.inc
index 251efa7..5999dec 100755
--- a/testautomation/framework/required/includes/basic_dialog_export.inc
+++ b/testautomation/framework/required/includes/basic_dialog_export.inc
@@ -66,7 +66,7 @@ testcase tUpdtDialogExport
hDestroyDocument()
goto endsub
endif
-
+ sleep(1)
printlog( "Click the Export button on the DialogBar" )
kontext "DialogBar"
Export.click()
diff --git a/testautomation/framework/required/includes/basic_dialog_i18n.inc b/testautomation/framework/required/includes/basic_dialog_i18n.inc
index 4947b72..5ac437e 100755
--- a/testautomation/framework/required/includes/basic_dialog_i18n.inc
+++ b/testautomation/framework/required/includes/basic_dialog_i18n.inc
@@ -54,6 +54,7 @@ testcase tUpdtBasicDialogI18n
printlog( "Click Manage Languages on ToolsCollectionBar")
kontext "ToolsCollectionBar"
+ sleep(1)
if ( ToolsCollectionBar.exists() ) then
ManageLanguage.click()
else
@@ -106,7 +107,7 @@ testcase tUpdtBasicDialogI18n
printlog( "Back on Manage UI Languages Dialog, delete selected language")
kontext "ManageUILanguages"
Delete.click()
-
+ sleep(1)
printlog( "Confirm delete")
kontext "active"
if ( Active.exists( 1 ) ) then
diff --git a/testautomation/framework/required/includes/basic_dialog_i18n_import.inc b/testautomation/framework/required/includes/basic_dialog_i18n_import.inc
index 8c26ab0..b1567c8 100755
--- a/testautomation/framework/required/includes/basic_dialog_i18n_import.inc
+++ b/testautomation/framework/required/includes/basic_dialog_i18n_import.inc
@@ -82,7 +82,7 @@ testcase tBasicDialogI18nImport
printlog( "Accept with yes" )
Active.Yes()
-
+ sleep(1)
Kontext "TranslationBar"
if ( TranslationBar.exists() ) then
diff --git a/testautomation/framework/required/includes/wizard_documentconverter.inc b/testautomation/framework/required/includes/wizard_documentconverter.inc
index 6749601..90b7404 100755
--- a/testautomation/framework/required/includes/wizard_documentconverter.inc
+++ b/testautomation/framework/required/includes/wizard_documentconverter.inc
@@ -46,7 +46,6 @@ testcase tUpdtWizardDocumentConverter
dim iDialog as integer
dim iDocumentType as integer
dim iWait as integer
- dim sKeys as string
dim sSourcePathWriter as string
sSourcePathWriter = gTesttoolpath & "framework\required\input\document_converter\"
sSourcePathWriter = convertpath( sSourcePathWriter )
@@ -132,12 +131,14 @@ testcase tUpdtWizardDocumentConverter
Kontext "DocumentConverter"
printlog( "Page 7" )
- sKeys = hGetAccel( "DocumentConverter_ShowLog" )
qaerrorlog( "#i54265# Show Logfile button has no HID, using accelerator instead" )
iWait = 0
do while ( DocumentConverter.exists() )
- DocumentConverter.TypeKeys( sKeys )
+ try
+ ContinueButton.click()
+ catch
+ endcatch
Wait( 1 )
iWait = iWait + 1
if ( iWait = 20000 ) then
diff --git a/testautomation/global/required/includes/g_customize.inc b/testautomation/global/required/includes/g_customize.inc
index 29b6dec..733f502 100644
--- a/testautomation/global/required/includes/g_customize.inc
+++ b/testautomation/global/required/includes/g_customize.inc
@@ -108,6 +108,7 @@ testcase tToolsCustomize
Kontext "TabCustomizeMenu"
'/// Click button 'Command' ///'
+ sleep(1)
Command.click
printlog "opened second one"
WaitSlot()
@@ -123,6 +124,7 @@ testcase tToolsCustomize
WaitSlot()
Kontext "TabCustomizeMenu"
'/// Click button 'Command' ///'
+ sleep(1)
Command.click
printlog "opened third one"
WaitSlot()
@@ -192,8 +194,10 @@ testcase tToolsCustomize
waitslot
Kontext "TabCustomizeToolbars"
+ sleep(1)
'/// Click button 'Command' ///'
Command.click
+ waitslot
'/// Select the firste entry 'Rename' ///'
hMenuSelectNr(1)
'/// Dialog 'Name' comes up ///'
@@ -206,7 +210,9 @@ testcase tToolsCustomize
endif
Kontext "TabCustomizeToolbars"
+ sleep(1)
Command.click
+ waitslot
hMenuSelectNr(1)
Kontext "CustomizeToolbarsReName"
call DialogTest (CustomizeToolbarsReName)
@@ -217,7 +223,9 @@ testcase tToolsCustomize
waitslot
Kontext "TabCustomizeToolbars"
'/// Click button 'Command' ///'
+ sleep(1)
Command.click
+ waitslot
'/// Select the fifth entry 'Change Icon' ///'
hMenuSelectNr(5)
'/// Dialog 'Change Icon' comes up ///'
@@ -252,6 +260,7 @@ testcase tToolsCustomize
WaitSlot()
Kontext "TabCustomizeToolbars"
'/// On Tab Page 'Customize Menus' click on Button 'Toolbar' ///'
+ sleep(1)
MenuBtn.openMenu
WaitSlot()
hMenuSelectNr(1)
diff --git a/testautomation/global/required/includes/g_option.inc b/testautomation/global/required/includes/g_option.inc
index 515f37a..d590016 100755
--- a/testautomation/global/required/includes/g_option.inc
+++ b/testautomation/global/required/includes/g_option.inc
@@ -699,6 +699,12 @@ testcase tToolsOptionsImprovementProgram
printlog( "Update test for the tools/options dialog of the OOo Improvement Program" )
+ if (gOOO AND NOT gOOoImprovementIsEnabled) then
+ 'In StarOffice this test should always work - but on OOo contributet builds the function is not available - only on OOo builds provided by Sun Microsystems
+ qaErrorlog ("This build does not participate in the OOo Improvement Program - test exit")
+ goto endsub
+ endif
+
dim cLogFile as string
cLogFile = gOfficePath & "user\temp\feedback\Current.csv"
cLogFile = convertpath( cLogFile )
diff --git a/testautomation/global/tools/includes/optional/t_filetools.inc b/testautomation/global/tools/includes/optional/t_filetools.inc
index a18319c..26316b4 100755
--- a/testautomation/global/tools/includes/optional/t_filetools.inc
+++ b/testautomation/global/tools/includes/optional/t_filetools.inc
@@ -149,22 +149,40 @@ function hHandleActivesOnLoad( iTries as integer , iAdd as integer ) as boolean
kontext "Active"
if ( Active.exists( 1 ) ) then
if ( Active.getButtonCount() = 2 ) then
- printlog( CFN & "Probably the dreaded <File corrupted warning>" )
+ printlog( CFN & "This is either the file corruption warning or the" & _
+ " <update links> dialog, the resource used is identical." )
+ 'printlog( "#105670# - File corruption warning" )
+ printlog( Active.getText() )
+ printlog( "Resource type: " & Active.getRT() )
active.yes()
hFileWait( FALSE )
kontext "Active"
- if ( Active.exists( 2 ) ) then
- qaerrorlog( CFN & "Trying to recover." )
+ if ( Active.exists() ) then
+ printlog( "Found another dialog:" )
+ printlog( Active.getText() )
+ printlog( "Resource: " & Active.getRT() )
Active.ok()
hHandleActivesOnLoad() = FALSE
exit function
endif
- warnlog( "#105670# - File corruption warning, the template is broken" )
+
endif
endif
- qaerrorlog( "Problem while trying to handle messageboxes" )
- hHandleActivesOnLoad() = false
+ kontext "Active"
+ if ( Active.exists() ) then
+ printlog( "Found another dialog:" )
+ printlog( Active.getText() )
+ printlog( "Resource: " & Active.getRT() )
+ try
+ active.no()
+ catch
+ active.click( 202 )
+ endcatch
+ endif
+
+' qaerrorlog( "Problem while trying to handle messageboxes" )
+' hHandleActivesOnLoad() = false
endcatch
next iTry
diff --git a/testautomation/graphics/optional/g_insert.bas b/testautomation/graphics/optional/g_insert.bas
index 92067c3..62d8422 100755
--- a/testautomation/graphics/optional/g_insert.bas
+++ b/testautomation/graphics/optional/g_insert.bas
@@ -60,7 +60,6 @@ sub main
Call tInsertSpreadsheet
Call tInsertGraphics
Call tInsertObjectPlugIn ' Doesn't exist in the VCL
- Call tInsertObjectApplet
Call tInsertObjectFormula ' Is in the VCL in InsertObjectOLEObject
Call tInsertChart
Call tdInsertFile
@@ -82,7 +81,6 @@ sub main
Call tInsertSpreadsheet
Call tInsertGraphics
Call tInsertObjectPlugIn ' Doesn't exist in the VCL
- Call tInsertObjectApplet
Call tInsertObjectFormula ' Is in the VCL in InsertObjectOLEObject
' Call tInsertChart
Call tdInsertFile
diff --git a/testautomation/graphics/optional/includes/global/export_graphic_2.inc b/testautomation/graphics/optional/includes/global/export_graphic_2.inc
index c39e12f..e6eaa35 100755
--- a/testautomation/graphics/optional/includes/global/export_graphic_2.inc
+++ b/testautomation/graphics/optional/includes/global/export_graphic_2.inc
@@ -519,7 +519,7 @@ testcase tPDF_Creator
gApplication = "WRITER"
sleep 5 ' wait for document to be loaded
' /Creator
- bTemp = hFindeImDokument ("<</Creator<",true)
+ bTemp = hFindeImDokument ("<</Creator<",true,true)
if (bTemp = TRUE) then
Printlog "OK"
else
@@ -569,22 +569,7 @@ testcase tPDF_Creator
endif
endif
endif
- ' /CreationDate (
- bTemp = hFindeImDokument ("/CreationDate(")
- if (bTemp = TRUE) then
- Printlog "OK"
- else
- warnlog " /CreationDate not found in pdf file :-("
- endif
- hTypeKeys("<left><right><shift end>")
- editcopy
- sTemp = getClipboardText()
- sTemp = left(sTemp, inStr(sTemp, ")")-1)
- printlog sTemp + " -- " + len(sTemp)
- iCreatorOffset = iCreatorOffset + (len(sTemp) - 23)
- if (len(sTemp) <> 23) then
- warnlog "Date is longer than expected; is: '" + sTemp2 + "'"
- endif
+
gApplication = sApp
call hCloseDocument
call hCloseDocument
@@ -657,7 +642,7 @@ endcase 'tSVG
'-------------------------------------------------------------------------------
testcase tBMP
-qaerrorlog
+
dim x as integer
dim i as integer
dim bTemp as boolean
@@ -785,7 +770,7 @@ qaerrorlog
else
warnlog "File didn't get saved :-("
endif
-
+ hCloseDocument ()
sleep 5
hNewDocument()
sleep 5
@@ -867,7 +852,7 @@ qaerrorlog
call hCloseDocument
-endcase
+endcase 'tBMP
'-------------------------------------------------------------------------------
testcase tEMF
diff --git a/testautomation/graphics/optional/includes/global/g_insert.inc b/testautomation/graphics/optional/includes/global/g_insert.inc
index 87689a7..2447495 100755
--- a/testautomation/graphics/optional/includes/global/g_insert.inc
+++ b/testautomation/graphics/optional/includes/global/g_insert.inc
@@ -35,19 +35,6 @@
'*
'* short description :
'*
-'**************************************************************************************
-' #1 tInsertFloatingFrame
-' #1 tInsertFields
-' #1 tdInsertObjectOleObjects
-' #1 tdInsertSnapPoint_Line
-' #1 tInsertSpecialCharacter
-' #1 tInsertSpreadsheet
-' #1 tInsertGraphics
-' #1 tInsertObjectPlugIn
-' #1 tInsertObjectApplet
-' #1 tInsertObjectFormula
-' #1 tInsertChart
-' #1 tdInsertFile
'\*************************************************************************************
testcase tdInsertObjectOleObjects
@@ -743,48 +730,7 @@ testcase tInsertGraphics
endcase 'tInsertGraphics
'-------------------------------------------------------------------------------
-testcase tInsertObjectApplet
- printlog " open application "
- Call hNewDocument
- printlog " Insert->Object->Applet "
- sleep 1
- InsertObjectApplet
- Kontext "AppletEinfuegen"
- printlog " press button 'Search' "
- sleep 2
- Suchen.Click
- Kontext "OeffnenDlg"
- printlog " set filename to 'global\\input\\java\\rocket.class' "
- Dateiname.SetText ConvertPath (gTesttoolPath + "global\input\java\Clock.class")
- printlog " close dialog 'Open' by pressing 'Open' "
- sleep 2
- Oeffnen.Click
- Kontext "AppletEinfuegen"
- printlog " close dialog 'Insert Applet' by pressing OK "
- sleep 2
- AppletEinfuegen.OK
- sleep 3
- printlog " deselect object by typing key [Escape] "
- hTypeKeys ("<Escape>")
- sleep 3
- try
- printlog " Edit->Select All "
- EditSelectAll
- printlog " delete object by typing key [Delete] "
- sleep 3
- hTypeKeys "<DELETE>"
- catch
- Warnlog "Delete did not work, maybe some error while creating the object before"
- endcatch
- sleep 1
- ' gMouseclick 70,70
- printlog " close application "
- Call hCloseDocument
-
-endcase 'tInsertObjectApplet
-
-'-------------------------------------------------------------------------------
testcase tInsertObjectFormula
printlog " open application "
diff --git a/testautomation/graphics/optional/includes/global/g_spellcheck.inc b/testautomation/graphics/optional/includes/global/g_spellcheck.inc
index c2ab184..cb3b2f9 100755
--- a/testautomation/graphics/optional/includes/global/g_spellcheck.inc
+++ b/testautomation/graphics/optional/includes/global/g_spellcheck.inc
@@ -190,7 +190,7 @@ testcase tiToolsSpellcheckError
ToolsOptions
Kontext "ExtrasOptionenDlg"
hToolsOptions("LANGUAGESETTINGS","Languages")
- Westlich.Select 32
+ Westlich.Select 34
Kontext "ExtrasOptionenDlg"
ExtrasOptionenDlg.OK
printlog "Create 1 textbox with 1 spelling error (test replace always)"
@@ -489,16 +489,6 @@ testcase tiToolsSpellcheckCheck
goto endsub
end if
Kontext "Spellcheck"
- printlog "Save the current Dictionary Language."
- s = DictionaryLanguage.GetSelIndex
- for i= 1 to DictionaryLanguage.GetItemCount
- DictionaryLanguage.Select i
- sleep 1
- printlog "Dictionary language is: # "+i+": "+DictionaryLanguage.GetSelText
- next i
- iWord(1) = 1
- iWord(2) = 2
- DictionaryLanguage.Select s
printlog "Close dialog 'Spellcheck'."
Spellcheck.Close
Kontext "Active"
diff --git a/testautomation/graphics/optional/includes/global/g_tables.inc b/testautomation/graphics/optional/includes/global/g_tables.inc
index 6b64796..99b5a84 100755
--- a/testautomation/graphics/optional/includes/global/g_tables.inc
+++ b/testautomation/graphics/optional/includes/global/g_tables.inc
@@ -59,11 +59,11 @@ testcase tiInsertTableUsingMenu
if (UCase(gApplication)) = "IMPRESS" then
DocumentImpress.UseMenu
hMenuSelectNr(4)
- hMenuSelectNr(13)
+ hMenuSelectNr(14)
else
DocumentDraw.UseMenu
hMenuSelectNr(4)
- hMenuSelectNr(10)
+ hMenuSelectNr(11)
endif
@@ -222,11 +222,11 @@ testcase tiTableObjectBar
if (UCase(gApplication)) = "IMPRESS" then
DocumentImpress.UseMenu
hMenuSelectNr(4)
- hMenuSelectNr(13)
+ hMenuSelectNr(14)
else
DocumentDraw.UseMenu
hMenuSelectNr(4)
- hMenuSelectNr(10)
+ hMenuSelectNr(11)
endif
Kontext "InsertTableImpress"
diff --git a/testautomation/graphics/optional/includes/global/g_tools.inc b/testautomation/graphics/optional/includes/global/g_tools.inc
index 1e58bda..7602dc9 100755
--- a/testautomation/graphics/optional/includes/global/g_tools.inc
+++ b/testautomation/graphics/optional/includes/global/g_tools.inc
@@ -126,7 +126,7 @@ testcase tiToolsThesaurus
ToolsOptions
Kontext "ExtrasOptionenDlg"
hToolsOptions("LANGUAGESETTINGS","Languages")
-Westlich.Select 32
+Westlich.Select 34
Kontext "ExtrasOptionenDlg"
ExtrasOptionenDlg.OK
sleep 1
diff --git a/testautomation/graphics/optional/includes/impress/i_us_present.inc b/testautomation/graphics/optional/includes/impress/i_us_present.inc
index 6b95ef9..c2c7451 100755
--- a/testautomation/graphics/optional/includes/impress/i_us_present.inc
+++ b/testautomation/graphics/optional/includes/impress/i_us_present.inc
@@ -233,9 +233,10 @@ testcase i_us_presentation2
printlog " Did the 'mistake' to FadeIn/Out the Slidepane"
- '/// Make a Mouse Double-Click on the left part of the Layout, to input a picture ///'
+ printlog "activating the input picture area"
kontext "DocumentImpress"
- DocumentImpress.MouseDoubleClick 30,50
+ DocumentImpress.TypeKeys "<TAB>",2
+ DocumentImpress.TypeKeys "<RETURN>"
sleep (1)
'/// Graphics-Import-dialogue. Select "i_us_large.jpg" ///'
diff --git a/testautomation/spreadsheet/required/includes/c_upd_editmenu2.inc b/testautomation/spreadsheet/required/includes/c_upd_editmenu2.inc
index 1220b28..b062973 100755
--- a/testautomation/spreadsheet/required/includes/c_upd_editmenu2.inc
+++ b/testautomation/spreadsheet/required/includes/c_upd_editmenu2.inc
@@ -590,7 +590,7 @@ testcase tEditImageMap
Aktiv.Click
'/// Click on 'Macro...'-button
printlog " Click on 'Macro...'-button"
- warnlog "Due to #i102720# this functionality is outcommented"
+ QaErrorLog "Due to #i102720# this functionality is outcommented"
' Makro.Click
' Kontext "MakroZuweisen"
' Call DialogTest ( MakroZuweisen )
diff --git a/testautomation/writer/optional/includes/clipboard/w_216_.inc b/testautomation/writer/optional/includes/clipboard/w_216_.inc
index d285a3e..e798e27 100755
--- a/testautomation/writer/optional/includes/clipboard/w_216_.inc
+++ b/testautomation/writer/optional/includes/clipboard/w_216_.inc
@@ -58,6 +58,9 @@ testcase HTMLToWRITERText
printlog " Copy selected text "
Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html",false)
Call sMakeReadOnlyDocumentEditable
+ if GetDocumentCount() = 2 then
+ QAErrorlog "#i104365#read only document remains opened"
+ endif
sleep (3)
printlog " Jump to beginning of document "
Call wTypeKeys "<Mod1 Home>"
@@ -112,7 +115,9 @@ testcase HTMLToWRITERText
goto endsub
end if
printlog " Close saved document "
- Call hCloseDocument
+ Do Until GetDocumentCount() = 0
+ Call hCloseDocument
+ Loop
endcase
' ----------------------------------------------------------------------------------------------
@@ -125,6 +130,9 @@ testcase HTMLToWRITERField
printlog " Copy selected text "
Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html")
Call sMakeReadOnlyDocumentEditable
+ if GetDocumentCount() = 2 then
+ QAErrorlog "#i104365#read only document remains opened"
+ endif
printlog " Jump to beginning of document "
Call wTypeKeys "<Mod1 Home>"
Call wTypeKeys "<Down>",2
@@ -177,7 +185,9 @@ testcase HTMLToWRITERField
goto endsub
end if
printlog " Close saved document "
- Call hCloseDocument
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
endcase
' ----------------------------------------------------------------------------------------------
@@ -190,6 +200,9 @@ testcase HTMLToWRITERTable
printlog " Copy selected table "
Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html",false)
Call sMakeReadOnlyDocumentEditable
+ if GetDocumentCount() = 2 then
+ QAErrorlog "#i104365#read only document remains opened"
+ endif
printlog " Jump to beginning of document "
Call wTypeKeys "<Mod1 Home>"
Call wTypeKeys "<Down>",5
@@ -242,7 +255,9 @@ testcase HTMLToWRITERTable
goto endsub
end if
printlog " Close saved document "
- Call hCloseDocument
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
endcase
' ----------------------------------------------------------------------------------------------
@@ -255,6 +270,9 @@ testcase HTMLToWRITERGraphicLinked
printlog " Copy selected Linked Graphic "
Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html",false)
Call sMakeReadOnlyDocumentEditable
+ if GetDocumentCount() = 2 then
+ QAErrorlog "#i104365#read only document remains opened"
+ endif
printlog " Jump to beginning of document "
Call wTypeKeys "<Mod1 Home>"
Call wTypeKeys ( "<Shift F4>" )
@@ -296,7 +314,9 @@ testcase HTMLToWRITERGraphicLinked
goto endsub
end if
printlog " Close saved document "
- Call hCloseDocument
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
endcase
' ----------------------------------------------------------------------------------------------
@@ -309,6 +329,9 @@ testcase HTMLToWRITERControl
printlog " Copy selected Control "
Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html",false)
Call sMakeReadOnlyDocumentEditable
+ if GetDocumentCount() = 2 then
+ QAErrorlog "#i104365#read only document remains opened"
+ endif
printlog " Jump to beginning of document "
Call wTypeKeys "<Mod1 Home>"
Call wTypeKeys ( "<Shift F4>" )
@@ -351,7 +374,9 @@ testcase HTMLToWRITERControl
goto endsub
end if
printlog " Close saved document "
- Call hCloseDocument
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
endcase
' ----------------------------------------------------------------------------------------------
@@ -364,6 +389,9 @@ testcase HTMLToWRITERFloatingFrame
printlog " Copy selected Floating Frame "
Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html",false)
Call sMakeReadOnlyDocumentEditable
+ if GetDocumentCount() = 2 then
+ QAErrorlog "#i104365#read only document remains opened"
+ endif
printlog " Jump to beginning of document "
Call wTypeKeys "<Mod1 Home>"
Call wTypeKeys ( "<Shift F4>" )
@@ -412,5 +440,7 @@ testcase HTMLToWRITERFloatingFrame
goto endsub
end if
printlog " Close saved document "
- Call hCloseDocument
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
endcase
diff --git a/testautomation/writer/optional/includes/formatcharacter/w_format_character1.inc b/testautomation/writer/optional/includes/formatcharacter/w_format_character1.inc
index 20b8f62..0f1d3b2 100755
--- a/testautomation/writer/optional/includes/formatcharacter/w_format_character1.inc
+++ b/testautomation/writer/optional/includes/formatcharacter/w_format_character1.inc
@@ -234,11 +234,11 @@ testcase tFormatCharacter3
Kontext
active.SetPage TabHyperlinkZeichen
kontext "TabHyperlinkZeichen"
- if URLName.GetText <> "http://www.mikeportnoy.com/" then Warnlog "#i41171#Wrong URL : " + URLName.GetText
+ if URLName.GetText <> "http://www.mikeportnoy.com/" then QAErrorlog "#i105855#Wrong URL : " + URLName.GetText
SetClipboard UrlName.Gettext
- if NameText.GetText <> "A hyperlink with testtool" then Warnlog "Wrong Linkname : " + NameText.GetText
- if TargetFrame.GetSelIndex <> 2 then Warnlog "Wrong Target selected : " + TargetFrame.GetSelText
- if UnbesuchterLink.GetSelIndex <> vLink then Warnlog "Wrong Style for unused Link :" + UnbesuchterLink.GetSelIndex
+ if NameText.GetText <> "A hyperlink with testtool" then QAErrorlog "#i105855#Wrong Linkname : " + NameText.GetText
+ if TargetFrame.GetSelIndex <> 2 then QAErrorlog "#i105855#Wrong Target selected : " + TargetFrame.GetSelText
+ if UnbesuchterLink.GetSelIndex <> vLink then QAErrorlog "#i105855#Wrong Style for unused Link :" + UnbesuchterLink.GetSelIndex
TabHyperlinkZeichen.OK
if gApplication = "WRITER" then
@@ -292,9 +292,9 @@ testcase tFormatCharacter3
Kontext
active.SetPage TabHyperlinkZeichen
kontext "TabHyperlinkZeichen"
- if URLName.GetText <> "http://www.mikeportnoy.com/" then Warnlog "#i41171#Wrong URL : " + URLName.GetText
- if NameText.GetText <> "A hyperlink with testtool" then Warnlog "Wrong Linkname : " + NameText.GetText
- if TargetFrame.GetSelIndex <> 2 then Warnlog "Wrong Target selected : " + TargetFrame.GetSelText
+ if URLName.GetText <> "http://www.mikeportnoy.com/" then QAErrorlog "#i105855#Wrong URL : " + URLName.GetText
+ if NameText.GetText <> "A hyperlink with testtool" then QAErrorlog "#i105855#Wrong Linkname : " + NameText.GetText
+ if TargetFrame.GetSelIndex <> 2 then QAErrorlog "#i105855#Wrong Target selected : " + TargetFrame.GetSelText
TabHyperlinkZeichen.OK
'/// Close document ///
Call hCloseDocument
@@ -579,11 +579,11 @@ testcase tFormatCharacter
Kontext
active.SetPage TabHyperlinkZeichen
kontext "TabHyperlinkZeichen"
- if URLName.GetText <> "http://www.mikeportnoy.com/" then Warnlog "Wrong URL : " + URLName.GetText + " (#BugID:90982)"
+ if URLName.GetText <> "http://www.mikeportnoy.com/" then QAErrorlog "#i105855#Wrong URL : " + URLName.GetText
SetClipboard UrlName.Gettext
- if NameText.GetText <> "Ein Link mit dem Testtool" then Warnlog "Wrong Linkname : " + NameText.GetText
- if TargetFrame.GetSelIndex <> 2 then Warnlog "Wrong Target selected : " + TargetFrame.GetSelText
- if UnbesuchterLink.GetSelIndex <> 6 then Warnlog "Wrong Style for unused Link :" + UnbesuchterLink.GetSelIndex
+ if NameText.GetText <> "Ein Link mit dem Testtool" then QAErrorlog "#i105855#Wrong Linkname : " + NameText.GetText
+ if TargetFrame.GetSelIndex <> 2 then QAErrorlog "#i105855#Wrong Target selected : " + TargetFrame.GetSelText
+ if UnbesuchterLink.GetSelIndex <> 6 then QAErrorlog "#i105855#Wrong Style for unused Link :" + UnbesuchterLink.GetSelIndex
TabHyperlinkZeichen.OK
if gApplication = "WRITER" then
@@ -638,9 +638,9 @@ testcase tFormatCharacter
Kontext
active.SetPage TabHyperlinkZeichen
kontext "TabHyperlinkZeichen"
- if URLName.GetText <> "http://www.mikeportnoy.com/" then Warnlog "Wrong URL : " + URLName.GetText
- if NameText.GetText <> "Ein Link mit dem Testtool" then Warnlog "Wrong Linkname : " + NameText.GetText
- if TargetFrame.GetSelIndex <> 2 then Warnlog "Wrong Target selected : " + TargetFrame.GetSelText
+ if URLName.GetText <> "http://www.mikeportnoy.com/" then QAErrorlog "#i105855#Wrong URL : " + URLName.GetText
+ if NameText.GetText <> "Ein Link mit dem Testtool" then QAErrorlog "#i105855#Wrong Linkname : " + NameText.GetText
+ if TargetFrame.GetSelIndex <> 2 then QAErrorlog "#i105855#Wrong Target selected : " + TargetFrame.GetSelText
TabHyperlinkZeichen.OK
'/// Close document ///
Call hCloseDocument
diff --git a/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph1.inc b/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph1.inc
index cdd4bc0..73cfed5 100755
--- a/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph1.inc
+++ b/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph1.inc
@@ -1162,58 +1162,59 @@ endcase
testcase tParagraphIndent17
- Dim sTestFile1 as String
- Dim sTestFile2 as String
-
- sTestFile1 = Convertpath (gTesttoolpath + "writer\optional\input\formatparagraph\AddSpacingShouldCheck.doc")
- sTestFile2 = Convertpath (gTesttoolpath + "writer\optional\input\formatparagraph\AddSpacingShouldNotCheck.doc")
-
- PrintLog "- Test 'Add spacing between paragarph and talbes' when importing from MS-Word"
- '/// <b>Test 'Add spacing between paragarph and talbes' when importing from MS-Word</b>
-
- Call hNewDocument
-
- '/// 1.Open the test file - AddSpacingShouldCheck.doc
- '/// In Tools/Optionis/Text Document/Compatibility,
- '/// + the 'Add spacing between paragarph and talbes'
- '/// + should be checked
- Call hFileOpen(sTestFile1)
- Call sMakeReadOnlyDocumentEditable
-
- ToolsOptions
- Call hToolsOptions("WRITER","COMPATIBILITY")
- Kontext "TabCompatibility"
- Sleep 2
- Options.TypeKeys "<Down>"
- if Options.IsChecked <> TRUE then
- warnlog "'Add spacing between paragarph and talbes' should be checked"
- end if
- Kontext "ExtrasOptionenDlg"
- ExtrasOptionenDlg.OK
-
- Call hCloseDocument
-
- Call hNewDocument
-
- '/// 2.Open the test file - AddSpacingShouldNotCheck.doc
- '/// In Tools/Optionis/Text Document/Compatibility,
- '/// + the 'Add spacing between paragarph and talbes'
- '/// + should NOT be checked
- Call hFileOpen(sTestFile2)
- Call sMakeReadOnlyDocumentEditable
-
- ToolsOptions
- Call hToolsOptions("WRITER","COMPATIBILITY")
- Kontext "TabCompatibility"
- Sleep 2
- Options.TypeKeys "<Down>"
- if Options.IsChecked = TRUE then
- warnlog "'Add spacing between paragarph and talbes' should NOT be checked"
- end if
- Kontext "ExtrasOptionenDlg"
- ExtrasOptionenDlg.OK
-
- Call hCloseDocument
+ Dim sTestFile1 as String
+ Dim sTestFile2 as String
+
+ sTestFile1 = Convertpath (gTesttoolpath + "writer\optional\input\formatparagraph\AddSpacingShouldCheck.doc")
+ sTestFile2 = Convertpath (gTesttoolpath + "writer\optional\input\formatparagraph\AddSpacingShouldNotCheck.doc")
+
+ PrintLog "- Test 'Add spacing between paragraph and tables' when importing from MS-Word"
+
+ Call hNewDocument
+
+ '/// 1.Open the test file - AddSpacingShouldCheck.doc
+ '/// In Tools/Optionis/Text Document/Compatibility,
+ '/// + the 'Add spacing between paragarph and talbes'
+ '/// + should be checked
+ Call hFileOpen(sTestFile1)
+ Call sMakeReadOnlyDocumentEditable
+
+ ToolsOptions
+ Call hToolsOptions("WRITER","COMPATIBILITY")
+ Kontext "TabCompatibility"
+ Sleep 2
+ Options.TypeKeys "<Down>"
+ if Options.IsChecked <> TRUE then
+ warnlog "'Add spacing between paragarph and talbes' should be checked"
+ end if
+ Kontext "ExtrasOptionenDlg"
+ ExtrasOptionenDlg.OK
+
+ Call hCloseDocument
+
+ Call hNewDocument
+
+ '/// 2.Open the test file - AddSpacingShouldNotCheck.doc
+ '/// In Tools/Optionis/Text Document/Compatibility,
+ '/// + the 'Add spacing between paragarph and talbes'
+ '/// + should NOT be checked
+ Call hFileOpen(sTestFile2)
+ Call sMakeReadOnlyDocumentEditable
+
+ ToolsOptions
+ Call hToolsOptions("WRITER","COMPATIBILITY")
+ Kontext "TabCompatibility"
+ Sleep 2
+ Options.TypeKeys "<Down>"
+ if Options.IsChecked = TRUE then
+ warnlog "'Add spacing between paragarph and talbes' should NOT be checked"
+ end if
+ Kontext "ExtrasOptionenDlg"
+ ExtrasOptionenDlg.OK
+
+ Do Until GetDocumentCount = 0
+ Call hCloseDocument
+ Loop
endcase
diff --git a/testautomation/writer/optional/includes/navigator/w_navigator.inc b/testautomation/writer/optional/includes/navigator/w_navigator.inc
index 21dc8ec..f85c1d8 100755
--- a/testautomation/writer/optional/includes/navigator/w_navigator.inc
+++ b/testautomation/writer/optional/includes/navigator/w_navigator.inc
@@ -217,7 +217,7 @@ endcase
' **********************************************************************
testcase tViewNavigator3
- WarnLog "#i94614# - tViewNavigator3 outcommented"
+ QaErrorlog "#i94614# - tViewNavigator3 outcommented"
goto endsub
Dim NavigationTearOff as boolean
diff --git a/testautomation/writer/optional/includes/undo/w_undo_history_3.inc b/testautomation/writer/optional/includes/undo/w_undo_history_3.inc
index f0e3d89..1dc8668 100755
--- a/testautomation/writer/optional/includes/undo/w_undo_history_3.inc
+++ b/testautomation/writer/optional/includes/undo/w_undo_history_3.inc
@@ -296,23 +296,23 @@ endcase
testcase tUndoNote
'/// <B>Note (Insert/Delete)</B>
- printlog "- Insert Note"
+ printlog "- Insert Comment"
'/// new document
Call hNewDocument
'/// Insert / Note
InsertNoteWriter
- '/// string in Undo-list has to be: "Insert note")
- Call CheckUndoStringInUndoList ( 10, "InsertNote" )
- printlog "- Delete Note"
- '/// Bring up the Navigator, find the entry "Notes", expand it, and select the expanded section.
+ '/// string in Undo-list has to be: "Insert comment")
+ Call CheckUndoStringInUndoList ( 10, "InsertComment" )
+ printlog "- Delete Comment"
+ '/// Bring up the Navigator, find the entry "Comments", expand it, and select the expanded section.
Call wNavigatorAuswahl( 11, 1 )
'/// Enter 'Delete' 'Backspace'
kontext "Navigator"
Navigator.TypeKeys "<DELETE>"
'/// Close the Navigator
ViewNavigator
- '/// string in Undo-list has to be: "Delete: 'This is a note'")
- Call CheckUndoStringInUndoList ( 10, "DeleteNote" )
+ '/// string in Undo-list has to be: "Delete comment")
+ Call CheckUndoStringInUndoList ( 10, "DeleteComment" )
'/// Close document
Call hCloseDocument
diff --git a/testautomation/writer/required/includes/w_004_.inc b/testautomation/writer/required/includes/w_004_.inc
index 8576820..8832285 100755
--- a/testautomation/writer/required/includes/w_004_.inc
+++ b/testautomation/writer/required/includes/w_004_.inc
@@ -55,7 +55,7 @@ sub w_004_
Call tInsertCaption
Call tInsertBookmark
Call tInsertCrossReference
- Call tInsertNote
+ Call tInsertComment
Call tInsertScript
Call tInsertIndexesEntry
Call tInsertIndexesIndex
@@ -479,22 +479,22 @@ endcase
'-----------------------------------------------------------
-testcase tInsertNote
+testcase tInsertComment
dim sNoteText as String
- PrintLog "- Insert / Note"
+ PrintLog "- Insert / Comment"
Call hNewDocument
- printlog " Insert / Note"
+ printlog " Insert / Comment"
InsertNoteWriter
Kontext "DocumentWriter"
- sNoteText = "Testnote inserted by testtool !"
+ sNoteText = "Comment inserted by testtool !"
Call wTypeKeys (sNoteText)
Call wNavigatorAuswahl( 11, 1 )
Kontext "NavigatorWriter"
if Auswahlliste.Gettext <> sNoteText then
- warnlog ("Note was not inserted correctly (Focus problem?")
+ warnlog ("Comment was not inserted correctly (Focus problem?")
end if
printlog " Close active document"
diff --git a/testautomation/writer/tools/includes/w_tools_undo.inc b/testautomation/writer/tools/includes/w_tools_undo.inc
index d896d8d..0189fc1 100644
--- a/testautomation/writer/tools/includes/w_tools_undo.inc
+++ b/testautomation/writer/tools/includes/w_tools_undo.inc
@@ -414,17 +414,17 @@ sub CheckUndoStringInUndoList(vType as integer, optional vShould as string)
Case else: QAErrorlog "Please adapt test for this language: " & UndoStringFromUndoList
end select
- Case "InsertNote"
+ Case "InsertComment"
Select Case iSprache
- Case 01: if UndoStringFromUndoList <> "Insert note" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
- Case 34: if UndoStringFromUndoList <> "Insertar nota" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+ Case 01: if UndoStringFromUndoList <> "Insert comment" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+ Case 34: if UndoStringFromUndoList <> "Insertar commenta" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
Case 86: if UndoStringFromUndoList <> "æ’å…¥ 批注" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
Case else: QAErrorlog "Please adapt test for this language: " & UndoStringFromUndoList
end select
- Case "DeleteNote"
+ Case "DeleteComment"
Select Case iSprache
- Case 01: if UndoStringFromUndoList <> "Delete note" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+ Case 01: if UndoStringFromUndoList <> "Delete comment" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
Case 34: if UndoStringFromUndoList <> "Eliminar nota" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
Case 86: if UndoStringFromUndoList <> "åˆ é™¤ 批注" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
Case else: QAErrorlog "Please adapt test for this language: " & UndoStringFromUndoList
diff --git a/testautomation/xml/optional/includes/f_xml_save_ms_ole.inc b/testautomation/xml/optional/includes/f_xml_save_ms_ole.inc
index d57626d..5f61ba7 100755
--- a/testautomation/xml/optional/includes/f_xml_save_ms_ole.inc
+++ b/testautomation/xml/optional/includes/f_xml_save_ms_ole.inc
@@ -172,7 +172,7 @@ testcase tXML_OLE_Conversion ( sCurrentTestDocument as STRING )
select case sCurrentOLE
case "mat"
SAXSeekElement( 1 )
- if SAXGetElementName() <> "math:math" then
+ if SAXGetElementName() <> "math" then
warnlog "A Math object was expected here -> Check this out!"
endif
case else
diff --git a/testautomation/xml/optional/includes/sxc7_01.inc b/testautomation/xml/optional/includes/sxc7_01.inc
index 8008b8c..345f80a 100755
--- a/testautomation/xml/optional/includes/sxc7_01.inc
+++ b/testautomation/xml/optional/includes/sxc7_01.inc
@@ -188,7 +188,7 @@ testcase tAlienAttributes
end if
if c = 2 or c = 3 then
' warnlog "Hidden attributes (in a paragraph style): " & AttributeSearch(i) & " is not " & AttributeValue(i) & "!"
- warnlog "#i100879# : Hidden attributes (in a paragraph style): " & AttributeSearch(i) & " is not " & AttributeValue(i) & "!"
+ QaErrorLog "#i100879# : Hidden attributes (in a paragraph style): " & AttributeSearch(i) & " is not " & AttributeValue(i) & "!"
end if
if c = 4 or c = 5 then
warnlog "Hidden attributes (in a text style): " & AttributeSearch(i) & " is not " & AttributeValue(i) & "!"
diff --git a/testautomation/xml/optional/includes/sxc7_03.inc b/testautomation/xml/optional/includes/sxc7_03.inc
index 43e0d37..9386a24 100755
--- a/testautomation/xml/optional/includes/sxc7_03.inc
+++ b/testautomation/xml/optional/includes/sxc7_03.inc
@@ -148,8 +148,7 @@ testcase tcontrols01
if SecurityWarning.Exists(1) then
SecurityWarning.OK
else
- warnlog "#i80769# Macros not being loaded. Exiting test case."
- 'warnlog "No Macro Security Warning occoured while loading 'controls01.sdc'."
+ warnlog "No Macro Security Warning occoured while loading 'controls01.sdc'."
call hCloseDocument
goto endsub
end if
More information about the ooo-build-commit
mailing list