[ooo-build-commit] Branch 'ooo/master' - 3 commits - testautomation/chart2 testautomation/framework testautomation/global
Jan Holesovsky
kendy at kemper.freedesktop.org
Sat Sep 12 05:56:00 PDT 2009
testautomation/chart2/optional/ch2_lvl1.bas | 1
testautomation/chart2/optional/includes/ch2_lvl1a.inc | 22 -
testautomation/chart2/required/includes/ch2_datadialogue.inc | 6
testautomation/chart2/required/includes/ch2_format.inc | 66 ++--
testautomation/chart2/required/includes/ch2_insert.inc | 9
testautomation/chart2/required/includes/ch2_insert_ctl.inc | 63 +---
testautomation/chart2/required/includes/ch2_menu.inc | 12
testautomation/chart2/tools/ch_tools_select.inc | 18 +
testautomation/chart2/tools/ch_tools_statistics.inc | 8
testautomation/framework/required/f_basic_dialogs.bas | 2
testautomation/framework/required/includes/basic_dialog_i18n.inc | 151 ++++------
testautomation/framework/required/includes/basic_dialog_i18n_import.inc | 143 +++++++++
testautomation/framework/required/includes/wizard_euroconverter.inc | 2
testautomation/framework/required/input/basic_ide/Dialog5.xdl | 7
testautomation/framework/required/input/basic_ide/Dialog5_ar_DZ.properties | 5
testautomation/framework/required/input/basic_ide/Dialog5_ca_ES.properties | 5
testautomation/framework/required/input/basic_ide/Dialog5_de_DE.properties | 5
testautomation/framework/required/input/basic_ide/Dialog5_en_US.properties | 5
testautomation/framework/required/input/basic_ide/Dialog5_fr_FR.properties | 5
testautomation/global/sid/e_all.sid | 17 -
testautomation/global/win/bars.win | 3
testautomation/global/win/etab_a_d.win | 2
22 files changed, 374 insertions(+), 183 deletions(-)
New commits:
commit 5c71f9b63c423d47c869a542c3d4f95dbbfef32b
Author: Kurt Zenker <kz at openoffice.org>
Date: Fri Sep 11 16:49:12 2009 +0000
CWS-TOOLING: integrate CWS extras320
2009-09-09 07:44:31 +0200 jsk r275963 : #i104797# - changed number of currencies from 13 to 16
2009-08-20 10:20:49 +0200 va r275169 : #i99047# Added Font Hinting
2009-08-18 12:50:42 +0200 va r275092 : #i99047# Added Font Hinting
2009-08-18 10:44:16 +0200 va r275083 : #i104220# French Holiday: Added Whit Sunday
2009-08-14 11:46:39 +0200 va r274973 : #i104220# Corrected French Holidays
2009-08-11 17:51:29 +0200 va r274872 : #i98254# Button for Logfile expanded.
2009-08-11 17:28:09 +0200 va r274870 : #i103011# Added latest 3 Euro Countries
2009-08-11 17:27:48 +0200 va r274869 : #i103011# Added latest 3 Euro Countries
2009-08-11 17:17:41 +0200 va r274868 : #i102567# Updated AutoCorrection
2009-08-11 17:16:59 +0200 va r274867 : #i102567# Updated AutoCorrection
2009-08-11 17:16:27 +0200 va r274866 : #i102567# Updated AutoCorrection
diff --git a/testautomation/framework/required/includes/wizard_euroconverter.inc b/testautomation/framework/required/includes/wizard_euroconverter.inc
index 0548e80..a85c802 100755
--- a/testautomation/framework/required/includes/wizard_euroconverter.inc
+++ b/testautomation/framework/required/includes/wizard_euroconverter.inc
@@ -44,7 +44,7 @@ testcase tUpdtWizardEuroconverter
dim cMsg as string
dim iKnownCurrencies as integer
- const KNOWN_CURRENCIES = 13
+ const KNOWN_CURRENCIES = 16
const TARGET_FILE = "barfly.ods"
commit 8e5e25adeade22018ea209c5e4befdc0bbc0c71c
Author: Kurt Zenker <kz at openoffice.org>
Date: Fri Sep 11 16:06:18 2009 +0000
CWS-TOOLING: integrate CWS chartuseability01
2009-09-07 17:26:44 +0200 iha r275906 : CWS-TOOLING: rebase CWS chartuseability01 to trunk at 275801 (milestone: DEV300:m57)
2009-08-27 13:48:16 +0200 iha r275481 : #7049# listbox to select chart elements
2009-08-27 11:54:53 +0200 iha r275464 : #i58163# #i69422# #i102820# enhance chart context menu
2009-08-26 16:49:58 +0200 iha r275435 : #i102820# added missing case 'floor'
2009-08-26 15:33:51 +0200 iha r275427 : #i102820# make 'insert legend' work properly
2009-08-25 16:35:00 +0200 ufi r275369 : i104087
2009-08-25 15:12:17 +0200 iha r275360 : #i104087# 'Object Properties' -> 'Format Selection'
2009-08-25 15:11:31 +0200 iha r275359 : #i104087# 'Object Properties' -> 'Format Selection'
2009-08-25 15:11:15 +0200 iha r275358 : #i104087# 'Object Properties' -> 'Format Selection'
2009-08-25 11:57:43 +0200 iha r275344 : #i104087# changed behavior of insert menu
2009-08-18 12:53:54 +0200 oc r275093 : #i104082,104086,104089# multiple changes because of changed chartUI
2009-08-10 16:46:17 +0200 ufi r274824 : i104083 i104087 i104090
2009-08-07 14:04:34 +0200 iha r274763 : #7049# listbox to select chart elements
2009-08-07 13:06:05 +0200 iha r274760 : #7049# listbox to select chart elements
2009-08-07 13:05:06 +0200 iha r274759 : #7049# listbox to select chart elements
2009-08-07 12:32:31 +0200 iha r274756 : #i58163# #i69422# #i102820# enhance chart context menu
2009-08-07 12:31:54 +0200 iha r274755 : #i58163# #i69422# #i102820# enhance chart context menu
2009-08-06 19:00:48 +0200 iha r274742 : #i103593# make insert menu behavior selection dependent
2009-08-06 19:00:14 +0200 iha r274741 : #i103593# make insert menu behavior selection dependent
2009-08-06 15:34:01 +0200 iha r274731 : #i58163# #i69422# #i102820# enhance chart context menu
2009-08-06 14:39:20 +0200 iha r274728 : #i86146# ease adding R-squared value with an equation
2009-08-06 14:37:02 +0200 iha r274727 : #i86146# ease adding R-squared value with an equation
2009-08-06 13:37:54 +0200 iha r274724 : #i86146# ease adding R-squared value with an equation
2009-08-06 13:37:15 +0200 iha r274723 : #i86146# ease adding R-squared value with an equation
2009-08-06 13:04:27 +0200 iha r274722 : #i103593# make insert menu behavior selection dependent
2009-08-06 13:03:35 +0200 iha r274721 : #i103593# make insert menu behavior selection dependent
2009-08-05 18:26:31 +0200 iha r274693 : #i104033# inconsistent wording 'error indicator' <-> 'error bar'
2009-08-05 16:51:45 +0200 iha r274688 : #i104028# rename font tabpage 'Characters'->'Font'
2009-08-05 16:30:21 +0200 iha r274685 : #i58163# #i69422# #i102820# enhance chart context menu
2009-08-05 15:34:11 +0200 iha r274680 : #i58163# #i69422# #i102820# enhance chart context menu
2009-08-05 15:32:43 +0200 iha r274679 : #i58163# #i69422# #i102820# enhance chart context menu
2009-08-05 15:31:26 +0200 iha r274678 : #i58163# #i69422# #i102820# enhance chart context menu
2009-08-05 15:17:51 +0200 iha r274676 : #i58163# #i69422# #i102820# enhance chart context menu
2009-08-05 15:16:22 +0200 iha r274675 : #i58163# #i69422# #i102820# enhance chart context menu
2009-08-05 14:58:59 +0200 iha r274674 : #7049# listbox to select chart elements
2009-08-05 14:33:54 +0200 iha r274669 : #7049# listbox to select chart elements
2009-08-05 14:22:17 +0200 iha r274665 : #7049# listbox to select chart elements
2009-08-05 13:21:05 +0200 iha r274656 : #i102820# offer insertion of several elements in context menu also if nothing is selected
2009-08-05 11:56:06 +0200 iha r274647 : #7049# listbox to select chart elements
2009-08-05 11:43:40 +0200 iha r274645 : #7049# listbox to select chart elements
2009-07-24 19:46:50 +0200 iha r274318 : #i58163# #i69422# #i102820# enhance chart context menu
2009-07-24 16:23:13 +0200 iha r274313 : #i58163# #i69422# #i102820# enhance chart context menu
2009-07-24 16:13:22 +0200 iha r274311 : #i58163# #i69422# #i102820# enhance chart context menu
diff --git a/testautomation/chart2/optional/ch2_lvl1.bas b/testautomation/chart2/optional/ch2_lvl1.bas
index 0a92711..3344b52 100755
--- a/testautomation/chart2/optional/ch2_lvl1.bas
+++ b/testautomation/chart2/optional/ch2_lvl1.bas
@@ -39,6 +39,7 @@
sub main
use "chart2\tools\ch_tools_common.inc"
+ use "chart2\tools\ch_tools_select.inc"
use "chart2\optional\includes\ch2_lvl1a.inc"
Call hStatusIn ( "Chart2", "ch2_lvl1.bas" )
diff --git a/testautomation/chart2/optional/includes/ch2_lvl1a.inc b/testautomation/chart2/optional/includes/ch2_lvl1a.inc
index e28c9b8..3015fc3 100755
--- a/testautomation/chart2/optional/includes/ch2_lvl1a.inc
+++ b/testautomation/chart2/optional/includes/ch2_lvl1a.inc
@@ -64,12 +64,13 @@ testcase tPlotOptions
printlog "Edit / Object / Edit"
EditObjectEdit
- printlog "Move to third object in Chart using TAB key (data series)"
+ printlog "Select DataSeries A by toolbar selectorbox"
Kontext "DocumentChart"
- DocumentChart.TypeKeys "<TAB>" , 3
+ call fChartSelectElement (8)
printlog "Invoke Format::ObjectProperties"
- FormatObjectProperties
+ Kontext "Toolbar"
+ FormatSelection.Click
printlog "Select tab page Options"
Kontext
@@ -85,8 +86,9 @@ testcase tPlotOptions
endcatch
printlog "Close and reopen data series dialog - checkbox should be still activated"
- TabDataSeriesOptions.Ok
- FormatObjectProperties
+ TabDataSeriesOptions.Ok
+ Kontext "DocumentChart"
+ FormatSelection
printlog "Select tab page Options"
Kontext
Active.SetPage TabDataSeriesOptions
@@ -119,12 +121,14 @@ testcase tPlotOptions
goto endsub
endif
-
EditObjectEdit
- Kontext "DocumentChart"
- DocumentChart.TypeKeys "<TAB>" , 3
+
+ printlog "Select DataSeries A by toolbar selectorbox"
+ call fChartSelectElement (8)
+
printlog "Invoke Format::ObjectProperties"
- FormatObjectProperties
+ Kontext "Toolbar"
+ FormatSelection.Click
Kontext
Active.SetPage TabDataSeriesOptions
Kontext "TabDataSeriesOptions"
diff --git a/testautomation/chart2/required/includes/ch2_datadialogue.inc b/testautomation/chart2/required/includes/ch2_datadialogue.inc
index bfc99dc..cc13cd2 100755
--- a/testautomation/chart2/required/includes/ch2_datadialogue.inc
+++ b/testautomation/chart2/required/includes/ch2_datadialogue.inc
@@ -63,7 +63,7 @@ testcase tChartDataDialogueButtons
DocumentChart.OpenContextMenu
'/// Select the third entry
printlog "Select the third entry"
- hMenuSelectNr (3)
+ hMenuSelectNr (6)
sleep (1)
Kontext "Diagramdata"
call DialogTest ( Diagramdata )
@@ -240,7 +240,7 @@ testcase tChartDataDialogueFieldsUndo
DocumentChart.OpenContextMenu
'/// Select third entry
printlog "Select third entry"
- hMenuSelectNr (3)
+ hMenuSelectNr (6)
sleep (1)
Kontext "Diagramdata"
call DialogTest ( Diagramdata )
@@ -308,7 +308,7 @@ testcase tChartDataDialogueFieldsUndo
DocumentChart.OpenContextMenu
'/// Select third entry
printlog "Select third entry"
- hMenuSelectNr (3)
+ hMenuSelectNr (6)
sleep (1)
Kontext "Diagramdata"
'/// Inside the Tables: Press the 'TAB'-key 14 times.
diff --git a/testautomation/chart2/required/includes/ch2_format.inc b/testautomation/chart2/required/includes/ch2_format.inc
index e03a0bd..64f4227 100755
--- a/testautomation/chart2/required/includes/ch2_format.inc
+++ b/testautomation/chart2/required/includes/ch2_format.inc
@@ -70,30 +70,39 @@ testcase tFormatObjectProperties
if fSelectFirstOLE = 0 then
printlog "Edit / Object / Edit"
EditObjectEdit
- printlog "Move to third object in Chart using TAB key (data series)"
- Kontext "DocumentChart"
- DocumentChart.TypeKeys "<TAB>" , 3
- printlog "Invoke Format::ObjectProperties"
- FormatObjectProperties
- printlog "Select tab page Aligment"
+ printlog "Select DataSeries A by toolbar selectorbox"
+ call fChartSelectElement (8)
+ printlog "Open the properties dialog by using the FormatSelection button in the toolbar"
+ FormatSelection.Click
+ printlog "Select tab page Options"
Kontext
iCountTabPg = Active.GetPageCount
- if iCountTabPg <> 7 then
- warnlog "Edit::Properties on a data series should have 7 tab pages but has " & iCountTabPg & "."
+ if iCountTabPg <> 4 then
+ warnlog "Edit::Properties on a data series should have 4 tab pages but has " & iCountTabPg & "."
else
- printlog "Edit::Properties on a data series has 7 tab pages."
+ printlog "Edit::Properties on a data series has 4 tab pages."
endif
- Active.SetPage TabDataSeriesLabels
- '/// Check if tab page series labels exists
- Kontext "TabDataSeriesLabels"
- call DialogTest ( TabDataSeriesLabels )
+ Active.SetPage TabDataSeriesOptions
'/// Check if tab page data series options exists
- Kontext
- Active.SetPage TabDataSeriesOptions
Kontext "TabDataSeriesOptions"
- call DialogTest ( TabDataSeriesOptions )
+ call DialogTest ( TabDataSeriesOptions )
+ '/// Check if tab page area exists
+ Kontext
+ Active.SetPage TabArea
+ Kontext "TabArea"
+ call DialogTest ( TabArea )
+ '/// Check if tab page transparency exists
+ Kontext
+ Active.SetPage TabTransparency
+ Kontext "TabTransparency"
+ call DialogTest ( TabTransparency )
+ '/// Check if tab page borders exists
+ Kontext
+ Active.SetPage TabFormatChartBorders
+ Kontext "TabFormatChartBorders"
+ call DialogTest ( TabFormatChartBorders )
'/// Close dialog with Cancel-button
- TabDataSeriesOptions.Cancel
+ TabFormatChartBorders.Cancel
'/// Close document
Kontext "DocumentCalc"
DocumentCalc.TypeKeys "<Escape>"
@@ -138,25 +147,24 @@ testcase tFormatObjectPropertiesPieChart
Call hCloseDocument
goto endsub
endif
- '/// Move to third object in Chart using TAB key (data series)
- Kontext "DocumentChart"
- DocumentChart.TypeKeys "<TAB>" , 3
- '/// Invoke Format::ObjectProperties
- FormatObjectProperties
+ '/// Move to data series in Chart
+ call fChartSelectElement (5)
+ printlog "Open the properties dialog by using the FormatSelection button in the toolbar"
+ FormatSelection.Click
'/// Select tab page Aligment
Kontext
iCountTabPg = Active.GetPageCount
- if iCountTabPg <> 7 then
- warnlog "Edit::Properties on a data series of a pie chart should have 7 tab pages but has " & iCountTabPg & "."
+ if iCountTabPg <> 4 then
+ warnlog "Edit::Properties on a data series of a pie chart should have 4 tab pages but has " & iCountTabPg & "."
else
- printlog "Edit::Properties on a data series on a pie chart has 7 tab pages."
+ printlog "Edit::Properties on a data series on a pie chart has 4 tab pages."
endif
- Active.SetPage TabChartPieOpetions
+ Active.SetPage TabChartPieOptions
'/// Check if tab page Options exists
- Kontext "TabChartPieOpetions"
- call DialogTest ( TabChartPieOpetions )
+ Kontext "TabChartPieOptions"
+ call DialogTest ( TabChartPieOptions )
'/// Close dialog with Cancel-button
- TabChartPieOpetions.Cancel
+ TabChartPieOptions.Cancel
'/// Close document
Kontext "DocumentCalc"
DocumentCalc.TypeKeys "<ESCAPE>"
diff --git a/testautomation/chart2/required/includes/ch2_insert.inc b/testautomation/chart2/required/includes/ch2_insert.inc
index 526d430..fae0ead 100755
--- a/testautomation/chart2/required/includes/ch2_insert.inc
+++ b/testautomation/chart2/required/includes/ch2_insert.inc
@@ -220,12 +220,9 @@ testcase tInsertTrendLines
call fSelectFirstOLE
'/// Invoke Edit::Object::Edit to enter Inplace Mode
EditObjectEdit
- '/// Invoke Insert::TrendLines
- if fInvokeTrendLinesDialog() > 0 then
- warnlog "Something went wrong trying to invoke Trend Lines dialog -> Check this out!"
- Call hCloseDocument
- goto endsub
- endif
+ Kontext "DocumentChart"
+ printlog "Insert TrendLines"
+ InsertTrendlines
'/// Check existence of dialog
Kontext "InsertTrendlinesDialog"
Call DialogTest ( InsertTrendlinesDialog )
diff --git a/testautomation/chart2/required/includes/ch2_insert_ctl.inc b/testautomation/chart2/required/includes/ch2_insert_ctl.inc
index 3a72c13..4049907 100644
--- a/testautomation/chart2/required/includes/ch2_insert_ctl.inc
+++ b/testautomation/chart2/required/includes/ch2_insert_ctl.inc
@@ -61,14 +61,14 @@ testcase tTitleTextDirection
printlog "Select the first OLE object in the document."
call fSelectFirstOLE
printlog "Edit / Object / Edit"
- EditObjectEdit
- Kontext "DocumentChart"
- printlog "Type in the Chart document <TAB>"
- DocumentChart.TypeKeys "<TAB>"
- printlog "Format / Object properties"
- FormatObjectProperties
+ EditObjectEdit
+ Kontext "DocumentChart"
+ printlog "Select the Main Title by using the ChartElememtSelectorListBox in the toolbar (4th entry)"
+ call fChartSelectElement (4)
+ printlog "Open the properties dialog by using the FormatSelection button in the toolbar"
+ FormatSelection.Click
Kontext
- printlog "Select the tab page alignment"
+ printlog "Select the tab page Alignment"
Active.SetPage TabFormatChartTitleAlignment
Kontext "TabFormatChartTitleAlignment"
call DialogTest(TabFormatChartTitleAlignment)
@@ -172,13 +172,13 @@ testcase tDataSeriesTextDirection
bCTLSupBefore = ActiveDeactivateCTLSupport(TRUE)
call fSelectFirstOLE
printlog "Select the first OLE object"
- EditObjectEdit
printlog "Edit / Object Edit"
- Kontext "DocumentChart"
- printlog "Type thrice in the Chart document <TAB>"
- DocumentChart.TypeKeys "<TAB>" , 3
- printlog "Format / Object properties"
- FormatObjectProperties
+ EditObjectEdit
+ printlog "Select DataSeries A by toolbar selectorbox"
+ call fChartSelectElement (8)
+ printlog "Insert DataLabels"
+ Kontext "DocumentChart"
+ InsertDataLabels
Kontext
Active.Setpage TabDataSeriesLabels
Kontext "TabDataSeriesLabels"
@@ -299,36 +299,27 @@ testcase tEquationTextDirection
call fSelectFirstOLE
printlog "Edit / Object Edit"
EditObjectEdit
- Kontext "DocumentChart"
- printlog "Type thrice in the Chart document <TAB>"
- DocumentChart.TypeKeys "<TAB>" , 3
- printlog "Press F3-key to enter the data series."
- DocumentChart.TypeKeys "<F3>"
+ printlog "Select DataSeries A by toolbar selectorbox"
+ call fChartSelectElement (8)
+ Kontext "DocumentChart"
if fInvokeTrendLinesDialog() > 0 then
warnlog "Something went wrong trying to invoke Trend Lines dialog -> Check this out!"
Call hCloseDocument
goto endsub
endif
- Kontext "InsertTrendlinesDialog"
- Call DialogTest(InsertTrendlinesDialog)
+ Kontext "TabTrendLineType"
+ Call DialogTest(TabTrendLineType)
printlog "Select Linear radio-button"
Linear.Check
printlog "Check Show Equation check-box"
ShowEquation.Check
printlog "Leave the dialog with OK"
- InsertTrendlinesDialog.OK
+ TabTrendLineType.OK
Kontext "DocumentChart"
- printlog "Leave Chart by ESC and reenter Chart"
- DocumentChart.TypeKeys "<ESC>" , 2
- call fSelectFirstOLE
- EditObjectEdit
- Kontext "DocumentChart"
- printlog "Type <TAB> thrice in the Chart document, press F3 and <TAB> to select the equation"
- DocumentChart.TypeKeys "<TAB>" , 3
- DocumentChart.TypeKeys "<F3>"
- DocumentChart.TypeKeys "<TAB>"
+ printlog "Select Equation by toolbar selectorbox"
+ call fChartSelectElement (10)
printlog "Format / Object properties"
- FormatObjectProperties
+ FormatSelection.Click
Kontext
printlog "Count the numbers of tab pages. It should be 7 in CTL mode."
if Active.GetPageCount <> 7 then
@@ -372,13 +363,13 @@ testcase tDataPointTextDirection
printlog "Select the first OLE object"
EditObjectEdit
printlog "Edit / Object Edit"
- Kontext "DocumentChart"
- printlog "Type thrice in the Chart document <TAB>"
- DocumentChart.TypeKeys "<TAB>" , 3
+ printlog "Select DataSeries A by toolbar selectorbox"
+ call fChartSelectElement (8)
+ Kontext "DocumentChart"
printlog "Press F3-key to enter the data series."
DocumentChart.TypeKeys "<F3>"
- printlog "Format / Object properties"
- FormatObjectProperties
+ printlog "Insert / DataLabels"
+ InsertDataLabels
Kontext
Active.Setpage TabDataPointLabels
Kontext "TabDataPointLabels"
diff --git a/testautomation/chart2/required/includes/ch2_menu.inc b/testautomation/chart2/required/includes/ch2_menu.inc
index 50da902..5d6105f 100644
--- a/testautomation/chart2/required/includes/ch2_menu.inc
+++ b/testautomation/chart2/required/includes/ch2_menu.inc
@@ -149,7 +149,7 @@ testcase tMainMenu
printlog "check if there are 6 items in the FORMAT/AXIS menu."
DocumentCalc.UseMenu
hMenuSelectNr(5) ' FORMAT
- hMenuSelectNr(5) ' AXIS
+ hMenuSelectNr(6) ' AXIS
iCount = hMenuItemGetCount()
if (iCount <> 6) then
warnlog "There should 6 items in the FORMAT/AXIS menu but there are " + iCount + " items."
@@ -158,7 +158,7 @@ testcase tMainMenu
printlog "check if there are 7 items in the FORMAT/GRID menu."
DocumentCalc.UseMenu
hMenuSelectNr(5) ' FORMAT
- hMenuSelectNr(6) ' GRID
+ hMenuSelectNr(7) ' GRID
iCount = hMenuItemGetCount()
if (iCount <> 7) then
warnlog "There should 7 items in the FORMAT/GRID menu but there are " + iCount + " items."
@@ -173,12 +173,12 @@ testcase tMainMenu
warnlog "There should 8 items in the FORMAT/Title menu but there are " + iCount + " items."
end if
- printlog "check if there are 13 items in the TOOLS menu."
+ printlog "check if there are 4 items in the TOOLS menu."
DocumentCalc.UseMenu
- hMenuSelectNr(5)
+ hMenuSelectNr(6)
iCount = hMenuItemGetCount()
- if (iCount <> 13) then
- warnlog "There should 13 items in the tools menu but there are " + iCount + " items."
+ if (iCount <> 4) then
+ warnlog "There should 4 items in the tools menu but there are " + iCount + " items."
end if
call hMenuClose()
diff --git a/testautomation/chart2/tools/ch_tools_select.inc b/testautomation/chart2/tools/ch_tools_select.inc
index 0cf1343..375039c 100644
--- a/testautomation/chart2/tools/ch_tools_select.inc
+++ b/testautomation/chart2/tools/ch_tools_select.inc
@@ -39,6 +39,7 @@
'*
' #1 fSelectChartByNumber
' #1 fCalcSelectSheet
+' #1 fChartSelectElement
'*
'\************************************************************************************************
@@ -123,4 +124,19 @@ function fCalcSelectSheet ( sSelectThisSheet ) as boolean
endif
endcatch
end function
-
+'
+'--------------------------------------------------------------------
+'
+function fChartSelectElement ( iObjectPosition as INTEGER ) as boolean
+ ' Select a chartelement by using the ChartElementSelectorListBox in the Toolbar
+ ' RETURNS: boolean (success)
+ fChartSelectElement = FALSE
+ try
+ Kontext "Toolbar"
+ sleep (1)
+ ChartElementSelector.Select (iObjectPosition)
+ fChartSelectElement = TRUE
+ catch
+ warnlog "Something went wrong while selecting a chartelement"
+ endcatch
+end function
diff --git a/testautomation/chart2/tools/ch_tools_statistics.inc b/testautomation/chart2/tools/ch_tools_statistics.inc
index abee294..7666fac 100644
--- a/testautomation/chart2/tools/ch_tools_statistics.inc
+++ b/testautomation/chart2/tools/ch_tools_statistics.inc
@@ -87,8 +87,10 @@ function fInvokeTrendlinesDialog() as INTEGER
endcatch
'/// Lookup if call was successful
- Kontext "InsertTrendlinesDialog"
- if InsertTrendlinesDialog.exists(2) then
+ Kontext
+ active.SetPage "TabTrendLineType"
+ Kontext "TabTrendLineType"
+ if TabTrendLineType.exists(2) then
printlog ">> Trend lines dialog is visible now."
fInvokeTrendlinesDialog = 0
else
@@ -171,7 +173,7 @@ function fInsertMeanValueLines() as INTEGER
DocumentChart.TypeKeys "<F3>"
'/// Open the context menu
DocumentChart.OpenContextMenu TRUE
- if hMenuItemGetCount = 10 then
+ if hMenuItemGetCount = 6 then
'/// Select the first entry (properties)
hMenuSelectNr (1)
else
diff --git a/testautomation/global/sid/e_all.sid b/testautomation/global/sid/e_all.sid
index e64af67..a4fad52 100644
--- a/testautomation/global/sid/e_all.sid
+++ b/testautomation/global/sid/e_all.sid
@@ -393,14 +393,14 @@ InsertSymbol SID_CHOOSE_POLYGON
InsertSnapPointLine SID_CAPTUREPOINT
' **** Chart
-InsertTitle .uno:InsertTitle
-InsertAxes .uno:InsertAxis
-InsertGrids .uno:InsertGrids
-InsertLegend .uno:InsertLegend
-InsertDataLabels .uno:InsertDescription
-InsertTrendlines .uno:InsertTrendlines
-InsertMeanValueLines .uno:InsertMeanValues
-InsertYErrorBars .uno:InsertYErrorbars
+InsertTitle .uno:InsertMenuTitles
+InsertAxes .uno:InsertMenuAxes
+InsertGrids .uno:InsertMenuGrids
+InsertLegend .uno:InsertMenuLegend
+InsertDataLabels .uno:InsertMenuDataLabels
+InsertTrendlines .uno:InsertMenuTrendlines
+InsertMeanValueLines .uno:InsertMenuMeanValues
+InsertYErrorBars .uno:InsertMenuYErrorBars
' ***********************************
' *********** Format Menu ***********
@@ -643,6 +643,7 @@ FormatChartArea .uno:DiagramArea
FormatChartType .uno:DiagramType
FormatDataRanges .uno:DataRanges
Format3DView .uno:View3D
+FormatSelection .uno:FormatSelection
' **** Math
FormatFonts SID_FONT
FormatFontSize SID_FONTSIZE
diff --git a/testautomation/global/win/bars.win b/testautomation/global/win/bars.win
index 35b87e3..993ce83 100755
--- a/testautomation/global/win/bars.win
+++ b/testautomation/global/win/bars.win
@@ -1332,6 +1332,8 @@ Hyphenation .uno:Hyphenate
ThesaurusD .uno:ThesaurusDialog
EuroConverter .uno:EuroConverter
ImageMap .uno:ImageMapDialog
+ChartElementSelector .uno:ChartElementSelector
+FormatSelection .uno:FormatSelection
'-------------------------------------------------------------------------
*ToolsCollectionBar .HelpId:insertcontrolsbar
'-------------------------------------------------------------------------
diff --git a/testautomation/global/win/etab_a_d.win b/testautomation/global/win/etab_a_d.win
index 3c84eb9..65008b1 100755
--- a/testautomation/global/win/etab_a_d.win
+++ b/testautomation/global/win/etab_a_d.win
@@ -242,7 +242,7 @@ Hidden_More2 chart2:PushButton:TP_AXIS_POSITIONS:PB_MINOR_GRID
+TabDataRangesDataSeries TabChartTypeDataSeries
+TabFormatDataRangesDataSeries TabChartTypeDataSeries
-*TabChartPieOpetions chart2:TabPage:TP_POLAROPTIONS
+*TabChartPieOptions chart2:TabPage:TP_POLAROPTIONS
Clockwise chart2:CheckBox:TP_POLAROPTIONS:CB_CLOCKWISE
StartingAngle HID_SCH_STARTING_ANGLE_DIAL
Degrees chart2:NumericField:TP_POLAROPTIONS:NF_STARTING_ANGLE
commit 3d770a8bf6b2a61ea3c99f48992335104ec04a75
Author: Kurt Zenker <kz at openoffice.org>
Date: Fri Sep 11 09:40:28 2009 +0000
CWS-TOOLING: integrate CWS ab70
2009-09-10 15:12:54 +0200 jsk r276034 : #i85434# - mandatory automatic update test
2009-09-10 15:11:06 +0200 jsk r276033 : #i85434# - mandatory automatic update test
2009-09-02 09:49:24 +0200 ab r275698 : #i85434# Dialog Import
diff --git a/testautomation/framework/required/f_basic_dialogs.bas b/testautomation/framework/required/f_basic_dialogs.bas
index 7f08745..d0e1535 100755
--- a/testautomation/framework/required/f_basic_dialogs.bas
+++ b/testautomation/framework/required/f_basic_dialogs.bas
@@ -43,12 +43,14 @@ sub main
use "framework\required\includes\basic_dialog_i18n.inc"
use "framework\required\includes\basic_organizer.inc"
use "framework\required\includes\basic_dialog_export.inc"
+ use "framework\required\includes\basic_dialog_i18n_import.inc"
call hStatusIn( "framework" , "f_basic_dialogs.bas" )
call tUpdtMacroAssignment()
call tUpdtBasicDialogI18n()
call tUpdtBasicOrganizer()
call tUpdtDialogExport()
+ call tBasicDialogI18nImport()
call hStatusOut()
end sub
diff --git a/testautomation/framework/required/includes/basic_dialog_i18n.inc b/testautomation/framework/required/includes/basic_dialog_i18n.inc
index 152af61..4947b72 100755
--- a/testautomation/framework/required/includes/basic_dialog_i18n.inc
+++ b/testautomation/framework/required/includes/basic_dialog_i18n.inc
@@ -39,23 +39,11 @@
testcase tUpdtBasicDialogI18n
- '///<h3>Update test for Basic IDE / Dialog i18n-feature</h3>
- '///<i>Specification: Translation Inside Dialog IDE</i><br>
-
+ printlog( "BASIC IDE Dialog i18n." )
+
dim brc as boolean
- '///<ul>
- '///+<li>Create a new writer document</li>
- '///+<li>Open the BASIC organiser</li>
- '///+<li>Select the document and create a new BASIC module</li>
- '///+<li>Edit the module</li>
- '///+<li>Create a new dialog</li>
- '///+<li>Open the ToolsCollectionBar</li>
-
- ' Just in case, this thing is annoying
hCloseNavigator()
-
- '///+<li>Open a new writer document</li>
hCreateDocument()'
brc = hInitFormControls( "tDialogI18n" )
@@ -64,91 +52,94 @@ testcase tUpdtBasicDialogI18n
goto endsub
endif
- '///+<li>Click the "Add language" button on the ToolsCollectionBar</li>
printlog( "Click Manage Languages on ToolsCollectionBar")
kontext "ToolsCollectionBar"
- ManageLanguage.click()
+ if ( ToolsCollectionBar.exists() ) then
+ ManageLanguage.click()
+ else
+ warnlog( "<ToolsCollectionBar> is not open, is the test environment dirty?" )
+ endif
kontext "ManageUILanguages"
- call dialogtest( ManageUILanguages )
-
- '///+<li>Click the "Add" button, this will add a default language</li>
- printlog( "Add default language, choose preselection")
- kontext "ManageUILanguages"
- Add.click()
-
- kontext "SetDefaultLanguage"
- call dialogtest( SetDefaultLanguage )
-
- '///+<li>Select a language at random</li>
- kontext "SetDefaultLanguage"
- DefaultLanguageListbox.select( 3 )
-
- '///+<li>Leave the dialog with "ok"</li>
- kontext "SetDefaultLanguage"
- SetDefaultLanguage.ok()
-
- '///+<li>Click "Add" again</li>
- printlog( "Back on Manage UI Languages Dialog")
- kontext "ManageUILanguages"
- Add.click()
-
- kontext "AddUserInterface"
- call dialogtest( AddUserInterface )
+ if ( ManageUILanguages.exists( 2 ) ) then
+ call dialogtest( ManageUILanguages )
+
+ printlog( "Add default language, choose preselection")
+ kontext "ManageUILanguages"
+ Add.click()
+
+ kontext "SetDefaultLanguage"
+ if ( SetDefaultLanguage.exists( 2 ) ) then
+ call dialogtest( SetDefaultLanguage )
+
+ kontext "SetDefaultLanguage"
+ DefaultLanguageListbox.select( 3 )
+
+ kontext "SetDefaultLanguage"
+ SetDefaultLanguage.ok()
+ else
+ warnlog( "Dialog <SetDefaultLanguage> did not open" )
+ endif
+
+ printlog( "Back on Manage UI Languages Dialog we click <Add>")
+ kontext "ManageUILanguages"
+ Add.click()
+
+ kontext "AddUserInterface"
+ if ( AddUserInterface.exists( 2 ) ) then
+ call dialogtest( AddUserInterface )
- '///+<li>Select and check the first language in the list</li>
- printlog( "Add just another language at random")
- kontext "AddUserInterface"
- AddNewControl.typeKeys( "<HOME>" ) ' select first item
- AddNewControl.typeKeys( "<SPACE>" ) ' check it
+ printlog( "Add just another language at random")
+ kontext "AddUserInterface"
+ AddNewControl.typeKeys( "<HOME>" ) ' select first item
+ AddNewControl.typeKeys( "<SPACE>" ) ' check it
- '///+<li>Leave the dialog with "ok"</li>
- kontext "AddUserInterface"
- AddUserInterface.ok()
-
- '///+<li>Select the first language in the languages list</li>
- kontext "ManageUILanguages"
- PresentLanguages.Select (1)
-
- '///+<li>Click "Delete"</li>
- printlog( "Back on Manage UI Languages Dialog, delete selected language")
- kontext "ManageUILanguages"
- Delete.click()
-
- printlog( "Confirm delete")
- kontext "active"
- call dialogtest( active )
-
- '///+<li>Confirm deletion</li>
- kontext "active"
- active.ok()
-
- '///+<li>Close "Manage User Interface languages" dialog</li>
- printlog( "Leave Manage UI Languages Dialog")
- kontext "ManageUILanguages"
- ManageUILanguages.ok()
+ kontext "AddUserInterface"
+ AddUserInterface.ok()
+ else
+ warnlog( "Dialog <AddUserInterface> did not open" )
+ endif
+
+ kontext "ManageUILanguages"
+ PresentLanguages.Select (1)
+
+ printlog( "Back on Manage UI Languages Dialog, delete selected language")
+ kontext "ManageUILanguages"
+ Delete.click()
+
+ printlog( "Confirm delete")
+ kontext "active"
+ if ( Active.exists( 1 ) ) then
+ call dialogtest( active )
+
+ kontext "active"
+ active.ok()
+ else
+ warnlog( "Confirm delete messagebox is missing" )
+ endif
+
+ printlog( "Leave Manage UI Languages Dialog")
+ kontext "ManageUILanguages"
+ ManageUILanguages.ok()
+ else
+ warnlog( "Manage UI languages did not open" )
+ endif
- '///+<li>Verify that the new translation toolbar is visible</li>
printlog( "Verify that the translationbar is visible")
kontext "TranslationBar"
if ( not TranslationBar.exists() ) then
warnlog( "The IDE Translation Toolbar is not visible" )
endif
-
- '///+<li>Cleanup: Close ToolsCollectionBar</li>
+
kontext "ToolsCollectionBar"
if ( not ToolsCollectionBar.exists() ) then
warnlog( "The ToolsCollectionBar is not visible" )
endif
+
+ printlog( "Cleanup" )
ToolsCollectionBar.Close
-
- '///+<li>Cleanup: Close the basic IDE</li>
hClosebasicIDE()
-
- '///+<li>Cleanup: Close the document</li>
hDestroyDocument()
- '///</ul>
-
endcase
diff --git a/testautomation/framework/required/includes/basic_dialog_i18n_import.inc b/testautomation/framework/required/includes/basic_dialog_i18n_import.inc
new file mode 100755
index 0000000..ebaa8ae
--- /dev/null
+++ b/testautomation/framework/required/includes/basic_dialog_i18n_import.inc
@@ -0,0 +1,143 @@
+'encoding UTF-8 Do not remove or change this line!
+'**************************************************************************
+'* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+'*
+'* Copyright 2008 by Sun Microsystems, Inc.
+'*
+'* OpenOffice.org - a multi-platform office productivity suite
+'*
+'* $RCSfile: basic_delete_modules.inc,v $
+'*
+'* $Revision: 1.1 $
+'*
+'* last change: $Author: jsi $ $Date: 2008-06-16 12:18:13 $
+'*
+'* 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 : joerg.skottke at sun.com
+'*
+'* short description :
+'*
+'\******************************************************************************
+
+testcase tBasicDialogI18nImport
+
+ printlog( "Dialogs that show up when importing Multi locale dialogs into BASIC IDE" )
+
+ dim cDialogPath as string
+ cDialogPath = gTesttoolPath & "framework\required\input\basic_ide\Dialog5.xdl"
+ cDialogPath = convertpath( cDialogPath )
+
+ printlog( "Open BASIC-IDE" )
+ hCreateDocument()
+ hInitFormControls( "tDialogI18nImport" )
+
+ kontext "ToolsCollectionBar"
+ if ( ToolsCollectionBar.exists() ) then
+ ToolsCollectionBar.close()
+ endif
+
+ Kontext "DialogBar"
+ if ( DialogBar.exists() ) then
+
+ printlog( "Click on <Import> button on <DialogBar>" )
+ Import.click()
+
+ kontext "OeffnenDlg"
+ if ( OeffnenDlg.exists( 2 ) ) then
+
+ printlog( "Enter path to test dialog" )
+ DateiName.setText( cDialogPath )
+ Oeffnen.click()
+
+ printlog( "Test messagebox" )
+ kontext "active"
+ if ( Active.exists( 2 ) ) then
+
+ printlog( "Messagebox: " & Active.getText() )
+ if ( Active.getButtonCount <> 4 ) then
+ warnlog( "Incorrect messagebox, expected locale clash warning" )
+ endif
+
+ call DialogTest( Active )
+
+ printlog( "Accept with yes" )
+ Active.Yes()
+
+ Kontext "TranslationBar"
+ if ( TranslationBar.exists() ) then
+
+ printlog( "Check number of imported languages, should be 5" )
+ if ( CurrentLanguage.getItemCount <> 5 ) then
+ warnlog( "Five languages should be listed in the languages box" )
+ endif
+
+ Kontext "DialogBar"
+ if ( DialogBar.exists() ) then
+
+ printlog( "Click on <Import> button on <DialogBar>" )
+ Import.click()
+
+ kontext "OeffnenDlg"
+ if ( OeffnenDlg.exists( 2 ) ) then
+
+ printlog( "Enter path to test dialog" )
+ DateiName.setText( cDialogPath )
+ Oeffnen.click()
+
+ printlog( "Test messagebox" )
+ kontext "Active"
+ if ( Active.exists( 2 ) ) then
+
+ printlog( "Messagebox: " & Active.getText() )
+ if ( Active.getButtonCount <> 3 ) then
+ warnlog( "Incorrect messagebox, expected dialog replace warning" )
+ endif
+
+ call DialogTest( Active )
+
+ Printlog( "Rename the new dialog" )
+ Active.Yes()
+ else
+ warnlog( "Overwrite warning missing" )
+ endif
+ else
+ warnlog( "<OeffnenDlg> did not open" )
+ endif
+ else
+ warnlog( "<DialogBar> is not available" )
+ endif
+ else
+ warnlog( "<TranslationBar> is not available" )
+ endif
+ else
+ warning( "Locale clash messagebox is missing" )
+ endif
+ else
+ warnlog( "<OeffnenDlg> did not open" )
+ endif
+ else
+ warnlog( "<DialogBar> is not available" )
+ endif
+ hCloseBasicIde()
+ hDestroyDocument()
+
+endcase
+
diff --git a/testautomation/framework/required/input/basic_ide/Dialog5.xdl b/testautomation/framework/required/input/basic_ide/Dialog5.xdl
new file mode 100644
index 0000000..8813d9f
--- /dev/null
+++ b/testautomation/framework/required/input/basic_ide/Dialog5.xdl
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE dlg:window PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "dialog.dtd">
+<dlg:window xmlns:dlg="http://openoffice.org/2000/dialog" xmlns:script="http://openoffice.org/2000/script" dlg:id="Dialog5" dlg:left="259" dlg:top="130" dlg:width="201" dlg:height="169" dlg:help-text="&28.Dialog5.HelpText" dlg:closeable="true" dlg:moveable="true" dlg:title="&29.Dialog5.Title">
+ <dlg:bulletinboard>
+ <dlg:button dlg:id="CommandButton1" dlg:tab-index="0" dlg:left="59" dlg:top="44" dlg:width="84" dlg:height="49" dlg:help-text="&30.Dialog5.CommandButton1.HelpText" dlg:value="&31.Dialog5.CommandButton1.Label"/>
+ </dlg:bulletinboard>
+</dlg:window>
\ No newline at end of file
diff --git a/testautomation/framework/required/input/basic_ide/Dialog5_ar_DZ.default b/testautomation/framework/required/input/basic_ide/Dialog5_ar_DZ.default
new file mode 100644
index 0000000..e69de29
diff --git a/testautomation/framework/required/input/basic_ide/Dialog5_ar_DZ.properties b/testautomation/framework/required/input/basic_ide/Dialog5_ar_DZ.properties
new file mode 100644
index 0000000..66ee58c
--- /dev/null
+++ b/testautomation/framework/required/input/basic_ide/Dialog5_ar_DZ.properties
@@ -0,0 +1,5 @@
+# Dialog5 strings
+28.Dialog5.HelpText=
+29.Dialog5.Title=
+30.Dialog5.CommandButton1.HelpText=
+31.Dialog5.CommandButton1.Label=Arabic
diff --git a/testautomation/framework/required/input/basic_ide/Dialog5_ca_ES.properties b/testautomation/framework/required/input/basic_ide/Dialog5_ca_ES.properties
new file mode 100644
index 0000000..5dcdf5d
--- /dev/null
+++ b/testautomation/framework/required/input/basic_ide/Dialog5_ca_ES.properties
@@ -0,0 +1,5 @@
+# Dialog5 strings
+28.Dialog5.HelpText=
+29.Dialog5.Title=
+30.Dialog5.CommandButton1.HelpText=
+31.Dialog5.CommandButton1.Label=Catalan
diff --git a/testautomation/framework/required/input/basic_ide/Dialog5_de_DE.properties b/testautomation/framework/required/input/basic_ide/Dialog5_de_DE.properties
new file mode 100644
index 0000000..ef060d3
--- /dev/null
+++ b/testautomation/framework/required/input/basic_ide/Dialog5_de_DE.properties
@@ -0,0 +1,5 @@
+# Dialog5 strings
+28.Dialog5.HelpText=
+29.Dialog5.Title=
+30.Dialog5.CommandButton1.HelpText=
+31.Dialog5.CommandButton1.Label=German
diff --git a/testautomation/framework/required/input/basic_ide/Dialog5_en_US.properties b/testautomation/framework/required/input/basic_ide/Dialog5_en_US.properties
new file mode 100644
index 0000000..63ddbb0
--- /dev/null
+++ b/testautomation/framework/required/input/basic_ide/Dialog5_en_US.properties
@@ -0,0 +1,5 @@
+# Dialog5 strings
+28.Dialog5.HelpText=
+29.Dialog5.Title=
+30.Dialog5.CommandButton1.HelpText=
+31.Dialog5.CommandButton1.Label=English
diff --git a/testautomation/framework/required/input/basic_ide/Dialog5_fr_FR.properties b/testautomation/framework/required/input/basic_ide/Dialog5_fr_FR.properties
new file mode 100644
index 0000000..35ce6c9
--- /dev/null
+++ b/testautomation/framework/required/input/basic_ide/Dialog5_fr_FR.properties
@@ -0,0 +1,5 @@
+# Dialog5 strings
+28.Dialog5.HelpText=
+29.Dialog5.Title=
+30.Dialog5.CommandButton1.HelpText=
+31.Dialog5.CommandButton1.Label=French
diff --git a/testautomation/global/win/bars.win b/testautomation/global/win/bars.win
index 018ff2b..35b87e3 100755
--- a/testautomation/global/win/bars.win
+++ b/testautomation/global/win/bars.win
@@ -1397,3 +1397,4 @@ VorherigeDarstellung .uno:ZoomPrevious
Library .uno:LibSelector
Controls .uno:ChooseControls
Export .uno:ExportDialog
+Import .uno:ImportDialog
More information about the ooo-build-commit
mailing list