summaryrefslogtreecommitdiff
path: root/testautomation/chart2/optional/includes
diff options
context:
space:
mode:
Diffstat (limited to 'testautomation/chart2/optional/includes')
-rw-r--r--testautomation/chart2/optional/includes/ch2_flexible_source_range_selection.inc19
-rw-r--r--testautomation/chart2/optional/includes/ch2_flexible_source_range_selection01.inc4
-rw-r--r--[-rwxr-xr-x]testautomation/chart2/optional/includes/loadsave/ch2_losa.inc0
-rw-r--r--[-rwxr-xr-x]testautomation/chart2/optional/includes/wizard/ch2_lvl1_wizard.inc2
4 files changed, 12 insertions, 13 deletions
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