diff options
Diffstat (limited to 'testautomation/chart2')
20 files changed, 52 insertions, 233 deletions
diff --git a/testautomation/chart2/optional/ch2_chart_data_dlg_impress.bas b/testautomation/chart2/optional/ch2_chart_data_dlg_impress.bas index 83ac7f78c3c9..83ac7f78c3c9 100644..100755 --- a/testautomation/chart2/optional/ch2_chart_data_dlg_impress.bas +++ b/testautomation/chart2/optional/ch2_chart_data_dlg_impress.bas diff --git a/testautomation/chart2/optional/ch2_flexible_source_range_selection.bas b/testautomation/chart2/optional/ch2_flexible_source_range_selection.bas index 6feedeb8004e..6feedeb8004e 100644..100755 --- a/testautomation/chart2/optional/ch2_flexible_source_range_selection.bas +++ b/testautomation/chart2/optional/ch2_flexible_source_range_selection.bas diff --git a/testautomation/chart2/optional/ch2_losa_ods_to_sdc.bas b/testautomation/chart2/optional/ch2_losa_ods_to_sdc.bas deleted file mode 100755 index d61c6183086a..000000000000 --- a/testautomation/chart2/optional/ch2_losa_ods_to_sdc.bas +++ /dev/null @@ -1,67 +0,0 @@ -'encoding UTF-8 Do not remove or change this line! -'************************************************************************** -' DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -' -' Copyright 2000, 2010 Oracle and/or its affiliates. -' -' OpenOffice.org - a multi-platform office productivity suite -' -' This file is part of OpenOffice.org. -' -' OpenOffice.org is free software: you can redistribute it and/or modify -' it under the terms of the GNU Lesser General Public License version 3 -' only, as published by the Free Software Foundation. -' -' OpenOffice.org is distributed in the hope that it will be useful, -' but WITHOUT ANY WARRANTY; without even the implied warranty of -' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -' GNU Lesser General Public License version 3 for more details -' (a copy is included in the LICENSE file that accompanied this code). -' -' You should have received a copy of the GNU Lesser General Public License -' version 3 along with OpenOffice.org. If not, see -' <http://www.openoffice.org/license.html> -' for a copy of the LGPLv3 License. -' -'/************************************************************************ -'* -'* owner : oliver.craemer@oracle.com -'* -'* short description : Load/Save test for chart files - Input: ODS, Output: SDC -'* -'\************************************************************************ - -Global gsFileFormat as String -Global gsDirectoryInSourcePath as String -Global gsOutputFileCustomExtension as String - -sub main - gsFileFormat = "StarCalc 5.0" - 'Important for determination of input file source path - '-> gtesttoolpath & "chart2\optional\input\" & gsDirectoryInSourcePath &"\" - gsDirectoryInSourcePath = "ods" - - 'Custom output file extension. Can be different to result from hGetFilternameExtension. - 'e.g. "_excel95.xls" - gsOutputFileCustomExtension = ".sdc" - - Printlog "--------------------------------------------------" - Printlog "--- Load charts in ODS - SaveAS SDC ---" - Printlog "--------------------------------------------------" - - use "chart2/optional/includes/loadsave/ch2_losa.inc" - use "chart2/tools/ch_tools_common.inc" - - Call hStatusIn("Chart2", "ch2_losa_ods_to_sdc.bas") - call subLoSaFromTo - Call hStatusOut -end sub -' -'------------------------------------------------------------------------- -' -sub LoadIncludeFiles - use "global\system\includes\master.inc" - use "global\system\includes\gvariabl.inc" - gApplication = "CALC" - Call GetUseFiles -end sub diff --git a/testautomation/chart2/optional/ch2_losa_sxc_to_sdc.bas b/testautomation/chart2/optional/ch2_losa_sxc_to_sdc.bas deleted file mode 100755 index 7c8e8726f580..000000000000 --- a/testautomation/chart2/optional/ch2_losa_sxc_to_sdc.bas +++ /dev/null @@ -1,68 +0,0 @@ -'encoding UTF-8 Do not remove or change this line! -'************************************************************************** -' DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -' -' Copyright 2000, 2010 Oracle and/or its affiliates. -' -' OpenOffice.org - a multi-platform office productivity suite -' -' This file is part of OpenOffice.org. -' -' OpenOffice.org is free software: you can redistribute it and/or modify -' it under the terms of the GNU Lesser General Public License version 3 -' only, as published by the Free Software Foundation. -' -' OpenOffice.org is distributed in the hope that it will be useful, -' but WITHOUT ANY WARRANTY; without even the implied warranty of -' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -' GNU Lesser General Public License version 3 for more details -' (a copy is included in the LICENSE file that accompanied this code). -' -' You should have received a copy of the GNU Lesser General Public License -' version 3 along with OpenOffice.org. If not, see -' <http://www.openoffice.org/license.html> -' for a copy of the LGPLv3 License. -' -'/************************************************************************ -'* -'* owner : oliver.craemer@oracle.com -'* -'* short description : Load/Save test for chart files - Input: SXC, Output: SDC -'* -'\************************************************************************ - -Global gsFileFormat as String -Global gsDirectoryInSourcePath as String -Global gsOutputFileCustomExtension as String - -sub main - gsFileFormat = "StarCalc 5.0" - - 'Important for determination of input file source path - '-> gtesttoolpath & "chart2\optional\input\" & gsDirectoryInSourcePath &"\" - gsDirectoryInSourcePath = "sxc" - - 'Custom output file extension. Can be different to result from hGetFilternameExtension. - 'e.g. "_excel95.xls" - gsOutputFileCustomExtension = ".sdc" - - Printlog "--------------------------------------------------" - Printlog "--- Load charts in SXC - SaveAS SDC ---" - Printlog "--------------------------------------------------" - - use "chart2/optional/includes/loadsave/ch2_losa.inc" - use "chart2/tools/ch_tools_common.inc" - - Call hStatusIn("Chart2", "ch2_losa_sxc_to_sdc.bas") - Call subLoSaFromTo - Call hStatusOut -end sub -' -'------------------------------------------------------------------------- -' -sub LoadIncludeFiles - use "global\system\includes\master.inc" - use "global\system\includes\gvariabl.inc" - gApplication = "CALC" - Call GetUseFiles -end sub diff --git a/testautomation/chart2/optional/ch2_xml_format.bas b/testautomation/chart2/optional/ch2_xml_format.bas index 25f5d751b58f..25f5d751b58f 100644..100755 --- a/testautomation/chart2/optional/ch2_xml_format.bas +++ b/testautomation/chart2/optional/ch2_xml_format.bas diff --git a/testautomation/chart2/optional/includes/ch2_flexible_source_range_selection.inc b/testautomation/chart2/optional/includes/ch2_flexible_source_range_selection.inc index 0151f5021b3e..f2a6e24e45a2 100644 --- a/testautomation/chart2/optional/includes/ch2_flexible_source_range_selection.inc +++ b/testautomation/chart2/optional/includes/ch2_flexible_source_range_selection.inc @@ -239,10 +239,10 @@ testcase tDataSeriesWizardCalc call DialogTest ( TabChartTypeDataSeries ) printlog "Check if the data series listbox is enabled and contains three entries" iDataSeries = DataSeries.GetItemCount - if iDataSeries = 3 then - printlog " All 3 data series are available" + if iDataSeries = 4 then + printlog " All 4 data series are available" else - warnlog "There are " & iDataSeries & " data series instead of 3" + warnlog "There are " & iDataSeries & " data series instead of 4" endif printlog "Check if the ADD button is enabled and click the button" if AddButton.IsEnabled then @@ -253,10 +253,10 @@ testcase tDataSeriesWizardCalc endif printlog "Check if there are now four entries in the data series listbox" iDataSeries = DataSeries.GetItemCount - if iDataSeries = 4 then + if iDataSeries = 5 then printlog " Adding a data series was successfull" else - warnlog "There are " & iDataSeries & " data series instead of 4" + warnlog "There are " & iDataSeries & " data series instead of 5" endif printlog "Check if the second data series was added below the highlighted one" if DataSeries.GetSelIndex = 2 then @@ -271,9 +271,9 @@ testcase tDataSeriesWizardCalc else warnlog "REMOVE button is not enabled" endif - printlog "Check if there are now 3 entries in the data series listbox" + printlog "Check if there are now 4 entries in the data series listbox" iDataSeries = DataSeries.GetItemCount - if iDataSeries = 3 then + if iDataSeries = 4 then printlog " Removing a data series was successfull" else warnlog "There are " & iDataSeries & " data series instead of 3" @@ -302,13 +302,14 @@ testcase tDataSeriesWizardCalc DataSeries.Select(1) if MoveDown.IsEnabled then printlog " The MoveDown button is enabled" - printlog "Click Move Down button twice" + printlog "Click Move Down button three times" + MoveDown.Click MoveDown.Click MoveDown.Click else warnlog "The MoveDown button is disabled" endif - if DataSeries.GetSelIndex = 3 then + if DataSeries.GetSelIndex = 4 then printlog " Moving data series was successfull" if MoveDown.IsEnabled then warnlog "MoveDown button is not disabled on first entry" diff --git a/testautomation/chart2/optional/includes/ch2_flexible_source_range_selection01.inc b/testautomation/chart2/optional/includes/ch2_flexible_source_range_selection01.inc index ec2496ecb1f3..071e9146ef78 100644 --- a/testautomation/chart2/optional/includes/ch2_flexible_source_range_selection01.inc +++ b/testautomation/chart2/optional/includes/ch2_flexible_source_range_selection01.inc @@ -782,9 +782,7 @@ endcase ' function fOpenWriterTestDocumentAndInsertChart(sInputFile as STRING) as BOOLEAN fOpenWriterTestDocumentAndInsertChart = FALSE - call hFileOpen(sInputFile) - sleep(2) - Call sMakeReadOnlyDocumentEditable() + hFileOpenLocally(sInputFile) '///Menu Insert Object Chart to open chart wizard printlog "Menu Insert Object Chart to open chart wizard" InsertObjectChart diff --git a/testautomation/chart2/optional/includes/loadsave/ch2_losa.inc b/testautomation/chart2/optional/includes/loadsave/ch2_losa.inc index b530b0c2a364..b530b0c2a364 100755..100644 --- a/testautomation/chart2/optional/includes/loadsave/ch2_losa.inc +++ b/testautomation/chart2/optional/includes/loadsave/ch2_losa.inc diff --git a/testautomation/chart2/optional/includes/wizard/ch2_lvl1_wizard.inc b/testautomation/chart2/optional/includes/wizard/ch2_lvl1_wizard.inc index f87f915ea7f4..357fa89c4393 100755..100644 --- a/testautomation/chart2/optional/includes/wizard/ch2_lvl1_wizard.inc +++ b/testautomation/chart2/optional/includes/wizard/ch2_lvl1_wizard.inc @@ -199,7 +199,7 @@ testcase tCreateNew3DChart endif printlog "Check that 3D look is 'simple' (=default)" if Scheme3D.GetSelIndex <> 1 then - qaerrorlog "#i112522# - Default 3D Look ('simple') has not been preserved after save and reload." + warnlog "#i112522# - Default 3D Look ('simple') has not been preserved after save and reload." endif printlog "Check that 3D shape 'cone' is selected" if BarColumnShape.GetSelIndex <> 3 Then diff --git a/testautomation/chart2/required/ch2_updt_calc.bas b/testautomation/chart2/required/ch2_updt_calc.bas index 02cc2c883269..806f0f220ed2 100755..100644 --- a/testautomation/chart2/required/ch2_updt_calc.bas +++ b/testautomation/chart2/required/ch2_updt_calc.bas @@ -71,8 +71,6 @@ sub main call tFileSaveAsSTC call tFileSaveAsXLS call tFileSaveAsXLT - call tFileSaveAsSDC - call tFileSaveAsVOR call tFileReload printLog Chr(13) + "---------- Chart2 View Menu -----------" Call tViewToolbars @@ -112,6 +110,7 @@ sub main Call tFormatAxisSecondaryXAxis Call tFormatAxisSecondaryYAxis Call tFormatAxisAllAxes + Call tFormatDateAxis Call tFormatXAxisMainGrid Call tFormatYAxisMainGrid Call tFormatZAxisMainGrid diff --git a/testautomation/chart2/required/includes/ch2_file.inc b/testautomation/chart2/required/includes/ch2_file.inc index f7166df9c82e..51e41398532e 100755..100644 --- a/testautomation/chart2/required/includes/ch2_file.inc +++ b/testautomation/chart2/required/includes/ch2_file.inc @@ -37,8 +37,6 @@ ' #1 tFileSaveAsSTC ' #1 tFileSaveAsXLS ' #1 tFileSaveAsXLT -' #1 tFileSaveAsSDC -' #1 tFileSaveAsVOR ' #1 tFileReload '* '\************************************************************************ @@ -295,82 +293,7 @@ testcase tFileSaveAsXLT endcase ' '------------------------------------------------------------- -' -testcase tFileSaveAsSDC -'///<u><b>Save the test file as StarCalc 5.0 (.sdc)</b></u> - Dim sOutputFile as string - - sOutputFile = convertpath( gOfficepath & "user/work/verySimpleChart.sdc" ) - '/// Load simple chart document - if fLoadVerySimpleChartAndSaveLocal() > 0 then - warnlog "Loading test document seems to have failed -> Check this out!" - goto endsub - endif - '/// Select chart using navigator - call fSelectFirstOLE - '/// Invoke Edit::Object::Edit to enter Inplace Mode - EditObjectEdit - '/// Convert chart to 3D (just to edit document) - if NOT fConvertChartTo3D() then - warnlog "Conversion of chart to 3D failed -> Quit testcase" - Call hCloseDocument - goto endsub - endif - '/// Unselect chart using Escape key - Kontext "DocumentCalc" - DocumentCalc.TypeKeys "<Escape>" - '/// Save document as StarCalc 5.0 (.sdc) - if NOT hFileSaveAsWithFilterKill ( sOutputFile , "StarCalc 5.0" ) then - warnlog "Saving test document as '" & sOutputFile & "' failed -> Aborting" - call hCloseDocument - goto endsub - endif - '/// Close document - Kontext "DocumentCalc" - DocumentCalc.TypeKeys "<Escape>" - Call hCloseDocument -endcase -' -'------------------------------------------------------------- -' -testcase tFileSaveAsVOR -'///<u><b>Save the test file as StarCalc 5.0 Template(.vor)</b></u> - Dim sOutputFile as string - - sOutputFile = convertpath( gOfficepath & "user/work/verySimpleChart.vor" ) - - '/// Load simple chart document - if fLoadVerySimpleChartAndSaveLocal() > 0 then - warnlog "Loading test document seems to have failed -> Check this out!" - goto endsub - endif - '/// Select chart using navigator - call fSelectFirstOLE - '/// Invoke Edit::Object::Edit to enter Inplace Mode - EditObjectEdit - '/// Convert chart to 3D (just to edit document) - if NOT fConvertChartTo3D() then - warnlog "Conversion of chart to 3D failed -> Quit testcase" - Call hCloseDocument - goto endsub - endif - '/// Unselect chart using Escape key - Kontext "DocumentCalc" - DocumentCalc.TypeKeys "<Escape>" - '/// Save document as StarCalc 5.0 Template(.vor) - if NOT hFileSaveAsWithFilterKill ( sOutputFile , "StarCalc 5.0 Vorlage/Template" ) then - warnlog "Saving test document as '" & sOutputFile & "' failed -> Aborting" - call hCloseDocument - goto endsub - endif - '/// Close document - Kontext "DocumentCalc" - DocumentCalc.TypeKeys "<Escape>" - Call hCloseDocument -endcase -' -'------------------------------------------------------------- ' testcase tFileReload printlog "Load simple chart document" diff --git a/testautomation/chart2/required/includes/ch2_format.inc b/testautomation/chart2/required/includes/ch2_format.inc index 42048cbbb7de..27575ca4324f 100755..100644 --- a/testautomation/chart2/required/includes/ch2_format.inc +++ b/testautomation/chart2/required/includes/ch2_format.inc @@ -47,6 +47,7 @@ ' #1 tFormatAxisSecondaryXAxis ' #1 tFormatAxisSecondaryYAxis ' #1 tFormatAxisAllAxes +' #1 tFormatDateAxis '* '\************************************************************************ @@ -1404,4 +1405,40 @@ testcase tFormatAxisAllAxes endcase +' +'------------------------------------------------------------- +' +testcase tFormatDateAxis + printlog "Load simple chart document" + if fLoadVerySimpleChartAndSaveLocal() > 0 then + warnlog "Loading test document seems to have failed -> Check this out!" + goto endsub + endif + printlog " Select chart using navigator" + call fSelectFirstOLE + printlog "Edit / Object / Edit" + EditObjectEdit + sleep(1) + printlog "Invoke Format::Axis::X Axis" + FormatAxisXAxis + printlog "Goto tab page Scale" + Kontext + Active.SetPage TabChartAxisScale + Kontext "TabChartAxisScale" + printlog " Switch axis type to Date" + AxisType.Select (3) + printlog " Verify that the date controls are available" + if MinorIntervalUnit.exists then + call DialogTest ( TabChartAxisScale,2 ) + else + warnlog "Datecontrols are not available" + end if + printlog " Close dialog" + TabChartAxisScale.Cancel + printlog "Close document" + Kontext "DocumentCalc" + DocumentCalc.TypeKeys "<Escape>" + Call hCloseDocument + +endcase diff --git a/testautomation/chart2/required/includes/ch2_format1.inc b/testautomation/chart2/required/includes/ch2_format1.inc index dbe1de149c9c..dbe1de149c9c 100755..100644 --- a/testautomation/chart2/required/includes/ch2_format1.inc +++ b/testautomation/chart2/required/includes/ch2_format1.inc diff --git a/testautomation/chart2/required/includes/ch2_insert.inc b/testautomation/chart2/required/includes/ch2_insert.inc index 79923a8198c6..79923a8198c6 100755..100644 --- a/testautomation/chart2/required/includes/ch2_insert.inc +++ b/testautomation/chart2/required/includes/ch2_insert.inc diff --git a/testautomation/chart2/required/includes/ch2_ole.inc b/testautomation/chart2/required/includes/ch2_ole.inc index 6daf6545de41..6daf6545de41 100755..100644 --- a/testautomation/chart2/required/includes/ch2_ole.inc +++ b/testautomation/chart2/required/includes/ch2_ole.inc diff --git a/testautomation/chart2/required/includes/ch2_toolbars.inc b/testautomation/chart2/required/includes/ch2_toolbars.inc index 32eed54ee370..32eed54ee370 100755..100644 --- a/testautomation/chart2/required/includes/ch2_toolbars.inc +++ b/testautomation/chart2/required/includes/ch2_toolbars.inc diff --git a/testautomation/chart2/required/includes/ch2_view.inc b/testautomation/chart2/required/includes/ch2_view.inc index 39beac14839c..39beac14839c 100755..100644 --- a/testautomation/chart2/required/includes/ch2_view.inc +++ b/testautomation/chart2/required/includes/ch2_view.inc diff --git a/testautomation/chart2/required/includes/ch2_window.inc b/testautomation/chart2/required/includes/ch2_window.inc index 407898e228d1..407898e228d1 100755..100644 --- a/testautomation/chart2/required/includes/ch2_window.inc +++ b/testautomation/chart2/required/includes/ch2_window.inc diff --git a/testautomation/chart2/required/includes/ch2_wizard.inc b/testautomation/chart2/required/includes/ch2_wizard.inc index df97ba6bda43..df97ba6bda43 100755..100644 --- a/testautomation/chart2/required/includes/ch2_wizard.inc +++ b/testautomation/chart2/required/includes/ch2_wizard.inc diff --git a/testautomation/chart2/tools/ch_tools_common.inc b/testautomation/chart2/tools/ch_tools_common.inc index f6d722fa2a25..ad9f2108f024 100644 --- a/testautomation/chart2/tools/ch_tools_common.inc +++ b/testautomation/chart2/tools/ch_tools_common.inc @@ -162,9 +162,7 @@ end function ' function fOpenTestDocumentAndSelectDataRange(sInputFile as string) as BOOLEAN fOpenTestDocumentAndSelectDataRange = FALSE - call hFileOpen(sInputFile) - sleep(2) - Call sMakeReadOnlyDocumentEditable() + hFileOpenLocally(sInputFile) '/// Select chart using navigator printlog "Select chart using navigator" call fSelectFirstOLE @@ -191,9 +189,7 @@ end function ' function fOpenTestDocumentAndInsertChart(sInputFile as string) as BOOLEAN fOpenTestDocumentAndInsertChart = FALSE - call hFileOpen(sInputFile) - sleep(2) - Call sMakeReadOnlyDocumentEditable() + hFileOpenLocally(sInputFile) Kontext "DocumentCalc" printlog "Type <STRG+HOME>" DocumentCalc.TypeKeys "<MOD1 HOME>" |