diff options
Diffstat (limited to 'testautomation/spreadsheet/required')
13 files changed, 40 insertions, 103 deletions
diff --git a/testautomation/spreadsheet/required/includes/c_upd_datamenu.inc b/testautomation/spreadsheet/required/includes/c_upd_datamenu.inc index 2975a7b1c9e2..2c77baeea56d 100755..100644 --- a/testautomation/spreadsheet/required/includes/c_upd_datamenu.inc +++ b/testautomation/spreadsheet/required/includes/c_upd_datamenu.inc @@ -885,10 +885,7 @@ testcase tDataDataPilot '/// Open testdocument 'gTesttoolPath + spreadsheet\required\input\datapilot.ods' printlog " Open testdocument 'gTesttoolPath + spreadsheet\required\input\datapilot.ods'" - Call hFileOpen (Convertpath (gTesttoolPath + "spreadsheet\required\input\datapilot.ods" )) - '/// If the file is not editable, click the edit button on standardbar - printlog " If the file is not editable, click the edit button on standardbar" - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath & "spreadsheet\required\input\datapilot.ods" ) '/// Select cell C34 printlog " Select cell C34" Call fCalcSelectRange ( "C34" ) @@ -1030,10 +1027,7 @@ testcase tDataRefreshRange '/// Load testdocument Database_Refresh printlog " Load testdocument Database_Refresh" - Call hFileOpen (Convertpath (gTesttoolPath + "spreadsheet\required\input\Database_Refresh.ods" )) - '/// If the file is not editable, click the edit button on standardbar - printlog " If the file is not editable, click the edit button on standardbar" - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath & "spreadsheet\required\input\Database_Refresh.ods" ) '/// Refresh Database by 'Data – Refresh Range' printlog " Refresh Database by 'Data – Refresh Range'" DataRefreshRange diff --git a/testautomation/spreadsheet/required/includes/c_upd_editmenu.inc b/testautomation/spreadsheet/required/includes/c_upd_editmenu.inc index c90e44d30f01..c90e44d30f01 100755..100644 --- a/testautomation/spreadsheet/required/includes/c_upd_editmenu.inc +++ b/testautomation/spreadsheet/required/includes/c_upd_editmenu.inc diff --git a/testautomation/spreadsheet/required/includes/c_upd_editmenu2.inc b/testautomation/spreadsheet/required/includes/c_upd_editmenu2.inc index fed4fd764f17..a67502448d9a 100755..100644 --- a/testautomation/spreadsheet/required/includes/c_upd_editmenu2.inc +++ b/testautomation/spreadsheet/required/includes/c_upd_editmenu2.inc @@ -638,10 +638,7 @@ testcase tEditObjectEdit '/// Load testdocument 'spreadsheet/required/input/tEditObject.ods' printlog " Load testdocument 'spreadsheet/required/input/tEditObject.ods'" - Call hFileOpen ( ConvertPath ( gTesttoolPath + "spreadsheet\required\input\tEditObject.ods")) - '/// If the file is not editable, click the edit button on standardbar - printlog "If the file is not editable, click the edit button on standardbar" - sMakeReadOnlyDocumentEditable() + hFileOpenLocally( gTesttoolPath + "spreadsheet\required\input\tEditObject.ods" ) '/// Select OLE-object printlog " Select OLE-object" fselectFirstOLE diff --git a/testautomation/spreadsheet/required/includes/c_upd_filemenu.inc b/testautomation/spreadsheet/required/includes/c_upd_filemenu.inc index 6328a62f5b37..ea8efd09dd2c 100644 --- a/testautomation/spreadsheet/required/includes/c_upd_filemenu.inc +++ b/testautomation/spreadsheet/required/includes/c_upd_filemenu.inc @@ -358,10 +358,10 @@ endcase testcase tFileRecentDocuments -if gPlatform = "lin" then - warnlog "#110649# Due to bug this testcase is not available" - goto endsub -end if +'if gPlatform = "lin" then +' warnlog "#110649# Due to bug this testcase is not available" +' goto endsub +'end if dim sTestFile as string @@ -372,11 +372,15 @@ end if Printlog " Enter some text" Kontext "DocumentCalc" DocumentCalc.Typekeys "The first doc!<RETURN>" + Printlog " Copy Test File spreadsheet/required/input/recentdocument.ods locally" - app.FileCopy convertpath(gTesttoolpath & "spreadsheet\required\input\recentdocument.ods"),gOfficePath + ConvertPath("user/work/recentdocument.ods") - Printlog " Load local copied testfile recentdocument.ods" - sTestFile = convertpath(gOfficePath & "user/work/recentdocument.ods") - Call hFileOpen(sTestFile) + hFileOpenLocally( gTesttoolpath & "spreadsheet\required\input\recentdocument.ods" ) + sTestFile = gLastWorkFile ' get the new file location + + 'app.FileCopy convertpath(gTesttoolpath & "spreadsheet\required\input\recentdocument.ods"),gOfficePath + ConvertPath("user/work/recentdocument.ods") + 'Printlog " Load local copied testfile recentdocument.ods" + 'sTestFile = convertpath(gOfficePath & "user/work/recentdocument.ods") + 'Call hFileOpen(sTestFile) '/// Close the document. Printlog " Close the document." '/// Now an item in <i>File / Recent Documents</i> should exist @@ -413,6 +417,8 @@ end if '/// Close starting document Printlog " Close starting document" Call hCloseDocument + Printlog " Delete local copy of the workfile" + hFileDelete( sTestFile ) endcase '----------------------------------------------------------- diff --git a/testautomation/spreadsheet/required/includes/c_upd_formatmenu.inc b/testautomation/spreadsheet/required/includes/c_upd_formatmenu.inc index f61db3626809..3ca188c3a8ee 100755..100644 --- a/testautomation/spreadsheet/required/includes/c_upd_formatmenu.inc +++ b/testautomation/spreadsheet/required/includes/c_upd_formatmenu.inc @@ -630,8 +630,8 @@ testcase tFormatPage end if '/// Check that listbox 'Paper tray' has items printlog " Check that listbox 'Paper tray' has items" - if Schacht < 1 then - warnlog "The text direction listbox is empty" + if Schacht.GetItemCount < 1 then + warnlog "The paper tray listbox is empty" end if '/// Increase 'Margins Left' printlog " Increase 'Margins Left'" diff --git a/testautomation/spreadsheet/required/includes/c_upd_formatmenu2.inc b/testautomation/spreadsheet/required/includes/c_upd_formatmenu2.inc index 6ec04a89c260..cc448d3c3830 100755..100644 --- a/testautomation/spreadsheet/required/includes/c_upd_formatmenu2.inc +++ b/testautomation/spreadsheet/required/includes/c_upd_formatmenu2.inc @@ -29,23 +29,6 @@ '* '* short description : Resource Test - Format Menu Part II '* -'************************************************************************ -'* -' #1 tFormatPrintRanges -' #1 tFormatCharacter -' #1 tFormatParagraph -' #1 tFormatChangeCase -' #1 tFormatStyles -' #1 tFormatAutoFormat -' #1 tFormatConditionalFormatting -' #1 tFormatAnchor -' #1 tFormatAlignment -' #1 tFormatArrange -' #1 tFormatFlip -' #1 tFormatGroup -' #0 tFormatControl - -'* '\*********************************************************************** sub c_upd_formatmenu2 @@ -635,10 +618,7 @@ testcase tFormatAlignment '/// Load document from 'gTesttoolPath + "spreadsheet\required\input\twoobjects.ods"' printlog " Load document from 'gTesttoolPath + spreadsheet\required\input\twoobjects.ods" - Call hFileOpen (Convertpath (gTesttoolPath + "spreadsheet\required\input\twoobjects.ods" )) - '/// If the file is not editable, click the edit button on standardbar - printlog "If the file is not editable, click the edit button on standardbar" - call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath & "spreadsheet\required\input\twoobjects.ods" ) '/// Select first object by Navigator printlog " Select first object by Navigator" Call fNavigatorSelectObject ("drawing objects", 1) @@ -667,6 +647,7 @@ testcase tFormatAlignment '/// Close document printlog " Close document" Call hCloseDocument + hFileDelete( gLastWorkFile ) endcase @@ -747,10 +728,7 @@ testcase tFormatGroup '/// Load document from 'gTesttoolPath + "spreadsheet\required\input\twoobjects.ods"' printlog " Load document from 'gTesttoolPath + spreadsheet\required\input\twoobjects.ods" - Call hFileOpen (Convertpath (gTesttoolPath + "spreadsheet\required\input\twoobjects.ods" )) - '/// If the file is not editable, click the edit button on standardbar - printlog "If the file is not editable, click the edit button on standardbar" - call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath & "spreadsheet\required\input\twoobjects.ods" ) '/// Select first object by Navigator printlog " Select first object by Navigator" Call fNavigatorSelectObject ("drawing objects", 1) @@ -773,6 +751,7 @@ testcase tFormatGroup '/// Close document printlog " Close document" Call hCloseDocument + hFileDelete( gLastWorkFile ) endcase diff --git a/testautomation/spreadsheet/required/includes/c_upd_formatmenu3.inc b/testautomation/spreadsheet/required/includes/c_upd_formatmenu3.inc index 08ea0cd1a3af..0dd9d3200937 100755..100644 --- a/testautomation/spreadsheet/required/includes/c_upd_formatmenu3.inc +++ b/testautomation/spreadsheet/required/includes/c_upd_formatmenu3.inc @@ -29,14 +29,6 @@ '* '* short description : Resource Test - Format Menu Part III '* -'************************************************************************ -'* -' #1 tFormatGraphicPositionAndSize -' #1 tFormatGraphicLine -' #1 tFormatGraphicArea -' #1 tFormatGraphicText -' #1 tFormatGraphicPoints -'* '\*********************************************************************** sub c_upd_formatmenu3 @@ -58,10 +50,7 @@ testcase tFormatGraphicPositionAndSize '/// Load document from 'gTesttoolPath + "spreadsheet\required\input\twoobjects.ods"' printlog " Load document from 'gTesttoolPath + spreadsheet\required\input\twoobjects.ods" - Call hFileOpen (Convertpath (gTesttoolPath + "spreadsheet\required\input\twoobjects.ods" )) - '/// If the file is not editable, click the edit button on standardbar - printlog "If the file is not editable, click the edit button on standardbar" - call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath + "spreadsheet\required\input\twoobjects.ods" ) '/// Select first object by Navigator printlog " Select first object by Navigator" Call fNavigatorSelectObject ("drawing objects", 1) @@ -132,6 +121,7 @@ testcase tFormatGraphicPositionAndSize '/// Close document printlog " Close document" call hCloseDocument + hFileDelete( gLastWorkFile ) endcase @@ -144,10 +134,8 @@ testcase tFormatGraphicLine '/// Load document from 'gTesttoolPath + "spreadsheet\required\input\twoobjects.ods"' printlog " Load document from 'gTesttoolPath + spreadsheet\required\input\twoobjects.ods" - Call hFileOpen (Convertpath (gTesttoolPath + "spreadsheet\required\input\twoobjects.ods" )) - '/// If the file is not editable, click the edit button on standardbar - printlog "If the file is not editable, click the edit button on standardbar" - call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath & "spreadsheet\required\input\twoobjects.ods" ) + '/// Select first object by Navigator printlog " Select first object by Navigator" Call fNavigatorSelectObject ("drawing objects", 1) @@ -374,6 +362,7 @@ testcase tFormatGraphicLine '/// Close document printlog " Close document" Call hCloseDocument + hFileDelete( gLastWorkFile ) endcase @@ -384,10 +373,7 @@ testcase tFormatGraphicArea '/// Load document from 'gTesttoolPath + "spreadsheet\required\input\twoobjects.ods"' printlog " Load document from 'gTesttoolPath + spreadsheet\required\input\twoobjects.ods" - Call hFileOpen (Convertpath (gTesttoolPath + "spreadsheet\required\input\twoobjects.ods" )) - '/// If the file is not editable, click the edit button on standardbar - printlog "If the file is not editable, click the edit button on standardbar" - call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath & "spreadsheet\required\input\twoobjects.ods" ) '/// Select first object by Navigator printlog " Select first object by Navigator" Call fNavigatorSelectObject ("drawing objects", 1) @@ -919,6 +905,7 @@ testcase tFormatGraphicArea '/// Close document printlog " Close document" Call hCloseDocument + hFileDelete( gLastWorkFile ) endcase @@ -929,10 +916,7 @@ testcase tFormatGraphicText '/// Load document from 'gTesttoolPath + "spreadsheet\required\input\twoobjects.ods"' printlog " Load document from 'gTesttoolPath + spreadsheet\required\input\twoobjects.ods" - Call hFileOpen (Convertpath (gTesttoolPath + "spreadsheet\required\input\twoobjects.ods" )) - '/// If the file is not editable, click the edit button on standardbar - printlog "If the file is not editable, click the edit button on standardbar" - call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath & "spreadsheet\required\input\twoobjects.ods" ) '/// Select first object by Navigator printlog " Select first object by Navigator" Call fNavigatorSelectObject ("drawing objects", 1) @@ -1038,6 +1022,7 @@ testcase tFormatGraphicText '/// Close document printlog " Close document" call hCloseDocument + hFileDelete( gLastWorkFile ) endcase @@ -1048,10 +1033,7 @@ testcase tFormatGraphicPoints '/// Load document from 'gTesttoolPath + "spreadsheet\required\input\twoobjects.ods"' printlog " Load document from 'gTesttoolPath + spreadsheet\required\input\twoobjects.ods" - Call hFileOpen (Convertpath (gTesttoolPath + "spreadsheet\required\input\twoobjects.ods" )) - '/// If the file is not editable, click the edit button on standardbar - printlog "If the file is not editable, click the edit button on standardbar" - call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath & "spreadsheet\required\input\twoobjects.ods" ) '/// Select first object by Navigator printlog " Select first object by Navigator" Call fNavigatorSelectObject ("drawing objects", 1) @@ -1061,6 +1043,7 @@ testcase tFormatGraphicPoints '/// Close document printlog " Close document" call hCloseDocument + hFileDelete( gLastWorkFile ) endcase diff --git a/testautomation/spreadsheet/required/includes/c_upd_helpmenu.inc b/testautomation/spreadsheet/required/includes/c_upd_helpmenu.inc index 89495d36907e..89495d36907e 100755..100644 --- a/testautomation/spreadsheet/required/includes/c_upd_helpmenu.inc +++ b/testautomation/spreadsheet/required/includes/c_upd_helpmenu.inc diff --git a/testautomation/spreadsheet/required/includes/c_upd_insertmenu.inc b/testautomation/spreadsheet/required/includes/c_upd_insertmenu.inc index b8c749c27cd9..b8c749c27cd9 100755..100644 --- a/testautomation/spreadsheet/required/includes/c_upd_insertmenu.inc +++ b/testautomation/spreadsheet/required/includes/c_upd_insertmenu.inc diff --git a/testautomation/spreadsheet/required/includes/c_upd_toolsmenu.inc b/testautomation/spreadsheet/required/includes/c_upd_toolsmenu.inc index bcc263147371..74598099b43d 100644 --- a/testautomation/spreadsheet/required/includes/c_upd_toolsmenu.inc +++ b/testautomation/spreadsheet/required/includes/c_upd_toolsmenu.inc @@ -29,23 +29,6 @@ '* '* short description : Resource Test - Tools Menu Part I '* -'************************************************************************ -'* -' #1 tToolsSpellcheck -' #1 tToolsHangulHanjaConversion -' #1 tToolsLanguageChineseTranslation -' #1 tToolsLanguageThesaurus -' #1 tToolsLanguageHyphenation -' #1 tToolsDetective -' #1 tToolsAutoCorrect -' #1 tToolsGoalSeek -' #1 tToolsScenario -' #1 tToolsProtectSheet -' #1 tToolsProtectDocument -' #1 tToolsCellContents -' #1 tToolsGallery -' #1 tToolsMediaPlayer -'* '\*********************************************************************** sub c_upd_toolsmenu @@ -77,10 +60,7 @@ testcase tToolsSpellcheck Dim iDictionaries as integer printlog " Load document from 'gTesttoolPath + spreadsheet\required\input\english.ods" - Call hFileOpen (Convertpath (gTesttoolPath + "spreadsheet\required\input\english.ods" )) - '/// If the file is not editable, click the edit button on standardbar - printlog "If the file is not editable, click the edit button on standardbar" - call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath & "spreadsheet\required\input\english.ods" ) '/// Enter 'fgsdftk' in a cell printlog " Enter 'fgsdftk' in a cell" Kontext "DocumentCalc" @@ -208,6 +188,7 @@ testcase tToolsSpellcheck '/// Close starting document printlog " Close starting document" call hCloseDocument + hFileDelete( gLastWorkFile ) endcase @@ -228,10 +209,7 @@ testcase tToolsHangulHanjaConversion bCTLLanguage = ActiveDeactivateCTLSupport(TRUE) '/// Load document from 'gTesttoolPath + "spreadsheet\required\input\korean.ods"' printlog " Load document from 'gTesttoolPath + spreadsheet\required\input\korean.ods" - Call hFileOpen (Convertpath (gTesttoolPath + "spreadsheet\required\input\korean.ods" )) - '/// If the file is not editable, click the edit button on standardbar - printlog "If the file is not editable, click the edit button on standardbar" - call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath & "spreadsheet\required\input\korean.ods" ) '/// Select cell B1 printlog " Select cell B1" Call fCalcSelectRange ("B1") @@ -337,6 +315,7 @@ testcase tToolsHangulHanjaConversion '/// Close document printlog " Close document" call hCloseDocument + hFileDelete( gLastWorkFile ) endcase @@ -392,9 +371,7 @@ testcase tToolsLanguageThesaurus '///<u><b>Tools – Language – Chinese Translation</b></u> printlog " Load document from 'gTesttoolPath + spreadsheet\required\input\english.ods" - Call hFileOpen (Convertpath (gTesttoolPath + "spreadsheet\required\input\english.ods" )) - printlog "If the file is not editable, click the edit button on standardbar" - call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath & "spreadsheet\required\input\english.ods" ) Kontext "DocumentCalc" printlog " Enter 'test' in a cell" Call fCalcSelectRange ("B2") @@ -427,6 +404,7 @@ testcase tToolsLanguageThesaurus Thesaurus.Cancel printlog " Close document" call hCloseDocument + hFileDelete( gLastWorkFile ) endcase diff --git a/testautomation/spreadsheet/required/includes/c_upd_toolsmenu2.inc b/testautomation/spreadsheet/required/includes/c_upd_toolsmenu2.inc index f11857cf44ad..f11857cf44ad 100755..100644 --- a/testautomation/spreadsheet/required/includes/c_upd_toolsmenu2.inc +++ b/testautomation/spreadsheet/required/includes/c_upd_toolsmenu2.inc diff --git a/testautomation/spreadsheet/required/includes/c_upd_viewmenu.inc b/testautomation/spreadsheet/required/includes/c_upd_viewmenu.inc index e7568390c38a..e7568390c38a 100755..100644 --- a/testautomation/spreadsheet/required/includes/c_upd_viewmenu.inc +++ b/testautomation/spreadsheet/required/includes/c_upd_viewmenu.inc diff --git a/testautomation/spreadsheet/required/includes/c_upd_windowmenu.inc b/testautomation/spreadsheet/required/includes/c_upd_windowmenu.inc index 56adf3af682a..56adf3af682a 100755..100644 --- a/testautomation/spreadsheet/required/includes/c_upd_windowmenu.inc +++ b/testautomation/spreadsheet/required/includes/c_upd_windowmenu.inc |