diff options
Diffstat (limited to 'testautomation')
40 files changed, 565 insertions, 133 deletions
diff --git a/testautomation/chart2/optional/ch2_data_series.bas b/testautomation/chart2/optional/ch2_data_series.bas new file mode 100644 index 000000000000..6677c8a8c886 --- /dev/null +++ b/testautomation/chart2/optional/ch2_data_series.bas @@ -0,0 +1,60 @@ +'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 : Function test for Data Series functions in chart +'* +'\************************************************************************************************ + +sub main + use "chart2\tools\ch_tools_common.inc" + use "chart2\tools\ch_tools_chart_type.inc" + use "chart2\tools\ch_tools_select.inc" + use "chart2\optional\includes\ch2_lvl1_data_series1.inc" + + Call hStatusIn("Chart2", "ch2_data_series.bas") + + printlog "----------------------------------------" + printlog " C h a r t 2 D a t a S e r i e s " + printlog "----------------------------------------" + printLog Chr(13) + "----------- Options ------------" + Call tPlotMissingValuesBar + Call tPlotMissingValuesLine + Call hStatusOut +end sub +' +'------------------------------------------------------------------------------- +' +sub LoadIncludeFiles + use "global\tools\includes\optional\t_set_standard_controls.inc" + use "global\system\includes\master.inc" + use "global\system\includes\gvariabl.inc" + Call GetUseFiles + gApplication = "CALC" +end sub + diff --git a/testautomation/chart2/optional/includes/ch2_lvl1_data_series1.inc b/testautomation/chart2/optional/includes/ch2_lvl1_data_series1.inc new file mode 100644 index 000000000000..b13bf14eb6d2 --- /dev/null +++ b/testautomation/chart2/optional/includes/ch2_lvl1_data_series1.inc @@ -0,0 +1,214 @@ +'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 : Data Series dialog test cases +'* +'************************************************************************ +'* +' #1 tPlotMissingValuesBar +' #1 tPlotMissingValuesLine +'* +'\************************************************************************ + +testcase tPlotMissingValuesBar + Dim iCountTabPg as integer + iCountTabPg = 0 + Dim iTestRadio as integer + iTestRadio = 99 + printlog "Load simple chart document" + + if fLoadVerySimpleChartAndSaveLocal() > 0 then + warnlog "Loading test document seems to have failed -> Check this out!" + goto endsub + endif + printlog "Go one row down" + Kontext "DocumentCalc" + DocumentCalc.TypeKeys "<DOWN>" + printlog "Insert / Rows to insert one empty row in the data series" + InsertRowsCalc + printlog "Select chart using navigator" + if fSelectFirstOLE = 0 then + printlog "Edit / Object / Edit" + EditObjectEdit + 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 <> 4 then + warnlog "Edit / Properties on a data series should have 4 tab pages but has " & iCountTabPg & "." + endif + Active.SetPage TabDataSeriesOptions + Kontext "TabDataSeriesOptions" + call DialogTest ( TabDataSeriesOptions ) + printlog "Verify that 'Leave gap' is checked (default)" + if NOT LeaveGap.IsChecked then + warnlog "'Leave gap' should be the default setting in bar charts!" + endif + printlog "Check that 'ContinueLine' is disabled" + if ContinueLine.IsEnabled then + warnlog "Continue Line radio button is enabled but should not in bar charts!" + endif + printlog "Select 'AssumeZero' and close the dialog with OK" + iTestRadio = fSetRadioButton(AssumeZero) + if iTestRadio = 2 then + warnlog "Assume Zero radio button was not checked." + elseif iTestRadio = 11 then + warnlog "Assume Zero radio button is not visible." + elseif iTestRadio = 12 then + warnlog "Assume Zero radio button is not enabled." + endif + Kontext + printlog "Clicking OK" + TabDataSeriesOptions.OK + printlog "Invoke Format / Object Properties" + FormatSelection + Kontext + Active.SetPage TabDataSeriesOptions + Kontext "TabDataSeriesOptions" + printlog "Check if 'AssumeZero' is selected" + if NOT AssumeZero.IsChecked then + warnlog "'AssumeZero' should be selected." + endif + TabDataSeriesOptions.Cancel + else + warnlog "It was not possible to select the chart object!" + endif + printlog "Close document" + Call hCloseDocument +endcase +' +'------------------------------------------------------------------------- +' +testcase tPlotMissingValuesLine + Dim iCountTabPg as integer + iCountTabPg = 0 + Dim iTestRadio as integer + iTestRadio = 99 + + printlog "Load simple chart document" + + if fLoadVerySimpleChartAndSaveLocal() > 0 then + warnlog "Loading test document seems to have failed -> Check this out!" + goto endsub + endif + printlog "Go one row down" + Kontext "DocumentCalc" + DocumentCalc.TypeKeys "<DOWN>" + printlog "Insert / Rows to insert one empty row in the data series" + InsertRowsCalc + printlog "Select chart using navigator" + if fSelectFirstOLE = 0 then + printlog "Edit / Object / Edit" + EditObjectEdit + if fInvokeChartTypeDialog <> 0 then + warnlog "Impossible to invike the chart type dialog!" + goto endsub + endif + if fSetChartType("line") <> 0 then + warnlog "Selecting chart type 'line' failed!" + goto endsub + end if + if fSetChartTypeVariant(2) <> 0 then + warnlog "Selecting chart type 'line' variant 2 failed!" + goto endsub + end if + if fCloseChartTypeDialogOK <> 0 then + warnlog "Closing Chart Type dialog with OK failed!" + goto endsub + end if + printlog "Select DataSeries A by toolbar selectorbox" + call fChartSelectElement (8) + printlog "Invoke Format / Object Properties" + FormatSelection.Click + printlog "Select tab page Options" + Kontext + iCountTabPg = Active.GetPageCount + if iCountTabPg <> 2 then + warnlog "Edit / Properties on a data series of a line chart should have 2 tab pages but has " & iCountTabPg & "." + endif + Active.SetPage TabDataSeriesOptions + Kontext "TabDataSeriesOptions" + call DialogTest ( TabDataSeriesOptions ) + printlog "Verify that 'Leave gap' is checked (default)" + if NOT LeaveGap.IsChecked then + warnlog "'Leave gap' should be the default setting in line charts!" + endif + printlog "Select 'AssumeZero' and close the dialog with OK" + iTestRadio = fSetRadioButton(AssumeZero) + if iTestRadio = 2 then + warnlog "Assume Zero radio button was not checked." + elseif iTestRadio = 11 then + warnlog "Assume Zero radio button is not visible." + elseif iTestRadio = 12 then + warnlog "Assume Zero radio button is not enabled." + endif + Kontext + printlog "Clicking OK" + TabDataSeriesOptions.OK + printlog "Invoke Format / Object Properties" + FormatSelection + Kontext + Active.SetPage TabDataSeriesOptions + Kontext "TabDataSeriesOptions" + printlog "Check if 'AssumeZero' is selected" + if NOT AssumeZero.IsChecked then + warnlog "'AssumeZero' should be selected." + endif + printlog "Select 'ContinueLine' and close the dialog with OK" + iTestRadio = 99 + iTestRadio = fSetRadioButton(ContinueLine) + if iTestRadio = 2 then + warnlog "Continue Line radio button was not checked." + elseif iTestRadio = 11 then + warnlog "Continue Line radio button is not visible." + elseif iTestRadio = 12 then + warnlog "Continue Line radio button is not enabled." + endif + Kontext + TabDataSeriesOptions.OK + printlog "Invoke Format / Object Properties" + FormatSelection + Kontext + Active.SetPage TabDataSeriesOptions + Kontext "TabDataSeriesOptions" + printlog "Check if 'ContinueLine' is selected" + if NOT ContinueLine.IsChecked then + warnlog "'ContinueLine' should be selected." + endif + printlog "Close dialog with Cancel-button" + TabDataSeriesOptions.Cancel + else + warnlog "It was not possible to select the chart object!" + endif + printlog "Close document" + Call hCloseDocument +endcase diff --git a/testautomation/chart2/optional/includes/ch2_lvl1a.inc b/testautomation/chart2/optional/includes/ch2_lvl1a.inc index e012dd0253c8..e7154d3820cf 100755 --- a/testautomation/chart2/optional/includes/ch2_lvl1a.inc +++ b/testautomation/chart2/optional/includes/ch2_lvl1a.inc @@ -174,10 +174,15 @@ testcase tChartShapes 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 + if Not DrawBar.Exists then + warnlog "Drawbar is not enabled" + Kontext "DocumentCalc" + DocumentCalc.TypeKeys "<Escape>" + printlog " Close document" + Call hCloseDocument + goto endsub +' Call hToolbarSelect("Drawing", true) + endif printlog " Insert a shape to the chart by <STRG-RETURN>" Kontext "DocumentChart" diff --git a/testautomation/chart2/optional/includes/wizard/ch2_lvl1_wizard.inc b/testautomation/chart2/optional/includes/wizard/ch2_lvl1_wizard.inc index 357fa89c4393..2cc8a47568be 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 - warnlog "#i112522# - Default 3D Look ('simple') has not been preserved after save and reload." + warnlog "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 @@ -222,7 +222,7 @@ testcase tCreateNew3DChart warnlog "Data range wasn't correctly preserved after save and reload and does not caontain $A$2:$E$13." endif if instr ( sControlString , "$A$17:$E$17" ) = 0 Then - warnlog "#i72241# - Data range wasn't correctly preserved after save and reload and does not contain $A$17:$E$17." + warnlog "Data range wasn't correctly preserved after save and reload and does not contain $A$17:$E$17." endif printlog "Check that radio button 'rows' is checked" if NOT Rows.IsChecked then @@ -238,7 +238,7 @@ testcase tCreateNew3DChart endif printlog "Check that 'First column as label' checkbox is checked." if NOT FirstColumnAsLabel.IsChecked then - warnlog "#i72241# - Check box 'First column as label' (enabled) wasn't preserved after save and reload." + warnlog "Check box 'First column as label' (enabled) wasn't preserved after save and reload." endif else warnlog "Tab page 'Data Range' not visible!" @@ -260,7 +260,7 @@ testcase tCreateNew3DChart sControlString = RangeFor.GetText printlog "'Range for name' is: " & sControlString if instr ( sControlString , "$A$17" ) = 0 Then - warnlog "#i72241# - 'Range for name' wasn't correctly preserved after save and reload." + warnlog "'Range for name' wasn't correctly preserved after save and reload." else printlog "Select 'Y-Values' in Data Ranges list on the right." if fSetListBoxByItem ( DataRanges , 2 ) > 0 then @@ -594,7 +594,7 @@ testcase tCreateNewLineChart if instr ( sControlString , "$A$19" ) = 0 Then warnlog "'Categories' wasn't correctly preserved after save and reload." endif - printlog "Leave tab page data series with CANCEL" + printlog "Leave tab page data series with CANCEL" TabChartTypeDataSeries.Cancel else warnlog "Tab page Data Series was not up!" @@ -867,7 +867,7 @@ testcase tCreateNewBubbleChart warnlog "Data range wasn't correctly preserved after save and reload: $A$19" endif if instr ( sControlString , "$B$13:$C$16" ) = 0 Then - QAErrorlog "#i100780#Data range wasn't correctly preserved after save and reload: $B$13:$C$16" + QAErrorlog "Data range wasn't correctly preserved after save and reload: $B$13:$C$16" endif if instr ( sControlString , "$C$12" ) = 0 Then warnlog "Data range wasn't correctly preserved after save and reload: $E$1:$F$13" diff --git a/testautomation/chart2/required/includes/ch2_toolbars.inc b/testautomation/chart2/required/includes/ch2_toolbars.inc index 32eed54ee370..2ad6f3db7e46 100644 --- a/testautomation/chart2/required/includes/ch2_toolbars.inc +++ b/testautomation/chart2/required/includes/ch2_toolbars.inc @@ -48,11 +48,16 @@ testcase tDrawBar EditObjectEdit printlog " Verify that the drawbar is visible" Kontext "DrawBar" - - qaerrorlog "#i107003# disabled because of bug in toolbars" -' if Not DrawBar.Exists then + + if Not DrawBar.Exists then + warnlog "Drawbar is not enabled" + Kontext "DocumentCalc" + DocumentCalc.TypeKeys "<Escape>" + printlog " Close document" + Call hCloseDocument + goto endsub ' Call hToolbarSelect("Drawing", true) -' endif + endif printlog " Check if all items on drawbar are available" if DrawBar.GetItemCount <> 16 then diff --git a/testautomation/dbaccess/optional/includes/wiz_ReportWizard.inc b/testautomation/dbaccess/optional/includes/wiz_ReportWizard.inc index 8743feae997b..4620d90150d4 100644 --- a/testautomation/dbaccess/optional/includes/wiz_ReportWizard.inc +++ b/testautomation/dbaccess/optional/includes/wiz_ReportWizard.inc @@ -86,8 +86,7 @@ testcase tNewReport sleep(10) Kontext "DocumentWriter" - DocumentWriter.TypeKeys "<MOD1 SHIFT I>" , true ' EDIT / SELECT TEXT - DocumentWriter.TypeKeys "<DOWN>" , true + DocumentWriter.TypeKeys "<MOD1 SHIFT I>" , true ' EDIT / SELECT TEXT DocumentWriter.TypeKeys "<SHIFT END>" , true DocumentWriter.TypeKeys "<MOD1 C>" , true @@ -102,7 +101,7 @@ testcase tNewReport ' select next line and check content Kontext "DocumentWriter" - DocumentWriter.TypeKeys "<DOWN>" , true + DocumentWriter.TypeKeys "<DOWN>", 2, true DocumentWriter.TypeKeys "<SHIFT HOME>" , true DocumentWriter.TypeKeys "<MOD1 C>" , true diff --git a/testautomation/dbaccess/optional/includes/xf_Submission.inc b/testautomation/dbaccess/optional/includes/xf_Submission.inc index 05f0da768cdf..a928d660b093 100644 --- a/testautomation/dbaccess/optional/includes/xf_Submission.inc +++ b/testautomation/dbaccess/optional/includes/xf_Submission.inc @@ -172,8 +172,8 @@ testcase tDataNavigatorSubmission dim sLine as String Line Input #1, sLine - if sLine <> "<?xml version=""1.0""?>" then - warnlog "the first line in the xml document should <?xml version=""1.0""?> but it is " + sLine + if sLine <> "<?xml version=""1.0"" encoding=""UTF-8""?>" then + warnlog "the first line in the xml document should <?xml version=""1.0"" encoding=""UTF-8""?> but it is " + sLine endif Line Input #1, sLine if sLine <> "<instanceData><element1/></instanceData>" then diff --git a/testautomation/dbaccess/required/includes/ReportBuilder01.inc b/testautomation/dbaccess/required/includes/ReportBuilder01.inc index d1cce59d4d3f..91faba007d11 100644 --- a/testautomation/dbaccess/required/includes/ReportBuilder01.inc +++ b/testautomation/dbaccess/required/includes/ReportBuilder01.inc @@ -116,13 +116,13 @@ testcase tMainMenuBar 'edit menu - '/// check if there are 11 items in the edit menu. - printlog "check if there are 11 items in the edit menu." + '/// check if there are 14 items in the edit menu. + printlog "check if there are 14 items in the edit menu." ReportDesign.UseMenu hMenuSelectNr(2) iCount = hMenuItemGetCount() - if (iCount <> 11) then - warnlog "There should 11 items in the edit menu but there are " + iCount + " items." + if (iCount <> 14) then + warnlog "There should 14 items in the edit menu but there are " + iCount + " items." end if call hMenuClose() @@ -140,13 +140,13 @@ testcase tMainMenuBar 'insert menu - '/// check if there are 3 items in the insert menu. - printlog "check if there are 3 items in the insert menu." + '/// check if there are 5 items in the insert menu. + printlog "check if there are 5 items in the insert menu." ReportDesign.UseMenu hMenuSelectNr(4) iCount = hMenuItemGetCount() - if (iCount <> 3) then - warnlog "There should 3 items in the insert menu but there are " + iCount + " items." + if (iCount <> 5) then + warnlog "There should 5 items in the insert menu but there are " + iCount + " items." end if call hMenuClose() @@ -336,7 +336,7 @@ testcase tExecuteReport Kontext "ReportDesign" ReportDesign.UseMenu hMenuSelectNr(2) - hMenuSelectNr(11) + hMenuSelectNr(14) sleep(10) diff --git a/testautomation/framework/optional/includes/basic_gridcontrol.inc b/testautomation/framework/optional/includes/basic_gridcontrol.inc index 95bad4d09463..68a2416bddee 100644 --- a/testautomation/framework/optional/includes/basic_gridcontrol.inc +++ b/testautomation/framework/optional/includes/basic_gridcontrol.inc @@ -32,7 +32,6 @@ '\****************************************************************************** testcase tGridcontrolLoad - const MACRO_NAME = "Show" const FILE_NAME = "framework/optional/input/gridcontrol.odt" dim i as integer @@ -42,8 +41,10 @@ testcase tGridcontrolLoad call hFileOpenLocally( gTestToolPath & FILE_NAME ) printlog "Start the macro, that performs the test" - hExecMacro( MACRO_NAME ) + Kontext "ShowGridcontrol" + ' FAILS IF DOCUMENT IS READONLY.... + ShowGridcontrol.typeKeys "<space>" Kontext "GridControlDialog" if GridControlDialog.exists(5) then for i=1 to gridcontrolcontrol.getcolumncount diff --git a/testautomation/framework/optional/includes/basic_macros.inc b/testautomation/framework/optional/includes/basic_macros.inc index cc8ff04fb408..e649200a585f 100644 --- a/testautomation/framework/optional/includes/basic_macros.inc +++ b/testautomation/framework/optional/includes/basic_macros.inc @@ -351,7 +351,7 @@ testcase tMakro_Dialog printlog( "Select the last item in the treelist" ) kontext "Makro" hSelectTheLastNode( MakroAus ) - + WaitSlot(2000) printlog( "Delete the new module" ) Loeschen.Click() diff --git a/testautomation/framework/optional/input/gridcontrol.odt b/testautomation/framework/optional/input/gridcontrol.odt Binary files differindex d1d52c32245f..9d175f3c73eb 100755 --- a/testautomation/framework/optional/input/gridcontrol.odt +++ b/testautomation/framework/optional/input/gridcontrol.odt diff --git a/testautomation/global/sid/e_all.sid b/testautomation/global/sid/e_all.sid index 4770eab50f1b..a09d700c6f6c 100755 --- a/testautomation/global/sid/e_all.sid +++ b/testautomation/global/sid/e_all.sid @@ -204,6 +204,7 @@ ViewToolbarsInsertFormula .uno:InsertFormula ViewToolbarsCustomize .uno:ConfigureDialog ViewToolbarsPreviewbar .uno:AvailableToolbars?Toolbar:string=previewbar ViewToolbarsDrawObjectbar .uno:AvailableToolbars?Toolbar:string=drawobjectbar +ViewToolbarsReset SYM:.cmd:RestoreVisibility ' **** Writer ViewRuler .uno:Ruler diff --git a/testautomation/global/system/includes/gvariabl.inc b/testautomation/global/system/includes/gvariabl.inc index d9290ebb2c3c..20a05b164aaa 100644 --- a/testautomation/global/system/includes/gvariabl.inc +++ b/testautomation/global/system/includes/gvariabl.inc @@ -146,6 +146,7 @@ Global gTestAppArea as String '///+ gTestAppArea : name of the testarea (e Global gErrorSum as Integer '///+ gErrorSum : last value of errors in a test Global gWarningSum as Integer '///+ gWarningSum : last value of warnings in a test Global gQaErrorSum as Integer '///+ gQaErrorSum : last value of qaErrors in a test +Global gAssertionSum as Integer '///+ gAssertionSum : last value of Assertions in a test Global gStatusDuration '///+ gStatusDuration : starting time to get at the end the duration of a test Global gTestcaseStart as Date '///+ gTestCaseDuration : starting time of the testcase Global glsStatusPage (32000) as String '///+ glsStatusPage () : list for the output in the status-page diff --git a/testautomation/global/system/includes/iniinfo.inc b/testautomation/global/system/includes/iniinfo.inc index 3423584253fd..e187f77e4a57 100644 --- a/testautomation/global/system/includes/iniinfo.inc +++ b/testautomation/global/system/includes/iniinfo.inc @@ -122,27 +122,38 @@ sub GetIniInformation call sCheckValgrindStatus() ' set a global path for custom scripts outside of current environment gPrivateEnvironmentLocation = getIniValue(gTesttoolIni, "PrivateEnvironment", "Current") - if (gPrivateEnvironmentLocation <> "" AND gPrivateEnvironmentLocation <> ".") then + if (gPrivateEnvironmentLocation <> "" AND gPrivateEnvironmentLocation <> ".") then ' check if the gPrivateEnvironmentLocation path exists if fileExists(gPrivateEnvironmentLocation) then - ' check if the path ends with a path sign and add the path sign if not - if (Right(gPrivateEnvironmentLocation,1) <> gPathSigne) then - gPrivateEnvironmentLocation = gPrivateEnvironmentLocation & gPathSigne - endif + if getAttr(gPrivateEnvironmentLocation) = 16 then + ' check if the path ends with a path sign and add the path sign if not + if (Right(gPrivateEnvironmentLocation,1) <> gPathSigne) then + gPrivateEnvironmentLocation = gPrivateEnvironmentLocation & gPathSigne + endif + else + qaErrorLog "[PrivateEnvironment] you need to specify a path" + gPrivateEnvironmentLocation = "" + endif else ' check if the gTesttoolPath plus the gPrivateEnvironmentLocation path exists ' f.e. this is for a relative path if fileExists(gTesttoolPath & gPrivateEnvironmentLocation) then + ' check if the gPrivateEnvironmentLocation is a path gPrivateEnvironmentLocation = gTesttoolPath & gPrivateEnvironmentLocation - ' check if the path ends with a path sign and add the path sign if not - if (Right(gPrivateEnvironmentLocation,1) <> gPathSigne) then - gPrivateEnvironmentLocation = gPrivateEnvironmentLocation & gPathSigne - endif + if getAttr(gPrivateEnvironmentLocation) = 16 then + ' check if the path ends with a path sign and add the path sign if not + if (Right(gPrivateEnvironmentLocation,1) <> gPathSigne) then + gPrivateEnvironmentLocation = gPrivateEnvironmentLocation & gPathSigne + endif + else + qaErrorLog "[PrivateEnvironment] you need to specify a path" + gPrivateEnvironmentLocation = "" + endif else qaErrorLog "[PrivateEnvironment] defined in: '" & gTesttoolIni & "', but the path '" & gPrivateEnvironmentLocation & "'does not exist!" gPrivateEnvironmentLocation = "" endif - end if + end if else gPrivateEnvironmentLocation = "" end if diff --git a/testautomation/global/system/includes/status.inc b/testautomation/global/system/includes/status.inc index 83430bfaa332..da3e52e3992b 100644 --- a/testautomation/global/system/includes/status.inc +++ b/testautomation/global/system/includes/status.inc @@ -66,6 +66,7 @@ sub hStatusIn ( sTestAppArea as String, sTestname as String, optional sName as S gErrorSum = getErrorCount() ' not 0! if you run 2-times status in/out in one bas-file! gWarningSum = getWarningCount() gQaErrorSum = getQaErrorCount() + gAssertionSum = 0 ' make sure we have everything to update the status-Database. gDatabasePath = getDatabasePath(privateDatabasePath) @@ -109,6 +110,60 @@ sub hStatusOut ( optional NoKill as Boolean ) PrintLog Chr(13) + "* - End of the test - *" Printlog "Date : " + Date() + " Time: " + Time() Printlog "Duration : " + sLocalTestDuration + ' Output assertion count message only in nonpro version + if (NOT isProduct) then + if (gAssertionSum > 0) then + warnlog " ** " + gAssertionSum + " Assertions" + else + printlog " ** " + gAssertionSum + " Assertions" + endif + endif +end sub + +sub hGetNonproAssertions(sName as string, sDuration as string) + Dim sResultFilePath as string + dim fList(15000) as string + dim i, a as integer + dim aCount as integer + dim x + dim soutput as string + dim xlist(15000) as string + + if (bDebugVersion = true) then + 'Get the path to the RESULT directory and put resultfile into array + sResultFilePath = GetIniValue (gTesttoolIni, gTTProfileName , "LogBaseDir") + gPathSigne + Left(gTestname, Len(gTestname)-4) + ".res" + listRead(fList, sResultFilePath, "UTF8") + for i=1 to listcount(fList(0)) + 'Go through whole file, but only last testrun counts + if (left(fList(i),1,1) = "0") then + 'Line starting with 0 indicates start of new testrun: reset counters + aCount=0 + listalldelete(xlist()) + endif + if (left(fList(i),1,1) = "6") then + 'Assertion found like: + '5;~global\system\includes\master.inc;533;12;65535;"Dial + '0 1: file 2:Line 5:Text + x = split(fList(i), ";") + aCount=aCount+1 + sOutput = sName _ + + Chr(9) + sDuration _ + + Chr(9) + "4" _ + + Chr(9) + mid(fRemoveLineBreaks(x(5)),2, len(fRemoveLineBreaks(x(5)))-2) _ + + Chr(9) + x(2) _ + + Chr(9) + "No Revision found" _ + + Chr(9) + fgetFileName(x(1)) _ + + Chr(9) + ListAppend (xlist(), sOutput) + endif + next i + 'Update global message list + for i = gAssertionSum +1 to listcount(xlist) + ListAppend (glsStatusPage(), xlist(i)) + next i + 'Update global assertion counter + gAssertionSum = aCount + endif end sub sub hStatusAddTestcase() @@ -139,7 +194,7 @@ sub hStatusAddTestcase() '///+ duration => the duration of the testcase sTestcaseDuration = wielange(gTestcaseStart, 1) '(2) - sTestcaseStart = convertDateToDatabase(gTestcaseStart) + " " + convertTimeToDatabase(gTestcaseStart) ' TODO: ask HDE/TBO + sTestcaseStart = convertDateToDatabase(gTestcaseStart) + " " + convertTimeToDatabase(gTestcaseStart) sTCname = GetTestcaseName ' testtool basic command iCut = Instr ( sTCname, "(" ) @@ -177,7 +232,7 @@ sub hStatusAddTestcase() endif ' generate status line for testcase and append to global array - '/// iErrorLevel: 0: no faults; 1: Warning; 2: Error; 3: qaError ///' + '/// iErrorLevel: 0: no faults; 1: Warning; 2: Error; 3: qaError; 4: Assertion ///' iErrorLevel = -1 'D printlog "Iall: " + iAllErrorCount + " W:" + iWarningCount + " E: " + iErrorCount for i = 0 to iAllErrorCount @@ -215,6 +270,7 @@ sub hStatusAddTestcase() gErrorSum = getErrorCount() gQaErrorSum = getQaErrorCount() gWarningSum = getWarningCount() + hGetNonproAssertions(sTCname, sTestcaseDuration) ' workaround to get assertions count end sub sub hStatusWriteOutputFirstFile () @@ -234,6 +290,7 @@ sub hStatusWriteOutputFirstFile () dim sTemp as string dim sFileName as string dim slVersion() as string + dim iDebug as integer dim ilVersion as integer dim sVersionCWS as string dim iPosA as integer @@ -261,7 +318,7 @@ sub hStatusWriteOutputFirstFile () '///+ 13 cws name => if it is the master: 'Master' else the name of the childworkspace '///+ 14 source tree => '///+ 15 product => - '///+ 16 builder => + '///+ 16 debug => '///+ 17 checksum => '///+ data => @@ -307,6 +364,12 @@ sub hStatusWriteOutputFirstFile () sUsername = gReturnAddress endif + if (isProduct()) then + iDebug = 0 + else + iDebug = 1 + endif + ListAppend ( lTestrun(), "fileformat=0.2" ) ListAppend ( lTestrun(), "product=" + sProduct ) ListAppend ( lTestrun(), "sourcetree=" + sSource ) @@ -323,6 +386,7 @@ sub hStatusWriteOutputFirstFile () ListAppend ( lTestrun(), "testname=" + gTestName ) '(10) ' generated in hStatusIn ListAppend ( lTestrun(), "cws=" + sVersionCWS ) ListAppend ( lTestrun(), "ooolanguage=" + iSprache ) '(9) + ListAppend ( lTestrun(), "debug=" + iDebug ) ListAppend ( lTestrun(), "checksum=" + "") ' ListAppend ( lTestrun(), "data=" + ) diff --git a/testautomation/global/win/dial_d_h.win b/testautomation/global/win/dial_d_h.win index 6af13cd00f6c..75ab744dce79 100755 --- a/testautomation/global/win/dial_d_h.win +++ b/testautomation/global/win/dial_d_h.win @@ -443,8 +443,7 @@ Aktualisieren sym:SFX2_HID_TEMPLDLG_UPDATEBYEXAMPLE Vorlagenliste sym:SFX2_HID_TEMPLATE_FMT Gruppenliste sym:SFX2_HID_TEMPLATE_FILTER -*GridControlDialogStarter ACTIVE -ShowGridcontrol sym:showGridcontrol +*ShowGridcontrol sym:showgridcontrol *GridControlDialog sym:gridcontroldialog gridcontrolcontrol sym:gridcontrolself diff --git a/testautomation/global/win/etab_a_d.win b/testautomation/global/win/etab_a_d.win index e8fb0ac7b870..1267cdae88ca 100755 --- a/testautomation/global/win/etab_a_d.win +++ b/testautomation/global/win/etab_a_d.win @@ -364,6 +364,10 @@ SaveIn sym:CUI_HID_SVX_SAVE_IN ToolbarContents sym:CUI_HID_SVX_CONFIG_TOOLBAR_CONTENTS ResetBtn sym:SFX2_HID_TABDLG_RESET_BTN +*TabCustomProperties sym:SFX2_HID_TP_CUSTOMPROPERTIES +Properties sym:SFX2_HID_CTRL_CUSTOMPROPERTIES +Add sym:sfx2:PushButton:TP_CUSTOMPROPERTIES:BTN_ADD + *TabDatabaseField sym:extensions:TabPage:RID_PAGE_OPTION_DBFIELD YesSaveIt sym:extensions:RadioButton:RID_PAGE_OPTION_DBFIELD:RB_STOREINFIELD_YES NoValueForm sym:extensions:RadioButton:RID_PAGE_OPTION_DBFIELD:RB_STOREINFIELD_NO diff --git a/testautomation/graphics/optional/includes/global/g_clipboard.inc b/testautomation/graphics/optional/includes/global/g_clipboard.inc index 8da14643d748..2be5461617bd 100644 --- a/testautomation/graphics/optional/includes/global/g_clipboard.inc +++ b/testautomation/graphics/optional/includes/global/g_clipboard.inc @@ -29,7 +29,7 @@ '* '* short description : '* -'************************************************************************************** +'\************************************************************************************** testcase tiEditUndo diff --git a/testautomation/graphics/optional/includes/global/g_convertto.inc b/testautomation/graphics/optional/includes/global/g_convertto.inc index 3a829b1ef275..69719accd4e8 100644 --- a/testautomation/graphics/optional/includes/global/g_convertto.inc +++ b/testautomation/graphics/optional/includes/global/g_convertto.inc @@ -29,7 +29,7 @@ '* '* short description : '* -'************************************************************************************** +'\************************************************************************************** ' Dateiname.SetText ConvertPath (gTesttoolPath + "global\input\graf_inp\columbia.dxf") ' Call hGrafikEinfuegen ConvertPath ( gTesttoolPath + "global\input\graf_inp\enter.bmp" ) diff --git a/testautomation/graphics/optional/includes/global/g_demoguide.inc b/testautomation/graphics/optional/includes/global/g_demoguide.inc index 0860e8cb942a..9e1a4ffbf497 100644 --- a/testautomation/graphics/optional/includes/global/g_demoguide.inc +++ b/testautomation/graphics/optional/includes/global/g_demoguide.inc @@ -263,16 +263,15 @@ testcase t_Interoperability Kontext "DocumentImpress" Kontext "Slides" Kontext "SlidesControl" - SlidesControl.OpenContextMenu sleep 1 - hMenuSelectNr (8) + SlidesControl.TypeKeys "<MOD1 X>" + Kontext "DocumentImpress" DocumentImpress.TypeKeys "<HOME>", true Kontext "Slides" Kontext "SlidesControl" - SlidesControl.OpenContextMenu sleep 1 - hMenuSelectNr (10) + SlidesControl.TypeKeys "<MOD1 V>" Printlog " Verify that the slide was moved correctly" Kontext "Slides" diff --git a/testautomation/graphics/optional/includes/global/g_insert.inc b/testautomation/graphics/optional/includes/global/g_insert.inc index 44d9030413ea..67196c3145d6 100644 --- a/testautomation/graphics/optional/includes/global/g_insert.inc +++ b/testautomation/graphics/optional/includes/global/g_insert.inc @@ -29,7 +29,7 @@ '* '* short description : '* -'************************************************************************************** +'\************************************************************************************** testcase tdInsertObjectOleObjects diff --git a/testautomation/graphics/optional/includes/global/g_line.inc b/testautomation/graphics/optional/includes/global/g_line.inc index eb672b3b9716..758f537c5630 100644 --- a/testautomation/graphics/optional/includes/global/g_line.inc +++ b/testautomation/graphics/optional/includes/global/g_line.inc @@ -363,6 +363,7 @@ testcase tLineConnect Dim i as integer Dim cname as string Dim cfirst as integer + Dim CornerStyles as integer if bAsianLan then QaErrorLog "tLineConnect ends because Asian languages are not fully supported." @@ -517,10 +518,11 @@ testcase tLineConnect else sleep 1 endif + + For i = 1 to CornerStyles + Kontext "TabLinie" + if (i > 1) AND (cname <> CornerStyle.GetSelText) then - For i = 1 to CornerStyle.GetItemCount - Kontext "TabLinie" - if (i > 1) AND (cname <> CornerStyle.GetSelText) then warnlog "Cornerstylename wasnt saved. Should have been: " + cname + ". But was: " + CornerStyle.GetSelText endif CornerStyle.Select i diff --git a/testautomation/graphics/optional/includes/global/g_tools.inc b/testautomation/graphics/optional/includes/global/g_tools.inc index e8e918b95cbb..10d2c6bbe93a 100644 --- a/testautomation/graphics/optional/includes/global/g_tools.inc +++ b/testautomation/graphics/optional/includes/global/g_tools.inc @@ -275,8 +275,16 @@ testcase tiToolsThesaurusContextMenu end select PrintLog "Thesaurus with 1 word: " + sWord - Call hNewDocument + + printlog "Setting doc language to english" + ToolsOptions + Kontext "ExtrasOptionenDlg" + hToolsOptions("LANGUAGESETTINGS","Languages") + Westlich.Select 34 + Kontext "ExtrasOptionenDlg" + ExtrasOptionenDlg.OK + Call hTextrahmenErstellen (sWord,20,20,50,30) sleep 1 diff --git a/testautomation/graphics/optional/includes/impress/i_headerfooter.inc b/testautomation/graphics/optional/includes/impress/i_headerfooter.inc index d69a6762f886..390654350e29 100644 --- a/testautomation/graphics/optional/includes/impress/i_headerfooter.inc +++ b/testautomation/graphics/optional/includes/impress/i_headerfooter.inc @@ -29,7 +29,7 @@ '* '* short description : Tests the header-footer-function in Impress '* -'******************************************************************* +'\******************************************************************* testcase tiHeaderFooterSlide diff --git a/testautomation/graphics/optional/includes/impress/i_pengine1.inc b/testautomation/graphics/optional/includes/impress/i_pengine1.inc index ff4d2a035ef0..eeb6293ddb0d 100644 --- a/testautomation/graphics/optional/includes/impress/i_pengine1.inc +++ b/testautomation/graphics/optional/includes/impress/i_pengine1.inc @@ -29,7 +29,7 @@ '* '* short description : Tests the Engine for Presentation '* -'******************************************************************* +'\******************************************************************* testcase tiPengineTabEntrance diff --git a/testautomation/graphics/optional/includes/impress/i_pengine2.inc b/testautomation/graphics/optional/includes/impress/i_pengine2.inc index 56d15f6eee37..5f89299c066d 100644 --- a/testautomation/graphics/optional/includes/impress/i_pengine2.inc +++ b/testautomation/graphics/optional/includes/impress/i_pengine2.inc @@ -29,7 +29,7 @@ '* '* short description : Tests the Presentation-Engines effects '* -'******************************************************************* +'\******************************************************************* testcase tiPengineAnimationEffectsPreview dim bError as boolean diff --git a/testautomation/graphics/optional/includes/impress/i_saveloadlayout.inc b/testautomation/graphics/optional/includes/impress/i_saveloadlayout.inc index 06a7ac89cf9d..87f72b3e6673 100644 --- a/testautomation/graphics/optional/includes/impress/i_saveloadlayout.inc +++ b/testautomation/graphics/optional/includes/impress/i_saveloadlayout.inc @@ -29,7 +29,7 @@ '* '* short description: Save & Load testing of Layout -templates. '* -'************************************************************************************** +'\************************************************************************************** testcase tSaveLoadLayoutEmpty Dim NewFileDir as String diff --git a/testautomation/graphics/optional/includes/impress/i_slidelayer.inc b/testautomation/graphics/optional/includes/impress/i_slidelayer.inc index 508394144663..8b9504e7a5be 100644 --- a/testautomation/graphics/optional/includes/impress/i_slidelayer.inc +++ b/testautomation/graphics/optional/includes/impress/i_slidelayer.inc @@ -29,7 +29,7 @@ '* '* short description : '* -'********************************************************************* +'\********************************************************************* ' Dateiname.SetText ConvertPath (gTesttoolPath + "global\input\graf_inp\enter.bmp") ' Inhalt.SetText ConvertPath (gTesttoolPath + "graphics\required\input\leer.sxd") diff --git a/testautomation/graphics/optional/includes/impress/i_slideshow2.inc b/testautomation/graphics/optional/includes/impress/i_slideshow2.inc index 2df33261c6f2..f409aeb2e9f6 100644 --- a/testautomation/graphics/optional/includes/impress/i_slideshow2.inc +++ b/testautomation/graphics/optional/includes/impress/i_slideshow2.inc @@ -29,7 +29,7 @@ '* '* short description : '* -'******************************************************************* +'\******************************************************************* testcase tPraesentationAnimation diff --git a/testautomation/graphics/optional/includes/impress/i_slideshow3.inc b/testautomation/graphics/optional/includes/impress/i_slideshow3.inc index 52858e22e7cf..eee2416a1723 100644 --- a/testautomation/graphics/optional/includes/impress/i_slideshow3.inc +++ b/testautomation/graphics/optional/includes/impress/i_slideshow3.inc @@ -29,7 +29,7 @@ '* '* short description : '* -'******************************************************************* +'\******************************************************************* testcase tExtrasInteraktion diff --git a/testautomation/graphics/required/includes/global/id_001.inc b/testautomation/graphics/required/includes/global/id_001.inc index b878278961b1..509e35a52185 100644 --- a/testautomation/graphics/required/includes/global/id_001.inc +++ b/testautomation/graphics/required/includes/global/id_001.inc @@ -779,15 +779,17 @@ testcase tmFileProperties Kontext "TabDokumentInfo" Call DialogTest ( TabDokumentInfo ) - qaerrorlog "#i95523#" - 'Kontext - 'active.SetPage TabBenutzer - 'Kontext "TabBenutzer" - 'Call DialogTest ( TabBenutzer ) - 'Infofelder.Click - ' Kontext "InfonamenBearbeiten" - ' Call DialogTest (InfonamenBearbeiten) - 'InfonamenBearbeiten.Cancel + Kontext + '/// select tabpage 'Security' ///' + active.SetPage TabSecurityProperties + Kontext "TabSecurityProperties" + Call DialogTest ( TabSecurityProperties) + + Kontext + '/// select tabpage 'User defined' ///' + active.SetPage TabCustomProperties + Kontext "TabCustomProperties" + Call DialogTest ( TabCustomProperties ) Kontext active.SetPage TabInternet diff --git a/testautomation/math/required/includes/m_001_.inc b/testautomation/math/required/includes/m_001_.inc index 85546a0e222a..af5123591e62 100755 --- a/testautomation/math/required/includes/m_001_.inc +++ b/testautomation/math/required/includes/m_001_.inc @@ -636,28 +636,27 @@ testcase tmFileProperties Call DialogTest ( TabDokumentInfo ) Kontext + '/// select tabpage 'Security' ///' + active.SetPage TabSecurityProperties + Kontext "TabSecurityProperties" + Call DialogTest ( TabSecurityProperties) + + Kontext + '/// select tabpage 'User defined' ///' + active.SetPage TabCustomProperties + Kontext "TabCustomProperties" + Call DialogTest ( TabCustomProperties ) + + Kontext '/// select tabpage 'Internet' ///' active.SetPage TabInternet Kontext "TabInternet" Call DialogTest (TabInternet) + hCloseDialog( TabInternet, "cancel" ) '/// close application ///' Call hCloseDocument - qaerrorlog "#i95523# Custom Properties is not controlable by VCL TestTool Application" - goto endsub - - Kontext - '/// select tabpage 'User defined' ///' - active.SetPage TabBenutzer - Kontext "TabBenutzer" - Call DialogTest ( TabBenutzer ) - '/// click button 'info fields' ///' - Infofelder.Click - Kontext "InfonamenBearbeiten" - Call DialogTest (InfonamenBearbeiten) - '/// close dialog 'edit field names' ///' - hCloseDialog( InfoNamenBearbeiten, "cancel" ) endcase testcase tmFilePrinterSetting diff --git a/testautomation/spreadsheet/optional/includes/so7pp1/c_so7_pp1_iz.inc b/testautomation/spreadsheet/optional/includes/so7pp1/c_so7_pp1_iz.inc index 873ca1bddabc..4777fc60917f 100644 --- a/testautomation/spreadsheet/optional/includes/so7pp1/c_so7_pp1_iz.inc +++ b/testautomation/spreadsheet/optional/includes/so7pp1/c_so7_pp1_iz.inc @@ -104,11 +104,7 @@ testcase tIZ19381 sleep(2) Kontext if Active.exists(2) then - if gPlatGroup = "w95" then - warnlog "REGRESSION! #i41751# - Saving after Cut&Paste of OLE fails on windows!" - else - warnlog "OOPS, found unexpected MsgBox -> Check this out!" - end if + warnlog "OOPS, found unexpected MsgBox -> Check this out!" Active.OK call hCloseDocument goto endsub @@ -202,7 +198,7 @@ testcase tIZ21036 try printlog "OK, there are still " & GetDocumentCount & " documents open" catch - warnlog "Probably the office did crash -> #I21036#" + warnlog "Probably the office did crash" goto endsub endcatch diff --git a/testautomation/spreadsheet/required/includes/c_upd_filemenu.inc b/testautomation/spreadsheet/required/includes/c_upd_filemenu.inc index 33c52111c384..cf52ad4c7647 100644 --- a/testautomation/spreadsheet/required/includes/c_upd_filemenu.inc +++ b/testautomation/spreadsheet/required/includes/c_upd_filemenu.inc @@ -658,7 +658,7 @@ testcase tFileSaveAsDBF Kontext if Active.exists(2) then printlog " " - warnlog "#i87325# - Unexpected messagebox" + warnlog "Unexpected messagebox" Printlog Active.GetText Printlog " " Active.OK diff --git a/testautomation/spreadsheet/required/includes/c_upd_insertmenu.inc b/testautomation/spreadsheet/required/includes/c_upd_insertmenu.inc index b8c749c27cd9..b9c4b7d3b2ca 100644 --- a/testautomation/spreadsheet/required/includes/c_upd_insertmenu.inc +++ b/testautomation/spreadsheet/required/includes/c_upd_insertmenu.inc @@ -1204,7 +1204,7 @@ testcase tInsertObjectFormular Kontext "SelectionMath" call DialogTest (SelectionMath) catch - qaerrorlog "#i93427# Math Selection Dialog is not available" + warnlog "Math Selection Dialog is not available" endcatch end if '/// Close Formular with 'Esc' diff --git a/testautomation/spreadsheet/required/includes/c_upd_viewmenu.inc b/testautomation/spreadsheet/required/includes/c_upd_viewmenu.inc index e7568390c38a..99d8c9823776 100644 --- a/testautomation/spreadsheet/required/includes/c_upd_viewmenu.inc +++ b/testautomation/spreadsheet/required/includes/c_upd_viewmenu.inc @@ -173,8 +173,12 @@ testcase tViewToolbars TabCustomizeMenu.Cancel '/// Reset toolbars by 'View - Toolbars - Reset' printlog " Reset toolbars by 'View - Toolbars - Reset'" + Kontext "DocumentCalc" + DocumentCalc.UseMenu 'Selecting Menubar + hMenuSelectNr(3) 'Using third entry on Menubar (VIEW) + hMenuSelectNr(3) 'Using third entry on menu (TOOLBARS) + hMenuFindSelect(22, true, 22) 'Using last entry on menu (RESET) ' ViewToolbarsReset - qaerrorlog "Reset not possible because of #i84544" '/// Close document printlog " Close starting document" call hCloseDocument diff --git a/testautomation/writer/required/includes/w_001a_.inc b/testautomation/writer/required/includes/w_001a_.inc index cb9739cd00dd..d41a89fc7d61 100644 --- a/testautomation/writer/required/includes/w_001a_.inc +++ b/testautomation/writer/required/includes/w_001a_.inc @@ -88,22 +88,23 @@ testcase tFileProperties Kontext "TabDokumentinfo" Call DialogTest (TabDokumentinfo) + Kontext + printlog " Switch to Tabpage 'Security'" + active.SetPage TabSecurityProperties + Kontext "TabSecurityProperties" + Call DialogTest ( TabSecurityProperties) + printlog " Click button 'Protect...'" + Protect.click + kontext "PasswordDLG" + Call DialogTest (PasswordDLG) + printlog " Cancel dialog 'Password'" + PasswordDLG.cancel - Warnlog "#i95523# - FileProperties - Tabpage 'User Defined' has changed. - Adaption of testcases needed." - ' printlog " Switch to Tabpage 'User defined'" - ' Kontext - ' active.SetPage TabBenutzer - ' Kontext "TabBenutzer" - ' Call DialogTest ( TabBenutzer ) - - ' Wait 500 - - ' Infofelder.Click - ' printlog " Click 'Infofields'" - ' Kontext "InfonamenBearbeiten" - ' printlog " Close upcoming dialog with 'Cancel'" - ' Call DialogTest (InfonamenBearbeiten) - ' InfonamenBearbeiten.Cancel + Kontext + printlog " Switch to Tabpage 'User defined'" + active.SetPage TabCustomProperties + Kontext "TabCustomProperties" + Call DialogTest ( TabCustomProperties ) printlog " Switch to Tabpage 'Internet'" Kontext diff --git a/testautomation/writer/required/includes/w_002_.inc b/testautomation/writer/required/includes/w_002_.inc index e19b37514c99..0acd4d4a587c 100644 --- a/testautomation/writer/required/includes/w_002_.inc +++ b/testautomation/writer/required/includes/w_002_.inc @@ -1300,7 +1300,7 @@ testcase tEditImageMap printlog( "Check for <Imagemap changed> messagebox (should not appear)" ) kontext "Active" if ( Active.exists( 1 ) ) then - Warnlog( "<imagemap changed> message displayed." ) + Warnlog( "#i117432#<imagemap changed> message displayed." ) printlog( Active.getText ) Active.no() else diff --git a/testautomation/writer/required/w_updt.bas b/testautomation/writer/required/w_updt_1.bas index b8779647281b..c6f633ec7375 100755..100644 --- a/testautomation/writer/required/w_updt.bas +++ b/testautomation/writer/required/w_updt_1.bas @@ -27,7 +27,7 @@ '* '* owner : helge.delfs@oracle.com '* -'* short description : Ressource-Test Writer Document +'* short description : Ressource-Test Writer Document Part 1 / 2 '* '\****************************************************************** @@ -45,20 +45,12 @@ sub main use "writer\required\includes\w_004b_.inc" use "writer\required\includes\w_005_.inc" use "writer\required\includes\w_005b_.inc" - use "writer\required\includes\w_006_.inc" - use "writer\required\includes\w_007_.inc" - use "writer\required\includes\w_008_.inc" - use "writer\required\includes\w_009_.inc" - use "writer\required\includes\w_010_.inc" - use "writer\required\includes\w_010_1.inc" - use "writer\required\includes\w_011_.inc" - use "writer\required\includes\w_020_.inc" - Printlog "******* Ressource-Test Writer Document *******" + Printlog "******* Ressource-Test Writer Document Part 1 / 2 *******" Call wChangeDefaultView() - Call hStatusIn ( "writer", "w_updt.bas" ) + Call hStatusIn ( "writer", "w_updt_1.bas" ) Call w_001_ ' Menu File Call w_001a_ ' Menu File Call w_001b_ ' Menu File @@ -68,14 +60,6 @@ sub main Call w_004b_ ' Menu Insert Call w_005_ ' Menu Format Call w_005b_ ' Menu Format (2) - Call w_006_ ' Menu Table - Call w_007_ ' Menu Tools - Call w_008_ ' Menu Window - Call w_009_ ' Menu Help - Call w_010_ ' Objectbar - Call w_010_1 ' Objectbar. Part 2 - Call w_011_ ' Rest of Objectbar - Call w_020_ ' Toolbar Call hStatusOut end sub @@ -84,9 +68,7 @@ sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" use "global\required\includes\g_001.inc" - use "global\required\includes\g_option.inc" ' global subroutines for Tools / Options use "global\required\includes\g_printing.inc" - use "global\required\includes\g_findbar.inc" use "global\tools\includes\optional\t_xml_filter1.inc" ' global routines for XML-functionality use "global\tools\includes\optional\t_docfuncs.inc" use "global\tools\includes\optional\t_control_objects.inc" diff --git a/testautomation/writer/required/w_updt_2.bas b/testautomation/writer/required/w_updt_2.bas new file mode 100644 index 000000000000..6bbf7bb6a771 --- /dev/null +++ b/testautomation/writer/required/w_updt_2.bas @@ -0,0 +1,75 @@ +'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 : helge.delfs@oracle.com +'* +'* short description : Ressource-Test Writer Document Part 2 / 2 +'* +'\****************************************************************** + +sub main + use "writer\tools\includes\w_tools.inc" ' global subroutines for Writer-application + use "writer\tools\includes\w_tool1.inc" ' global subroutines for Writer-application + use "writer\tools\includes\w_tool2.inc" ' global subroutines for Writer-application + + use "writer\required\includes\w_006_.inc" + use "writer\required\includes\w_007_.inc" + use "writer\required\includes\w_008_.inc" + use "writer\required\includes\w_009_.inc" + use "writer\required\includes\w_010_.inc" + use "writer\required\includes\w_010_1.inc" + use "writer\required\includes\w_011_.inc" + use "writer\required\includes\w_020_.inc" + + Printlog "******* Ressource-Test Writer Document Part 2 / 2 *******" + + Call wChangeDefaultView() + + Call hStatusIn ( "writer", "w_updt_2.bas" ) + Call w_006_ ' Menu Table + Call w_007_ ' Menu Tools + Call w_008_ ' Menu Window + Call w_009_ ' Menu Help + Call w_010_ ' Objectbar + Call w_010_1 ' Objectbar. Part 2 + Call w_011_ ' Rest of Objectbar + Call w_020_ ' Toolbar + Call hStatusOut + +end sub + +sub LoadIncludeFiles + use "global\system\includes\master.inc" + use "global\system\includes\gvariabl.inc" + use "global\required\includes\g_option.inc" ' global subroutines for Tools / Options + use "global\required\includes\g_findbar.inc" + use "global\tools\includes\optional\t_docfuncs.inc" + use "global\tools\includes\optional\t_control_objects.inc" + + gApplication = "WRITER" + GetUseFiles () +end sub |