diff options
author | Daniel Rentz <dr@openoffice.org> | 2010-08-05 09:51:16 +0200 |
---|---|---|
committer | Daniel Rentz <dr@openoffice.org> | 2010-08-05 09:51:16 +0200 |
commit | d14a8b54ba38bc3c6e81e87c328f58f41f7b8c0e (patch) | |
tree | 9035be718cbc9b8b9b3e97c5a77a987519cb5889 /testautomation/spreadsheet | |
parent | d57ac99460bae6dd3b85e803367fa82073819770 (diff) | |
parent | 7bbf7ff48ffcd5a6dcfc46c31d95df33c360e4ee (diff) |
dr77: rebase to m86
Diffstat (limited to 'testautomation/spreadsheet')
31 files changed, 57 insertions, 62 deletions
diff --git a/testautomation/spreadsheet/optional/c_arrayconstants.bas b/testautomation/spreadsheet/optional/c_arrayconstants.bas index fd8b67123457..114293db4281 100755 --- a/testautomation/spreadsheet/optional/c_arrayconstants.bas +++ b/testautomation/spreadsheet/optional/c_arrayconstants.bas @@ -25,7 +25,7 @@ ' '/*********************************************************************** '* -'* owner : oliver.craemer@sun.com +'* owner : oliver.craemer@oracle.com '* '* short description : Functiontest for matrix/array constants in calc '* diff --git a/testautomation/spreadsheet/optional/c_getpivotdata.bas b/testautomation/spreadsheet/optional/c_getpivotdata.bas index f497b1bd7127..f55990107538 100755 --- a/testautomation/spreadsheet/optional/c_getpivotdata.bas +++ b/testautomation/spreadsheet/optional/c_getpivotdata.bas @@ -25,7 +25,7 @@ ' '/*********************************************************************** '* -'* owner : oliver.craemer@sun.com +'* owner : oliver.craemer@oracle.com '* '* short description : Test for function GETPIVOTDATA in calc '* diff --git a/testautomation/spreadsheet/optional/c_import_general.bas b/testautomation/spreadsheet/optional/c_import_general.bas index 71c1e28927d2..9c77346f2ca7 100755 --- a/testautomation/spreadsheet/optional/c_import_general.bas +++ b/testautomation/spreadsheet/optional/c_import_general.bas @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : oliver.craemer@sun.com +'* owner : oliver.craemer@oracle.com '* '* short description : Simply load max. 1000 files in .../spreadsheet/required/input/loadsave/ '* diff --git a/testautomation/spreadsheet/optional/c_solver.bas b/testautomation/spreadsheet/optional/c_solver.bas index 0af76f8cfba2..60744c0ef319 100755 --- a/testautomation/spreadsheet/optional/c_solver.bas +++ b/testautomation/spreadsheet/optional/c_solver.bas @@ -25,7 +25,7 @@ ' '/*********************************************************************** '* -'* owner : oliver.craemer@sun.com +'* owner : oliver.craemer@oracle.com '* '* short description : Functionality Test - Solver in Spreadsheet '* diff --git a/testautomation/spreadsheet/optional/includes/arrayconstants/c_arrayconstants.inc b/testautomation/spreadsheet/optional/includes/arrayconstants/c_arrayconstants.inc index 55c97473902c..ce5652c0ff1e 100755 --- a/testautomation/spreadsheet/optional/includes/arrayconstants/c_arrayconstants.inc +++ b/testautomation/spreadsheet/optional/includes/arrayconstants/c_arrayconstants.inc @@ -25,7 +25,7 @@ ' '/*********************************************************************** '* -'* owner : oliver.craemer@sun.com +'* owner : oliver.craemer@oracle.com '* '* short description : calc arrayconstants level2 test '* diff --git a/testautomation/spreadsheet/optional/includes/getpivotdata/c_getpivotdata.inc b/testautomation/spreadsheet/optional/includes/getpivotdata/c_getpivotdata.inc index 86a0555a8ae0..216551959ded 100644..100755 --- a/testautomation/spreadsheet/optional/includes/getpivotdata/c_getpivotdata.inc +++ b/testautomation/spreadsheet/optional/includes/getpivotdata/c_getpivotdata.inc @@ -25,7 +25,7 @@ ' '/*********************************************************************** '* -'* owner : oliver.craemer@sun.com +'* owner : oliver.craemer@oracle.com '* '* short description : level 2 test for the getpivotdata function '* diff --git a/testautomation/spreadsheet/optional/includes/import_general/c_import_general.inc b/testautomation/spreadsheet/optional/includes/import_general/c_import_general.inc index 87c6d899b7bb..d53c23fbbe3d 100755 --- a/testautomation/spreadsheet/optional/includes/import_general/c_import_general.inc +++ b/testautomation/spreadsheet/optional/includes/import_general/c_import_general.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '** -'** owner : oliver.craemer@sun.com +'** owner : oliver.craemer@oracle.com '** '** short description : Imports every Document from a given path (gsSourcePath variable) '** @@ -41,6 +41,8 @@ sub tLoadAllDocuments ( gsSourcePath as string ) Dim i as integer Dim x as integer + dim gsSourceDocument( 50 ) as string + printlog "Source path: " & gsSourcePath 'Get the files into a list. Call GetAllFileList(gsSourcePath, "*.*" , gsSourceDocument()) @@ -81,6 +83,7 @@ end function '------------------------------------------------------------------------------- ' testcase tLoadSpreadsheetDocument (SourceFile) + Dim sOnlyFileName as string Dim sOnlyFileExtension as string Dim sTempFileName as String @@ -88,13 +91,13 @@ testcase tLoadSpreadsheetDocument (SourceFile) sTempFileName = SourceFile sOnlyFileName = DateiOhneExt(DateiExtract(SourceFile) - sOnlyFileExtension = GetExtention(sTempFileName) - select case sOnlyFileName - case "so3tmpl", "so4tmpl", "so5tmpl" : - printlog "Test case: " & sOnlyFileName & "." & sOnlyFileExtension - - case else printlog "Test case: " & sOnlyFileName & "." & sOnlyFileExtension + sOnlyFileExtension = GetExtention(sTempFileName) + + select case ( sOnlyFileName ) + case "so3tmpl", "so4tmpl", "so5tmpl" : printlog "Test case: " & sOnlyFileName & "." & sOnlyFileExtension + case else : printlog "Test case: " & sOnlyFileName & "." & sOnlyFileExtension end select + 'Maybe file name is empty if sOnlyFileName > "" then 'Some extensions make no sense to load @@ -106,27 +109,15 @@ testcase tLoadSpreadsheetDocument (SourceFile) Call hCloseDocument else warnlog sOnlyFileName + " document has not been loaded correctly [hIsNamedDocLoaded]!" - if GetDocumentCount > 1 then - Do Until GetDocumentCount = 1 - Call hCloseDocument - Loop - endif + hFileCloseAll() endif else warnlog sOnlyFileName + " document has not been loaded correctly [fCalcFileOpen; IsItLoaded]!" - if GetDocumentCount > 1 then - Do Until GetDocumentCount = 1 - Call hCloseDocument - Loop - endif + hFileCloseAll() endif else printlog "(" + sOnlyFileName + "." + sOnlyFileExtension + ") won't be loaded because of excluded extensions .so and .tmp." - if GetDocumentCount > 1 then - Do Until GetDocumentCount = 1 - Call hCloseDocument - Loop - endif + hFileCloseAll() endif endif endcase diff --git a/testautomation/spreadsheet/optional/includes/namedrange/c_namedrange.inc b/testautomation/spreadsheet/optional/includes/namedrange/c_namedrange.inc index 35d10648adeb..25926d626bd4 100644..100755 --- a/testautomation/spreadsheet/optional/includes/namedrange/c_namedrange.inc +++ b/testautomation/spreadsheet/optional/includes/namedrange/c_namedrange.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : oliver.craemer@sun.com +'* owner : oliver.craemer@oracle.com '* '* short description : calc named range level 2 test '* diff --git a/testautomation/spreadsheet/optional/includes/printrange/c_printrange.inc b/testautomation/spreadsheet/optional/includes/printrange/c_printrange.inc index c8e83d2662b9..6bfa955a483a 100644..100755 --- a/testautomation/spreadsheet/optional/includes/printrange/c_printrange.inc +++ b/testautomation/spreadsheet/optional/includes/printrange/c_printrange.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : oliver.craemer@sun.com +'* owner : oliver.craemer@oracle.com '* '* short description : spreadsheet printrange test '* diff --git a/testautomation/spreadsheet/optional/includes/printscale/c_print_scale.inc b/testautomation/spreadsheet/optional/includes/printscale/c_print_scale.inc index e4429e015494..301bac08a49c 100644..100755 --- a/testautomation/spreadsheet/optional/includes/printscale/c_print_scale.inc +++ b/testautomation/spreadsheet/optional/includes/printscale/c_print_scale.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : oliver.craemer@sun.com +'* owner : oliver.craemer@oracle.com '* '* short description : Check correct print scaling settings '* diff --git a/testautomation/spreadsheet/optional/includes/solver/c_solver.inc b/testautomation/spreadsheet/optional/includes/solver/c_solver.inc index 623b43e98217..ba0e77d155be 100755 --- a/testautomation/spreadsheet/optional/includes/solver/c_solver.inc +++ b/testautomation/spreadsheet/optional/includes/solver/c_solver.inc @@ -25,7 +25,7 @@ ' '/*********************************************************************** '* -'* owner : oliver.craemer@sun.com +'* owner : oliver.craemer@oracle.com '* '* short description : Functionality Test - Solver '* diff --git a/testautomation/spreadsheet/required/c_updt1.bas b/testautomation/spreadsheet/required/c_updt1.bas index f5a523f79622..c6e785fb7ff5 100755 --- a/testautomation/spreadsheet/required/c_updt1.bas +++ b/testautomation/spreadsheet/required/c_updt1.bas @@ -25,7 +25,7 @@ ' '/*********************************************************************** '* -'* owner : oliver.craemer@sun.com +'* owner : oliver.craemer@oracle.com '* '* short description : Resource-Test Spreadsheet Application Part I '* diff --git a/testautomation/spreadsheet/required/c_updt2.bas b/testautomation/spreadsheet/required/c_updt2.bas index ecb5148538b8..a1bab7f128f4 100755 --- a/testautomation/spreadsheet/required/c_updt2.bas +++ b/testautomation/spreadsheet/required/c_updt2.bas @@ -25,7 +25,7 @@ ' '/*********************************************************************** '* -'* owner : oliver.craemer@sun.com +'* owner : oliver.craemer@oracle.com '* '* short description : Resource-Test Spreadsheet Application Part II '* diff --git a/testautomation/spreadsheet/required/includes/c_upd_datamenu.inc b/testautomation/spreadsheet/required/includes/c_upd_datamenu.inc index a74ada3d6397..2975a7b1c9e2 100644..100755 --- a/testautomation/spreadsheet/required/includes/c_upd_datamenu.inc +++ b/testautomation/spreadsheet/required/includes/c_upd_datamenu.inc @@ -25,7 +25,7 @@ ' '/*********************************************************************** '* -'* owner : oliver.craemer@sun.com +'* owner : oliver.craemer@oracle.com '* '* short description : Resource Test - Data Menu '* diff --git a/testautomation/spreadsheet/required/includes/c_upd_editmenu.inc b/testautomation/spreadsheet/required/includes/c_upd_editmenu.inc index 9af880af0e18..c90e44d30f01 100755 --- a/testautomation/spreadsheet/required/includes/c_upd_editmenu.inc +++ b/testautomation/spreadsheet/required/includes/c_upd_editmenu.inc @@ -25,7 +25,7 @@ ' '/*********************************************************************** '* -'* owner : oliver.craemer@sun.com +'* owner : oliver.craemer@oracle.com '* '* short description : Resource Test - Edit Menu '* diff --git a/testautomation/spreadsheet/required/includes/c_upd_editmenu2.inc b/testautomation/spreadsheet/required/includes/c_upd_editmenu2.inc index dc54ca10361e..fed4fd764f17 100644..100755 --- a/testautomation/spreadsheet/required/includes/c_upd_editmenu2.inc +++ b/testautomation/spreadsheet/required/includes/c_upd_editmenu2.inc @@ -25,7 +25,7 @@ ' '/*********************************************************************** '* -'* owner : oliver.craemer@sun.com +'* owner : oliver.craemer@oracle.com '* '* short description : Resource Test - Edit Menu Part II '* @@ -583,15 +583,15 @@ testcase tEditImageMap printlog " Click on 'Active'-button" Aktiv.Click '/// Click on 'Macro...'-button - printlog " Click on 'Macro...'-button" - warnlog "#i102720# => crash, therefor this functionality is outcommented" -' Makro.Click -' Kontext "MakroZuweisen" -' Call DialogTest ( MakroZuweisen ) -' '/// Close 'Assign Macro'-dialog with Cancel -' printlog " Close 'Assign Macro'-dialog with Cancel" -' MakroZuweisen.Cancel -' Kontext "ImageMapEditor" + printlog " Click on 'Macro...'-button" +' warnlog "#i102720# => crash, therefor this functionality is outcommented" + Makro.Click + Kontext "MakroZuweisen" + Call DialogTest ( MakroZuweisen ) + '/// Close 'Assign Macro'-dialog with Cancel + printlog " Close 'Assign Macro'-dialog with Cancel" + MakroZuweisen.Cancel + Kontext "ImageMapEditor" '/// Click on 'Properties'-button printlog " Click on 'Properties'-button" Eigenschaften.Click diff --git a/testautomation/spreadsheet/required/includes/c_upd_filemenu.inc b/testautomation/spreadsheet/required/includes/c_upd_filemenu.inc index 32eee7e6040c..296387d64f93 100755 --- a/testautomation/spreadsheet/required/includes/c_upd_filemenu.inc +++ b/testautomation/spreadsheet/required/includes/c_upd_filemenu.inc @@ -25,7 +25,7 @@ ' '/*********************************************************************** '* -'* owner : oliver.craemer@sun.com +'* owner : oliver.craemer@oracle.com '* '* short description : Resource Test - File Menu '* @@ -355,6 +355,11 @@ endcase '----------------------------------------------------------- testcase tFileRecentDocuments + +if gPlatform = "lin" then + warnlog "#110649# Due to bug this testcase is not available" + goto endsub +end if dim sTestFile as string diff --git a/testautomation/spreadsheet/required/includes/c_upd_formatmenu.inc b/testautomation/spreadsheet/required/includes/c_upd_formatmenu.inc index ba92cb53a0c6..f61db3626809 100644..100755 --- a/testautomation/spreadsheet/required/includes/c_upd_formatmenu.inc +++ b/testautomation/spreadsheet/required/includes/c_upd_formatmenu.inc @@ -25,7 +25,7 @@ ' '/*********************************************************************** '* -'* owner : oliver.craemer@sun.com +'* owner : oliver.craemer@oracle.com '* '* short description : Resource Test - Format Menu Part I '* diff --git a/testautomation/spreadsheet/required/includes/c_upd_formatmenu2.inc b/testautomation/spreadsheet/required/includes/c_upd_formatmenu2.inc index f85969784c39..6ec04a89c260 100755 --- a/testautomation/spreadsheet/required/includes/c_upd_formatmenu2.inc +++ b/testautomation/spreadsheet/required/includes/c_upd_formatmenu2.inc @@ -25,7 +25,7 @@ ' '/*********************************************************************** '* -'* owner : oliver.craemer@sun.com +'* owner : oliver.craemer@oracle.com '* '* short description : Resource Test - Format Menu Part II '* diff --git a/testautomation/spreadsheet/required/includes/c_upd_formatmenu3.inc b/testautomation/spreadsheet/required/includes/c_upd_formatmenu3.inc index 7cc051cbc1b7..08ea0cd1a3af 100644..100755 --- a/testautomation/spreadsheet/required/includes/c_upd_formatmenu3.inc +++ b/testautomation/spreadsheet/required/includes/c_upd_formatmenu3.inc @@ -25,7 +25,7 @@ ' '/*********************************************************************** '* -'* owner : oliver.craemer@sun.com +'* owner : oliver.craemer@oracle.com '* '* short description : Resource Test - Format Menu Part III '* diff --git a/testautomation/spreadsheet/required/includes/c_upd_helpmenu.inc b/testautomation/spreadsheet/required/includes/c_upd_helpmenu.inc index 87282429cbb1..89495d36907e 100644..100755 --- a/testautomation/spreadsheet/required/includes/c_upd_helpmenu.inc +++ b/testautomation/spreadsheet/required/includes/c_upd_helpmenu.inc @@ -25,7 +25,7 @@ ' '/*********************************************************************** '* -'* owner : oliver.craemer@sun.com +'* owner : oliver.craemer@oracle.com '* '* short description : Resource Test - Help Menu '* diff --git a/testautomation/spreadsheet/required/includes/c_upd_insertmenu.inc b/testautomation/spreadsheet/required/includes/c_upd_insertmenu.inc index be27490e3b18..b8c749c27cd9 100755 --- a/testautomation/spreadsheet/required/includes/c_upd_insertmenu.inc +++ b/testautomation/spreadsheet/required/includes/c_upd_insertmenu.inc @@ -25,7 +25,7 @@ ' '/*********************************************************************** '* -'* owner : oliver.craemer@sun.com +'* owner : oliver.craemer@oracle.com '* '* short description : Resource Test - Insert Menu '* diff --git a/testautomation/spreadsheet/required/includes/c_upd_toolsmenu.inc b/testautomation/spreadsheet/required/includes/c_upd_toolsmenu.inc index 434aae88f786..9efc84907b78 100755 --- a/testautomation/spreadsheet/required/includes/c_upd_toolsmenu.inc +++ b/testautomation/spreadsheet/required/includes/c_upd_toolsmenu.inc @@ -25,7 +25,7 @@ ' '/*********************************************************************** '* -'* owner : oliver.craemer@sun.com +'* owner : oliver.craemer@oracle.com '* '* short description : Resource Test - Tools Menu Part I '* diff --git a/testautomation/spreadsheet/required/includes/c_upd_toolsmenu2.inc b/testautomation/spreadsheet/required/includes/c_upd_toolsmenu2.inc index 91a806fd33ae..f11857cf44ad 100755 --- a/testautomation/spreadsheet/required/includes/c_upd_toolsmenu2.inc +++ b/testautomation/spreadsheet/required/includes/c_upd_toolsmenu2.inc @@ -25,7 +25,7 @@ ' '/*********************************************************************** '* -'* owner : oliver.craemer@sun.com +'* owner : oliver.craemer@oracle.com '* '* short description : Resource Test - Tools Menu Part II '* @@ -166,7 +166,6 @@ testcase tToolsMacro printlog " Close Select Certificate' dialog with 'Cancel'" SelectCertificate.Cancel Kontext "DigitalSignature" - add.click '/// Close 'Digital Signatures' dialog with 'Cancel' printlog " Close 'Digital Signatures' dialog with 'Cancel'" DigitalSignature.ok diff --git a/testautomation/spreadsheet/required/includes/c_upd_viewmenu.inc b/testautomation/spreadsheet/required/includes/c_upd_viewmenu.inc index 293418b76c2b..e7568390c38a 100755 --- a/testautomation/spreadsheet/required/includes/c_upd_viewmenu.inc +++ b/testautomation/spreadsheet/required/includes/c_upd_viewmenu.inc @@ -25,7 +25,7 @@ ' '/*********************************************************************** '* -'* owner : oliver.craemer@sun.com +'* owner : oliver.craemer@oracle.com '* '* short description : Resource Test - View Menu '* diff --git a/testautomation/spreadsheet/required/includes/c_upd_windowmenu.inc b/testautomation/spreadsheet/required/includes/c_upd_windowmenu.inc index d183e8c72e3f..56adf3af682a 100644..100755 --- a/testautomation/spreadsheet/required/includes/c_upd_windowmenu.inc +++ b/testautomation/spreadsheet/required/includes/c_upd_windowmenu.inc @@ -25,7 +25,7 @@ ' '/*********************************************************************** '* -'* owner : oliver.craemer@sun.com +'* owner : oliver.craemer@oracle.com '* '* short description : Resource Test - Window Menu '* diff --git a/testautomation/spreadsheet/tools/includes/c_cell_tools.inc b/testautomation/spreadsheet/tools/includes/c_cell_tools.inc index 9331b690f57f..0693f1daf19c 100644..100755 --- a/testautomation/spreadsheet/tools/includes/c_cell_tools.inc +++ b/testautomation/spreadsheet/tools/includes/c_cell_tools.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : oliver.craemer@sun.com +'* owner : oliver.craemer@oracle.com '* '* short description : tools for working with cells in calc '* diff --git a/testautomation/spreadsheet/tools/includes/c_l10n_tools.inc b/testautomation/spreadsheet/tools/includes/c_l10n_tools.inc index 9766f6464621..382e48f94f86 100644..100755 --- a/testautomation/spreadsheet/tools/includes/c_l10n_tools.inc +++ b/testautomation/spreadsheet/tools/includes/c_l10n_tools.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : oliver.craemer@sun.com +'* owner : oliver.craemer@oracle.com '* '* short description : tools for localisation in calc '* diff --git a/testautomation/spreadsheet/tools/includes/c_select_tools.inc b/testautomation/spreadsheet/tools/includes/c_select_tools.inc index 23147568aef9..f1087ca3fe8b 100644..100755 --- a/testautomation/spreadsheet/tools/includes/c_select_tools.inc +++ b/testautomation/spreadsheet/tools/includes/c_select_tools.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : oliver.craemer@sun.com +'* owner : oliver.craemer@oracle.com '* '* short description : selecting objects in calc '* diff --git a/testautomation/spreadsheet/tools/includes/c_tool_l10n_mnomics.inc b/testautomation/spreadsheet/tools/includes/c_tool_l10n_mnomics.inc index c4b74b9e0f12..43dd2945c22a 100644..100755 --- a/testautomation/spreadsheet/tools/includes/c_tool_l10n_mnomics.inc +++ b/testautomation/spreadsheet/tools/includes/c_tool_l10n_mnomics.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : oliver.craemer@sun.com +'* owner : oliver.craemer@oracle.com '* '* short description : Tools for Keyboard Accessibility '* diff --git a/testautomation/spreadsheet/tools/includes/c_tool_options.inc b/testautomation/spreadsheet/tools/includes/c_tool_options.inc index d75b6f8e74dd..89bc7a4e0ad3 100644..100755 --- a/testautomation/spreadsheet/tools/includes/c_tool_options.inc +++ b/testautomation/spreadsheet/tools/includes/c_tool_options.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : oliver.craemer@sun.com +'* owner : oliver.craemer@oracle.com '* '* short description : Tools for Tools::Options dialog '* |