summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xtestautomation/chart2/optional/ch2_lvl1.bas6
-rwxr-xr-xtestautomation/chart2/optional/includes/ch2_lvl1a.inc117
-rwxr-xr-xtestautomation/chart2/required/ch2_updt_calc.bas3
-rwxr-xr-xtestautomation/chart2/required/includes/ch2_menu.inc6
-rwxr-xr-xtestautomation/chart2/required/includes/ch2_toolbars.inc133
-rwxr-xr-x[-rw-r--r--]testautomation/extensions/optional/input/dependencies/version31.oxtbin1440 -> 1440 bytes
-rw-r--r--[-rwxr-xr-x]testautomation/framework/optional/input/gridcontrol.odtbin11602 -> 11602 bytes
-rwxr-xr-xtestautomation/global/win/bars.win3
-rwxr-xr-x[-rw-r--r--]testautomation/global/win/edia_p_s.win0
-rw-r--r--[-rwxr-xr-x]testautomation/spreadsheet/optional/input/validity.odsbin17087 -> 17087 bytes
10 files changed, 255 insertions, 13 deletions
diff --git a/testautomation/chart2/optional/ch2_lvl1.bas b/testautomation/chart2/optional/ch2_lvl1.bas
index 026ba32f1c6c..7d13d601ec18 100755
--- a/testautomation/chart2/optional/ch2_lvl1.bas
+++ b/testautomation/chart2/optional/ch2_lvl1.bas
@@ -33,14 +33,14 @@
sub main
use "chart2\tools\ch_tools_common.inc"
- use "chart2\tools\ch_tools_select.inc"
+ use "chart2\tools\ch_tools_select.inc"
use "chart2\optional\includes\ch2_lvl1a.inc"
Call hStatusIn ( "Chart2", "ch2_lvl1.bas" )
- Call ch2_lvl1a
+ Call ch2_lvl1a
- Call hStatusOut
+ Call hStatusOut
end sub
diff --git a/testautomation/chart2/optional/includes/ch2_lvl1a.inc b/testautomation/chart2/optional/includes/ch2_lvl1a.inc
index 1bf14fa3711d..f7ea955e3fad 100755
--- a/testautomation/chart2/optional/includes/ch2_lvl1a.inc
+++ b/testautomation/chart2/optional/includes/ch2_lvl1a.inc
@@ -33,7 +33,8 @@
sub ch2_lvl1a
- Call tPlotOptions
+ Call tPlotOptions
+ Call tChartShapes
end sub
@@ -143,3 +144,117 @@ testcase tPlotOptions
Call hCloseDocument
endcase
+
+'
+'-------------------------------------------------------------------------
+'
+testcase tChartShapes
+
+ Dim sLocalFile as string
+ Dim sLocalFileXLS as string
+ Dim sFormatXLS as string
+ sLocalFile = convertpath(gOfficepath & "user\work\chartshapes.ods")
+ sLocalFileXLS = convertpath(gOfficepath & "user\work\chartshapes.xls")
+ sFormatXLS = "MS Excel 97"
+
+ 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 " Invoke Edit::Object::Edit to enter Inplace Mode"
+ EditObjectEdit
+ printlog " Verify that the drawbar is visible"
+ Kontext "DrawBar"
+
+ qaerrorlog "#i107003# disabled because of bug in toolbars"
+' if Not DrawBar.Exists then
+' Call hToolbarSelect("Drawing", true)
+' endif
+
+ printlog " Insert a shape to the chart by <STRG-RETURN>"
+ Kontext "DrawBar"
+ sleep (1)
+ DrawBar.typekeys "<TAB>",TRUE
+ DrawBar.typekeys "<TAB>",TRUE
+ DrawBar.typekeys "<TAB>",TRUE
+ DrawBar.typekeys "<TAB>",TRUE
+ DrawBar.typekeys "<MOD1 RETURN>",TRUE
+ printlog " Rename inserted shape"
+ Kontext "DocumentChart"
+ sleep (1)
+ DocumentChart.OpenContextMenu
+ sleep (1)
+ hMenuSelectNr (6)
+ Kontext "NameDlgObject"
+ NameField.SetText "ChartShape1"
+ NameDlgObject.OK
+ printlog " Leave Chart"
+ Kontext "DocumentCalc"
+ DocumentCalc.TypeKeys "<Escape>"
+ printlog "Select chart using navigator"
+ call fSelectFirstOLE
+ printlog "Invoke Edit::Object::Edit to enter Inplace Mode"
+ EditObjectEdit
+ printlog " Check if shape is still there"
+ Kontext "DocumentChart"
+ DocumentChart.typekeys "<SHIFT TAB>"
+ Sleep (1)
+ Kontext "Toolbar"
+ if ChartElementSelector.GetSelText <> "ChartShape1" then
+ warnlog "Something is wrong with the shape"
+ endif
+ printlog " Leave Chart"
+ Kontext "DocumentCalc"
+ DocumentCalc.TypeKeys "<Escape>"
+ printlog " Save document with the default calc filter"
+ call hFileSaveAsKill ( sLocalFile )
+ printlog " Save document to xls"
+ if NOT hFileSaveAsWithFilterKill ( sLocalFileXLS , sFormatXLS ) then
+ warnlog "Saving test document localy failed -> Aborting"
+ call hCloseDocument
+ goto endsub
+ end if
+ printlog " Close document"
+ call hCloseDocument
+ printlog " Open document"
+ call hFileOpen ( sLocalFile )
+ printlog "Select chart using navigator"
+ call fSelectFirstOLE
+ printlog "Invoke Edit::Object::Edit to enter Inplace Mode"
+ EditObjectEdit
+ printlog " Check if shape is still there"
+ Kontext "DocumentChart"
+ DocumentChart.typekeys "<SHIFT TAB>"
+ Sleep (1)
+ Kontext "Toolbar"
+ if ChartElementSelector.GetSelText <> "ChartShape1" then
+ warnlog "Something is wrong with the shape"
+ endif
+ printlog " Leave Chart"
+ Kontext "DocumentCalc"
+ DocumentCalc.TypeKeys "<Escape>"
+ printlog " Close document"
+ Call hCloseDocument
+ call hFileOpen ( sLocalFileXLS )
+ printlog "Select chart using navigator"
+ call fSelectFirstOLE
+ printlog "Invoke Edit::Object::Edit to enter Inplace Mode"
+ EditObjectEdit
+ printlog " Check if shape is still there"
+ Kontext "DocumentChart"
+ DocumentChart.typekeys "<SHIFT TAB>"
+ Sleep (1)
+ Kontext "Toolbar"
+ if ChartElementSelector.GetSelText <> "ChartShape1" then
+ warnlog "Something is wrong with the shape"
+ endif
+ printlog " Leave Chart"
+ Kontext "DocumentCalc"
+ DocumentCalc.TypeKeys "<Escape>"
+ printlog " Close document"
+ Call hCloseDocument
+
+endcase
diff --git a/testautomation/chart2/required/ch2_updt_calc.bas b/testautomation/chart2/required/ch2_updt_calc.bas
index 261424c87cd9..f451eb78c685 100755
--- a/testautomation/chart2/required/ch2_updt_calc.bas
+++ b/testautomation/chart2/required/ch2_updt_calc.bas
@@ -128,7 +128,7 @@ sub main
printlog Chr(13) + "--------- Chart2 Window Menu ---------"
Call tWindowNewWindowAndClose
printLog Chr(13) + "---------- Chart2 Toolbars -----------"
- Call tdummyToolbar
+ Call tDrawBar
printLog Chr(13) + "--------- Chart2 as OLE object ---------"
Call tChartOLE("WRITER")
Call tChartOLE("CALC")
@@ -149,4 +149,3 @@ sub LoadIncludeFiles
Call GetUseFiles
gApplication = "CALC"
end sub
-
diff --git a/testautomation/chart2/required/includes/ch2_menu.inc b/testautomation/chart2/required/includes/ch2_menu.inc
index 0f981efb838f..1a847c34c1d9 100755
--- a/testautomation/chart2/required/includes/ch2_menu.inc
+++ b/testautomation/chart2/required/includes/ch2_menu.inc
@@ -108,13 +108,13 @@ testcase tMainMenu
end if
call hMenuClose()
- printlog "check if there are 4 items in the VIEW/TOOLBAR menu."
+ printlog "check if there are 5 items in the VIEW/TOOLBAR menu."
DocumentCalc.UseMenu
hMenuSelectNr(3) ' VIEW
hMenuSelectNr(1) ' TOOLBAR
iCount = hMenuItemGetCount()
- if (iCount <> 4) then
- warnlog "There should 4 items in the VIEW/TOOLBAR menu but there are " + iCount + " items."
+ if (iCount <> 5) then
+ warnlog "There should 5 items in the VIEW/TOOLBAR menu but there are " + iCount + " items."
end if
call hMenuClose()
diff --git a/testautomation/chart2/required/includes/ch2_toolbars.inc b/testautomation/chart2/required/includes/ch2_toolbars.inc
index 4b1a66e88500..1651073e05fb 100755
--- a/testautomation/chart2/required/includes/ch2_toolbars.inc
+++ b/testautomation/chart2/required/includes/ch2_toolbars.inc
@@ -31,11 +31,138 @@
'*
'************************************************************************
'*
-' #1 tdummyToolbar
+' #1 tDrawBar
'*
'\************************************************************************
-testcase tdummyToolbar
- QAErrorLog "Implement test for toolbar features when toolbars are ready"
+testcase tDrawBar
+
+ 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 " Invoke Edit::Object::Edit to enter Inplace Mode"
+ EditObjectEdit
+ printlog " Verify that the drawbar is visible"
+ Kontext "DrawBar"
+
+ qaerrorlog "#i107003# disabled because of bug in toolbars"
+' if Not DrawBar.Exists then
+' Call hToolbarSelect("Drawing", true)
+' endif
+
+ printlog " Check if all items on drawbar are available"
+ if DrawBar.GetItemCount <> 16 then
+ warnlog "There are " & DrawBar.GetItemCount & " instead of 16 items on drawbar"
+ endif
+ printlog " Click on every button on the Drawingbar"
+ Auswahl.click
+ Linie.click
+ LineArrowEnd.click
+ Rechteck.click
+ Ellipse.click
+ Freihand.click
+ Textobjekt.click
+ Legende.click
+ BasicShapes.click
+ SymbolShapes.click
+ BlockArrows.click
+ Flowcharts.click
+ Callouts.click
+ Stars.click
+ printlog " Open menubutton BasicShapes"
+ BasicShapes.TearOff
+ Kontext "BasicShapes"
+ printlog " Check that there are 25 BasicShapes"
+ if BasicShapes.GetItemCount <> 25 then
+ warnlog "There are " & BasicShapes.GetItemCount & " instead of 25 BasicShapes"
+ endif
+ BasicShapes.close
+ Kontext "DrawBar"
+ printlog " Open menubutton SymbolShapes"
+ SymbolShapes.TearOff
+ Kontext "SymbolShapes"
+ printlog " Check that there are 20 SymbolShapes"
+ if SymbolShapes.GetItemCount <> 20 then
+ warnlog "There are " & SymbolShapes.GetItemCount & " instead of 25 SymbolShapes"
+ endif
+ SymbolShapes.close
+ Kontext "DrawBar"
+ printlog " Open menubutton BlockArrows"
+ BlockArrows.TearOff
+ Kontext "ArrowShapes"
+ printlog " Check that there are 30 ArrowShapes"
+ if ArrowShapes.GetItemCount <> 30 then
+ warnlog "There are " & ArrowShapes.GetItemCount & " instead of 25 ArrowShapes"
+ endif
+ ArrowShapes.close
+ Kontext "DrawBar"
+ printlog " Open menubutton Flowcharts"
+ Flowcharts.TearOff
+ Kontext "Flowchart"
+ printlog " Check that there are 32 FlowChartShapes"
+ if Flowchart.GetItemCount <> 32 then
+ warnlog "There are " & Flowchart.GetItemCount & " instead of 32 Flowchartshapes"
+ endif
+ Flowchart.close
+ Kontext "DrawBar"
+ printlog " Open menubutton Callouts"
+ Callouts.TearOff
+ Kontext "Callouts"
+ printlog " Check that there are 7 Callouts"
+ if Callouts.GetItemCount <> 7 then
+ warnlog "There are " & Callouts.GetItemCount & " instead of 7 Callouts"
+ endif
+ Callouts.close
+ Kontext "DrawBar"
+ printlog " Open menubutton Stars"
+ Stars.TearOff
+ Kontext "Starshapes"
+ printlog " Check that there are 13 StarShapes"
+ if Starshapes.GetItemCount <> 13 then
+ warnlog "There are " & Starshapes.GetItemCount & " instead of 13 StarShapes"
+ endif
+ Starshapes.close
+ printlog " Insert a shape to the chart by <STRG-RETURN>"
+ Kontext "DrawBar"
+ sleep (1)
+ DrawBar.typekeys "<TAB>",TRUE
+ DrawBar.typekeys "<TAB>",TRUE
+ DrawBar.typekeys "<TAB>",TRUE
+ DrawBar.typekeys "<TAB>",TRUE
+ DrawBar.typekeys "<MOD1 RETURN>",TRUE
+ printlog " Rename inserted shape"
+ Kontext "DocumentChart"
+ DocumentChart.OpenContextMenu
+ sleep (1)
+ hMenuSelectNr (6)
+ sleep (1)
+ Kontext "NameDlgObject"
+ NameField.SetText "ChartShape1"
+ NameDlgObject.OK
+ printlog " Leave Chart"
+ Kontext "DocumentCalc"
+ DocumentCalc.TypeKeys "<Escape>"
+ printlog "Select chart using navigator"
+ call fSelectFirstOLE
+ printlog "Invoke Edit::Object::Edit to enter Inplace Mode"
+ EditObjectEdit
+ printlog " Check if shape is still there"
+ Kontext "DocumentChart"
+ DocumentChart.typekeys "<SHIFT TAB>",TRUE
+ Sleep (1)
+ Kontext "Toolbar"
+ if ChartElementSelector.GetSelText <> "ChartShape1" then
+ warnlog "Something is wrong with the shape"
+ endif
+ printlog " Leave Chart"
+ Kontext "DocumentCalc"
+ DocumentCalc.TypeKeys "<Escape>"
+ printlog " Close document"
+ Call hCloseDocument
+
endcase
diff --git a/testautomation/extensions/optional/input/dependencies/version31.oxt b/testautomation/extensions/optional/input/dependencies/version31.oxt
index 870b4cc97a9a..870b4cc97a9a 100644..100755
--- a/testautomation/extensions/optional/input/dependencies/version31.oxt
+++ b/testautomation/extensions/optional/input/dependencies/version31.oxt
Binary files differ
diff --git a/testautomation/framework/optional/input/gridcontrol.odt b/testautomation/framework/optional/input/gridcontrol.odt
index b3e5c6fb40bb..b3e5c6fb40bb 100755..100644
--- a/testautomation/framework/optional/input/gridcontrol.odt
+++ b/testautomation/framework/optional/input/gridcontrol.odt
Binary files differ
diff --git a/testautomation/global/win/bars.win b/testautomation/global/win/bars.win
index bbd72a12bf82..e29318019aa5 100755
--- a/testautomation/global/win/bars.win
+++ b/testautomation/global/win/bars.win
@@ -251,6 +251,7 @@ Textobjekt .uno:DrawText
Toolbox SID_DRAW_SELECT
VerticalCallout .uno:VerticalCaption
VerticalText .uno:VerticalText
+LineArrowEnd .uno:LineArrowEnd
BasicShapes .uno:BasicShapes
SymbolShapes .uno:SymbolShapes
BlockArrows .uno:ArrowShapes
@@ -355,7 +356,7 @@ ExtrusionLightingFloater .uno:ExtrusionLightingFloater
ExtrusionSurfaceFloater .uno:ExtrusionSurfaceFloater
Extrusion3DColor .uno:Extrusion3DColor
'-------------------------------------------------------------------------
-Flowchart .HelpId:flowchartshapes
+*Flowchart .HelpId:flowchartshapes
'-------------------------------------------------------------------------
Process .uno:FlowChartShapes.flowchart-process
AlternateProcess .uno:FlowChartShapes.flowchart-alternate-process
diff --git a/testautomation/global/win/edia_p_s.win b/testautomation/global/win/edia_p_s.win
index a95316d03619..a95316d03619 100644..100755
--- a/testautomation/global/win/edia_p_s.win
+++ b/testautomation/global/win/edia_p_s.win
diff --git a/testautomation/spreadsheet/optional/input/validity.ods b/testautomation/spreadsheet/optional/input/validity.ods
index 06a980c67478..06a980c67478 100755..100644
--- a/testautomation/spreadsheet/optional/input/validity.ods
+++ b/testautomation/spreadsheet/optional/input/validity.ods
Binary files differ
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-25 04:08:09 +0000