diff options
author | Vladimir Glazounov <vg@openoffice.org> | 2008-10-01 14:59:18 +0000 |
---|---|---|
committer | Vladimir Glazounov <vg@openoffice.org> | 2008-10-01 14:59:18 +0000 |
commit | ac5d01db85bc2b2bd3f793aa9147c237f0cfcfbf (patch) | |
tree | e9e3077a7602a786bce1340a1d90d8bca989ee8c /testautomation | |
parent | 1577d17d8faaf2e29bf2a9526288578a9acf0a0d (diff) |
CWS-TOOLING: integrate CWS qaerrorlogfixes1_DEV300
Diffstat (limited to 'testautomation')
65 files changed, 762 insertions, 755 deletions
diff --git a/testautomation/chart2/required/includes/ch2_flexible_source_range_selection.inc b/testautomation/chart2/required/includes/ch2_flexible_source_range_selection.inc index f7bcf0459960..74f44f05692f 100755 --- a/testautomation/chart2/required/includes/ch2_flexible_source_range_selection.inc +++ b/testautomation/chart2/required/includes/ch2_flexible_source_range_selection.inc @@ -48,13 +48,10 @@ testcase tDataRangeWizardCalc dim sDataRange as string dim sInputFile as string - sInputFile = convertpath(gTestToolPath & "chart2/required/input/ch_flexrange01.ods") - - '/// Open test document gtesttoolpath/chart2/required/input/ch_flexrange01.ods + sInputFile = convertpath(gTestToolPath & "chart2/required/input/ch_flexrange01.ods") printlog "Open test document gtesttoolpath/chart2/required/input/ch_flexrange01.ods" if fOpenTestDocumentAndInsertChart(sInputFile) then Kontext "ChartType" - '///Choose the Chart type <i>bar</i> (should be the second in the top-down list) printlog "Choose the Chart type <i>bar</i> (should be the second in the top-down list)" if fSetChartType( "bar" ) > 0 then warnlog "Something went wrong setting chart type to BAR." @@ -64,14 +61,12 @@ testcase tDataRangeWizardCalc call hCloseDocument goto endsub endif - '///Switch to tabpage Data Range printlog "Switch to tabpage Data Range" Kontext "ChartWizard" GoNext.Click Kontext "TabChartTypeDataRange" call DialogTest ( TabChartTypeDataRange ) - '///Check that the data range in edit field has the value $ChartFlexRange.$B$3:$E$6 - printlog "heck that the data range in edit field has the value $ChartFlexRange.$B$3:$E$6" + printlog "Check that the data range in edit field has the value $ChartFlexRange.$B$3:$E$6" Kontext "TabChartTypeDataRange" sDataRange = DataRange.GetText if sDataRange <> "$ChartFlexRange.$B$3:$E$6" then @@ -79,15 +74,13 @@ testcase tDataRangeWizardCalc else printlog " Datarange is correct" endif - '///Check if -Data series in rows- is enabled printlog "Check if -Data series in rows- is enabled" if Rows.IsEnabled then printlog " Data series in rows is enabled" else warnlog "Data series in rows is disabled" - endif - '///Check if -Data series in columns- is enabled and chosen - printlog "Check if -Data series in columns- is enabled and chosen" + endif + printlog "Check if Data series in columns- is enabled and chosen" if Columns.IsEnabled then printlog " Data series in columns is enabled" if Columns.IsChecked then @@ -98,7 +91,6 @@ testcase tDataRangeWizardCalc else warnlog "Data series in columns is disabled" endif - '///Check if -First row as label- is enabled and checked printlog "Check if -First row as label- is enabled and checked" if FirstRowAsLabel.IsEnabled then printlog " First row as label is enabled" @@ -110,7 +102,6 @@ testcase tDataRangeWizardCalc else warnlog "First row as label is disabled" endif - '///Check if -First column as label- is enabled and not checked printlog "Check if -First column as label- is enabled and not checked" if FirstColumnAsLabel.IsEnabled then printlog " First column as label is enabled" @@ -121,45 +112,38 @@ testcase tDataRangeWizardCalc endif else warnlog "First column as label is disabled" - endif - '///Press button Range Chooser + endif printlog "Press button Range Chooser" - SelectDataRange.Click - '///Enter invalid range $ChartFlexRange.$B$3:$E$0 and close Range Chooser + SelectDataRange.Click printlog "Enter invalid range $ChartFlexRange.$B$3:$E$0 and close Range Chooser" Kontext "AcceptOrRejectChangesArea" AreaEditField.SetText "$ChartFlexRange.$B$3:$E$0" - ShrinkButton.Click - '///Check if -Data series in rows- is disabled + ShrinkButton.Click printlog "Check if -Data series in rows- is disabled" Kontext "TabChartTypeDataRange" if NOT Rows.IsEnabled then printlog " Data series in rows is disabled" else warnlog "Data series in rows is enabled, but should be disabled" - endif - '///Check if -Data series in columns- is disabled + endif printlog "Check if -Data series in columns- is disabled" if NOT Columns.IsEnabled then printlog " Data series in columns is disabled" else warnlog "Data series in columns is enabled, but should be disabled" - endif - '///Check if -First row as label- is disabled + endif printlog "Check if -First row as label- is disabled" if NOT FirstRowAsLabel.IsEnabled then printlog " First row as label is disabled" else warnlog "First row as label is enabled, but should be disabled" - endif - '///Check if -First column as label- is disabled + endif printlog "Check if -First column as label- is disabled" if NOT FirstColumnAsLabel.IsEnabled then printlog " First Column as label is disabled" else warnlog "First Column as label is enabled, but should be disabled" - endif - '///Check if Back, Next and Finish does not work + endif printlog "Check if Back, Next and Finish does not work" Kontext "ChartWizard" GoBack.Click @@ -170,19 +154,16 @@ testcase tDataRangeWizardCalc warnlog "Back button is not functionless" Kontext "ChartWizard" GoNext.Click - endif - '///Enter valid range $ChartFlexRange.$B$3:$E$6 + endif printlog "Enter valid range $ChartFlexRange.$B$3:$E$6" Kontext "TabChartTypeDataRange" - DataRange.SetText "$ChartFlexRange.$B$3:$E$6" - '///Check if -Data series in rows- is enabled + DataRange.SetText "$ChartFlexRange.$B$3:$E$6" printlog "Check if -Data series in rows- is enabled" if Rows.IsEnabled then printlog " Data series in rows is enabled" else warnlog "Data series in rows is disabled" - endif - '///Check if -Data series in columns- is enabled and chosen + endif printlog "Check if -Data series in columns- is enabled and chosen" if Columns.IsEnabled then printlog " Data series in columns is enabled" @@ -193,8 +174,7 @@ testcase tDataRangeWizardCalc endif else warnlog "Data series in rows is disabled" - endif - '///Check if -First row as label- is enabled and checked + endif printlog "Check if -First row as label- is enabled and checked" if FirstRowAsLabel.IsEnabled then printlog " First row as label is enabled" @@ -205,8 +185,7 @@ testcase tDataRangeWizardCalc endif else warnlog "First row as label is disabled" - endif - '///Check if -First column as label- is enabled and not checked + endif printlog "Check if -First column as label- is enabled and not checked" if FirstColumnAsLabel.IsEnabled then printlog " First column as label is enabled" @@ -217,12 +196,10 @@ testcase tDataRangeWizardCalc endif else warnlog "First column as label is disabled" - endif - '///Press Cancel button + endif printlog "Press Cancel button" Kontext "ChartWizard" - ChartWizard.Cancel - '///Close document + ChartWizard.Cancel printlog "Close document" Call hCloseDocument else @@ -238,11 +215,9 @@ testcase tDataSeriesWizardCalc dim sDataRanges as string dim sRangeFor as string dim sCategories as string - sInputFile = convertpath(gTestToolPath & "chart2/required/input/ch_flexrange02.ods") - '///Open test document <i>gTestToolPath</i>/chart2/required/input/ch_flexrange02.ods + sInputFile = convertpath(gTestToolPath & "chart2/required/input/ch_flexrange02.ods") printlog "Open test document gTestToolPath/chart2/required/input/ch_flexrange02.ods" - if fOpenTestDocumentAndInsertChart(sInputFile) then - '///Choose the Chart type <i>XY (SCATTER)</i> (should be the second in the top-down list) + if fOpenTestDocumentAndInsertChart(sInputFile) then Kontext "ChartType" printlog "Choose the Chart type XY (SCATTER) (should be the second in the top-down list)" if fSetChartType( "xy" ) > 0 then @@ -252,11 +227,9 @@ testcase tDataSeriesWizardCalc call hCloseDocument goto endsub endif - Kontext "ChartWizard" - '/// Click on Next button + Kontext "ChartWizard" printlog "Click on Next button" - GoNext.Click - '/// Click on Next button + GoNext.Click printlog "Click on Next button" GoNext.Click Kontext "TabChartTypeDataSeries" @@ -269,60 +242,52 @@ testcase tDataSeriesWizardCalc call hCloseDocument goto endsub endif - call DialogTest ( TabChartTypeDataSeries ) - '///Check if the data series listbox is enabled and contains three entries + call DialogTest ( TabChartTypeDataSeries ) printlog "Check if the data series listbox is enabled and contains three entries" iDataSeries = DataSeries.GetItemCount if iDataSeries = 3 then printlog " All 3 data series are available" else warnlog "There are " & iDataSeries & " data series instead of 3" - endif - '///Check if the ADD button is enabled and click the button + endif printlog "Check if the ADD button is enabled and click the button" if AddButton.IsEnabled then printlog " ADD button is enabled" AddButton.Click else warnlog "ADD button is not enabled" - endif - '///Check if there are now four entries in the data series listbox + endif printlog "Check if there are now four entries in the data series listbox" iDataSeries = DataSeries.GetItemCount if iDataSeries = 4 then printlog " Adding a data series was successfull" else warnlog "There are " & iDataSeries & " data series instead of 4" - endif - '///Check if the second data series was added below the highlighted one + endif printlog "Check if the second data series was added below the highlighted one" if DataSeries.GetSelIndex = 2 then printlog " The new data series was inserted below the highlighted (first) one" else warnlog "The new dataseries was not inserted below the highlighted one" - endif - '///Check if the REMOVE button is enabled and click the button + endif printlog "Check if the REMOVE button is enabled and click the button" if RemoveButton.IsEnabled then printlog " REMOVE button is enabled" RemoveButton.Click else warnlog "REMOVE button is not enabled" - endif - '///Check if there are now 3 entries in the data series listbox + endif printlog "Check if there are now 3 entries in the data series listbox" iDataSeries = DataSeries.GetItemCount if iDataSeries = 3 then printlog " Removing a data series was successfull" else warnlog "There are " & iDataSeries & " data series instead of 3" - endif - '///Use UP button and verify that it it disabled on first entry + endif printlog "Use UP button on last data series and verify that it it disabled on first entry" DataSeries.Select(3) if MoveUp.IsEnabled then - printlog " The MoveUp button is enabled" - '/// Click on Move Up button twice." + printlog " The MoveUp button is enabled" printlog "Click on Move Up button twice." MoveUp.Click MoveUp.Click @@ -338,13 +303,11 @@ testcase tDataSeriesWizardCalc endif else warnlog "Moving data series was not successfull" - endif - '///Use DOWN button and verify that it is disabled on last entry + endif printlog "Use DOWN button and verify that it is disabled on last entry" DataSeries.Select(1) if MoveDown.IsEnabled then - printlog " The MoveDown button is enabled" - '/// Click Move Down button twice + printlog " The MoveDown button is enabled" printlog "Click Move Down button twice" MoveDown.Click MoveDown.Click @@ -360,11 +323,9 @@ testcase tDataSeriesWizardCalc endif else warnlog "Moving data series was not successfull" - endif - '///Select first entry in Data Ranges + endif printlog "Select first entry in Data Ranges" - DataRanges.Select(1) - '///Verify that the range matches the one in edit field + DataRanges.Select(1) printlog "Verify that the range matches the one in edit field" 'GetSelText(line,column) is a new parameter since CWS:SRC680gh13 'Instead of 1,2 there must be 1,4 used becqause there are two invisible @@ -375,12 +336,9 @@ testcase tDataSeriesWizardCalc printlog " Both ranges are matching" else warnlog "The ranges does not match: " & sDataRanges & sRangeFor - endif - '///Select second entry in Data Ranges + endif printlog "Select second entry in Data Ranges" - DataRanges.Select 2 - - '///Check that the range in the edit field has changed, too. + DataRanges.Select(2) printlog "Check that the range in the edit field has changed, too." 'GetSelText(line,column) is a new parameter since CWS:SRC680gh13 'Instead of 1,2 there must be 1,4 used becqause there are two invisible @@ -391,11 +349,9 @@ testcase tDataSeriesWizardCalc printlog " Both ranges are matching" else warnlog "The ranges does not match" & sDataRanges & sRangeFor - endif - '///Change the range in edit field + endif printlog "Change the range in edit field" - RangeFor.SetText "$ChartFlexRange.$D$5:$D$6;$ChartFlexRange.$D$8" - '///Check that the range in Data Ranges has changed, too + RangeFor.SetText "$ChartFlexRange.$D$5:$D$6;$ChartFlexRange.$D$8" printlog "Check that the range in Data Ranges has changed, too" 'GetSelText(line,column) is a new parameter since CWS:SRC680gh13 'Instead of 1,2 there must be 1,4 used becqause there are two invisible @@ -405,18 +361,14 @@ testcase tDataSeriesWizardCalc printlog " The data range has also changed" else warnlog "The data range has not changed" - endif - '///Click on Range Chooser and change the range + endif printlog "Click on Range Chooser and change the range" SelectRange.Click - Kontext "AcceptOrRejectChangesArea" - '/// Enter $ChartFlexRange.$D$5:$D$6 in edit field + Kontext "AcceptOrRejectChangesArea" printlog "Enter $ChartFlexRange.$D$5:$D$6 in edit field" - AreaEditField.SetText "$ChartFlexRange.$D$5:$D$6" - '/// Click on Shirnk button + AreaEditField.SetText "$ChartFlexRange.$D$5:$D$6" printlog "Click on Shirnk button" - ShrinkButton.Click - '///Check if the range in the Data ranges has been changed + ShrinkButton.Click printlog "Check if the range in Data ranges has changed" Kontext "TabChartTypeDataSeries" 'GetSelText(line,column) is a new parameter since CWS:SRC680gh13 @@ -427,31 +379,24 @@ testcase tDataSeriesWizardCalc printlog " The data range has also changed" else warnlog "The data range has not changed" - endif - '///Edit range for Data Labels - printlog "Edit range for Data Labels" - '/// Set text $ChartFlexRange.$C$15:$C$16 in categories + endif + printlog "Edit range for Data Labels" printlog "Set text $ChartFlexRange.$C$15:$C$16 in categories" Categories.SetText "$ChartFlexRange.$C$15:$C$16" - sCategories = Categories.GetText - '/// Validate the changes have not been modified + sCategories = Categories.GetText printlog "Validate the changes have not been modified" if sCategories = "$ChartFlexRange.$C$15:$C$16" then printlog " The range has been modified" else warnlog "Modifiing the range was not successfull" - endif - '///Click on Range Chooser and change the range + endif printlog "Click on Range Chooser and change the range" SelectCategories.Click - Kontext "AcceptOrRejectChangesArea" - '/// Set text $ChartFlexRange.$C$5:$C$6 in the edit field + Kontext "AcceptOrRejectChangesArea" printlog "Set text $ChartFlexRange.$C$5:$C$6 in the edit field" - AreaEditField.SetText "$ChartFlexRange.$C$5:$C$6" - '/// Click on Shrink button + AreaEditField.SetText "$ChartFlexRange.$C$5:$C$6" printlog "Click on Shrink button" - ShrinkButton.Click - '///Verify that the range is taken + ShrinkButton.Click printlog "Verify that the range is taken" Kontext "TabChartTypeDataSeries" sCategories = Categories.GetText @@ -459,12 +404,10 @@ testcase tDataSeriesWizardCalc printlog " The range has been modified" else warnlog "Modifiing the range was not successfull" - endif - '///Enter invalid range $ChartFlexRange.$C$5:$C$ + endif printlog "Enter invalid range $ChartFlexRange.$C$5:$C$" Categories.SetText "$ChartFlexRange.$C$5:$C$" - Kontext "ChartWizard" - '/// Click on the Back button + Kontext "ChartWizard" printlog "Click on the Back button" GoBack.Click Kontext "TabChartTypeDataSeries" @@ -474,24 +417,18 @@ testcase tDataSeriesWizardCalc warnlog "Back button is not functionless" Kontext "ChartWizard" GoNext.Click - endif - '///Enter $ChartFlexRange.$C$5:$C$6 - a valid range + endif printlog "Enter $ChartFlexRange.$C$5:$C$6 - a valid range" - Categories.SetText "$ChartFlexRange.$C$5:$C$6" - '///Press Range Chooser for Data Lables + Categories.SetText "$ChartFlexRange.$C$5:$C$6" printlog "Press Range Chooser" - SelectCategories.Click - '/// Press <END>-key + SelectCategories.Click printlog "Press <END>-key" Kontext "AcceptOrRejectChangesArea" - AreaEditField.TypeKeys "<END>" - '///Enter a semicolon and the second range $ChartFlexRange.$C$8 + AreaEditField.TypeKeys "<END>" printlog "Enter a semicolon and the second range $ChartFlexRange.$C$8" - AreaEditField.TypeKeys ";$ChartFlexRange.$C$8" - '///Close Range Chooser + AreaEditField.TypeKeys ";$ChartFlexRange.$C$8" printlog "Close Range Chooser" - ShrinkButton.Click - '///Verify that there is a multiple range + ShrinkButton.Click printlog "Verify that there is a multiple range" Kontext "TabChartTypeDataSeries" sCategories = Categories.GetText @@ -499,12 +436,10 @@ testcase tDataSeriesWizardCalc printlog " The range has been modified to a multiple range" else warnlog "Modifiing the range was not successfull" - endif - '///Press Cancel button + endif printlog "Press Cancel button" Kontext "ChartWizard" - ChartWizard.Cancel - '///Close document + ChartWizard.Cancel printlog "Close document" Call hCloseDocument else @@ -517,12 +452,9 @@ endcase testcase tDataRangeDialogCalc dim sDataRange as string dim sInputFile as string - sInputFile = convertpath(gTestToolPath & "chart2/required/input/ch_flexrange03.ods" ) - - '///Open test document <i>gTestToolPath</i>/chart2/required/input/ch_flexrange03.ods + sInputFile = convertpath(gTestToolPath & "chart2/required/input/ch_flexrange03.ods" ) printlog "Open test document gTestToolPath/chart2/required/input/ch_flexrange03.ods" - if fOpenTestDocumentAndSelectDataRange(sInputFile) then - '///Check data range in edit field is $ChartFlexRange.$D$4:$G$6;$ChartFlexRange.$C$5:$G$6;$ChartFlexRange.$C$4 + if fOpenTestDocumentAndSelectDataRange(sInputFile) then printlog "Check if the data range in edit field is $ChartFlexRange.$D$4:$G$6;$ChartFlexRange.$C$5:$G$6;$ChartFlexRange.$C$4" Kontext "TabChartTypeDataRange" sDataRange = DataRange.GetText @@ -530,15 +462,13 @@ testcase tDataRangeDialogCalc warnlog "This is not the expected datarange, it is " & sDataRange & " but should be $ChartFlexRange.$C$4:$G$6" else printlog " Datarange is correct" - endif - '///Check if -Data series in columns- is enabled + endif printlog "Check if -Data series in columns- is enabled" if Columns.IsEnabled then printlog " Data series in columns is enabled" else warnlog "Data series in columns is disabled" - endif - '///Check if -Data series in rows- is enabled and chosen + endif printlog "Check if -Data series in columns- is enabled and chosen" if Rows.IsEnabled then printlog " Data series in rows is enabled" @@ -549,8 +479,7 @@ testcase tDataRangeDialogCalc endif else warnlog "Data series in rows is disabled" - endif - '///Check if -First row as label- is enabled and checked + endif printlog "Check if -First row as label- is enabled and checked" if FirstRowAsLabel.IsEnabled then printlog " First row as label is enabled" @@ -561,8 +490,7 @@ testcase tDataRangeDialogCalc endif else warnlog "First row as label is disabled" - endif - '///Check if -First column as label- is enabled and checked + endif printlog "Check if -First column as label- is enabled and checked" if FirstColumnAsLabel.IsEnabled then printlog " First column as label is enabled" @@ -573,45 +501,38 @@ testcase tDataRangeDialogCalc endif else warnlog "First column as label is disabled" - endif - '///Press button Range Chooser + endif printlog "Press button Range Chooser" - SelectDataRange.Click - '///Enter an $ChartFlexRange.$B$3:$E$0 in Range Chooser and close Range Chooser + SelectDataRange.Click printlog "Enter $ChartFlexRange.$B$3:$E$0 in Range Chooser and close Range Chooser" Kontext "AcceptOrRejectChangesArea" AreaEditField.SetText "$ChartFlexRange.$B$3:$E$0" - ShrinkButton.Click - '///Check if -Data series in rows- is disabled + ShrinkButton.Click printlog "Check if -Data series in rows- is disabled" Kontext "TabChartTypeDataRange" if NOT Rows.IsEnabled then printlog " Data series in rows is disabled" else warnlog "Data series in rows is enabled, but should be disabled" - endif - '///Check if -Data series in columns- is disabled + endif printlog "Check if -Data series in columns- is disabled" if NOT Columns.IsEnabled then printlog " Data series in columns is disabled" else warnlog "Data series in columns is enabled, but should be disabled" - endif - '///Check if -First row as label- is disabled + endif printlog "Check if -First row as label- is disabled" if NOT FirstRowAsLabel.IsEnabled then printlog " First row as label is disabled" else warnlog "First row as label is enabled, but should be disabled" - endif - '///Check if -First column as label- is disabled + endif printlog "Check if -First column as label- is disabled" if NOT FirstColumnAsLabel.IsEnabled then printlog " First Column as label is disabled" else warnlog "First Column as label is enabled, but should be disabled" - endif - '///Check that OK button is disabled + endif printlog "Check if OK button is disabled" try Kontext "TabChartTypeDataRange" @@ -620,19 +541,16 @@ testcase tDataRangeDialogCalc goto endsub catch printlog " The OK button is disabled" - endcatch - '///Enter a valid multiple range + endcatch printlog "Enter a valid range" Kontext "TabChartTypeDataRange" - DataRange.SetText "$ChartFlexRange.$C$4:$G$6;$ChartFlexRange.$C$8:$G$8" - '///Check if -Data series in columns- is enabled + DataRange.SetText "$ChartFlexRange.$C$4:$G$6;$ChartFlexRange.$C$8:$G$8" printlog "Check if -Data series in columns- is enabled" if Columns.IsEnabled then printlog " Data series in columns is enabled" else warnlog "Data series in columns is disabled" - endif - '///Check if -Data series in rows- is enabled and chosen + endif printlog "Check if -Data series in columns- is enabled and chosen" if Rows.IsEnabled then printlog " Data series in rows is enabled" @@ -643,8 +561,7 @@ testcase tDataRangeDialogCalc endif else warnlog "Data series in rows is disabled" - endif - '///Check if -First row as label- is enabled and checked + endif printlog "Check if -First row as label- is enabled and checked" if FirstRowAsLabel.IsEnabled then printlog " First row as label is enabled" @@ -655,8 +572,7 @@ testcase tDataRangeDialogCalc endif else warnlog "First row as label is disabled" - endif - '///Check if -First column as label- is enabled and checked + endif printlog "Check if -First column as label- is enabled and checked" if FirstColumnAsLabel.IsEnabled then printlog " First column as label is enabled" @@ -667,12 +583,10 @@ testcase tDataRangeDialogCalc endif else warnlog "First column as label is disabled" - endif - '///Press Cancel button + endif printlog "Press Cancel button" Kontext "TabChartTypeDataRange" - TabChartTypeDataRange.Cancel - '///Close document + TabChartTypeDataRange.Cancel printlog "Close document" Call hCloseDocument else @@ -688,46 +602,39 @@ testcase tDataSeriesDialogCalc dim sDataRanges as string dim sRangeFor as string dim sCategories as string - sInputFile = convertpath(gTestToolPath & "chart2/required/input/ch_flexrange04.ods") - '///Open test document <i>gTestToolPath</i>/chart2/required/input/ch_flexrange04.ods + sInputFile = convertpath(gTestToolPath & "chart2/required/input/ch_flexrange04.ods") printlog "Open test document gTestToolPath/chart2/required/input/ch_flexrange04.ods" if fOpenTestDocumentAndSelectDataRange(sInputFile) then - Kontext - '///Switch to tabpage Data Series + Kontext Active.SetPage TabChartTypeDataSeries - Kontext "TabChartTypeDataSeries" - '///Check if the data series listbox is enabled and contains one entry + Kontext "TabChartTypeDataSeries" printlog "Check if the data series listbox is enabled and contains one entry" iDataSeries = DataSeries.GetItemCount if iDataSeries = 1 then printlog " One data serie is available" else warnlog "There are " & iDataSeries & " data series instead of 1" - endif - '///Check if the ADD button is enabled and click the button + endif printlog "Check if the ADD button is enabled and click the button" if AddButton.IsEnabled then printlog " ADD button is enabled" AddButton.Click else warnlog "ADD button is not enabled" - endif - '///Check if there are now two entries in the data series listbox + endif printlog "Check if there are now two entries in the data series listbox" iDataSeries = DataSeries.GetItemCount if iDataSeries = 2 then printlog " Adding a data series was successfull" else warnlog "There are " & iDataSeries & " data series instead of 2" - endif - '///Check if the new data series was added below the highlighted one + endif printlog "Check if the new data series was added below the highlighted one" if DataSeries.GetSelIndex = 2 then printlog " The new data series was inserted below the highlighted (first) one" else warnlog "The new dataseries was not inserted below the highlighted one" - endif - '///Use UP button and verify that it it disabled on first entry + endif printlog "Use UP button on last data series and verify that it it disabled on first entry" DataSeries.Select(2) if MoveUp.IsEnabled then @@ -745,8 +652,7 @@ testcase tDataSeriesDialogCalc endif else warnlog "Moving data series was not successfull" - endif - '///Use DOWN button and verify that it is disabled on last entry + endif printlog "Use DOWN button and verify that it is disabled on last entry" DataSeries.Select(1) if MoveDown.IsEnabled then @@ -764,27 +670,23 @@ testcase tDataSeriesDialogCalc endif else warnlog "Moving data series was not successfull" - endif - '///Check if the REMOVE button is enabled and click the button + endif printlog "Check if the REMOVE button is enabled and click the button" if RemoveButton.IsEnabled then printlog " REMOVE button is enabled" RemoveButton.Click else warnlog "REMOVE button is not enabled" - endif - '///Check if there are now one entry in the data series listbox + endif printlog "Check if there are now one entry in the data series listbox" iDataSeries = DataSeries.GetItemCount if iDataSeries = 1 then printlog " Removing a data series was successfull" else warnlog "There are " & iDataSeries & " data series instead of 1" - endif - '///Select first entry in Data Ranges + endif printlog "Select first entry in Data Ranges" - DataRanges.Select(1) - '///Verify that the range for NAME matches the one in edit field + DataRanges.Select(1) printlog "Verify that the range for NAME matches the one in edit field" 'GetSelText(line,column) is a new parameter since CWS:SRC680gh13 'Instead of 1,2 there must be 1,4 used becqause there are two invisible @@ -795,11 +697,9 @@ testcase tDataSeriesDialogCalc printlog " Both ranges are matching" else warnlog "The ranges does not match: " & sDataRanges & sRangeFor - endif - '///Select second entry in Data Ranges + endif printlog "Select second entry in Data Ranges" - DataRanges.Select(2) - '///Check that the range in the edit field has changed too + DataRanges.Select(2) printlog "Check that the range in the edit field has changed too" 'GetSelText(line,column) is a new parameter since CWS:SRC680gh13 'Instead of 1,2 there must be 1,4 used becqause there are two invisible @@ -810,11 +710,9 @@ testcase tDataSeriesDialogCalc printlog " Both ranges are matching" else warnlog "The ranges does not match" & sDataRanges & sRangeFor - endif - '///Change the range in edit field + endif printlog "Change the range in edit field" - RangeFor.SetText "$ChartFlexRange.$D$5:$D$10" - '///Check that the range in Data Ranges has changed too + RangeFor.SetText "$ChartFlexRange.$D$5:$D$10" printlog "Check that the range in Data Ranges has changed too" 'GetSelText(line,column) is a new parameter since CWS:SRC680gh13 'Instead of 1,2 there must be 1,4 used becqause there are two invisible @@ -824,14 +722,12 @@ testcase tDataSeriesDialogCalc printlog " The data range has also changed" else warnlog "The data range has not changed" - endif - '///Click on Range Chooser and change the range + endif printlog "Click on Range Chooser and change the range" SelectRange.Click Kontext "AcceptOrRejectChangesArea" AreaEditField.SetText "$ChartFlexRange.$D$5:$D$12" - ShrinkButton.Click - '///Check if the range in the Data ranges has changed + ShrinkButton.Click printlog "Check if the range in Data ranges has changed" Kontext "TabChartTypeDataSeries" 'GetSelText(line,column) is a new parameter since CWS:SRC680gh13 @@ -842,8 +738,7 @@ testcase tDataSeriesDialogCalc printlog " The data range has also changed" else warnlog "The data range has not changed" - endif - '///Edit range for Categories + endif printlog "Edit range for Categories" Categories.SetText "$ChartFlexRange.$B$5:$B$10" sCategories = Categories.GetText @@ -851,14 +746,12 @@ testcase tDataSeriesDialogCalc printlog " The range has been modified" else warnlog "Modifiing the range was not successfull" - endif - '///Click on Range Chooser and change the range to $ChartFlexRange.$B$5:$B$12 + endif printlog "Click on Range Chooser and change the range to $ChartFlexRange.$B$5:$B$12" SelectCategories.Click Kontext "AcceptOrRejectChangesArea" AreaEditField.SetText "$ChartFlexRange.$B$5:$B$12" - ShrinkButton.Click - '///Verify that the range is taken + ShrinkButton.Click printlog "Verify that the range is taken" Kontext "TabChartTypeDataSeries" sCategories = Categories.GetText @@ -866,11 +759,9 @@ testcase tDataSeriesDialogCalc printlog " The range has been modified" else warnlog "Modifiing the range was not successfull" - endif - '///Enter $ChartFlexRange.$B$5:$B$ as an invalid range + endif printlog "Enter $ChartFlexRange.$B$5:$B$ as an invalid range" - Categories.SetText "$ChartFlexRange.$B$5:$B$" - '///Check that the OK button does not work + Categories.SetText "$ChartFlexRange.$B$5:$B$" printlog "Check that the OK button does not work" try Kontext "TabChartTypeDataSeries" @@ -879,25 +770,19 @@ testcase tDataSeriesDialogCalc goto endsub catch printlog " The OK button is disabled" - endcatch - '///Enter as valid range $ChartFlexRange.$B$5:$B$12 + endcatch printlog "Enter as valid range $ChartFlexRange.$B$5:$B$12" Kontext "TabChartTypeDataSeries" - Categories.SetText "$ChartFlexRange.$B$5:$B$12" - '///Press Range Chooser + Categories.SetText "$ChartFlexRange.$B$5:$B$12" printlog "Press Range Chooser" - SelectCategories.Click - '///Move cursor to the end + SelectCategories.Click printlog "Move cursor to the end" Kontext "AcceptOrRejectChangesArea" - AreaEditField.TypeKeys "<END>" - '///Enter a semicolon and the second range $ChartFlexRange.$B$14 + AreaEditField.TypeKeys "<END>" printlog "Enter a semicolon and the second range $ChartFlexRange.$B$14" - AreaEditField.TypeKeys ";$ChartFlexRange.$B$14" - '///Close Range Chooser + AreaEditField.TypeKeys ";$ChartFlexRange.$B$14" printlog "Close Range Chooser" - ShrinkButton.Click - '///Verify that there is a multiple range + ShrinkButton.Click printlog "Verify that there is a multiple range" Kontext "TabChartTypeDataSeries" sCategories = Categories.GetText @@ -905,44 +790,14 @@ testcase tDataSeriesDialogCalc printlog " The range has been modified to a multiple range" else warnlog "Modifiing the range was not successfull" - endif - '///Press Cancel button + endif printlog "Press Cancel button" Kontext "TabChartTypeDataSeries" - TabChartTypeDataSeries.Cancel - '///Close document + TabChartTypeDataSeries.Cancel printlog "Close document" Call hCloseDocument else warnlog "It was not possible to open the test document." endif endcase -' -'------------------------------------------------------------------------- -' -function fOpenTestDocumentAndInsertChart(sInputFile as string) as BOOLEAN - fOpenTestDocumentAndInsertChart = FALSE - call hFileOpen(sInputFile) - sleep(2) - Call sMakeReadOnlyDocumentEditable() - Kontext "DocumentCalc" - '/// Type <STRG+HOME> - printlog "Type <STRG+HOME>" - DocumentCalc.TypeKeys "<MOD1 HOME>" - '/// Type twice <RIGHT> cursor key - printlog "Type twice <RIGHT> cursor key" - DocumentCalc.TypeKeys "<RIGHT>" , 2 - '/// Type thrice <DOWN> cursor key - printlog "Type thrice <DOWN> cursor key" - DocumentCalc.TypeKeys "<DOWN>" , 3 - '/// Menu Insert chart to open chart wizard - printlog "Menu Insert chart to open chart wizard" - InsertChart - try - WaitSlot() - fOpenTestDocumentAndInsertChart = TRUE - catch - fOpenTestDocumentAndInsertChart = FALSE - endcatch -end function diff --git a/testautomation/chart2/required/includes/ch2_format.inc b/testautomation/chart2/required/includes/ch2_format.inc index a2ef42d7c5e7..a1192f620cb7 100755 --- a/testautomation/chart2/required/includes/ch2_format.inc +++ b/testautomation/chart2/required/includes/ch2_format.inc @@ -194,7 +194,47 @@ endcase '------------------------------------------------------------------------------- ' testcase tFormatArrangement - QAErrorLog "#i63017# - Should be only enabled to sort data curves; testcase has to be designed." + dim sInputFile as string + dim iLoop as integer + sInputFile = convertpath(gTestToolPath & "chart2/required/input/ch_flexrange01.ods") + printlog "Open test document gtesttoolpath/chart2/required/input/ch_flexrange01.ods" + if fOpenTestDocumentAndInsertChart(sInputFile) then + Kontext "ChartType" + printlog "Choose the Chart type 'bar' (should be the second in the top-down list)" + if fSetChartType( "bar" ) > 0 then + warnlog "Something went wrong setting chart type to BAR. Testcase aborted" + Kontext "ChartWizard" + ChartWizard.Cancel + call hCloseDocument + goto endsub + endif + Kontext "ChartWizard" + printlog "Press OK button" + ChartWizard.OK + Kontext "DocumentChart" + printlog "Type twice <TAB> to select a data series to enable the menu entry." + DocumentChart.TypeKeys "<TAB>", 2, TRUE + Kontext "DocumentCalc" + DocumentCalc.UseMenu + printlog "Select 'Format' entry in main menu" + hMenuSelectNr(5) ' FORMAT + printlog "Select 'Arrangement' entry in 'Format'-menu" + hMenuSelectNr(3) ' ARRANGEMENT + printlog "Select enabled 'Send Backward' entry." + hMenuSelectNr(2) + Kontext "DocumentCalc" + DocumentCalc.UseMenu + printlog "Select 'Format' entry in main menu again" + hMenuSelectNr(5) ' FORMAT + printlog "Select 'Arrangement' entry in 'Format'-menu" + hMenuSelectNr(3) ' ARRANGEMENT + printlog "Select now enabled 'Bring Forward' entry." + hMenuSelectNr(1) + printlog "Close document" + Call hCloseDocument + else + warnlog "It was not possible to open the test document." + endif endcase ' '------------------------------------------------------------------------------- diff --git a/testautomation/chart2/required/includes/ch2_insert.inc b/testautomation/chart2/required/includes/ch2_insert.inc index 68bab270d44d..bf91156c2f9b 100755 --- a/testautomation/chart2/required/includes/ch2_insert.inc +++ b/testautomation/chart2/required/includes/ch2_insert.inc @@ -293,7 +293,43 @@ endcase ' '------------------------------------------------------------- ' -testcase tInsertSpecialCharacter - qaErrorLog "#125905# - Insert / SpecialCharacter doesn't work corrcetly in title dialog." +testcase tInsertSpecialCharacter + 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 "Invoke Insert::Titles" + if fInvokeTitlesDialog() > 0 then + warnlog "Something went wrong trying to invoke Titles dialog -> Check this out! (Previous log may help you)" + Call hCloseDocument + goto endsub + endif + Kontext "InsertTitleDialog" + if fSetTitle(MainTitle , "Test title") = 0 then + Kontext "InsertTitleDialog" + InsertTitleDialog.OK + Kontext "DocumentChart" + printlog "Type <TAB> to select the title" + DocumentChart.TypeKeys "<TAB>" , TRUE + DocumentChart.UseMenu + printlog "Select menu 'Insert'" + hMenuSelectNr(4) 'INSERT + printlog "Select menu item 'Special Character'." + hMenuSelectNr(9) 'SPECIAL CHARACTER + printlog "Close the 'Insert Special Character'-dialog." + Kontext "Sonderzeichen" + Call Dialogtest( Sonderzeichen ) + Sonderzeichen.CANCEL + else + warnlog "It was not possible to set the title. Test aborted!" + Kontext "InsertTitleDialog" + InsertTitleDialog.Cancel + endif + Call hCloseDocument endcase diff --git a/testautomation/chart2/required/includes/ch2_menu.inc b/testautomation/chart2/required/includes/ch2_menu.inc index c5206826c498..b17a8ab42318 100644 --- a/testautomation/chart2/required/includes/ch2_menu.inc +++ b/testautomation/chart2/required/includes/ch2_menu.inc @@ -116,7 +116,7 @@ testcase tMainMenu printlog "check if there are 9 items in the INSERT menu." DocumentCalc.UseMenu - hMenuSelectNr(4) + hMenuSelectNr(4) 'INSERT iCount = hMenuItemGetCount() if (iCount <> 9) then warnlog "There should 9 items in the INSERT menu but there are " + iCount + " items." @@ -134,7 +134,7 @@ testcase tMainMenu printlog "check if there are 2 items in the FORMAT/ARRANGEMENT menu." DocumentCalc.UseMenu hMenuSelectNr(5) ' FORMAT - hMenuSelectNr(3) ' AXIS + hMenuSelectNr(3) ' ARRANGEMENT iCount = hMenuItemGetCount() if (iCount <> 2) then warnlog "There should 2 items in the FORMAT/ARRANGEMENT menu but there are " + iCount + " items." diff --git a/testautomation/chart2/tools/ch_tools_common.inc b/testautomation/chart2/tools/ch_tools_common.inc index 8a2c98772f4f..76915006a130 100644 --- a/testautomation/chart2/tools/ch_tools_common.inc +++ b/testautomation/chart2/tools/ch_tools_common.inc @@ -42,6 +42,7 @@ ' #1 fLoadVerySimpleChartAndSaveLocal ' Load file with a very simple chart and save it loacally ' #1 fConvertChartTo3D ' Function to invoke the 'Insert::Titles...' dialog ' #1 fOpenTestDocumentAndSelectDataRange ' Opens a test document and executes FormatDataRange +' #1 fOpenTestDocumentAndInsertChart ' Opens a test document and selects a data range at a specific position '* '\************************************************************************************************ @@ -180,3 +181,27 @@ function fOpenTestDocumentAndSelectDataRange(sInputFile as string) as BOOLEAN call DialogTest ( TabChartTypeDataRange ) fOpenTestDocumentAndSelectDataRange = TRUE end function +' +'------------------------------------------------------------------------- +' +function fOpenTestDocumentAndInsertChart(sInputFile as string) as BOOLEAN + fOpenTestDocumentAndInsertChart = FALSE + call hFileOpen(sInputFile) + sleep(2) + Call sMakeReadOnlyDocumentEditable() + Kontext "DocumentCalc" + printlog "Type <STRG+HOME>" + DocumentCalc.TypeKeys "<MOD1 HOME>" + printlog "Type twice <RIGHT> cursor key" + DocumentCalc.TypeKeys "<RIGHT>" , 2 + printlog "Type thrice <DOWN> cursor key" + DocumentCalc.TypeKeys "<DOWN>" , 3 + printlog "Menu Insert chart to open chart wizard" + InsertChart + try + WaitSlot() + fOpenTestDocumentAndInsertChart = TRUE + catch + fOpenTestDocumentAndInsertChart = FALSE + endcatch +end function diff --git a/testautomation/extensions/optional/includes/display_name.inc b/testautomation/extensions/optional/includes/display_name.inc index 34b85436ab4f..d6f165ff0f79 100755 --- a/testautomation/extensions/optional/includes/display_name.inc +++ b/testautomation/extensions/optional/includes/display_name.inc @@ -39,6 +39,11 @@ testcase tExtensionDisplayName + if ( gISOLang <> "en-US" ) then + qaerrorlog( "Test is not locale-safe, en-US only" ) + goto endsub + endif + '///<h1>Extension display names</h1> '///<u><pre>Synopsis</pre></u>Since CWS jl76 a possibility exists to give an extension a name which '///+ differs from the filename to be displayed in the extension manager.<br> diff --git a/testautomation/extensions/optional/includes/publisher.inc b/testautomation/extensions/optional/includes/publisher.inc index 0f0c2da47722..58f52cb7300f 100755 --- a/testautomation/extensions/optional/includes/publisher.inc +++ b/testautomation/extensions/optional/includes/publisher.inc @@ -41,6 +41,11 @@ testcase tExtensionPublisher '///<h1>Extension publisher and release notes</h1> + if ( gISOLang <> "en-US" ) then + qaerrorlog( "Test does not handle translated strings, aborting" ) + goto endsub + endif + '///<u><pre>Synopsis</pre></u>With CWS jl76 extensions can bring a link to the extension '///+ publisher and the release notes which are displayed in the online update dialog '///+ for extensions - if provided. Otherwise these fields are not visible.<br> @@ -103,7 +108,7 @@ testcase tExtensionPublisher try ToolsPackageManager catch - warnlog( "#i84786# UNopkg processes block UI" ) + warnlog( "#i84786# Unopkg processes block UI" ) endcatch '///+<li>Wait about 5 seconds - the "Live-Deployment" needs time to strike.</li> diff --git a/testautomation/framework/optional/f_extras_templatefileopen.bas b/testautomation/framework/optional/f_extras_templatefileopen.bas index 3743fc8f0c18..a6f8c71d302e 100755 --- a/testautomation/framework/optional/f_extras_templatefileopen.bas +++ b/testautomation/framework/optional/f_extras_templatefileopen.bas @@ -39,15 +39,15 @@ sub main - use "framework\optional\includes\extras_file_open.inc" + use "framework\optional\includes\extras_file_open.inc" - hSetMacroSecurityAPI( GC_MACRO_SECURITY_LEVEL_LOW ) + hSetMacroSecurityAPI( GC_MACRO_SECURITY_LEVEL_LOW ) - call hStatusIn( "framework", "f_extras_templatefileopen.bas" ) - call tOpenObjectsWithFileDialog( "TEMPLATES" ) - call hStatusOut + call hStatusIn( "framework", "f_extras_templatefileopen.bas" ) + call tOpenObjectsWithFileDialog( "TEMPLATES" ) + call hStatusOut - hSetMacroSecurityAPI( GC_MACRO_SECURITY_LEVEL_DEFAULT ) + hSetMacroSecurityAPI( GC_MACRO_SECURITY_LEVEL_DEFAULT ) end sub @@ -55,19 +55,19 @@ end sub sub LoadIncludeFiles - use "global\system\includes\master.inc" - use "global\system\includes\gvariabl.inc" + use "global\system\includes\master.inc" + use "global\system\includes\gvariabl.inc" - use "global\tools\includes\optional\t_docfuncs.inc" - use "global\tools\includes\optional\t_filetools.inc" - use "global\tools\includes\optional\t_security_tools.inc" - use "global\tools\includes\optional\t_listfuncs.inc" + use "global\tools\includes\optional\t_docfuncs.inc" + use "global\tools\includes\optional\t_filetools.inc" + use "global\tools\includes\optional\t_security_tools.inc" + use "global\tools\includes\optional\t_listfuncs.inc" - use "framework\tools\includes\apicalls.inc" - use "framework\tools\includes\template_tools.inc" + use "framework\tools\includes\apicalls.inc" + use "framework\tools\includes\template_tools.inc" - gApplication = "WRITER" - GetUseFiles + gApplication = "WRITER" + GetUseFiles end sub diff --git a/testautomation/framework/optional/includes/basic_formcontrols.inc b/testautomation/framework/optional/includes/basic_formcontrols.inc index 5d7ae8b7045c..78f4002670d8 100755 --- a/testautomation/framework/optional/includes/basic_formcontrols.inc +++ b/testautomation/framework/optional/includes/basic_formcontrols.inc @@ -192,12 +192,16 @@ testcase tAllControlsOnDialog( cMajor as string ) '///+<li>Select every control, open its properties and verify its name, close properties</li> for iCurrentControl = 1 to ICONTROLCOUNT - - hSelectControl( iCurrentControl ) - hOpenPropertyBrowser() - sCurrentControl = lsControlNames( iCurrentControl ) - hPBGetControlName( sCurrentControl ) - hClosePropertyBrowser() + + if ( instr( gtSysName, "Solaris" ) > 0 ) then + qaerrorlog( "Skipping frame control on Solaris" ) + else + hSelectControl( iCurrentControl ) + hOpenPropertyBrowser() + sCurrentControl = lsControlNames( iCurrentControl ) + hPBGetControlName( sCurrentControl ) + hClosePropertyBrowser() + endif next iCurrentControl diff --git a/testautomation/framework/optional/includes/basic_issues.inc b/testautomation/framework/optional/includes/basic_issues.inc index 7a0b4ccecaed..63186f36a94d 100755 --- a/testautomation/framework/optional/includes/basic_issues.inc +++ b/testautomation/framework/optional/includes/basic_issues.inc @@ -114,14 +114,16 @@ testcase t_macros() hTestActive( "12D687", 1 ) hTestActive( "4553207", 1 ) - printlog( "" ) - printlog( " ---------- i81674 ------------ " ) - hInsertMacroFromFile( "i81674" ) - hIDERunMacro() - hTestActive( "250", 1 ) - hTestActive( "Yes", 1 ) - hTestActive( "True", 1 ) - hTestActive( "On", 1 ) + if ( gISOLang = "en-US" ) then + printlog( "" ) + printlog( " ---------- i81674 ------------ " ) + hInsertMacroFromFile( "i81674" ) + hIDERunMacro() + hTestActive( "250", 1 ) + hTestActive( "Yes", 1 ) + hTestActive( "True", 1 ) + hTestActive( "On", 1 ) + endif printlog( "" ) printlog( " ---------- i80532 ------------ " ) diff --git a/testautomation/framework/optional/includes/basic_vba-compat_import_disabled.inc b/testautomation/framework/optional/includes/basic_vba-compat_import_disabled.inc index e0f6a7724ec5..ad50332fe7ab 100755 --- a/testautomation/framework/optional/includes/basic_vba-compat_import_disabled.inc +++ b/testautomation/framework/optional/includes/basic_vba-compat_import_disabled.inc @@ -96,7 +96,7 @@ testcase tBasicVBACompatImportDisabled() printlog( "Verify position of the document node" ) MakroAus.select( cNodeCount + DOCUMENT_POSITION_OFFSET ) if ( MakroAus.getSelText() <> "vba-test" ) then - warnlog( "The document node is not at the expected position" ) + qaerrorlog( "The document node is not at the expected position" ) endif for iCurrentModule = 2 to 7 diff --git a/testautomation/framework/optional/includes/basic_vba-compat_import_enabled.inc b/testautomation/framework/optional/includes/basic_vba-compat_import_enabled.inc index c8f6352ba1c9..9434fdd3af7d 100755 --- a/testautomation/framework/optional/includes/basic_vba-compat_import_enabled.inc +++ b/testautomation/framework/optional/includes/basic_vba-compat_import_enabled.inc @@ -97,7 +97,7 @@ testcase tBasicVBACompatImportEnabled() printlog( "Verify position of the document node" ) MakroAus.select( cNodeCount + DOCUMENT_POSITION_OFFSET ) if ( MakroAus.getSelText() <> "vba-test" ) then - warnlog( "The document node is not at the expected position" ) + qaerrorlog( "The document node is not at the expected position" ) endif for iCurrentModule = 2 to 3 diff --git a/testautomation/framework/optional/includes/basic_vba-compat_import_nothing.inc b/testautomation/framework/optional/includes/basic_vba-compat_import_nothing.inc index 260ca94e1cba..a962d527d415 100755 --- a/testautomation/framework/optional/includes/basic_vba-compat_import_nothing.inc +++ b/testautomation/framework/optional/includes/basic_vba-compat_import_nothing.inc @@ -82,7 +82,7 @@ testcase tBasicVBACompatImportNothing() printlog( "Verify position of the document node" ) MakroAus.select( cNodeCount + DOCUMENT_POSITION_OFFSET ) if ( MakroAus.getSelText() <> "vba-test" ) then - warnlog( "The document node is not at the expected position" ) + qaerrorlog( "The document node is not at the expected position" ) endif printlog( "Select the last node, this should be the standard Library for the document" ) diff --git a/testautomation/framework/optional/includes/extras_file_open.inc b/testautomation/framework/optional/includes/extras_file_open.inc index 303d46f2a060..7996a21ff6e7 100755 --- a/testautomation/framework/optional/includes/extras_file_open.inc +++ b/testautomation/framework/optional/includes/extras_file_open.inc @@ -45,7 +45,7 @@ private const MAX_FILE_COUNT = 3000 ' the max number of templates or samples testcase tOpenObjectsWithFileDialog( cCategory as string ) - const CFN = "tOpenObjectsWithFileDialog::" + const CFN = "tOpenObjectsWithFileDialog::" '///<h1>Open all templates using the File-Open dialog</h1> '///<i>Retrieve the templates out of ..\share\template\-directory</i><br> @@ -69,20 +69,24 @@ testcase tOpenObjectsWithFileDialog( cCategory as string ) dim bSkipFile as boolean ' turns true if file is to be skipped dim brc as boolean ' some multi purpose boolan returncode dim cOfficePath as string - + ' the path where the samples/templates are located, verify function params ' note that for some time the suffixes for the different filetypes are changed, ' so we have separate names for samples and templates. - cOfficePath = mid( gOfficeBasisPath, len( gNetzOfficePath ) + 1 ) + if ( FileExists( gOfficeBasisPath ) ) then + cOfficePath = gOfficeBasisPath + else + cOfficePath = mid( gOfficeBasisPath, len( gNetzOfficePath ) + 1 ) + endif printlog( "Using: " & cOfficePath ) select case cCategory - case "SAMPLES" : sRootPath = cOfficePath & "share\samples" - sRootPathFallback = "/opt/openoffice.org/basis3.0/share/samples" + case "SAMPLES" : sRootPath = cOfficePath & "share\samples\" & gISOLang + sRootPathFallback = "/opt/openoffice.org/basis3.0/share/samples/" & gISOLang sFIlter = "*.od*" - case "TEMPLATES" : sRootPath = cOfficePath & "share\template" - sRootPathFallback = "/opt/openoffice.org/basis3.0/share/template" + case "TEMPLATES" : sRootPath = cOfficePath & "share\template\" & gISOLang + sRootPathFallback = "/opt/openoffice.org/basis3.0/share/template/" & gISOLang sFilter = "*.ot*" case default warnlog( CFN & "Invalid category passed to function" ) @@ -106,16 +110,31 @@ testcase tOpenObjectsWithFileDialog( cCategory as string ) printlog( "Using filter: " & sFilter ) GetAllFileList ( sRootPath, sFilter, lsFile() ) hListDelete( lsFile(), 1 ) - iTemplateCount = listCount( lsFile() ) - for iCurrentTemplate = 1 to iTemplateCount + + ' Remove .lock-files + iTemplateCount = listCount( lsFile() ) + iCurrentTemplate = 1 + while( iCurrentTemplate <= iTemplateCount ) if ( instr( lsFile( iCurrentTemplate ), "~lock." ) > 0 ) then - qaerrorlog( "There are lock-files in the shared layer. They will be removed" ) - kill( lsFile( iCurrentTemplate ) ) hListDelete( lsFile(), iCurrentTemplate ) + iTemplateCount = iTemplateCount - 1 + else + iCurrentTemplate = iCurrentTemplate + 1 endif - next iCurrentTemplate - - + wend + + ' do not test wizard related files + iTemplateCount = listCount( lsFile() ) + iCurrentTemplate = 1 + while( iCurrentTemplate <= iTemplateCount ) + if ( instr( lsFile( iCurrentTemplate ), "wizard" ) > 0 ) then + hListDelete( lsFile(), iCurrentTemplate ) + iTemplateCount = iTemplateCount - 1 + else + iCurrentTemplate = iCurrentTemplate + 1 + endif + wend + hListPrint ( lsFile() , "" , "" ) if ( listcount( lsfile() ) = 1 ) then if ( gProductName = "OpenOffice.org" ) then diff --git a/testautomation/framework/optional/includes/scripting_organizers.inc b/testautomation/framework/optional/includes/scripting_organizers.inc index 60ba71bb500c..4afcf2373aca 100755 --- a/testautomation/framework/optional/includes/scripting_organizers.inc +++ b/testautomation/framework/optional/includes/scripting_organizers.inc @@ -39,6 +39,11 @@ testcase tScriptingOrganizers( iDialog as integer ) + if ( instr( gtSysName , "Solaris" ) > 0 ) then + qaerrorlog( "#i93502# JavaScript organizer broken" ) + goto endsub + endif + '///<H1>Test scripting-organizers</H1> ' 1 = BeanShell (.bsh) ' 2 = JavaScript (.js) diff --git a/testautomation/global/sid/e_all.sid b/testautomation/global/sid/e_all.sid index 09325daa9d52..232fed255f65 100644 --- a/testautomation/global/sid/e_all.sid +++ b/testautomation/global/sid/e_all.sid @@ -607,25 +607,26 @@ FormatCropPicture .uno:GrafAttrCrop 'FormatStandardChart SID_SET_DEFAULT FormatObjectProperties .uno:DiagramObjects FormatPositionAndSizeChart .uno:TransformDialog -FormatChartWizard .uno:AutoFormat -FormatChartType .uno:DiagramType -FormatDataRanges .uno:DataRanges -Format3DView .uno:View3D -FormatChartArea .uno:DiagramArea -FormatChartWall .uno:DiagramWall -FormatChartFloor .uno:DiagramFloor +FormatArrangement .uno:ArrangeRow +FormatArrangementForward .uno:Forward +FormatArrangementBackward .uno:Backward +FormatTitle .uno:ChartTitleMenu FormatTitleMainTitle .uno:MainTitle FormatTitleSubTitle .uno:SubTitle FormatTitleX_Axis .uno:XTitle FormatTitleY_Axis .uno:YTitle FormatTitleZ_Axis .uno:ZTitle +FormatTitleSecondaryX_Axis .uno:SecondaryXTitle +FormatTitleSecondaryY_Axis .uno:SecondaryYTitle FormatTitleAllTitles .uno:AllTitles +FormatAxis .uno:DiagramAxisMenu FormatAxisXAxis .uno:DiagramAxisX FormatAxisYAxis .uno:DiagramAxisY FormatAxisZAxis .uno:DiagramAxisZ FormatAxisSecondaryXAxis .uno:DiagramAxisA FormatAxisSecondaryYAxis .uno:DiagramAxisB FormatAxisAllAxes .uno:DiagramAxisAll +FormatGrid .uno:DiagramGridMenu FormatGridXAxisMainGrid .uno:DiagramGridYMain FormatGridYAxisMainGrid .uno:DiagramGridXMain FormatGridZAxisMainGrid .uno:DiagramGridZMain @@ -634,7 +635,12 @@ FormatGridYAxisMinorGrid .uno:DiagramGridXHelp FormatGridZAxisMinorGrid .uno:DiagramGridZHelp FormatGridAllAxisGrids .uno:DiagramGridAll FormatLegend .uno:Legend - +FormatChartWall .uno:DiagramWall +FormatChartFloor .uno:DiagramFloor +FormatChartArea .uno:DiagramArea +FormatChartType .uno:DiagramType +FormatDataRanges .uno:DataRanges +Format3DView .uno:View3D ' **** Math FormatFonts SID_FONT FormatFontSize SID_FONTSIZE diff --git a/testautomation/global/tools/includes/optional/t_filetools.inc b/testautomation/global/tools/includes/optional/t_filetools.inc index 0dff52c72d36..62f218f7adfb 100755 --- a/testautomation/global/tools/includes/optional/t_filetools.inc +++ b/testautomation/global/tools/includes/optional/t_filetools.inc @@ -211,7 +211,8 @@ function hHandleActivesOnLoad( iTries as integer , iAdd as integer ) as boolean printlog( CFN & "MSG (" & iActives & "): closed with Cancel" ) bSkip = true catch - printlog( CFN & "Missed - this dialog has no Cancel button (create new document)" ) + printlog( CFN & "Missed - this dialog has no OK button (create new document)" ) + active.ok() endcatch if ( not bSkip ) then diff --git a/testautomation/graphics/optional/includes/global/export_graphic.inc b/testautomation/graphics/optional/includes/global/export_graphic.inc index ce652cffcc01..8e8484812b39 100755 --- a/testautomation/graphics/optional/includes/global/export_graphic.inc +++ b/testautomation/graphics/optional/includes/global/export_graphic.inc @@ -50,22 +50,22 @@ '* '\****************************************************************************** testcase tEPS + + dim x as integer + dim i as integer + dim sFilter as string + dim sExt as string - dim x as integer - dim i as integer - dim sFilter as string - dim sExt as string - - sFilter = "EPS - Encapsulated PostScript (.eps)" - sExt = ".eps" + sFilter = "EPS - Encapsulated PostScript (.eps)" + sExt = ".eps" - '/// open the document + open the document hFileOpen ConvertPath ( gTesttoolPath + "graphics\required\input\graphicexport."+ExtensionString) if hCallExport (OutputGrafikTBO , sFilter ) = TRUE then Kontext "EPSOptionen" if EPSOptionen.Exists (2) then - '/// check if all properties have the right count, and depend on each other ///' + printlog "check if all properties have the right count, and depend on each other" ' they do not affect annything, i can check (TBO) ' VorschauTIF.Check ' InterchangeEPSI.Check @@ -81,7 +81,7 @@ testcase tEPS if (LZWKodierung.IsEnabled <> TRUE) then warnlog " :-(" if (Keine.IsEnabled <> TRUE) then warnlog " :-(" ' if (TextEinstellungen.IsEnabled <> TRUE) then warnlog " :-(" - '/// 'Color Resolution' listbox contains eight items ///' + printlog "'Color Resolution' listbox contains eight items" ' x = TextEinstellungen.GetItemCount ' if x <> 2 then warnlog "'TextEinstellungen' Count is wrong; should:2, is:" + x ' for i = 1 to x @@ -89,7 +89,7 @@ testcase tEPS ' sleep 1 ' Printlog " - " + i + ": '" +TextEinstellungen.GetSelText + "'" ' next i - '/// leave dialog with cancel -> there has to be no file created! ///' + printlog "leave dialog with cancel -> there has to be no file created!" EPSOptionen.Cancel sleep 5 if ( dir(OutputGrafikTBO+sExt) = "") then ' inspired by bug #99932 Graphic is exported though cancel is pressed @@ -108,11 +108,11 @@ testcase tEPS Active.OK end if end if - Printlog "'/// now save it realy and load the file afterwards ///'" + printlog " now save it realy and load the file afterwards" if hCallExport (OutputGrafikTBO , sFilter ) = TRUE then Kontext "EPSOptionen" if EPSOptionen.Exists (2) then - ' TextEinstellungen.select 2 + printlog "TextEinstellungen.select 2" EPSOptionen.OK sleep 5 endif @@ -130,7 +130,7 @@ testcase tEPS call hCloseDocument -endcase +endcase 'tEPS '------------------------------------------------------------------------- testcase tPCT @@ -150,24 +150,24 @@ testcase tPCT sFilter = "PCT - Mac Pict (.pct;.pict)" sExt = ".pct" - '/// open the document + printlog " open the document sDocument = ConvertPath ( gTesttoolPath + "graphics\required\input\graphicexport."+ExtensionString) hFileOpen sDocument if hCallExport (OutputGrafikTBO , sFilter ) = TRUE then Kontext "PICTOptionen" if PICTOptionen.Exists (2) then - '/// check if all properties have the right count, and depend on each other ///' + printlog "check if all properties have the right count, and depend on each other" Original.Check if Breite.IsEnabled then warnlog " :-(" if Hoehe.IsEnabled then warnlog " :-(" Groesse.Check Breite.More Hoehe.Less - '/// leave dialog with cancel -> there has to be no file created! ///' + printlog "leave dialog with cancel -> there has to be no file created!" PICTOptionen.Cancel sleep 5 - if ( dir(OutputGrafikTBO+sExt) = "") then ' inspired by bug #99932 Graphic is exported though cancel is pressed + if ( dir(OutputGrafikTBO+sExt) = "") then Printlog "Ok :-)" else warnlog "Dialog was canceled, but file got saved, too :-( - i35177" @@ -183,7 +183,7 @@ testcase tPCT Active.OK end if end if - Printlog "'/// now save it realy and load the file afterwards ///'" + printlog " now save it realy and load the file afterwards" if hCallExport (OutputGrafikTBO , sFilter ) = TRUE then Kontext "PICTOptionen" if PICTOptionen.Exists (2) then @@ -214,13 +214,13 @@ testcase tPCT Call hGrafikEinfuegen ( OutputGrafikTBO+sExt ) endif hCloseDocument () - Printlog "'/// now save a SELECTION in ORIGINAL SIZE and load the file afterwards ///'" + printlog " now save a SELECTION in ORIGINAL SIZE and load the file afterwards" hFileOpen (sDocument) sleep (10) - ' check if the document is writable + printlog "check if the document is writable" if fIsDocumentWritable = false then - ' make the document writable and check if it's succesfull + printlog "make the document writable and check if it's succesfull" if fMakeDocumentWritable = false then warnlog "The document can't be make writeable. Test stopped." goto endsub @@ -262,7 +262,7 @@ testcase tPCT endif endif hCloseDocument () - Printlog "'/// now CREATE a rectangle, select it, save it in SIZE and load the file afterwards ///'" + printlog " now CREATE a rectangle, select it, save it in SIZE and load the file afterwards" hNewDocument() hRechteckErstellen ( 10, 10, 30, 40 ) if hCallExport (OutputGrafikTBO + "2" , sFilter, TRUE ) = TRUE then @@ -271,7 +271,8 @@ testcase tPCT Groesse.Check Breite.SetText "9" Hoehe.SetText "9" - Groesse.Check 'Check "Size" one more time to make the change go through" + Groesse.Check + printlog "Check 'Size' one more time to make the change go through" sx1 = Breite.GetText sY = Hoehe.GetText PICTOptionen.OK @@ -330,7 +331,7 @@ testcase tPCT call hCloseDocument -endcase +endcase 'tPCT '------------------------------------------------------------------------------- testcase tPBM @@ -342,10 +343,10 @@ testcase tPBM sFilter = "PBM - Portable Bitmap (.pbm)" sExt = ".pbm" - '/// open the document + printlog "Open the document" hFileOpen (ConvertPath ( gTesttoolPath + "graphics\required\input\graphicexport."+ExtensionString )) - '/// save it ///' + printlog "Save it" if hCallExport (OutputGrafikTBO , sFilter ) = TRUE then Kontext "PBMOptionen" if PBMOptionen.Exists (2) then @@ -367,7 +368,7 @@ testcase tPBM call hCloseDocument -endcase +endcase 'tPBM '------------------------------------------------------------------------------- testcase tPGM @@ -379,10 +380,10 @@ testcase tPGM sFilter = "PGM - Portable Graymap (.pgm)" sExt = ".pgm" - '/// open the document + printlog "Open the document" hFileOpen (ConvertPath ( gTesttoolPath + "graphics\required\input\graphicexport."+ExtensionString )) - '/// save it ///' + printlog "Save it" if hCallExport (OutputGrafikTBO , sFilter ) = TRUE then Kontext "PGMOptionen" if PGMOptionen.Exists (2) then @@ -404,7 +405,7 @@ testcase tPGM call hCloseDocument -endcase +endcase 'tPGM '------------------------------------------------------------------------------- testcase tPPM @@ -416,10 +417,10 @@ testcase tPPM sFilter = "PPM - Portable Pixelmap (.ppm)" sExt = ".ppm" - '/// open the document + printlog "Open the document" hFileOpen (ConvertPath ( gTesttoolPath + "graphics\required\input\graphicexport."+ExtensionString )) - '/// save it ///' + printlog "Save it" if hCallExport (OutputGrafikTBO , sFilter ) = TRUE then Kontext "PPMOptionen" if PPMOptionen.Exists (2) then @@ -441,7 +442,7 @@ testcase tPPM call hCloseDocument -endcase +endcase 'tPPM '------------------------------------------------------------------------------ testcase tRAS @@ -453,10 +454,10 @@ testcase tRAS sFilter = "RAS - Sun Raster Image (.ras)" sExt = ".ras" - '/// open the document + printlog "Open the document" hFileOpen (ConvertPath ( gTesttoolPath + "graphics\required\input\graphicexport."+ExtensionString )) - '/// save it ///' + printlog "Save it" if hCallExport (OutputGrafikTBO , sFilter ) = TRUE then if ( dir(OutputGrafikTBO+sExt) <> "") then Printlog "Ok :-) Saved as: '" + OutputGrafikTBO+sExt + "'" @@ -472,7 +473,7 @@ testcase tRAS call hCloseDocument -endcase +endcase 'tRAS '------------------------------------------------------------------------------ testcase tTIFF @@ -484,10 +485,10 @@ testcase tTIFF sFilter = "TIFF - Tagged Image File Format (.tif;.tiff)" sExt = ".tif" - '/// open the document + printlog "Open the document" hFileOpen (ConvertPath ( gTesttoolPath + "graphics\required\input\graphicexport."+ExtensionString )) - '/// save it ///' + printlog "Save it" if hCallExport (OutputGrafikTBO , sFilter ) = TRUE then if ( dir(OutputGrafikTBO+sExt) <> "") then Printlog "Ok :-) Saved as: '" + OutputGrafikTBO+sExt + "'" @@ -503,7 +504,7 @@ testcase tTIFF call hCloseDocument -endcase +endcase 'tTIFF '------------------------------------------------------------------------------ testcase tXPM @@ -515,10 +516,10 @@ testcase tXPM sFilter = "XPM - X PixMap (.xpm)" sExt = ".xpm" - '/// open the document + printlog "Open the document" hFileOpen (ConvertPath ( gTesttoolPath + "graphics\required\input\graphicexport."+ExtensionString )) - '/// save it ///' + printlog "save it" if hCallExport (OutputGrafikTBO , sFilter ) = TRUE then if ( dir(OutputGrafikTBO+sExt) <> "") then Printlog "Ok :-) Saved as: '" + OutputGrafikTBO+sExt + "'" @@ -534,7 +535,7 @@ testcase tXPM call hCloseDocument -endcase +endcase 'tXPM '------------------------------------------------------------------------------- testcase tGIF @@ -546,10 +547,10 @@ testcase tGIF sFilter = "GIF - Graphics Interchange Format (.gif)" sExt = ".gif" - '/// open the document + printlog "Open the document" hFileOpen (ConvertPath ( gTesttoolPath + "graphics\required\input\graphicexport."+ExtensionString) - '/// save it ///' + printlog " save it ///' if hCallExport (OutputGrafikTBO , sFilter ) = TRUE then Kontext "GIFOptionen" if GIFOptionen.Exists (2) then @@ -572,7 +573,7 @@ testcase tGIF call hCloseDocument -endcase +endcase 'tGIF '------------------------------------------------------------------------------- testcase tJPEG @@ -584,10 +585,10 @@ testcase tJPEG sFilter = "JPEG - Joint Photographic Experts Group (.jpg;.jpeg;.jfif;.jif;.jpe)" sExt = ".jpg" - '/// open the document + printlog "Open the document" hFileOpen (ConvertPath ( gTesttoolPath + "graphics\required\input\graphicexport."+ExtensionString) - '/// save it ///' + printlog " save it " if hCallExport (OutputGrafikTBO , sFilter ) = TRUE then Kontext "JpegOptionen" if JpegOptionen.Exists (2) then @@ -610,5 +611,5 @@ testcase tJPEG call hCloseDocument -endcase +endcase 'tJPEG '------------------------------------------------------------------------- diff --git a/testautomation/graphics/optional/includes/global/g_character.inc b/testautomation/graphics/optional/includes/global/g_character.inc index 69f9d7b2cdf0..e3a0d370f051 100755 --- a/testautomation/graphics/optional/includes/global/g_character.inc +++ b/testautomation/graphics/optional/includes/global/g_character.inc @@ -366,6 +366,10 @@ testcase tDialogCharacter endcase testcase tSetFormatCharacter + if iSprache = 48 then + qaerrorlog "Test not adapted to polish, 48." + goto endsub + endif Dim i as integer dim iWest as integer dim iAsian as integer diff --git a/testautomation/graphics/optional/includes/global/g_spellcheck.inc b/testautomation/graphics/optional/includes/global/g_spellcheck.inc index a54bf067db05..4b876e8871fa 100755 --- a/testautomation/graphics/optional/includes/global/g_spellcheck.inc +++ b/testautomation/graphics/optional/includes/global/g_spellcheck.inc @@ -44,6 +44,10 @@ '* '\******************************************************************* testcase tiToolsSpellcheckCorrect + if iSprache = 48 then + qaerrorlog "This test is not adapted for polish, 48." + got endsub + endif Dim DieDatei as String dim lFiles(100) as string @@ -152,15 +156,19 @@ endcase 'tiToolsSpellcheckCorrect '------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ testcase tiToolsSpellcheckError - + if iSprache = 48 then + qaerrorlog "This test is not adapted for polish, 48." + got endsub + endif Dim Fehler$ Dim Sprachenname$ Dim Dummy$ Dim FehlerText$ Dim i as integer - '/// New document ///' + printlog "New document" Call hNewDocument + printlog "Selecting language case: " & iSprache select case iSprache case 01 : FehlerText$ = "Thatt is a failure test." : Fehler$ = "Thatt" : Sprachenname$ = "English (US)" case 34 : FehlerText$ = "Ezte es un chico muy importante." : Fehler$ = "Ezte" : Sprachenname$ = "Niederlaendisch" @@ -181,39 +189,40 @@ testcase tiToolsSpellcheckError Warnlog "For the language " + iSprache +" nothing is prepared yet: insert text here" end if end select + printlog "Error Text taken for testing is: " & FehlerText$ sleep 2 - '/// delete ignore word list ///' + printlog "Delete ignore word list" if (not wIgnorierenlisteLoeschen) then qaErrorLog "Can't get into Dictionary lists" goto endsub end if - '/// create 1 textbox with 1 spelling error (test replace always) ///' + printlog "Create 1 textbox with 1 spelling error (test replace always)" hTextrahmenErstellen (FehlerText$,30,30,90,40) - printlog "Setting Text to english" - sleep 1 - EditSelectAll - FormatCharacter - sleep 1 - Kontext - Messagebox.SetPage TabFont - Kontext "TabFont" - Language.Select 41 - TabFont.OK + 'printlog "Setting Text to english" + 'sleep 1 + 'EditSelectAll + 'FormatCharacter + 'sleep 1 + 'Kontext + 'Messagebox.SetPage TabFont + 'Kontext "TabFont" + 'Language.Select 41 + 'TabFont.OK hTypeKeys "<HOME>" - '/// call 'Tools->Spellcheck->Check' ///' + printlog "Call 'Tools->Spellcheck->Check'" ToolsSpellcheck - '/// Spellcheck dialog has to come up, wrong word is selected ///' + printlog "Spellcheck dialog has to come up, wrong word is selected." Kontext "Spellcheck" if Spellcheck.Exists then - '/// there has to be at least ONE suggestion ///' + printlog "There has to be at least ONE suggestion." if (Suggestions.GetItemCount < 1) then - '/// if no suggestion avilable: ///' + printlog "If no suggestion avilable:" warnlog " - no suggestion for the language: "+DictionaryLanguage.GetSelIndex+" '"+DictionaryLanguage.GetSelText+"' , press check button..." - '///+ press button 'Check word' ///' + printlog "+ press button 'Check word'" Pruefen.click if (Suggestions.GetItemCount < 1) then warnlog " STILL no suggestions :-( errors will follow " @@ -222,20 +231,20 @@ testcase tiToolsSpellcheckError end if end if Dummy$=Suggestions.GetItemText (1) - '/// select first spellcheck suggestion (click it!) ///' + printlog "Select first spellcheck suggestion (click it!)." Suggestions.Select (1) - '/// check if textfield 'word' has changed to selected word ///' + printlog "Check if textfield 'word' has changed to selected word." if (Suggestions.GetSelText <> Dummy$) Then - Warnlog " - Suggestion not used" + Warnlog "Suggestion not used" else - Printlog " Suggestion is used" + Printlog "Suggestion is used" end if sleep 1 kontext "Spellcheck" - '/// click button 'Always replace' ///' + printlog "click button 'Always replace'" ChangeAll.Click - '/// spellcheck dialog has to disappear and ///' - '///+ There has to come up only one active: 'Spellcheck of entire document has been completed [OK]' ///' + printlog "spellcheck dialog has to disappear and" + printlog "There has to come up only one active: 'Spellcheck of entire document has been completed [OK]'" Kontext "Active" if Active.Exists(5) then Printlog "Message: Spellchecking has finished?: '" + active.gettext + "'" @@ -246,10 +255,10 @@ testcase tiToolsSpellcheckError Spellcheck.Close Kontext "Active" if active.exists(5) then - Printlog " Spellcheck dialog closed'" + active.gettext + "'" + Printlog "Spellcheck dialog closed'" + active.gettext + "'" Active.OK else - Printlog " Spellcheck dialog closed'" + Printlog "Spellcheck dialog closed'" end if end if else @@ -261,33 +270,33 @@ testcase tiToolsSpellcheckError end if end if - '/// delete textbox ///' + printlog "delete textbox" EditSelectAll hTypeKeys "<DELETE>" sleep 1 - '/// create same textbox again (test IGNORE function) ///' - Printlog " check function Ignore" + printlog "Create same textbox again (test IGNORE function)." + Printlog "Check function Ignore" hTextrahmenErstellen (FehlerText$,30,30,80,40) - '/// call 'Tools->Spellcheck->Check' ///' + printlog "All 'Tools->Spellcheck->Check'." - printlog "Setting Text to english" - sleep 1 - EditSelectAll - FormatCharacter - sleep 1 - Kontext - Messagebox.SetPage TabFont - Kontext "TabFont" - Language.Select 41 - TabFont.OK + 'printlog "Setting Text to english" + 'sleep 1 + 'EditSelectAll + 'FormatCharacter + 'sleep 1 + 'Kontext + 'Messagebox.SetPage TabFont + 'Kontext "TabFont" + 'Language.Select 41 + 'TabFont.OK ToolsSpellcheck Kontext "Spellcheck" - '/// press button 'Ignore' ///' + printlog "press button 'Ignore'" IgnoreOnce.Click - '/// spellcheck dialog has to disappear and ///' - '///+ There has to come up only one active: 'Spellcheck of entire document has been completed [OK]' ///' + printlog "spellcheck dialog has to disappear and " + printlog " There has to come up only one active: 'Spellcheck of entire document has been completed [OK]'." Kontext "Active" if Active.Exists(5) Then Printlog " Spellcheck ended because of only 1 defined error. And Ignore worked.'" + active.gettext + "'" @@ -305,7 +314,7 @@ testcase tiToolsSpellcheckError end if end if - '/// call 'Tools->Spellcheck->Check' ///' + printlog "Call 'Tools->Spellcheck->Check." ToolsSpellcheck Kontext "Spellcheck" if Spellcheck.Exists Then @@ -322,32 +331,32 @@ testcase tiToolsSpellcheckError Warnlog " Spellcheck ended even we only ignored the error" end if - '/// delete textbox ///' + printlog "delete textbox." EditSelectAll hTypeKeys "<DELETE>" sleep 1 - '/// create same textbox again (test ALWAYS IGNORE function) ///' + printlog "create same textbox again (test ALWAYS IGNORE function)." hTextrahmenErstellen (FehlerText$,30,30,60,40) - printlog "Setting Text to english" - sleep 1 - EditSelectAll - FormatCharacter - sleep 1 - Kontext - Messagebox.SetPage TabFont - Kontext "TabFont" - Language.Select 41 - TabFont.OK + 'printlog "Setting Text to english" + 'sleep 1 + 'EditSelectAll + 'FormatCharacter + 'sleep 1 + 'Kontext + 'Messagebox.SetPage TabFont + 'Kontext "TabFont" + 'Language.Select 41 + 'TabFont.OK - '/// call 'Tools->Spellcheck->Check' ///' + printlog "Call 'Tools->Spellcheck->Check'." ToolsSpellcheck Kontext "Spellcheck" - '/// click button 'Always Ignore' ///' + printlog "click button 'Always Ignore." IgnoreAll.Click - '/// spellcheck dialog has to disappear and ///' - '///+ There has to come up only one active: 'Spellcheck of entire document has been completed [OK]' ///' + printlog "spellcheck dialog has to disappear and" + printlog "There has to come up only one active: 'Spellcheck of entire document has been completed [OK]'." Kontext "Active" if active.exists(5) then Printlog " Spellcheck ended because of only 1 defined error. And Ignore worked.'" + active.gettext + "'" @@ -367,7 +376,7 @@ testcase tiToolsSpellcheckError Printlog "- Delete ignore list" sleep 1 - '/// delete ignore word list ///' + printlog "Delete ignore word list." if (not wIgnorierenlisteLoeschen) then qaErrorLog "Can't get into Dictionary lists" goto endsub @@ -377,7 +386,10 @@ endcase 'tiToolsSpellcheckError '------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ testcase tiToolsSpellcheckCheck - + if iSprache = 48 then + qaerrorlog "This test is not adapted for polish, 48." + got endsub + endif Dim Datei$ Dim sWord(2) as string Dim i as integer diff --git a/testautomation/graphics/optional/includes/impress/i_slideshow.inc b/testautomation/graphics/optional/includes/impress/i_slideshow.inc index d602ae643580..4f31ca9ea2be 100755 --- a/testautomation/graphics/optional/includes/impress/i_slideshow.inc +++ b/testautomation/graphics/optional/includes/impress/i_slideshow.inc @@ -1129,115 +1129,116 @@ endcase '------------------------------------------------------------------------------------- testcase tSlideShowShowHideSlide - dim saSlideNames(4) as string - dim i as integer - - S1 = glLocale (2) + " 1" - S2 = glLocale (2) + " 2" - S3 = glLocale (2) + " 3" - S4 = glLocale (2) + " 4" - saSlideNames(1) = S1 - saSlideNames(2) = S2 - saSlideNames(3) = S3 - saSlideNames(4) = S4 + dim saSlideNames(4) as string + dim i as integer + + S1 = glLocale (2) + " 1" + S2 = glLocale (2) + " 2" + S3 = glLocale (2) + " 3" + S4 = glLocale (2) + " 4" + saSlideNames(1) = S1 + saSlideNames(2) = S2 + saSlideNames(3) = S3 + saSlideNames(4) = S4 - '/// open file 'graphics\\input\\diashow.odp' (Slide Show with 4 Slides) ///' - hFileOpen ConvertPath (gTesttoolPath + "graphics\required\input\diashow.odp") - sleep (10) - ' check if the document is writable - if fIsDocumentWritable = false then - ' make the document writable and check if it's succesfull - if fMakeDocumentWritable = false then - warnlog " The document can't be make writeable. Test stopped." - goto endsub - endif - endif - Kontext "Navigator" - if Navigator.exists then - '///+ close navigator ! ///' + printlog "Open file 'graphics\\input\\diashow.odp' (Slide Show with 4 Slides)" + hFileOpen ConvertPath (gTesttoolPath + "graphics\required\input\diashow.odp") + sleep (10) + printlog "check if the document is writable" + if fIsDocumentWritable = false then + printlog "make the document writable and check if it's succesfull" + if fMakeDocumentWritable = false then + warnlog " The document can't be make writeable. Test stopped." + goto endsub + endif + endif + Kontext "Navigator" + if Navigator.exists then + printlog "close navigator" Navigator.Close - else + else printlog "Navigator: NOT available" - endif - '/// - View->Workspace->Slides View ///' - ViewWorkspaceSlidesView - sleep (1) - Kontext "Slides" - '///Selecting 2nd slide - SlidesControl.TypeKeys "<PAGEDOWN>" - '///Hiding 2nd slide - SlideShowHideSlide - '///Selecting 4th slide - SlidesControl.TypeKeys "<PAGEDOWN>" ,2 - '///Hiding 4th slide - SlideShowHideSlide - - sleep (2) - '/// View->Workspace->Drawing View ///' - ViewWorkspaceDrawingView - kontext "DocumentImpress" - DocumentImpress.TypeKeys "<HOME>" - sleep (2) - '/// SlideShow->Slide Show Settings... ///' - SlideShowPresentationSettings - Kontext "Bildschirmpraesentation" - sleep (2) - '/// check Radio button 'Type': 'Window' ///' - Fenster.Check - sleep (1) - '/// close dialog 'Slide Show' with OK ///' - Bildschirmpraesentation.OK - '/// start the slideshow with 'Slide Show->Slide Show' ///' - SlideShowSlideshow - sleep (1) - kontext "DocumentPresentation" - '/// type the key [MOD1 SHIFT F5] to open the navigator ///' '-------------------------------------------------------------------------- - DocumentPresentation.TypeKeys "<MOD1 SHIFT F5>" - sleep (1) - kontext "NavigatorDraw" - for i = 1 to 2 - if ((i mod 2) = 1) then ' for all odd numbers (ungerade) do + endif + printlog "View->Workspace->Slides View" + ViewWorkspaceSlidesView + sleep (1) + Kontext "Slides" + printlog "Selecting 2nd slide" + SlidesControl.TypeKeys "<PAGEDOWN>" + printlog "Hiding 2nd slide" + SlideShowHideSlide + printlog "Selecting 4th slide" + SlidesControl.TypeKeys "<PAGEDOWN>" ,2 + printlog "Hiding 4th slide" + SlideShowHideSlide + + sleep (2) + printlog "View->Workspace->Drawing View" + ViewWorkspaceDrawingView + kontext "DocumentImpress" + DocumentImpress.TypeKeys "<HOME>" + sleep (2) + printlog "SlideShow->Slide Show Settings..." + SlideShowPresentationSettings + Kontext "Bildschirmpraesentation" + sleep (2) + printlog "check Radio button 'Type': 'Window'" + Fenster.Check + sleep (1) + printlog "close dialog 'Slide Show' with OK " + Bildschirmpraesentation.OK + printlog "start the slideshow with 'Slide Show->Slide Show'" + SlideShowSlideshow + sleep (1) + kontext "DocumentPresentation" + printlog "type the key [MOD1 SHIFT F5] to open the navigator" '-------------------------------------------------------------------------- + DocumentPresentation.TypeKeys "<MOD1 SHIFT F5>" + sleep (1) + kontext "NavigatorDraw" + for i = 1 to 2 + if ((i mod 2) = 1) then ' for all odd numbers (ungerade) do + printlog "Getting slide names" fGetSlideName(saSlideNames(i)) kontext "DocumentPresentation" DocumentPresentation.TypeKeys "<pagedown>" sleep (3) - endif - Kontext "NavigatorDraw" - if NavigatorDraw.exists (5) then + endif + Kontext "NavigatorDraw" + if NavigatorDraw.exists (5) then sleep 1 - '/// check in list, if the page changed ///' + printlog "check in list, if the page changed" if ((i mod 2) = 1) then ' for all odd numbers (ungerade) do - if i = Liste.GetSelIndex then - qaerrorlog "the Navigator didn't update!" - endif + if i = Liste.GetSelIndex then + qaerrorlog "the Navigator didn't update!" + endif endif - else + else warnlog " Navigator doesn't exist?!?!?" - endif - sleep (1) - next i - sleep (3) - Kontext "DocumentPresentation" - DocumentPresentation.TypeKeys "<pagedown>" - sleep (2) - DocumentPresentation.TypeKeys "<pagedown>" - sleep (5) - try - DocumentPresentation.MouseDown 50,50 - DocumentPresentation.MouseUp 50,50 'This one works to recognice the not ending. - warnlog " Presentation did NOT END!!!" - catch - printlog " ended right." - endcatch - sleep (2) - Kontext "Navigator" - if Navigator.exists then - '///+ close navigator ! ///' - Navigator.Close - else - printlog "Navigator: NOT available" - endif - Call hCloseDocument + endif + sleep (1) + next i + sleep (3) + Kontext "DocumentPresentation" + DocumentPresentation.TypeKeys "<pagedown>" + sleep (2) + DocumentPresentation.TypeKeys "<pagedown>" + sleep (5) + try + DocumentPresentation.MouseDown 50,50 + DocumentPresentation.MouseUp 50,50 'This one works to recognice the not ending. + warnlog " Presentation did NOT END!!!" + catch + printlog " ended right." + endcatch + sleep (2) + Kontext "Navigator" + if Navigator.exists then + printlog "close navigator !" + Navigator.Close + else + printlog "Navigator: NOT available" + endif + Call hCloseDocument endcase '------------------------------------------------------------------------------ diff --git a/testautomation/graphics/optional/includes/impress/i_us_present.inc b/testautomation/graphics/optional/includes/impress/i_us_present.inc index 2eaa2c872253..fdc87d40b742 100755 --- a/testautomation/graphics/optional/includes/impress/i_us_present.inc +++ b/testautomation/graphics/optional/includes/impress/i_us_present.inc @@ -626,8 +626,8 @@ endcase 'i_us_presentation6 '00oo...//==---...---...---...---....---...---...---...---...---...---...--..--.--.-.-.-.-....---.... testcase i_us_presentation7 - qaErrorLog "#i70754# - i_us_presentation7 outcommented due to bug." - goto endsub + 'qaErrorLog "#i70754# - i_us_presentation7 outcommented due to bug." + 'goto endsub dim sFilter as string dim sFileName as string dim PresentationFile6 as string diff --git a/testautomation/graphics/tools/id_tools.inc b/testautomation/graphics/tools/id_tools.inc index 8f44a5b3a46f..1bec888ca50b 100755 --- a/testautomation/graphics/tools/id_tools.inc +++ b/testautomation/graphics/tools/id_tools.inc @@ -1036,14 +1036,16 @@ function fGetSlideName (optional sCompare as string) as string Kontext "NavigatorDraw" if NavigatorDraw.exists (5) then sleep 3 - '/// check in list, if the page changed ///' + printlog "check in list, if the page changed" fGetSlideName = Liste.GetSelText else - warnlog " Navigator not open! in function fGetSlideName TBO" + warnlog "Navigator not open! in function fGetSlideName TBO" Kontext "NavigatorDraw" fGetSlideName = "" endif if (isMissing (sCompare) = False) then ' if optional parameter exists + printlog "fGetSlideName is: " & fGetSlideName + printlog "sCompare is: " & sCompare if fGetSlideName <> sCompare then warnlog " Slide Name is '" + fGetSlideName + "'; should be: '" + sCompare + "'" endif diff --git a/testautomation/graphics/tools/locale_1.txt b/testautomation/graphics/tools/locale_1.txt index b8bc58bd361a..f71b11e55fae 100755 --- a/testautomation/graphics/tools/locale_1.txt +++ b/testautomation/graphics/tools/locale_1.txt @@ -22,7 +22,7 @@ Achtergrond Duits (Duitsland) 33 Prospectus -Page +Diapo Standard Anglais (U.S.A.) Arrière-plan diff --git a/testautomation/spreadsheet/required/includes/c_upd_insertmenu.inc b/testautomation/spreadsheet/required/includes/c_upd_insertmenu.inc index 825c0b3ff396..6132213590eb 100755 --- a/testautomation/spreadsheet/required/includes/c_upd_insertmenu.inc +++ b/testautomation/spreadsheet/required/includes/c_upd_insertmenu.inc @@ -572,9 +572,9 @@ testcase tInsertFunction '/// Check option 'Array' printlog " Check option 'Array'" Matrix.check - '/// Choose the second entry (all) in the category listbox - printlog " Choose the second entry (all) in the category listbox" - Kategorie.Select(2) + '/// Choose the third entry (database) in the category listbox + printlog " Choose the third entry (database) in the category listbox" + Kategorie.Select(3) '/// Choose first function printlog " Choose first function" Funktion.Select (1) diff --git a/testautomation/writer/optional/includes/CJKCTLDependency/CJKCTLDependency1.inc b/testautomation/writer/optional/includes/CJKCTLDependency/CJKCTLDependency1.inc index 163e46f928c1..7b7b9793d4da 100755 --- a/testautomation/writer/optional/includes/CJKCTLDependency/CJKCTLDependency1.inc +++ b/testautomation/writer/optional/includes/CJKCTLDependency/CJKCTLDependency1.inc @@ -324,7 +324,7 @@ testcase tCJKDependency_5 printlog " Format/Frame / Options, the listbox 'Text direction' shouldn't exist" Call fFormatFrame("TabZusaetze") if TextDirection.IsVisible = TRUE then - QAErrorLog "#135837# Shouldn't get listbox 'Text direction'." + warnlog "Shouldn't get listbox 'Text direction'." end if TabZusaetze.Cancel diff --git a/testautomation/writer/optional/includes/autotext/w_autotext.inc b/testautomation/writer/optional/includes/autotext/w_autotext.inc index 25196ee321e6..af0618823113 100755 --- a/testautomation/writer/optional/includes/autotext/w_autotext.inc +++ b/testautomation/writer/optional/includes/autotext/w_autotext.inc @@ -131,7 +131,7 @@ testcase tEditAutotext_1 EditAutotext Kontext "Active" if Active.Exists then - QAErrorlog Active.Gettext + warnlog Active.Gettext Active.Ok end if Kontext "Autotext" @@ -230,7 +230,7 @@ testcase tEditAutotext_1 Active.Setpage TabHyperlinkZeichen Kontext "TabHyperlinkZeichen" if UrlName.Gettext <> "http://www.irgendwas.de/" then Warnlog "Wrong hyperlink has been added to text!" - if Vergleich4$ <> TargetFrame.GetSelText then QAerrorlog "#i74539#Wrong targetFrame has been added to text!" + if Vergleich4$ <> TargetFrame.GetSelText then warnlog "Wrong targetFrame has been added to text!" TabHyperlinkZeichen.Cancel end if end if @@ -331,7 +331,7 @@ testcase tEditAutotext_2 EditAutotext Kontext "Active" if Active.Exists then - QAErrorlog Active.Gettext + warnlog Active.Gettext Active.Ok end if Kontext "Autotext" @@ -455,7 +455,7 @@ testcase tEditAutotext_3 EditAutotext Kontext "Active" if Active.Exists then - QAErrorlog Active.Gettext + warnlog Active.Gettext Active.Ok end if @@ -535,7 +535,7 @@ testcase tEditAutotext_4 Kontext "Active" if Active.Exists then if Active.GetRT = 304 then - QAErrorlog Active.Gettext + warnlog Active.Gettext Active.Ok end if end if @@ -546,7 +546,7 @@ testcase tEditAutotext_4 if wDeleteAutotextCategory("AAAAAA") = false then Warnlog "Unable to delete category" Kontext "Autotext" AutoText.Close - Call hCloseDocument + Call hCloseDocument goto endsub end if @@ -568,7 +568,7 @@ testcase tEditAutotext_4 Kontext "Active" if Active.Exists then if Active.GetRT = 304 then - QAErrorlog Active.Gettext + warnlog Active.Gettext Active.Ok end if end if @@ -590,7 +590,7 @@ testcase tEditAutotext_4 Kontext "Active" if Active.Exists then if Active.GetRT = 304 then - QAErrorlog Active.Gettext + warnlog Active.Gettext Active.Ok end if end if @@ -598,11 +598,11 @@ testcase tEditAutotext_4 Warnlog "After denying the 'Deletemessage' the categorie has been deleted!" else Kontext "Autotext" - Bereiche.Click + Bereiche.Click Kontext "Active" if Active.Exists then if Active.GetRT = 304 then - QAErrorlog Active.Gettext + warnlog Active.Gettext Active.Ok end if end if @@ -649,7 +649,7 @@ testcase tEditAutotext_5 Kontext "Active" if Active.Exists then - QAErrorlog Active.GetText + warnlog Active.GetText Active.OK end if Sleep 1 diff --git a/testautomation/writer/optional/includes/clipboard/w_211_.inc b/testautomation/writer/optional/includes/clipboard/w_211_.inc index ce61fe2c570e..d368128d7843 100755 --- a/testautomation/writer/optional/includes/clipboard/w_211_.inc +++ b/testautomation/writer/optional/includes/clipboard/w_211_.inc @@ -334,7 +334,7 @@ testcase WriterToCalcGraphicLinked try EditPasteSpecialCalc catch - QAErrorLog "Check why linked graphic fails !" + warnlog "Check why linked graphic fails !" Call hCloseDocument wait 500 Call hCloseDocument diff --git a/testautomation/writer/optional/includes/clipboard/w_213_.inc b/testautomation/writer/optional/includes/clipboard/w_213_.inc index 8de38b7df841..bfa77b8362dd 100755 --- a/testautomation/writer/optional/includes/clipboard/w_213_.inc +++ b/testautomation/writer/optional/includes/clipboard/w_213_.inc @@ -330,7 +330,7 @@ testcase WriterToDrawGraphicLinked try EditPasteSpecial catch - QAErrorLog "Check why linked graphic fails !" + warnlog "Check why linked graphic fails !" Call hCloseDocument wait 500 Call hCloseDocument diff --git a/testautomation/writer/optional/includes/clipboard/w_214_.inc b/testautomation/writer/optional/includes/clipboard/w_214_.inc index ac26b899ef5d..172da65baffd 100755 --- a/testautomation/writer/optional/includes/clipboard/w_214_.inc +++ b/testautomation/writer/optional/includes/clipboard/w_214_.inc @@ -260,8 +260,8 @@ endcase testcase WriterToHTMLDrawingObject gApplication = "WRITER" - QAErrorlog "Crashes unreproducable only with testtool" - goto endsub +' QAErrorlog "Crashes unreproducable only with testtool" +' goto endsub printlog " Open File '..\\writer\\optional\\input\\clipboard\\writer.sxw' " printlog " + Jump to beginning of document " printlog " + Select 'Drawing Object' " @@ -415,8 +415,8 @@ endcase testcase WriterToHTMLOLEObject gApplication = "WRITER" - QAErrorlog "Crashes unreproducable only with testtool" - goto endsub +' QAErrorlog "Crashes unreproducable only with testtool" +' goto endsub printlog " Open File '..\\writer\\optional\\input\\clipboard\\writer.sxw' " printlog " + Jump to beginning of document " printlog " + Select 'OLE Object' " diff --git a/testautomation/writer/optional/includes/clipboard/w_217_.inc b/testautomation/writer/optional/includes/clipboard/w_217_.inc index 942f7136849d..d19f515065e2 100755 --- a/testautomation/writer/optional/includes/clipboard/w_217_.inc +++ b/testautomation/writer/optional/includes/clipboard/w_217_.inc @@ -228,7 +228,7 @@ testcase HTMLToCALCGraphicLinked try EditPasteSpecialCalc catch - QAErrorlog "Unable to execute 'Edit / Paste Special'! Test failed! Manually not reproducable" + warnlog "Unable to execute 'Edit / Paste Special'! Test failed! Manually not reproducable" Call hCloseDocument Call hCloseDocument goto endsub diff --git a/testautomation/writer/optional/includes/clipboard/w_220_.inc b/testautomation/writer/optional/includes/clipboard/w_220_.inc index 53ea1745e7c3..4c103f486c63 100755 --- a/testautomation/writer/optional/includes/clipboard/w_220_.inc +++ b/testautomation/writer/optional/includes/clipboard/w_220_.inc @@ -51,10 +51,10 @@ end sub testcase HTMLToHTMLText - if lcase(gPlatform) = "x86" and Val(mid$(gMinor, 2, Len(gMinor))) <= 129 then - QAErrorlog "#125780#Stacktrace ID: 251397" - goto endsub - end if +' if lcase(gPlatform) = "x86" and Val(mid$(gMinor, 2, Len(gMinor))) <= 129 then +' QAErrorlog "#125780#Stacktrace ID: 251397" +' goto endsub +' end if gApplication = "HTMLDOKUMENT" printlog " Open File '..\\writer\\optional\\input\\clipboard\\html.html' " printlog " Jump to beginning of document " diff --git a/testautomation/writer/optional/includes/drawing/w_drawing_tools1.inc b/testautomation/writer/optional/includes/drawing/w_drawing_tools1.inc index 017c9784425d..7795f58ddfb5 100755 --- a/testautomation/writer/optional/includes/drawing/w_drawing_tools1.inc +++ b/testautomation/writer/optional/includes/drawing/w_drawing_tools1.inc @@ -754,10 +754,10 @@ testcase tLine_3 fFormatLine("TabLinie") if Stil.GetSelIndex <> iLineStyle then Warnlog "Line style is wrong." if Farbe.GetSelIndex <> iColor then Warnlog "Line color is wrong." - if Breite.GetText <> sLineWidth then QAErrorLog "#i40843# Line width is wrong." + if Breite.GetText <> sLineWidth then warnlog "Line width is wrong." - if StilLinks.GetSelIndex <> iArrowStyleLeft then Warnlog "#i72807#Arrow style is not correctly shown in format dialog" - if StilRechts.GetSelIndex <> iArrowStyleRight then Warnlog "#i72807#Arrow style is not correctly shown in format dialog" + if StilLinks.GetSelIndex <> iArrowStyleLeft then Warnlog "Arrow style is not correctly shown in format dialog" + if StilRechts.GetSelIndex <> iArrowStyleRight then Warnlog "Arrow style is not correctly shown in format dialog" TabLinie.Cancel diff --git a/testautomation/writer/optional/includes/dropdownLB/w_dropdownLB1.inc b/testautomation/writer/optional/includes/dropdownLB/w_dropdownLB1.inc index 726acd7f5a6e..e3381afbde7c 100755 --- a/testautomation/writer/optional/includes/dropdownLB/w_dropdownLB1.inc +++ b/testautomation/writer/optional/includes/dropdownLB/w_dropdownLB1.inc @@ -1051,7 +1051,7 @@ testcase tDropDownLB_17 if EntrysList.GetSelText <> sItem1(i-1) then Warnlog "Hope to get " & sItem1(i-1) & " but get " & EntrysList.GetSelText next i else - QAErrorlog "#i56768#Not all entrys in field correctly imported!" + warnlog "Not all entrys in field correctly imported!" end if FeldbefehlBearbeitenFunktionen.Cancel @@ -1078,7 +1078,7 @@ testcase tDropDownLB_17 if EntrysList.GetSelText <> sItem2(i-1) then Warnlog "Hope to get " & sItem2(i-1) & " but get " & EntrysList.GetSelText next i else - QAErrorlog "#i56768#Not all entrys in field correctly imported!" + warnlog "Not all entrys in field correctly imported!" end if FeldbefehlBearbeitenFunktionen.Cancel diff --git a/testautomation/writer/optional/includes/formatcharacter/w_format_character1.inc b/testautomation/writer/optional/includes/formatcharacter/w_format_character1.inc index ebae91bf20b9..75ae59da75e0 100755 --- a/testautomation/writer/optional/includes/formatcharacter/w_format_character1.inc +++ b/testautomation/writer/optional/includes/formatcharacter/w_format_character1.inc @@ -48,7 +48,7 @@ testcase tFormatCharacter1 Kontext "TabFontPosition" '/// 'Pair Kerning' should be checked by default if Not PairKerning.IsChecked then - QAErrorlog "#i16874#Pair Kerning should be checked by default !" + warnlog "Pair Kerning should be checked by default !" end if TabFontPosition.Cancel '/// Close dialog and open Stylist @@ -63,7 +63,7 @@ testcase tFormatCharacter1 Kontext "TabFontPosition" '/// 'Pair Kerning' should be checked by default if Not PairKerning.IsChecked then - QAErrorlog "#i16874#Pair Kerning should be checked by default !" + warnlog "Pair Kerning should be checked by default !" end if TabFontPosition.Cancel '/// close Stylist diff --git a/testautomation/writer/optional/includes/formatpage/w_formatpage1.inc b/testautomation/writer/optional/includes/formatpage/w_formatpage1.inc index 6dbc1bb96f06..a4c4bcc1f7cb 100755 --- a/testautomation/writer/optional/includes/formatpage/w_formatpage1.inc +++ b/testautomation/writer/optional/includes/formatpage/w_formatpage1.inc @@ -870,7 +870,7 @@ testcase tFormatPage_15 Feldtyp.Select sType Sleep 3 if Formatliste.GetSelText <> sFormat then - QAErrorlog "the format setting should be " & sFormat & " but get " &Formatliste.GetSelText + warnlog "the format setting should be " & sFormat & " but get " &Formatliste.GetSelText end if TabDokumentFeldbefehle.Close diff --git a/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph2.inc b/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph2.inc index d2080ffe7161..050a01cb58ee 100755 --- a/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph2.inc +++ b/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph2.inc @@ -813,7 +813,7 @@ testcase tParagraphTextFlow4 Call wTypeKeys "<Shift End>" EditCopy if GetClipboardText <> sTestText(i) then - QAErrorlog "#i39917# Something wrong in Consecutive typhens 0 : " &i + warnlog " Something wrong in Consecutive typhens 0 : " &i exit for end if Call wTypeKeys "<MOD1 Home>" @@ -844,7 +844,7 @@ testcase tParagraphTextFlow4 Call wTypeKeys "<Shift End>" EditCopy if GetClipboardText <> sTestText(i) then - QAErrorlog "#i39917# Something wrong in Consecutive typhens 1 : " &i + warnlog " Something wrong in Consecutive typhens 1 : " &i exit for end if Call wTypeKeys "<MOD1 Home>" @@ -875,7 +875,7 @@ testcase tParagraphTextFlow4 Call wTypeKeys "<Shift End>" EditCopy if GetClipboardText <> sTestText(i) then - QAErrorlog "#i39917# Something wrong in Consecutive typhens 2 : " &i + warnlog " Something wrong in Consecutive typhens 2 : " &i exit for end if Call wTypeKeys "<MOD1 Home>" diff --git a/testautomation/writer/optional/includes/hangulhanjaonversion/hhConversion2.inc b/testautomation/writer/optional/includes/hangulhanjaonversion/hhConversion2.inc index bd81a642a664..1ffcd89f405f 100755 --- a/testautomation/writer/optional/includes/hangulhanjaonversion/hhConversion2.inc +++ b/testautomation/writer/optional/includes/hangulhanjaonversion/hhConversion2.inc @@ -1022,7 +1022,7 @@ testcase tHHConversion_18 Call wTypeKeys "<Shift End>" EditCopy if GetClipboardText <> sResult then - QAErrorlog "#i39308# Should get " & sResult & " but get " & GetClipboardText + QAErrorlog "Should get " & sResult & " but get " & GetClipboardText end if Call hCloseDocument diff --git a/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic1.inc b/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic1.inc index 24d6fb06f712..ec6d168de4a2 100755 --- a/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic1.inc +++ b/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic1.inc @@ -59,9 +59,6 @@ testcase tInsertGraphic_1 Dim sPathName as String Dim i as integer - QAErrorlog "#i68646#Listbox is invisible to TestTool: Options->Paths->MultiPath selection" - goto endsub - PrintLog "- Test default dirtory of inserting graphic -1" '/// Test default directory of inserting graphic -1 select case iSprache diff --git a/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic3.inc b/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic3.inc index 3ea6f4257806..5ef35bab54f0 100755 --- a/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic3.inc +++ b/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic3.inc @@ -908,7 +908,7 @@ testcase tInsertGraphic_29 fFormatGraphic("TabUmlauf") Sleep 1 - if Parallel.IsChecked <> TRUE then QAErrorlog "#138144#Graphic wrapping situation is wrong !" + if Parallel.IsChecked <> TRUE then warnlog "Graphic wrapping situation is wrong !" if ErsterAbsatz.IsChecked <> TRUE then Warnlog "first paragraph configuration is wrong !" TabUmlauf.Cancel @@ -1018,7 +1018,7 @@ testcase tInsertGraphic_30 fFormatGraphic("TabUmlauf") Sleep 1 - if Parallel.IsChecked <> TRUE then QAErrorlog "#138144#Graphic wrapping situation is wrong !" + if Parallel.IsChecked <> TRUE then warnlog "Graphic wrapping situation is wrong !" if ErsterAbsatz.IsChecked <> TRUE then Warnlog "first paragraph configuration is wrong !" TabUmlauf.Cancel @@ -1038,7 +1038,7 @@ testcase tInsertGraphic_30 fFormatGraphic("TabUmlauf") Sleep 1 - if Kontur.IsChecked <> TRUE then Warnlog "i35239 - Contour configuration is wrong !" + if Kontur.IsChecked <> TRUE then Warnlog "Contour configuration is wrong !" TabUmlauf.Cancel Call hCloseDocument diff --git a/testautomation/writer/optional/includes/number/w_206_.inc b/testautomation/writer/optional/includes/number/w_206_.inc index 9798ddeaba14..01457e61aced 100755 --- a/testautomation/writer/optional/includes/number/w_206_.inc +++ b/testautomation/writer/optional/includes/number/w_206_.inc @@ -294,20 +294,20 @@ testcase tToolsNumbering5 end if Case 5 if Left$(sClipBrd(1), 2) <> "B)" then - QAErrorlog "Seems numbering A) has not been correctly created" + warnlog "Seems numbering A) has not been correctly created" end if Case 6 if Left$(sClipBrd(1), 2) <> "b)" then - QAErrorlog "Seems numbering a) has not been correctly created" + warnlog "Seems numbering a) has not been correctly created" end if Case 7 if Left$(sClipBrd(1), 2) <> "(b)" then - QAErrorlog "Seems numbering (a) has not been correctly created" + warnlog "Seems numbering (a) has not been correctly created" end if Case 8 if Left$(sClipBrd(1), 3) <> "ii." then 'Warnlog "Seems numbering i. has not been correctly created" - QAErrorlog "#i78524#Auto-capitalisation of letter i hinders Automatic numbering" + warnlog "#i78524#Auto-capitalisation of letter i hinders Automatic numbering" end if end select else diff --git a/testautomation/writer/optional/includes/option/wh_o_1.inc b/testautomation/writer/optional/includes/option/wh_o_1.inc index 6ac950955f8f..78dfe9bdae2d 100755 --- a/testautomation/writer/optional/includes/option/wh_o_1.inc +++ b/testautomation/writer/optional/includes/option/wh_o_1.inc @@ -152,7 +152,8 @@ testcase tToolsOptionsHTMLContent ExtrasOptionenDlg.OK Call hCloseDocument - + Call hCloseDocument + endcase '------------------------------------------------------------------------------ @@ -401,6 +402,7 @@ testcase tToolsOptionsHTMLLayout ExtrasOptionenDlg.OK Call hCloseDocument + Call hCloseDocument endcase '------------------------------------------------------------------------------ @@ -646,7 +648,7 @@ testcase tToolsOptionsHTMLGrid Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK - Do Until GetDocumentCount = 1 + Do Until GetDocumentCount = 0 Call hCloseDocument Loop diff --git a/testautomation/writer/optional/includes/option/wh_o_2.inc b/testautomation/writer/optional/includes/option/wh_o_2.inc index e69de566d80e..4a5ec880344c 100755 --- a/testautomation/writer/optional/includes/option/wh_o_2.inc +++ b/testautomation/writer/optional/includes/option/wh_o_2.inc @@ -164,7 +164,7 @@ testcase tToolsOptionsHTMLPrint if ( bTempRadioBut(3) <> Dokumentende.IsChecked) Then WarnLog "'End of document' state changed" if ( bTempRadioBut(4) <> Seitenende.IsChecked ) Then WarnLog "'End of page' state changed" - if ( Fax.GetSelIndex <> iTempListBox(1) ) Then QAErrorlog "#i62663#Fax state changed" + if ( Fax.GetSelIndex <> iTempListBox(1) ) Then warnlog "Fax state changed" printlog ("'/// - all UnCheck -> o ///") @@ -305,7 +305,7 @@ testcase tToolsOptionsHTMLPrint Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK - Do Until GetDocumentCount = 1 + Do Until GetDocumentCount = 0 Call hCloseDocument Loop endcase @@ -502,7 +502,9 @@ testcase tToolsOptionsHTMLTable Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK - Call hCloseDocument + Do Until GetDocumentCount = 0 + Call hCloseDocument + Loop endcase '------------------------------------------------------------------------------ diff --git a/testautomation/writer/optional/includes/option/wh_o_3.inc b/testautomation/writer/optional/includes/option/wh_o_3.inc index 373401acef08..9cc54c298fcb 100755 --- a/testautomation/writer/optional/includes/option/wh_o_3.inc +++ b/testautomation/writer/optional/includes/option/wh_o_3.inc @@ -68,41 +68,41 @@ testcase tToolsOptionsHTMLInsert '(7) = Zahlenformaterkennung depends on AutomatischeZahlenerkennung '(8) = AutomatischeAusrichtung depends on AutomatischeZahlenerkennung - hNewDocument - printlog "'///- Tools/Options/HTML: Insert ///" + call hNewDocument + printlog "'///- Tools/Options/HTML: Insert ///" - printlog ("'/// - save states ///") + printlog ("'/// - save states ///") ToolsOptions hToolsOptions ("HtmlDocument","Table") - irgendwas(2) = Ueberschrift.IsChecked - irgendwas(3) = Wiederholen.IsChecked - irgendwas(5) = Umrandung.IsChecked + irgendwas(2) = Ueberschrift.IsChecked + irgendwas(3) = Wiederholen.IsChecked + irgendwas(5) = Umrandung.IsChecked - irgendwas(6) = AutomatischeZahlenerkennung.IsChecked - irgendwas(7) = Zahlenformaterkennung.IsChecked - irgendwas(8) = AutomatischeAusrichtung.IsChecked + irgendwas(6) = AutomatischeZahlenerkennung.IsChecked + irgendwas(7) = Zahlenformaterkennung.IsChecked + irgendwas(8) = AutomatischeAusrichtung.IsChecked - printlog ("'/// - all states inverting ///") + printlog ("'/// - all states inverting ///") ' if irgendwas(2) Then Ueberschrift.UnCheck Else Ueberschrift.Check - Ueberschrift.Check - if irgendwas(3) Then Wiederholen.UnCheck Else Wiederholen.Check - if irgendwas(5) Then Umrandung.UnCheck Else Umrandung.Check + Ueberschrift.Check + if irgendwas(3) Then Wiederholen.UnCheck Else Wiederholen.Check + if irgendwas(5) Then Umrandung.UnCheck Else Umrandung.Check ' if irgendwas(6) Then AutomatischeZahlenerkennung.UnCheck Else AutomatischeZahlenerkennung.Check - AutomatischeZahlenerkennung.Check - if irgendwas(7) Then Zahlenformaterkennung.UnCheck Else Zahlenformaterkennung.Check - if irgendwas(8) Then AutomatischeAusrichtung.UnCheck Else AutomatischeAusrichtung.Check + AutomatischeZahlenerkennung.Check + if irgendwas(7) Then Zahlenformaterkennung.UnCheck Else Zahlenformaterkennung.Check + if irgendwas(8) Then AutomatischeAusrichtung.UnCheck Else AutomatischeAusrichtung.Check Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK - printlog ("'/// - SO quit - start ///") + printlog ("'/// - SO quit - start ///") - wOfficeRestart + call wOfficeRestart - printlog ("'/// - checking states ///") + printlog ("'/// - checking states ///") ToolsOptions hToolsOptions ( "HtmlDocument" , "Table" ) @@ -119,15 +119,15 @@ testcase tToolsOptionsHTMLInsert Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK - printlog ("'/// - all UnCheck -> o ///") + printlog ("'/// - all UnCheck -> o ///") ToolsOptions hToolsOptions ( "HtmlDocument" , "Table" ) - Ueberschrift.UnCheck + Ueberschrift.UnCheck ' Wiederholen.UnCheck - Umrandung.UnCheck + Umrandung.UnCheck - AutomatischeZahlenerkennung.UnCheck + AutomatischeZahlenerkennung.UnCheck ' Zahlenformaterkennung.UnCheck ' AutomatischeAusrichtung.UnCheck @@ -139,44 +139,41 @@ testcase tToolsOptionsHTMLInsert '/// 2.Location of Options: InsertTableWriter get's checked too ///' Printlog "'/// - check in InsertTableHTML ///" - hNewDocument - 'printlog "a" + Call hNewDocument InsertTableWriter Kontext "TabelleEinfuegenWriter" -' printlog "b" If ( Ueberschrift.IsChecked ) Then WarnLog "Ueberschrift x" ' If ( UeberschriftWiederholen.IsChecked ) Then WarnLog "Wiederholen x" If ( Umrandung.IsChecked ) Then WarnLog "Umrandung x" TabelleEinfuegenWriter.OK - 'printlog "c" '/// Function: Input in tables ///' Kontext "DocumentWriter" -'printlog "d" + DocumentWriter.TypeKeys "<Down>1<Tab><Left>" -'printlog "e" + FormatParagraph -'printlog "f" + Kontext Active.SetPage TabAusrichtungAbsatz Kontext "TabAusrichtungAbsatz" if NOT Links.IsChecked then Warnlog "Die automatische Ausrichtung der Zahl wurde trotzdem durchgeführt!" -'printlog "g" + TabAusrichtungAbsatz.Cancel FormatNumberFormat -'printlog "h" + Kontext "Zahlenformat" If Kategorie.GetSelIndex <> 11 then Warnlog "Das Zahlenformat ist nicht Text geblieben!" -'printlog "i" + Zahlenformat.Cancel -'printlog "j" - hCloseDocument + + Call hCloseDocument '................. @@ -237,7 +234,7 @@ testcase tToolsOptionsHTMLInsert If Kategorie.GetSelIndex <> 3 then Warnlog "numberformat didn't get changed!" Zahlenformat.Cancel - hCloseDocument + Call hCloseDocument '....................... @@ -275,9 +272,13 @@ testcase tToolsOptionsHTMLInsert Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK - hCloseDocument + Do Until GetDocumentCount = 0 + Call hCloseDocument + Loop endcase +'------------------------------------------------------------------------------------------------------------------------ + testcase tToolsOptionsHTMLCursor dim irgendwas(17) as boolean ' Checkbox states @@ -387,6 +388,8 @@ testcase tToolsOptionsHTMLCursor Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK - hCloseDocument + Do Until GetDocumentCount = 0 + Call hCloseDocument + Loop endcase diff --git a/testautomation/writer/optional/includes/option/wr_o_2.inc b/testautomation/writer/optional/includes/option/wr_o_2.inc index e9a88046f5ff..13dcec84cb38 100755 --- a/testautomation/writer/optional/includes/option/wr_o_2.inc +++ b/testautomation/writer/optional/includes/option/wr_o_2.inc @@ -389,17 +389,17 @@ testcase tToolsOptionsWriterDefaultfont (WestOrEast as string) ToolsOptions Call hToolsOptions ( "TextDocument" , WestOrEast ) - if ( StandardSchrift.GetSelText <> sInitFont(1) ) then QAErrorLog "#i80554#Default not init font!" - if ( Ueberschrift.GetSelText <> sInitFont(2) ) then QAErrorLog "#i80554#Heading not init font! BUGID: 89816" - if ( Liste.GetSelText <> sInitFont(3) ) then QAErrorLog "#i80554#List not init font!" - if ( Beschriftung.GetSelText <> sInitFont(4) ) then QAErrorLog "#i80554#Caption not init font!" - if ( Verzeichnis.GetSelText <> sInitFont(5) ) then QAErrorLog "#i80554#Index not init font!" - - if ( StandardSchriftGroesse.GetSelText <> sInitFontSize(1) ) then QAErrorLog "#i80554#Default fontsize not init font!" - if ( UeberschriftGroesse.GetSelText <> sInitFontSize(2) ) then QAErrorLog "#i80554#Heading fontsize not init font! BUGID: 89816" - if ( ListeGroesse.GetSelText <> sInitFontSize(3) ) then QAErrorLog "#i80554#List fontsize not init font!" - if ( BeschriftungGroesse.GetSelText <> sInitFontSize(4) ) then QAErrorLog "#i80554#Caption fontsize not init font!" - if ( VerzeichnisGroesse.GetSelText <> sInitFontSize(5) ) then QAErrorLog "#i80554#Index fontsize not init font!" + if ( StandardSchrift.GetSelText <> sInitFont(1) ) then warnlog "Default not init font!" + if ( Ueberschrift.GetSelText <> sInitFont(2) ) then warnlog "Heading not init font! BUGID: 89816" + if ( Liste.GetSelText <> sInitFont(3) ) then warnlog "List not init font!" + if ( Beschriftung.GetSelText <> sInitFont(4) ) then warnlog "Caption not init font!" + if ( Verzeichnis.GetSelText <> sInitFont(5) ) then warnlog "Index not init font!" + + if ( StandardSchriftGroesse.GetSelText <> sInitFontSize(1) ) then warnlog "Default fontsize not init font!" + if ( UeberschriftGroesse.GetSelText <> sInitFontSize(2) ) then warnlog "Heading fontsize not init font! BUGID: 89816" + if ( ListeGroesse.GetSelText <> sInitFontSize(3) ) then warnlog "List fontsize not init font!" + if ( BeschriftungGroesse.GetSelText <> sInitFontSize(4) ) then warnlog "Caption fontsize not init font!" + if ( VerzeichnisGroesse.GetSelText <> sInitFontSize(5) ) then warnlog "Index fontsize not init font!" Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.Cancel Call hCloseDocument @@ -424,7 +424,7 @@ testcase tToolsOptionsWriterDefaultfont (WestOrEast as string) Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK - Do Until GetDocumentCount = 1 + Do Until GetDocumentCount = 0 Call hCloseDocument Loop endcase @@ -582,10 +582,10 @@ testcase tToolsOptionsWriterPrint1 if ( bCheckboxes(12)= AusDruckereinstellung.IsChecked ) then WarnLog "AusDruckereinstellung state changed" if ( bCheckboxes(13)= LeereSeitenDrucken.IsChecked ) then WarnLog "'Print automatically inserted blank pages' state changed" - if ( Fax.GetSelIndex <> iTempListBox(1) ) Then QAErrorlog "#i62663#Fax state changed" + if ( Fax.GetSelIndex <> iTempListBox(1) ) Then warnlog "Fax state changed" - if ( bTempRadioBut(1) <> Keine.IsChecked ) then WarnLog "Keine state changed (Bug#99202)" - if ( bTempRadioBut(2) <> NurNotizen.IsChecked ) then WarnLog "NurNotizen state changed (Bug#99202)" + if ( bTempRadioBut(1) <> Keine.IsChecked ) then WarnLog "Keine state changed" + if ( bTempRadioBut(2) <> NurNotizen.IsChecked ) then WarnLog "NurNotizen state changed" if ( bTempRadioBut(3) <> Dokumentende.IsChecked) then WarnLog "Dokumentende state changed" if ( bTempRadioBut(4) <> Seitenende.IsChecked ) then WarnLog "Seitenende state changed" @@ -753,7 +753,7 @@ testcase tToolsOptionsWriterPrint1 ExtrasOptionenDlg.OK sleep 2 - Do Until GetDocumentCount = 1 + Do Until GetDocumentCount = 0 Call hCloseDocument Loop endcase @@ -945,7 +945,9 @@ testcase tToolsOptionsWriterTable Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK - Call hCloseDocument + Do Until GetDocumentCount = 0 + Call hCloseDocument + Loop endcase '------------------------------------------------------------------------------ @@ -975,6 +977,8 @@ testcase tToolsOptionsWriterTable1 Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK - Call hCloseDocument + Do Until GetDocumentCount = 0 + Call hCloseDocument + Loop endcase diff --git a/testautomation/writer/optional/includes/option/wr_o_3.inc b/testautomation/writer/optional/includes/option/wr_o_3.inc index 24ff5afd367c..6574c8f88322 100755 --- a/testautomation/writer/optional/includes/option/wr_o_3.inc +++ b/testautomation/writer/optional/includes/option/wr_o_3.inc @@ -257,7 +257,9 @@ testcase tToolsOptionsWriterCursor Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK - Call hCloseDocument + Do Until GetDocumentCount = 0 + Call hCloseDocument + Loop endcase '------------------------------------------------------------------------------ @@ -720,7 +722,9 @@ testcase tToolsOptionsWriterInsert Call wOptionenUndo("Table") - Call hCloseDocument + Do Until GetDocumentCount = 0 + Call hCloseDocument + Loop endcase ' ******************************************************************** @@ -1135,7 +1139,7 @@ DIM sFoundWord AS string 'variable for word found one line below DocumentWriter.TypeKeys "<SHIFT LEFT>" 'deleting space EditCopy if GetClipboardText <> "twenty" then - QAErrorlog "#i80554#wrong word found, formatting broken" + warnlog "wrong word found, formatting broken" else printlog "Correct word found, aligment ok" end if diff --git a/testautomation/writer/optional/includes/regexp/search.inc b/testautomation/writer/optional/includes/regexp/search.inc index 73345a2141aa..fe25e036a77f 100755 --- a/testautomation/writer/optional/includes/regexp/search.inc +++ b/testautomation/writer/optional/includes/regexp/search.inc @@ -297,8 +297,6 @@ endcase '--------------------------------------------------------- testcase tItalic_Search - QAErrorlog "#i74765#Search for typeface Italic fails" - goto endsub call wSetFindAndReplaceToDefault(1) Such_Text = "k" 'Suche nach Format "kursiv" Meldungs_Text = "Suchen Format kursiv" @@ -358,9 +356,7 @@ endcase '--------------------------------------------------------- testcase tItalic_Replace - QAErrorlog "#i74765#Search for typeface Italic fails" - goto endsub - call wSetFindAndReplaceToDefault(1) + call wSetFindAndReplaceToDefault(1) Such_Text = "kursiv" 'Suche Format "kursiv", ersetze Meldungs_Text = "Ersetzte kursiv mit durchgestrichen" 'mit Format "durchgestrichen" SearchFor.SetText Such_Text diff --git a/testautomation/writer/optional/includes/section/w_section_2.inc b/testautomation/writer/optional/includes/section/w_section_2.inc index b40fdf39b4c8..c402bfb67dec 100755 --- a/testautomation/writer/optional/includes/section/w_section_2.inc +++ b/testautomation/writer/optional/includes/section/w_section_2.inc @@ -919,7 +919,7 @@ testcase tDisplaySection_6 Sleep 2 Call wTypeKeys "<home><Shift End>" EditCopy - if GetClipboardText <> sectionContent(j-1) then QAErrorLog "The focus is NOT in the correct location" + if GetClipboardText <> sectionContent(j-1) then warnlog "The focus is NOT in the correct location" Kontext "NavigatorWriter" next j @@ -952,7 +952,7 @@ testcase tDisplaySection_7 Auswahlliste.TypeKeys "<down><return>" printlog " -- check if the section name in navigator is right " - if Auswahlliste.GetitemText(2) <> "sectionNormal" then QAErrorLog "The section can't be displayed immediately in the Navigator." + if Auswahlliste.GetitemText(2) <> "sectionNormal" then warnlog "The section can't be displayed immediately in the Navigator." 'Close Navigator before close the document fCloseNavigator diff --git a/testautomation/writer/optional/includes/section/w_section_3.inc b/testautomation/writer/optional/includes/section/w_section_3.inc index 2910d2ccd987..ac58d9c38b35 100755 --- a/testautomation/writer/optional/includes/section/w_section_3.inc +++ b/testautomation/writer/optional/includes/section/w_section_3.inc @@ -954,7 +954,7 @@ testcase tOperationSection_3 Bereich.TypeKeys "<Up>",2 Bereich.TypeKeys "<Down>" - if BereichsName.GetText <> sectionName then QAErrorLog "We hope the section name is " & sectionName & " but get " & BereichsName.GetText + if BereichsName.GetText <> sectionName then warnlog "We hope the section name is " & sectionName & " but get " & BereichsName.GetText BereicheBearbeiten.Cancel PrintLog " Close document" @@ -1322,11 +1322,11 @@ testcase tWrappedSections_2 Kontext "BereicheBearbeiten" Bereich.TypeKeys "<UP>" if BereichsName.GetText <> wrappingSection then - QAErrorLog "The wrapping section names is wrong. Bug #102552" + QAErrorLog "#102552# - The wrapping section names is wrong." end if Bereich.TypeKeys "<Down>" if BereichsName.GetText <> wrappedSection then - QAErrorLog "The wrapped section names is wrong. Bug #102552" + QAErrorLog "#102552# - The wrapped section names is wrong." end if BereicheBearbeiten.Cancel catch diff --git a/testautomation/writer/optional/includes/sorting/w_sorting1.inc b/testautomation/writer/optional/includes/sorting/w_sorting1.inc index 43d314d43a87..d683cf005de0 100755 --- a/testautomation/writer/optional/includes/sorting/w_sorting1.inc +++ b/testautomation/writer/optional/includes/sorting/w_sorting1.inc @@ -61,10 +61,6 @@ end sub testcase tToolsSort1 PrintLog "- Tools / Sort normal Text ( 1. Column )" - if iSprache = 82 then - QAErrorlog "#59349#Sorting: Keytype-Reset when language changes" - goto endsub - end if Printlog " - alphanumeric ascending ( Key 1 )" Call hNewDocument Call wTypeKeys "Ohallo<Return>Ahallo<Return>Ghallo<Return>Zhallo<Return>Shallo" @@ -181,24 +177,20 @@ testcase tToolsSort2 Call AbsteigendKontrollieren ( TRUE ) Printlog " - numeric ascending ( Key 2 )" - if iSprache = 82 then - QAErrorlog "#59349#Sorting: Keytype-Reset when language changes" - else - Call wTypeKeys "<Mod1 a>" - Call wTypeKeys "<Delete>" - Sleep 1 - Call wTypeKeys "43<Return>54<Return>23<Return>65<Return>56" - Call wTypeKeys ( "<Mod1 a>" ) - ToolsSort - Kontext "Sortieren" - Schluessel1.Uncheck - Schluessel2.Check - Spalte2.SetText "1" - Schluesseltyp2.Select 2 - Aufsteigend2.Check - Sortieren.OK - Call AufsteigendKontrollieren ( TRUE ) - end if + Call wTypeKeys "<Mod1 a>" + Call wTypeKeys "<Delete>" + Sleep 1 + Call wTypeKeys "43<Return>54<Return>23<Return>65<Return>56" + Call wTypeKeys ( "<Mod1 a>" ) + ToolsSort + Kontext "Sortieren" + Schluessel1.Uncheck + Schluessel2.Check + Spalte2.SetText "1" + Schluesseltyp2.Select 2 + Aufsteigend2.Check + Sortieren.OK + Call AufsteigendKontrollieren ( TRUE ) Printlog " - numeric descending ( Key 2 )" Call wTypeKeys ( "<Mod1 a>" ) @@ -213,25 +205,21 @@ testcase tToolsSort2 Call AbsteigendKontrollieren ( TRUE ) Printlog " - numeric ascending ( Key 3 )" - if iSprache = 82 then - QAErrorlog "#59349#Sorting: Keytype-Reset when language changes" - else - Call wTypeKeys ( "<Mod1 a>" ) - Call wTypeKeys ( "<Delete>" ) - Sleep 1 - Call wTypeKeys "43<Return>54<Return>23<Return>65<Return>56" - Call wTypeKeys ( "<Mod1 a>" ) - ToolsSort - Kontext "Sortieren" - Schluessel1.Uncheck - Schluessel2.UnCheck - Schluessel3.Check - Spalte3.SetText "1" - Schluesseltyp3.Select 2 - Aufsteigend3.Check - Sortieren.OK - Call AufsteigendKontrollieren ( TRUE ) - end if + Call wTypeKeys ( "<Mod1 a>" ) + Call wTypeKeys ( "<Delete>" ) + Sleep 1 + Call wTypeKeys "43<Return>54<Return>23<Return>65<Return>56" + Call wTypeKeys ( "<Mod1 a>" ) + ToolsSort + Kontext "Sortieren" + Schluessel1.Uncheck + Schluessel2.UnCheck + Schluessel3.Check + Spalte3.SetText "1" + Schluesseltyp3.Select 2 + Aufsteigend3.Check + Sortieren.OK + Call AufsteigendKontrollieren ( TRUE ) Printlog " - numeric descending ( Key 3 )" Call wTypeKeys ( "<Mod1 a>" ) @@ -254,10 +242,6 @@ endcase testcase tToolsSort3 Dim i as Integer : Dim Trennzeichen as String PrintLog "- Tools / Sorting text in several lines" - if iSprache = 82 then - QAErrorlog "#59349#Sorting: Keytype-Reset when language changes" - goto endsub - end if for i=1 to 3 select case i case 1: Printlog " - Seperator is a tabulator" @@ -339,10 +323,6 @@ endcase testcase tToolsSort4 PrintLog "- Tools / Sorting in table with header" - if iSprache = 82 then - QAErrorlog "#59349#Sorting: Keytype-Reset when language changes" - goto endsub - end if if gApplication = "WRITER" then Call hFileOpen ( gTesttoolPath + "writer\optional\input\sorting\sort1.odt" ) else @@ -465,10 +445,6 @@ endcase testcase tToolsSort5 PrintLog "- Tools / Sorting in table without header" - if iSprache = 82 then - QAErrorlog "#59349#Sorting: Keytype-Reset when language changes" - goto endsub - end if if gApplication = "WRITER" then Call hFileOpen ( gTesttoolPath + "writer\optional\input\sorting\sort1.odt" ) else diff --git a/testautomation/writer/optional/includes/spellcheck/w_spellcheck.inc b/testautomation/writer/optional/includes/spellcheck/w_spellcheck.inc index 25372a07aa07..412e463fe5a1 100755 --- a/testautomation/writer/optional/includes/spellcheck/w_spellcheck.inc +++ b/testautomation/writer/optional/includes/spellcheck/w_spellcheck.inc @@ -317,7 +317,7 @@ testcase tToolsSpellcheck1Mistake printlog " - replace wrong word with a suggestion" '/// replace wrong word with a suggestion /// if trim$(NotInDictionary.GetText) <> trim(sErrorSampleText) then - QAErrorlog "#i79988#" & sErrorSampleText & " has not been detected as mistake. Detected mistake is:" & NotInDictionary.GetText + warnlog " " & sErrorSampleText & " has not been detected as mistake. Detected mistake is:" & NotInDictionary.GetText end if if Suggestions.GetItemCount > 0 then if Suggestions.IsEnabled then diff --git a/testautomation/writer/optional/includes/stylist/w_stylist.inc b/testautomation/writer/optional/includes/stylist/w_stylist.inc index 8f2f4ab313e3..70ecabb1e024 100755 --- a/testautomation/writer/optional/includes/stylist/w_stylist.inc +++ b/testautomation/writer/optional/includes/stylist/w_stylist.inc @@ -255,11 +255,11 @@ testcase tFormatStylist3 if AllStyles <> "122" then Select Case iSprache Case 07 - QAErrorlog "#i69453#Double styles in stylist" + warnlog "Double styles in stylist" Case 55 - QAErrorlog "#i48359#Missing Style in Stylist" + warnlog "Missing Style in Stylist" Case 31 - QAErrorlog "#i55810#Missing Style in Stylist" + warnlog "Missing Style in Stylist" Case else Warnlog "There are " + AllStyles + " styles in this category and not 122!" end select @@ -554,7 +554,7 @@ testcase tAssigningStyles1 Kontext "Textobjectbar" if Vorlage.GetItemCount <> 7 then Select case iSprache - case 82 : QAErrorlog "#i65956#Korean: Number of styles in styleslistbox wrong" + case 82 : warnlog "Korean: Number of styles in styleslistbox wrong" case else : Warnlog "Not 7 entrys in Styles & Formatting combobox but: " & Vorlage.GetItemCount end select end if @@ -719,7 +719,7 @@ testcase tAssigningStyles4 wait 500 Kontext "Textobjectbar" if Vorlage.GetSelIndex <> 2 then - QAErrorlog "#i63400#Seems paragraph has not been set to default! " & Vorlage.GetSelText & "(" & Vorlage.GetSelIndex & ")" + warnlog "Seems paragraph has not been set to default! " & Vorlage.GetSelText & "(" & Vorlage.GetSelIndex & ")" end if printlog "Close Document" diff --git a/testautomation/writer/optional/includes/table/w_204_.inc b/testautomation/writer/optional/includes/table/w_204_.inc index 18f524a286bb..7d16cd99915f 100755 --- a/testautomation/writer/optional/includes/table/w_204_.inc +++ b/testautomation/writer/optional/includes/table/w_204_.inc @@ -352,7 +352,7 @@ testcase tTableInsert3 if (itemp(2) <> itemp(3)) then printlog "--- Table splitted" + itemp(3) else - QAErrorlog "put some more rows in!!!" + warnlog "put some more rows in!!!" end if Call hCloseDocument @@ -723,7 +723,7 @@ testcase tTableNumberFormat if (Kategorie.GetSelIndex = 10) then printlog " - Value is correctly recognized as boolean" elseif iSprache = 86 or iSprache = 82 or iSprache =88 then - qaerrorlog "#i73416#Boolean value in chinese and korean not recognized" + warnlog "Boolean value in chinese and korean not recognized" else warnlog "The value " & fLocaleString("LocaleBooleanValue") & "is not recognized as boolean, it is " & Kategorie.GetSelText end if @@ -736,7 +736,7 @@ testcase tTableNumberFormat if (rechts.isChecked = true) then printlog " - Booleanvalue is correctly alligned" elseif iSprache = 86 or iSprache = 82 or iSprache = 88 then - qaerrorlog "#i73416#Boolean value in chinese and korean not recognized" + warnlog "Boolean value in chinese and korean not recognized" else warnlog "wrong alignment of number" end if diff --git a/testautomation/writer/optional/includes/table/w_204a_.inc b/testautomation/writer/optional/includes/table/w_204a_.inc index 9c7725bbcf6c..4b02b12ab014 100755 --- a/testautomation/writer/optional/includes/table/w_204a_.inc +++ b/testautomation/writer/optional/includes/table/w_204a_.inc @@ -134,7 +134,7 @@ testcase sTableAlignment if ((Breite.IsWritable AND NachRechts.IsWritable) <> TRUE) then warnlog "edit field not active " if (LiberalMeasurement(PAGEWIDTH ,(StrToDouble (Breite.GetText) + StrToDouble (NachRechts.GetText))) <> TRUE) then if PAGEWIDTH < 0 then - QAErrorlog "#i78144#Cdbl returns wrong values" + warnlog "Cdbl returns wrong values" else warnlog "measurement value error "+ "is: "+(StrToDouble (Breite.GetText) + StrToDouble (NachRechts.GetText))+" should: " + PAGEWIDTH end if @@ -152,7 +152,7 @@ testcase sTableAlignment if (temp(1) <> NachRechts.GetText) then warnlog "value changed" if (LiberalMeasurement(PAGEWIDTH ,(StrToDouble (Breite.GetText) + StrToDouble (NachRechts.GetText))) <> TRUE) then if PAGEWIDTH < 0 then - QAErrorlog "#i78144#Cdbl returns wrong values" + warnlog "Cdbl returns wrong values" else warnlog "measurement value error "+ "is: "+(StrToDouble (Breite.GetText) + StrToDouble (NachRechts.GetText))+" should: "+PAGEWIDTH end if @@ -166,7 +166,7 @@ testcase sTableAlignment if ((Breite.IsWritable AND NachLinks.IsWritable) <> TRUE) then warnlog "edit field not active " if (LiberalMeasurement(PAGEWIDTH ,StrToDouble (Breite.GetText) + StrToDouble(NachLinks.GetText)) <> TRUE) then if PAGEWIDTH < 0 then - QAErrorlog "#i78144#Cdbl returns wrong values" + warnlog "Cdbl returns wrong values" else warnlog "measurement value error "+ "is: "+(StrToDouble (Breite.GetText) + StrToDouble (NachLinks.GetText))+" should: "+PAGEWIDTH end if @@ -189,7 +189,7 @@ testcase sTableAlignment if (temp(1) <> NachLinks.GetText) then warnlog "value changed"+" should: "+temp(1)+" is: "+ NachLinks.GetText if (LiberalMeasurement(PAGEWIDTH ,StrToDouble (Breite.GetText) + StrToDouble(NachLinks.GetText)) <> TRUE) then if PAGEWIDTH < 0 then - QAErrorlog "#i78144#Cdbl returns wrong values" + warnlog "Cdbl returns wrong values" else warnlog "measurement value error "+ "is: "+(StrToDouble (Breite.GetText) + StrToDouble (NachLinks.GetText))+" should: "+PAGEWIDTH end if @@ -202,7 +202,7 @@ testcase sTableAlignment if ((Breite.IsWritable AND NachLinks.IsWritable) <> TRUE) then warnlog "edit field not active " if (LiberalMeasurement(PAGEWIDTH ,StrToDouble (Breite.GetText) + StrToDouble(NachLinks.GetText)) <> TRUE) then if PAGEWIDTH < 0 then - QAErrorlog "#i78144#Cdbl returns wrong values" + warnlog "Cdbl returns wrong values" else warnlog "measurement value error "+ "is: "+(StrToDouble (Breite.GetText) + StrToDouble (NachLinks.GetText))+" should: "+PAGEWIDTH end if @@ -220,7 +220,7 @@ testcase sTableAlignment if (temp(1) <> NachLinks.GetText) then warnlog "value changed" if (LiberalMeasurement(PAGEWIDTH ,StrToDouble (Breite.GetText) + StrToDouble(NachLinks.GetText)) <> TRUE) then if PAGEWIDTH < 0 then - QAErrorlog "#i78144#Cdbl returns wrong values" + warnlog "Cdbl returns wrong values" else warnlog "measurement value error "+ "is: "+(StrToDouble (Breite.GetText) + StrToDouble (NachLinks.GetText))+" should: "+PAGEWIDTH end if @@ -233,7 +233,7 @@ testcase sTableAlignment if ((Breite.IsWritable AND NachLinks.IsWritable) <> TRUE) then warnlog "edit field not active " if (LiberalMeasurement(PAGEWIDTH ,StrToDouble (Breite.GetText) + (2 * StrToDouble (NachLinks.GetText))) <> TRUE) then if PAGEWIDTH < 0 then - QAErrorlog "#i78144#Cdbl returns wrong values" + warnlog "Cdbl returns wrong values" else warnlog "measurement value error "+ "is: "+(StrToDouble (Breite.GetText) + StrToDouble (NachLinks.GetText))+" should: "+PAGEWIDTH end if @@ -251,7 +251,7 @@ testcase sTableAlignment if (temp(1) <> NachLinks.GetText) then warnlog "value changed" if (LiberalMeasurement(PAGEWIDTH ,StrToDouble (Breite.GetText) + (2 * StrToDouble (NachLinks.GetText))) <> TRUE) then if PAGEWIDTH < 0 then - QAErrorlog "#i78144#Cdbl returns wrong values" + warnlog "Cdbl returns wrong values" else warnlog "measurement value error "+ "is: "+(StrToDouble (Breite.GetText) + StrToDouble (NachLinks.GetText))+" should: "+PAGEWIDTH end if @@ -264,7 +264,7 @@ testcase sTableAlignment if ((Breite.IsWritable AND NachLinks.IsWritable AND NachRechts.IsWritable) <> TRUE) then warnlog "edit field not active " if (LiberalMeasurement(PAGEWIDTH ,StrToDouble (Breite.GetText) + StrToDouble (NachLinks.GetText) + StrToDouble (NachRechts.GetText)) <> TRUE) then if PAGEWIDTH < 0 then - QAErrorlog "#i78144#Cdbl returns wrong values" + warnlog "Cdbl returns wrong values" else warnlog "measurement value error "+ "is: "+(StrToDouble (Breite.GetText) + StrToDouble (NachLinks.GetText)+ StrToDouble (NachRechts.GetText))+" should: "+PAGEWIDTH end if @@ -285,7 +285,7 @@ testcase sTableAlignment if (temp(2) <> NachRechts.GetText) then warnlog "value changed" if (LiberalMeasurement(PAGEWIDTH ,StrToDouble (Breite.GetText) + StrToDouble (NachLinks.GetText) + StrToDouble (NachRechts.GetText)) <> TRUE) then if PAGEWIDTH < 0 then - QAErrorlog "#i78144#Cdbl returns wrong values" + warnlog "Cdbl returns wrong values" else warnlog "measurement value error "+ "is: "+(StrToDouble (Breite.GetText) + StrToDouble (NachLinks.GetText)+ StrToDouble (NachRechts.GetText))+" should: "+PAGEWIDTH end if diff --git a/testautomation/writer/optional/includes/textframes/w_textframes5.inc b/testautomation/writer/optional/includes/textframes/w_textframes5.inc index 0aa4d4af7462..1e8aa4becfff 100755 --- a/testautomation/writer/optional/includes/textframes/w_textframes5.inc +++ b/testautomation/writer/optional/includes/textframes/w_textframes5.inc @@ -527,7 +527,7 @@ testcase tTextframes_83 '/// + input a positive number in vertical by Call fFormatFrame("TabType") if Vertical.GetItemCount <> 6 then - QAErrorlog "#i74734#Russian: Missing string in frame options" + warnlog " Missing string in frame options" TabType.Cancel Call hCloseDocument goto endsub @@ -589,7 +589,7 @@ testcase tTextframes_84 '/// + input a negative number in vertical by Call fFormatFrame("TabType") if Vertical.GetItemCount <> 6 then - QAErrorlog "#i74734#Russian: Missing string in frame options" + warnlog " Missing string in frame options" TabType.Cancel Call hCloseDocument goto endsub diff --git a/testautomation/writer/optional/includes/tools/tools1.inc b/testautomation/writer/optional/includes/tools/tools1.inc index a2138714c167..be5bbb5454c4 100755 --- a/testautomation/writer/optional/includes/tools/tools1.inc +++ b/testautomation/writer/optional/includes/tools/tools1.inc @@ -83,9 +83,9 @@ function fFormatGraphic(Options as string) as boolean try FormatGraphics - sSlotOK = true - catch - QAErrorlog "Unable to execute Format / Graphics" + sSlotOK = true + catch + warnlog "Unable to execute Format / Graphics" endcatch sleep(1) Kontext @@ -99,7 +99,7 @@ function fFormatGraphic(Options as string) as boolean case "TabZuschneiden" : active.SetPage TabZuschneiden case "TabUmrandung" : active.SetPage TabUmrandung case "TabHintergrund" : active.SetPage TabHintergrund - case "TabMakro" + case "TabMakro" active.SetPage TabMakro ' if no JRE is installed a messagebox appears Do @@ -107,7 +107,7 @@ function fFormatGraphic(Options as string) as boolean Kontext "Active" if Active.Exists then if Active.GetRT = 304 then - if j = 1 then Warnlog Active.Gettext + if j = 1 then Warnlog Active.Gettext Active.Ok else exit do diff --git a/testautomation/writer/required/includes/w_001_.inc b/testautomation/writer/required/includes/w_001_.inc index 2a6dec3b911b..c87a8e126ed6 100755 --- a/testautomation/writer/required/includes/w_001_.inc +++ b/testautomation/writer/required/includes/w_001_.inc @@ -681,7 +681,7 @@ goto endsub CountDocu = CountDocu + 1 Loop if CountDocu > 1 then - QAErrorlog "#i42080#More than 1 document had to be closed!" + QAErrorlog "More than 1 document had to be closed!" end if PrintLog "Close document" @@ -1070,9 +1070,9 @@ testcase tFileSendOutlineToPresentation Wait(500) try EditCopy - if GetClipboardText <> "Seite 1." then QAErrorlog "#i29453#Wrong Outline in Impress Outlinemode" + if GetClipboardText <> "Seite 1." then QAErrorlog "Wrong Outline in Impress Outlinemode" catch - QAErrorlog "#i47819#Send outline to presentation doesn't work correct." + QAErrorlog "Send outline to presentation doesn't work correct." endcatch else WarnLog "Outlinemode comes not up!" @@ -1127,7 +1127,7 @@ testcase tFileSendOutlineToClipboard Call wTypeKeys("<Up>", 6) Call wTypeKeys("<Home><Shift End>") EditCopy - if GetClipboardText <> "Seite 1." then QAErrorlog "#i29453#Wrong Outline in Impress Outlinemode" + if GetClipboardText <> "Seite 1." then QAErrorlog "Wrong Outline in Impress Outlinemode" WaitSlot(1000) PrintLog "Close active document" Call hCloseDocument @@ -1173,9 +1173,9 @@ testcase tFileSendCreateAutoabstract try EditCopy WaitSlot(1000) - if GetClipboardText <> "Seite 1." then QAErrorlog "#i29453#Wrong Outline in Impress Outlinemode" + if GetClipboardText <> "Seite 1." then QAErrorlog "Wrong Outline in Impress Outlinemode" catch - QAErrorlog "#i47819#Empty autoabstract created" + QAErrorlog "Empty autoabstract created" endcatch Kontext "Navigator" @@ -1235,9 +1235,9 @@ testcase tFileSendAutoabstractToPresentation try EditCopy WaitSlot(1000) - if GetClipboardText <> "Seite 1." then QAErrorlog "#i29453#Wrong Outline in Impress Outlinemode" + if GetClipboardText <> "Seite 1." then QAErrorlog "Wrong Outline in Impress Outlinemode" catch - QAErrorlog "#i42310#Edit / copy disabled. Maybe data could not be pasted correctly!" + QAErrorlog "Edit / copy disabled. Maybe data could not be pasted correctly!" endcatch else Warnlog "- Outline in Impress not created!" diff --git a/testautomation/writer/required/includes/w_001a_.inc b/testautomation/writer/required/includes/w_001a_.inc index 094b6e536e4b..3f680ef5adb8 100644 --- a/testautomation/writer/required/includes/w_001a_.inc +++ b/testautomation/writer/required/includes/w_001a_.inc @@ -246,7 +246,7 @@ testcase tFileTemplatesAddressbookSource AddressbookSource.Cancel end if else - QAErrorlog "#i62423#Adress Source Autopilot crashes" + Warnlog "Somethine wrong with Adress Source Autopilot - Check it." PrintLog " Close dialog" Kontext "AddressbookSource" AddressbookSource.Cancel diff --git a/testautomation/writer/required/includes/w_005_.inc b/testautomation/writer/required/includes/w_005_.inc index 8e200cdca6a7..061c5a5cbb96 100755 --- a/testautomation/writer/required/includes/w_005_.inc +++ b/testautomation/writer/required/includes/w_005_.inc @@ -556,7 +556,7 @@ testcase tFormatNumberingBullets try Auswahl.Click catch - QAErrorlog "#i67185#Numbering option 'Linked graphics' is missing" + QAErrorlog "Numbering option 'Linked graphics' is missing" TabOptionenNumerierung.Cancel Call hCloseDocument goto endsub @@ -604,7 +604,7 @@ testcase tFormatStylist PrintLog "- Format / Stylist" if gPlatgroup = "unx" then - QAErrorlog "HDE: Doesn't run on unix" + QAErrorlog "Doesn't run on unix" goto endsub end if printlog " Open new document" diff --git a/testautomation/writer/required/includes/w_007_.inc b/testautomation/writer/required/includes/w_007_.inc index ab43aad11393..94d851bb895e 100755 --- a/testautomation/writer/required/includes/w_007_.inc +++ b/testautomation/writer/required/includes/w_007_.inc @@ -307,7 +307,7 @@ testcase tToolsHyphenation end if if gBuild < 9239 then - QAErrorlog "#i81689#Hyphenation dialog freezes office!" + QAErrorlog "Hyphenation dialog freezes office!" goto endsub end if diff --git a/testautomation/writer/required/includes/w_010_.inc b/testautomation/writer/required/includes/w_010_.inc index 423c7c03e109..736ed462b508 100755 --- a/testautomation/writer/required/includes/w_010_.inc +++ b/testautomation/writer/required/includes/w_010_.inc @@ -495,7 +495,7 @@ testcase tNumSubpointsMoveUpMoveDown printlog " - move down 3 times" if Val(mid$(gMinor, 2, Len(gMinor))) >= 139 and Val(mid$(gMinor, 2, Len(gMinor))) <= 140 then - QAErrorlog "#57856#Loop when moving numbered list up and down with subpoints" + QAErrorlog "Loop when moving numbered list up and down with subpoints" else printlog " click 3 times move down in object bar" for i=1 to 3 @@ -911,7 +911,7 @@ testcase tUpSubpointsMoveUpMoveDown HochschiebenMitUnterpunkten.Click if Val(mid$(gMinor, 2, Len(gMinor))) >= 139 and Val(mid$(gMinor, 2, Len(gMinor))) <= 140 then - QAErrorlog "#57856#Loop when moving numbered list up and down with subpoints" + QAErrorlog "Loop when moving numbered list up and down with subpoints" else printlog " - move down 3 times" for i=1 to 3 diff --git a/testautomation/writer/required/includes/w_010_1.inc b/testautomation/writer/required/includes/w_010_1.inc index 66103a7a6541..b0527a748879 100644 --- a/testautomation/writer/required/includes/w_010_1.inc +++ b/testautomation/writer/required/includes/w_010_1.inc @@ -90,7 +90,7 @@ testcase tInsertFormula Sleep 1 Kontext "OL_SW_Rechenleiste" if OL_SW_Rechenleiste.NotExists then - QAErrorlog "Formula border doesn't come up" + warnlog "Formula border doesn't come up" else printlog " Click 'Cancel' in object bar" Verwerfen.Click @@ -504,7 +504,7 @@ testcase tGraphicBorders TB_Umrandungsstil.Close Sleep 1 catch - QAErrorlog "#i78975#Error in Toolbox Borderstyle" + Warnlog "Error in Toolbox Borderstyle" endcatch try @@ -518,7 +518,7 @@ testcase tGraphicBorders printlog " Close toolbox" Sleep 1 catch - QAErrorlog "#i78975#Error in Toolbox Colour" + warnlog "Error in Toolbox Colour" endcatch Call hCloseDocument @@ -709,7 +709,7 @@ testcase tFormulaApply Call wDokSchreiben ("<Mod1 A>") EditCopy if GetClipboardText <> "25" then - QAErrorlog "#i80314#Not possible to calculate in tables anymore. Result isn't 25, is: " + GetClipboardText + warnlog "Not possible to calculate in tables anymore. Result isn't 25, is: " + GetClipboardText endif Call hCloseDocument printlog " Close active document" diff --git a/testautomation/writer/required/includes/w_020_.inc b/testautomation/writer/required/includes/w_020_.inc index bad39d15f459..604a4005be93 100755 --- a/testautomation/writer/required/includes/w_020_.inc +++ b/testautomation/writer/required/includes/w_020_.inc @@ -223,7 +223,7 @@ testcase t_TB_InsertFields printlog "- Toolbox ( normal ) : Fields" if gPlatgroup = "unx" then - QAErrorlog "HDE: Doesn't run on unix" + QAErrorlog "Doesn't run on unix" goto endsub end if Call hNewDocument diff --git a/testautomation/writer/tools/includes/w_tool6.inc b/testautomation/writer/tools/includes/w_tool6.inc index 2f762efc0793..642f351b7e32 100755 --- a/testautomation/writer/tools/includes/w_tool6.inc +++ b/testautomation/writer/tools/includes/w_tool6.inc @@ -207,7 +207,7 @@ function wKillUpcomingActives(optional sDocument as string) else Select case sDocument Case "sw31.sdw", "sw31.vor" - QAErrorlog "#i76220#Saving sdw-file as sxw fails" + warnlog "Saving sdw-file as sxw fails" Case else Warnlog Active.Gettext end select diff --git a/testautomation/writer/tools/includes/w_tools.inc b/testautomation/writer/tools/includes/w_tools.inc index f3e41dab38c7..d63760c60298 100755 --- a/testautomation/writer/tools/includes/w_tools.inc +++ b/testautomation/writer/tools/includes/w_tools.inc @@ -839,7 +839,7 @@ sub wRectangleToClipboard try EditSelectAll catch - QAErrorlog "Unable to select object. Maybe not drawn!" + warnlog "Unable to select object. Maybe not drawn!" endcatch ' copy the selected object try |