-- cgit -- cgit From a32de79fdb59629e6f42342968ae6977bbc32683 Mon Sep 17 00:00:00 2001 From: Oliver Craemer Date: Tue, 24 Nov 2009 14:43:48 +0000 Subject: #i106356# Autotests for chartshapes --- testautomation/chart2/optional/ch2_lvl1.bas | 6 +- .../chart2/optional/includes/ch2_lvl1a.inc | 117 +++++++++++++++++- testautomation/chart2/required/ch2_updt_calc.bas | 2 +- .../chart2/required/includes/ch2_toolbars.inc | 133 ++++++++++++++++++++- testautomation/global/win/bars.win | 3 +- 5 files changed, 252 insertions(+), 9 deletions(-) diff --git a/testautomation/chart2/optional/ch2_lvl1.bas b/testautomation/chart2/optional/ch2_lvl1.bas index 3344b5218ee0..86453fc39995 100755 --- a/testautomation/chart2/optional/ch2_lvl1.bas +++ b/testautomation/chart2/optional/ch2_lvl1.bas @@ -39,14 +39,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 3015fc3d7d0c..db88358ff18c 100755 --- a/testautomation/chart2/optional/includes/ch2_lvl1a.inc +++ b/testautomation/chart2/optional/includes/ch2_lvl1a.inc @@ -39,7 +39,8 @@ sub ch2_lvl1a - Call tPlotOptions + Call tPlotOptions + Call tChartShapes end sub @@ -149,3 +150,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 " + Kontext "DrawBar" + sleep (1) + DrawBar.typekeys "",TRUE + DrawBar.typekeys "",TRUE + DrawBar.typekeys "",TRUE + DrawBar.typekeys "",TRUE + DrawBar.typekeys "",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 "" + 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 "" + Sleep (1) + Kontext "Toolbar" + if ChartElementSelector.GetSelText <> "ChartShape1" then + warnlog "Something is wrong with the shape" + endif + printlog " Leave Chart" + Kontext "DocumentCalc" + DocumentCalc.TypeKeys "" + 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 "" + Sleep (1) + Kontext "Toolbar" + if ChartElementSelector.GetSelText <> "ChartShape1" then + warnlog "Something is wrong with the shape" + endif + printlog " Leave Chart" + Kontext "DocumentCalc" + DocumentCalc.TypeKeys "" + 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 "" + Sleep (1) + Kontext "Toolbar" + if ChartElementSelector.GetSelText <> "ChartShape1" then + warnlog "Something is wrong with the shape" + endif + printlog " Leave Chart" + Kontext "DocumentCalc" + DocumentCalc.TypeKeys "" + 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 981d17400fc2..1eb4da5509b1 100755 --- a/testautomation/chart2/required/ch2_updt_calc.bas +++ b/testautomation/chart2/required/ch2_updt_calc.bas @@ -134,7 +134,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") diff --git a/testautomation/chart2/required/includes/ch2_toolbars.inc b/testautomation/chart2/required/includes/ch2_toolbars.inc index 3dc52aa0c0e4..e0485d5e8c24 100755 --- a/testautomation/chart2/required/includes/ch2_toolbars.inc +++ b/testautomation/chart2/required/includes/ch2_toolbars.inc @@ -37,11 +37,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 " + Kontext "DrawBar" + sleep (1) + DrawBar.typekeys "",TRUE + DrawBar.typekeys "",TRUE + DrawBar.typekeys "",TRUE + DrawBar.typekeys "",TRUE + DrawBar.typekeys "",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 "" + 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 "",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 "" + printlog " Close document" + Call hCloseDocument + endcase diff --git a/testautomation/global/win/bars.win b/testautomation/global/win/bars.win index 993ce8347d90..650273826ad2 100755 --- a/testautomation/global/win/bars.win +++ b/testautomation/global/win/bars.win @@ -256,6 +256,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 @@ -360,7 +361,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 -- cgit From 00d8bfedd81b52ce72deb7542114d6212bb61cb2 Mon Sep 17 00:00:00 2001 From: Oliver Craemer Date: Fri, 27 Nov 2009 12:04:47 +0000 Subject: #i106356# Autotests for chartshapes --- testautomation/chart2/required/includes/ch2_menu.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testautomation/chart2/required/includes/ch2_menu.inc b/testautomation/chart2/required/includes/ch2_menu.inc index df03c4dcabb8..1e8613410ec1 100644 --- a/testautomation/chart2/required/includes/ch2_menu.inc +++ b/testautomation/chart2/required/includes/ch2_menu.inc @@ -114,13 +114,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() -- cgit