diff options
Diffstat (limited to 'testautomation/writer')
14 files changed, 810 insertions, 1011 deletions
diff --git a/testautomation/writer/optional/includes/fields/w_fields4.inc b/testautomation/writer/optional/includes/fields/w_fields4.inc index f0444a21271b..0331c701032d 100755 --- a/testautomation/writer/optional/includes/fields/w_fields4.inc +++ b/testautomation/writer/optional/includes/fields/w_fields4.inc @@ -782,15 +782,15 @@ testcase tDocInformationPrinted if Active.GetRT = 304 then Active.Ok QAErrorLog "No Default-Printer! The testcase isn't tested !" - Kontext "DruckenDlg" + Kontext "Printing" Sleep 1 - DruckenDlg.Cancel + Printing.Cancel goto NoTest end if else - Kontext "DruckenDlg" + Kontext "Printing" Sleep 1 - DruckenDlg.OK + Printing.OK kontext "active" if active.exists(5) then QaErrorLog "Error Printing..." diff --git a/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic1.inc b/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic1.inc index 034bbd7c1793..ff010c0cda14 100755 --- a/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic1.inc +++ b/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic1.inc @@ -455,39 +455,34 @@ endcase testcase tInsertGraphic_8 - Dim iFileType as Integer - Dim iFileNumber as Integer - - iFileType = 1 'filter (Format <All>) - - if gPlatGroup = "unx" then - iFileNumber = 4 '4 graphic files. (directory hidden on Unix) - else - iFileNumber = 5 '4 graphic files and 1 directory. - end if - - PrintLog "- Test preselect Filter (Format <All>)" - '/// Test preselect Filter (Format <All>) - - Call hNewDocument - - '/// Insert a Graphic , Insert/Graphics/From file - InsertGraphicsFromFile - - '/// Select filter (Format <All>) - Kontext "GrafikEinfuegenDlg" - Dateiname.Settext (ConvertPath (gTesttoolpath + "writer\optional\input\insertgraphic") ) - Sleep 1 - Oeffnen.Click - - Dateityp.Select iFileType - Sleep 1 - - '/// Check if Filter (Format <All>) works well - if DateiAuswahl.GetItemCount <> iFileNumber then Warnlog "Filter (Format <All>) does NOT work well" - GrafikEinfuegenDlg.Cancel - - Call hCloseDocument + Dim iFileType as Integer + Dim iFileNumber as Integer + + iFileType = 1 'filter (Format <All>) + iFileNumber = 4 + + PrintLog "- Test preselect Filter (Format <All>)" + '/// Test preselect Filter (Format <All>) + + Call hNewDocument + + '/// Insert a Graphic , Insert/Graphics/From file + InsertGraphicsFromFile + + '/// Select filter (Format <All>) + Kontext "GrafikEinfuegenDlg" + Dateiname.Settext (ConvertPath (gTesttoolpath + "writer\optional\input\insertgraphic") ) + Sleep 1 + Oeffnen.Click + + Dateityp.Select iFileType + Sleep 1 + + '/// Check if Filter (Format <All>) works well + if DateiAuswahl.GetItemCount <> iFileNumber then Warnlog "Filter (Format <All>) does NOT work well" + GrafikEinfuegenDlg.Cancel + + Call hCloseDocument endcase @@ -495,39 +490,34 @@ endcase testcase tInsertGraphic_9 - Dim iFileType as Integer - Dim iFileNumber as Integer - - iFileType = 2 'another filter except for (Format <All>) -- bmp - - if gPlatGroup = "unx" then - iFileNumber = 1 - else - iFileNumber = 2 'the first is the .svn-directory - end if - - PrintLog "- Test preselect Filter excepte for (Format <All>)" - '/// Test preselect Filter excepte for (Format <All>) - - Call hNewDocument - - '/// Insert a Graphic , Insert/Graphics/From file - InsertGraphicsFromFile - - '/// Select filter 'BMP' - Kontext "GrafikEinfuegenDlg" - Dateiname.Settext (ConvertPath (gTesttoolpath + "writer\optional\input\insertgraphic") ) - Sleep 1 - Oeffnen.Click - - Dateityp.Select iFileType - Sleep 1 - - '/// Check if Filter BMP works well - if DateiAuswahl.GetItemCount <> iFileNumber then Warnlog "Filter BMP does NOT work well" - GrafikEinfuegenDlg.Cancel - - Call hCloseDocument + Dim iFileType as Integer + Dim iFileNumber as Integer + + iFileType = 2 'another filter except for (Format <All>) -- bmp + iFileNumber = 1 + + PrintLog "- Test preselect Filter excepte for (Format <All>)" + '/// Test preselect Filter excepte for (Format <All>) + + Call hNewDocument + + '/// Insert a Graphic , Insert/Graphics/From file + InsertGraphicsFromFile + + '/// Select filter 'BMP' + Kontext "GrafikEinfuegenDlg" + Dateiname.Settext (ConvertPath (gTesttoolpath + "writer\optional\input\insertgraphic") ) + Sleep 1 + Oeffnen.Click + + Dateityp.Select iFileType + Sleep 1 + + '/// Check if Filter BMP works well + if DateiAuswahl.GetItemCount <> iFileNumber then Warnlog "Filter BMP does NOT work well" + GrafikEinfuegenDlg.Cancel + + Call hCloseDocument endcase diff --git a/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic4.inc b/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic4.inc index 0a1790c1cbcb..83c59edb4a68 100755 --- a/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic4.inc +++ b/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic4.inc @@ -812,14 +812,14 @@ testcase tInsertGraphic_40 if Active.GetRT = 304 then Active.Ok QAErrorLog "No Default-Printer!" - Kontext "DruckenDlg" + Kontext "Printing" Sleep 1 - DruckenDlg.Cancel + Printing.Cancel end if else - Kontext "DruckenDlg" + Kontext "Printing" Sleep 1 - DruckenDlg.OK + Printing.OK Sleep 5 end if diff --git a/testautomation/writer/optional/includes/option/wh_o_1.inc b/testautomation/writer/optional/includes/option/wh_o_1.inc index 508030bdc4d7..73e129c47910 100755 --- a/testautomation/writer/optional/includes/option/wh_o_1.inc +++ b/testautomation/writer/optional/includes/option/wh_o_1.inc @@ -50,7 +50,7 @@ end sub '------------------------------------------------------------------------------ testcase tToolsOptionsHTMLContent - Dim irgendwas(17) as boolean + Dim bCheckboxStatus(17) as boolean printlog "tToolsOptionsHTMLContent datei erstellen zum laden" '/// uses "input\\writer\\optional\\options\\options1.sxw" /// @@ -63,23 +63,21 @@ testcase tToolsOptionsHTMLContent ToolsOptions Call hToolsOptions ("HTML","View") - irgendwas(1) = GrafikenUndObjekte.IsChecked - irgendwas(2) = Tabellen.IsChecked - irgendwas(3) = Zeichnungen.IsChecked - irgendwas(4) = Feldnamen.IsChecked - irgendwas(5) = Notizen.IsChecked + bCheckboxStatus(1) = GrafikenUndObjekte.IsChecked + bCheckboxStatus(3) = Zeichnungen.IsChecked + bCheckboxStatus(4) = Feldnamen.IsChecked + bCheckboxStatus(5) = Notizen.IsChecked - 'irgendwas(9) = Felder.IsChecked + 'bCheckboxStatus(9) = Felder.IsChecked printlog ("'/// - all states inverting ///") - if irgendwas(1) Then GrafikenUndObjekte.UnCheck Else GrafikenUndObjekte.Check - if irgendwas(2) Then Tabellen.UnCheck Else Tabellen.Check - if irgendwas(3) Then Zeichnungen.UnCheck Else Zeichnungen.Check - if irgendwas(4) Then Feldnamen.UnCheck Else Feldnamen.Check - if irgendwas(5) Then Notizen.UnCheck Else Notizen.Check + if bCheckboxStatus(1) Then GrafikenUndObjekte.UnCheck Else GrafikenUndObjekte.Check + if bCheckboxStatus(3) Then Zeichnungen.UnCheck Else Zeichnungen.Check + if bCheckboxStatus(4) Then Feldnamen.UnCheck Else Feldnamen.Check + if bCheckboxStatus(5) Then Notizen.UnCheck Else Notizen.Check - 'if irgendwas(9) Then Felder.UnCheck Else Felder.Check + 'if bCheckboxStatus(9) Then Felder.UnCheck Else Felder.Check Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK @@ -92,16 +90,14 @@ testcase tToolsOptionsHTMLContent ToolsOptions Call hToolsOptions ( "HTML","View" ) - if ( irgendwas(1) = GrafikenUndObjekte.IsChecked ) Then WarnLog "GrafikenUndObjekte state changed" - if ( irgendwas(2) = Tabellen.IsChecked ) Then WarnLog "Tabellen state changed" - if ( irgendwas(3) = Zeichnungen.IsChecked ) Then WarnLog "Zeichnungen state changed" - if ( irgendwas(4) = Feldnamen.IsChecked ) Then WarnLog "Feldnamen state changed" - if ( irgendwas(5) = Notizen.IsChecked ) Then WarnLog "Notizen state changed" + if ( bCheckboxStatus(1) = GrafikenUndObjekte.IsChecked ) Then WarnLog "Grafiken state changed" + if ( bCheckboxStatus(3) = Zeichnungen.IsChecked ) Then WarnLog "Zeichnungen state changed" + if ( bCheckboxStatus(4) = Feldnamen.IsChecked ) Then WarnLog "Feldnamen state changed" + if ( bCheckboxStatus(5) = Notizen.IsChecked ) Then WarnLog "Notizen state changed" printlog ("'/// - all UnCheck -> o ///") GrafikenUndObjekte.UnCheck - Tabellen.UnCheck Zeichnungen.UnCheck Feldnamen.UnCheck Notizen.UnCheck @@ -115,15 +111,13 @@ testcase tToolsOptionsHTMLContent ToolsOptions hToolsOptions ( "HTML","View" ) - if GrafikenUndObjekte.IsChecked Then WarnLog "GrafikenUndObjekte x" - if Tabellen.IsChecked Then WarnLog "Tabellen x" + if GrafikenUndObjekte.IsChecked Then WarnLog "Grafiken x" if Zeichnungen.IsChecked Then WarnLog "Zeichnungen x" if Feldnamen.IsChecked Then WarnLog "Feldnamen x" if Notizen.IsChecked Then WarnLog "Notizen x" Printlog ("'/// - all Check -> x ///") GrafikenUndObjekte.Check - Tabellen.Check Zeichnungen.Check Feldnamen.Check Notizen.Check @@ -135,18 +129,16 @@ testcase tToolsOptionsHTMLContent ToolsOptions Call hToolsOptions ( "HTML","View" ) - if true <> GrafikenUndObjekte.IsChecked Then WarnLog "GrafikenUndObjekte o" - if True <> Tabellen.IsChecked Then WarnLog "Tabellen o" + if true <> GrafikenUndObjekte.IsChecked Then WarnLog "Grafiken o" if True <> Zeichnungen.IsChecked Then WarnLog "Zeichnungen o" if True <> Feldnamen.IsChecked Then WarnLog "Feldnamen o" if True <> Notizen.IsChecked Then WarnLog "Notizen o" printlog ("'/// - restore states ///") - if ( irgendwas(1) = TRUE ) Then GrafikenUndObjekte.Check Else GrafikenUndObjekte.UnCheck - if ( irgendwas(2) = TRUE ) Then Tabellen.Check Else Tabellen.UnCheck - if ( irgendwas(3) = TRUE ) Then Zeichnungen.Check Else Zeichnungen.UnCheck - if ( irgendwas(4) = TRUE ) Then Feldnamen.Check Else Feldnamen.UnCheck - if ( irgendwas(5) = TRUE ) Then Notizen.Check Else Notizen.UnCheck + if ( bCheckboxStatus(1) = TRUE ) Then GrafikenUndObjekte.Check Else GrafikenUndObjekte.UnCheck + if ( bCheckboxStatus(3) = TRUE ) Then Zeichnungen.Check Else Zeichnungen.UnCheck + if ( bCheckboxStatus(4) = TRUE ) Then Feldnamen.Check Else Feldnamen.UnCheck + if ( bCheckboxStatus(5) = TRUE ) Then Notizen.Check Else Notizen.UnCheck Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK @@ -158,7 +150,7 @@ endcase '------------------------------------------------------------------------------ testcase tToolsOptionsHTMLLayout - Dim irgendwas(11) as boolean + Dim bCheckboxStatus(11) as boolean Dim iMasseinheit(3) as integer Dim iTemp(3) as integer '///Open "writer\\optional\\input\\options\\options1.sxw /// @@ -169,15 +161,15 @@ testcase tToolsOptionsHTMLLayout ToolsOptions Call hToolsOptions ( "HTML" , "VIEW" ) '*TabLayoutHTML/ (1) - irgendwas(1) = Hilfslinien.IsChecked - irgendwas(2) = FarbigeHandles.IsChecked - irgendwas(3) = GrosseHandles.IsChecked - irgendwas(4) = HorizontaleBildlaufleiste.IsChecked - irgendwas(5) = VertikaleBildlaufleiste.IsChecked - irgendwas(10) = Lineal.IsChecked - irgendwas(6) = HorizontalesLineal.IsChecked - irgendwas(7) = VertikalesLineal.IsChecked - irgendwas(8) = WeichesScrollen.IsChecked + bCheckboxStatus(1) = Hilfslinien.IsChecked + bCheckboxStatus(2) = FarbigeHandles.IsChecked + bCheckboxStatus(3) = GrosseHandles.IsChecked + bCheckboxStatus(4) = HorizontaleBildlaufleiste.IsChecked + bCheckboxStatus(5) = VertikaleBildlaufleiste.IsChecked + bCheckboxStatus(10) = Lineal.IsChecked + bCheckboxStatus(6) = HorizontalesLineal.IsChecked + bCheckboxStatus(7) = VertikalesLineal.IsChecked + bCheckboxStatus(8) = WeichesScrollen.IsChecked iMasseinheit(2) = HorizontalesLinealMasseinheit.GetSelIndex iMasseinheit(3) = VertikalesLinealMasseinheit.GetSelIndex @@ -185,17 +177,17 @@ testcase tToolsOptionsHTMLLayout printlog ("'/// - all states inverting ///") 'this one has 2 places: ViewTextBoundaries - if irgendwas(1) Then Hilfslinien.UnCheck Else Hilfslinien.Check - if irgendwas(2) Then FarbigeHandles.UnCheck Else FarbigeHandles.Check - if irgendwas(3) Then GrosseHandles.UnCheck Else GrosseHandles.Check + if bCheckboxStatus(1) Then Hilfslinien.UnCheck Else Hilfslinien.Check + if bCheckboxStatus(2) Then FarbigeHandles.UnCheck Else FarbigeHandles.Check + if bCheckboxStatus(3) Then GrosseHandles.UnCheck Else GrosseHandles.Check 'this one has 2 places: ViewRuler - if irgendwas(4) Then HorizontaleBildlaufleiste.UnCheck Else HorizontaleBildlaufleiste.Check - if irgendwas(5) Then VertikaleBildlaufleiste.UnCheck Else VertikaleBildlaufleiste.Check - if irgendwas(10) then Lineal.UnCheck Else Lineal.Check ' has to be checked to enable Horizontal and Vertical Ruler + if bCheckboxStatus(4) Then HorizontaleBildlaufleiste.UnCheck Else HorizontaleBildlaufleiste.Check + if bCheckboxStatus(5) Then VertikaleBildlaufleiste.UnCheck Else VertikaleBildlaufleiste.Check + if bCheckboxStatus(10) then Lineal.UnCheck Else Lineal.Check ' has to be checked to enable Horizontal and Vertical Ruler if Lineal.IsChecked then - if irgendwas(6) Then HorizontalesLineal.UnCheck Else HorizontalesLineal.Check - if irgendwas(7) Then VertikalesLineal.UnCheck Else VertikalesLineal.Check + if bCheckboxStatus(6) Then HorizontalesLineal.UnCheck Else HorizontalesLineal.Check + if bCheckboxStatus(7) Then VertikalesLineal.UnCheck Else VertikalesLineal.Check if ( HorizontalesLinealMasseinheit.GetItemCount <> iMasseinheit(2) ) Then HorizontalesLinealMasseinheit.Select (HorizontalesLinealMasseinheit.GetItemCount) Else HorizontalesLinealMasseinheit.Select (1) if ( VertikalesLinealMasseinheit.GetItemCount <> iMasseinheit(3) ) Then VertikalesLinealMasseinheit.Select (VertikalesLinealMasseinheit.GetItemCount) Else VertikalesLinealMasseinheit.Select (1) iTemp(2) = HorizontalesLinealMasseinheit.GetSelIndex @@ -203,13 +195,13 @@ testcase tToolsOptionsHTMLLayout '/// if Asian Language enabled there has to be a checkbox 'Right-aligned' for 'Vertical-Ruler' /// if gAsianSup = True and VertikalesLineal.IsChecked = True then if RechtsAusgerichtet.IsVisible = True then - if irgendwas(9) Then RechtsAusgerichtet.Uncheck Else RechtsAusgerichtet.Check + if bCheckboxStatus(9) Then RechtsAusgerichtet.Uncheck Else RechtsAusgerichtet.Check else Warnlog "- Checkbox 'Right-aligned' is not visible !" end if end if end if - if irgendwas(8) Then WeichesScrollen.UnCheck Else WeichesScrollen.Check + if bCheckboxStatus(8) Then WeichesScrollen.UnCheck Else WeichesScrollen.Check Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK @@ -222,22 +214,22 @@ testcase tToolsOptionsHTMLLayout ToolsOptions Call hToolsOptions ( "HTML" , "VIEW" ) '*TabLayoutHTML/ (1) - if ( irgendwas(1) = Hilfslinien.IsChecked ) Then WarnLog "Hilfslinien state changed" - if ( irgendwas(2) = FarbigeHandles.IsChecked ) Then WarnLog "FarbigeHandles state changed" - if ( irgendwas(3) = GrosseHandles.IsChecked ) Then WarnLog "GrosseHandles state changed" - if ( irgendwas(4) = HorizontaleBildlaufleiste.IsChecked ) Then WarnLog "HorizontaleBildlaufleiste state changed" - if ( irgendwas(5) = VertikaleBildlaufleiste.IsChecked ) Then WarnLog "VertikaleBildlaufleiste state changed" - if ( irgendwas(8) = WeichesScrollen.IsChecked ) Then WarnLog "WeichesScrollen state changed" - if ( irgendwas(10) = Lineal.IsChecked ) Then + if ( bCheckboxStatus(1) = Hilfslinien.IsChecked ) Then WarnLog "Hilfslinien state changed" + if ( bCheckboxStatus(2) = FarbigeHandles.IsChecked ) Then WarnLog "FarbigeHandles state changed" + if ( bCheckboxStatus(3) = GrosseHandles.IsChecked ) Then WarnLog "GrosseHandles state changed" + if ( bCheckboxStatus(4) = HorizontaleBildlaufleiste.IsChecked ) Then WarnLog "HorizontaleBildlaufleiste state changed" + if ( bCheckboxStatus(5) = VertikaleBildlaufleiste.IsChecked ) Then WarnLog "VertikaleBildlaufleiste state changed" + if ( bCheckboxStatus(8) = WeichesScrollen.IsChecked ) Then WarnLog "WeichesScrollen state changed" + if ( bCheckboxStatus(10) = Lineal.IsChecked ) Then WarnLog "Ruler state changed" - if ( irgendwas(6) = HorizontalesLineal.IsChecked ) Then WarnLog "HorizontalesLineal state changed" - if ( irgendwas(7) = VertikalesLineal.IsChecked ) Then WarnLog "VertikalesLineal state changed" + if ( bCheckboxStatus(6) = HorizontalesLineal.IsChecked ) Then WarnLog "HorizontalesLineal state changed" + if ( bCheckboxStatus(7) = VertikalesLineal.IsChecked ) Then WarnLog "VertikalesLineal state changed" if ( HorizontalesLinealMasseinheit.GetSelIndex <> iTemp(2) ) Then WarnLog "HorizontalesLinealMasseinheit state changed" if ( VertikalesLinealMasseinheit.GetSelIndex <> iTemp(3) ) Then WarnLog "VertikalesLinealMasseinheit state changed" if gAsianSup = True and VertikalesLineal.IsChecked = True then if RechtsAusgerichtet.IsVisible = True then - if irgendwas(9) = RechtsAusgerichtet.IsChecked then WarnLog "Right-aligned state changed" + if bCheckboxStatus(9) = RechtsAusgerichtet.IsChecked then WarnLog "Right-aligned state changed" else Warnlog "- Checkbox 'Right-aligned' is not visible !" end if @@ -381,19 +373,19 @@ testcase tToolsOptionsHTMLLayout ToolsOptions Call hToolsOptions ( "HTML" , "VIEW" ) - if ( irgendwas(1) = TRUE ) Then Hilfslinien.Check Else Hilfslinien.UnCheck - if ( irgendwas(2) = TRUE ) Then FarbigeHandles.Check Else FarbigeHandles.UnCheck - if ( irgendwas(3) = TRUE ) Then GrosseHandles.Check Else GrosseHandles.UnCheck + if ( bCheckboxStatus(1) = TRUE ) Then Hilfslinien.Check Else Hilfslinien.UnCheck + if ( bCheckboxStatus(2) = TRUE ) Then FarbigeHandles.Check Else FarbigeHandles.UnCheck + if ( bCheckboxStatus(3) = TRUE ) Then GrosseHandles.Check Else GrosseHandles.UnCheck - if ( irgendwas(4) = TRUE ) Then HorizontaleBildlaufleiste.Check Else HorizontaleBildlaufleiste.UnCheck - if ( irgendwas(5) = TRUE ) Then VertikaleBildlaufleiste.Check Else VertikaleBildlaufleiste.UnCheck + if ( bCheckboxStatus(4) = TRUE ) Then HorizontaleBildlaufleiste.Check Else HorizontaleBildlaufleiste.UnCheck + if ( bCheckboxStatus(5) = TRUE ) Then VertikaleBildlaufleiste.Check Else VertikaleBildlaufleiste.UnCheck Lineal.Check - if ( irgendwas(6) = TRUE ) Then HorizontalesLineal.Check Else HorizontalesLineal.UnCheck - if ( irgendwas(7) = TRUE ) Then VertikalesLineal.Check Else VertikalesLineal.UnCheck + if ( bCheckboxStatus(6) = TRUE ) Then HorizontalesLineal.Check Else HorizontalesLineal.UnCheck + if ( bCheckboxStatus(7) = TRUE ) Then VertikalesLineal.Check Else VertikalesLineal.UnCheck HorizontalesLinealMasseinheit.Select (iMasseinheit(2)) VertikalesLinealMasseinheit.Select (iMasseinheit(3)) - if ( irgendwas(8) = TRUE ) Then WeichesScrollen.Check Else WeichesScrollen.UnCheck + if ( bCheckboxStatus(8) = TRUE ) Then WeichesScrollen.Check Else WeichesScrollen.UnCheck Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK @@ -406,7 +398,7 @@ endcase '------------------------------------------------------------------------------ testcase tToolsOptionsHTMLGrid - Dim irgendwas(3) as boolean + Dim bCheckboxStatus(3) as boolean Dim sMetricField(4) as string ' MetricField Dim sTempMetricField(4) as string @@ -422,9 +414,9 @@ testcase tToolsOptionsHTMLGrid printlog ("'///TabRaster all UnCheck ! ///") - irgendwas(1) = FangrasterBenutzen.IsChecked - irgendwas(2) = RasterSichtbar.IsChecked - irgendwas(3) = AchsenSynchronisieren.IsChecked + bCheckboxStatus(1) = FangrasterBenutzen.IsChecked + bCheckboxStatus(2) = RasterSichtbar.IsChecked + bCheckboxStatus(3) = AchsenSynchronisieren.IsChecked sMetricField(1) = RasterAufloesungXAchse.GetText sMetricField(2) = RasterAufloesungYAchse.GetText @@ -433,9 +425,9 @@ testcase tToolsOptionsHTMLGrid printlog ("'/// - all states inverting ///") - if irgendwas(1) Then FangrasterBenutzen.UnCheck Else FangrasterBenutzen.Check - if irgendwas(2) Then RasterSichtbar.UnCheck Else RasterSichtbar.Check - ' if irgendwas(3) Then AchsenSynchronisieren.UnCheck Else AchsenSynchronisieren.Check + if bCheckboxStatus(1) Then FangrasterBenutzen.UnCheck Else FangrasterBenutzen.Check + if bCheckboxStatus(2) Then RasterSichtbar.UnCheck Else RasterSichtbar.Check + ' if bCheckboxStatus(3) Then AchsenSynchronisieren.UnCheck Else AchsenSynchronisieren.Check ' this CheckBox interacts with the MetricBoxes: AchsenSynchronisieren.UnCheck @@ -467,8 +459,8 @@ testcase tToolsOptionsHTMLGrid ToolsOptions Call hToolsOptions ( "HTML","Grid" ) - if (irgendwas(1) = FangrasterBenutzen.IsChecked ) Then WarnLog "FangrasterBenutzen state changed BugID: 82944 " - if (irgendwas(2) = RasterSichtbar.IsChecked ) Then WarnLog "RasterSichtbar state changed" + if (bCheckboxStatus(1) = FangrasterBenutzen.IsChecked ) Then WarnLog "FangrasterBenutzen state changed BugID: 82944 " + if (bCheckboxStatus(2) = RasterSichtbar.IsChecked ) Then WarnLog "RasterSichtbar state changed" if ( AchsenSynchronisieren.IsChecked = TRUE ) Then WarnLog "AchsenSynchronisieren state changed" if ( RasterAufloesungXAchse.GetText <> sTempMetricField(1) ) Then WarnLog "RasterAufloesungXAchse state changed" if ( RasterAufloesungYAchse.GetText <> sTempMetricField(2) ) Then WarnLog "RasterAufloesungYAchse state changed" @@ -638,9 +630,9 @@ testcase tToolsOptionsHTMLGrid ToolsOptions Call hToolsOptions ( "HTML","Grid" ) - if ( irgendwas(1) = TRUE ) Then FangrasterBenutzen.Check Else FangrasterBenutzen.UnCheck - if ( irgendwas(2) = TRUE ) Then RasterSichtbar.Check Else RasterSichtbar.UnCheck - if ( irgendwas(3) = TRUE ) Then AchsenSynchronisieren.Check Else AchsenSynchronisieren.UnCheck + if ( bCheckboxStatus(1) = TRUE ) Then FangrasterBenutzen.Check Else FangrasterBenutzen.UnCheck + if ( bCheckboxStatus(2) = TRUE ) Then RasterSichtbar.Check Else RasterSichtbar.UnCheck + if ( bCheckboxStatus(3) = TRUE ) Then AchsenSynchronisieren.Check Else AchsenSynchronisieren.UnCheck RasterAufloesungXAchse.SetText (sMetricField(1)) RasterAufloesungYAchse.SetText (sMetricField(2)) RasterUnterteilungXAchse.SetText (sMetricField(3)) diff --git a/testautomation/writer/optional/includes/option/wh_o_2.inc b/testautomation/writer/optional/includes/option/wh_o_2.inc index ca7c0a789349..dd25cb452c08 100755 --- a/testautomation/writer/optional/includes/option/wh_o_2.inc +++ b/testautomation/writer/optional/includes/option/wh_o_2.inc @@ -48,53 +48,28 @@ end sub '------------------------------------------------------------------------------ testcase tToolsOptionsHTMLPrint - dim irgendwas(12) as boolean ' Checkbox states + dim bCheckboxStatus(12) as boolean ' Checkbox states dim iListBox(1) as integer ' ListBox dim iTempListBox(1) as integer dim bRadioBut(4) as boolean ' RadioButtons dim bTempRadioBut(4) as boolean - ' sMetricField(i) and sTempMetricField(i) - '(1) = Grafiken - '(2) = Tabellen - '(3) = Zeichnungen - '(4) = Kontrollfelder - '(5) = Hintergrund - '(6) = SchwarzDrucken - ' - '(7) = LinkeSeiten - '(8) = RechteSeiten - '(9) = Umgekehrt - '(10)= Prospekt - ' - '(11)= EinzelneDruckauftraege - '(12)= AusDruckereinstellung - - ' bRadioBut(i) and bTempRadioBut(i) / RadioButton - '(1) = Keine - '(2) = NurNotizen - '(3) = Dokumentende - '(4) = Seitenende - Call hFileOpen ( gTesttoolPath + "writer\optional\input\options\test.html" ) Call sMakeReadOnlyDocumentEditable - printlog "'///- Tools/Options/HTML: PrintHTML ///" + printlog "- Tools/Options/HTML: PrintHTML " - printlog ("'/// - save states ///") + printlog (" - save states ") ToolsOptions Call hToolsOptions ("HTML","PRINT") - irgendwas(1) = Grafiken.IsChecked - irgendwas(2) = Tabellen.IsChecked - irgendwas(4) = Kontrollfelder.IsChecked - irgendwas(5) = Hintergrund.IsChecked - irgendwas(6) = SchwarzDrucken.IsChecked + bCheckboxStatus(1) = Grafiken.IsChecked + bCheckboxStatus(2) = Kontrollfelder.IsChecked + bCheckboxStatus(3) = Hintergrund.IsChecked + bCheckboxStatus(4) = SchwarzDrucken.IsChecked - irgendwas(9) = Umgekehrt.IsChecked - irgendwas(10)= Prospekt.IsChecked + bCheckboxStatus(5)= Prospekt.IsChecked - irgendwas(11)= EinzelneDruckauftraege.IsChecked - irgendwas(12)= AusDruckereinstellung.IsChecked + bCheckboxStatus(6)= AusDruckereinstellung.IsChecked iListBox(1) = Fax.GetSelIndex @@ -103,19 +78,16 @@ testcase tToolsOptionsHTMLPrint bRadioBut(3) = Dokumentende.IsChecked bRadioBut(4) = Seitenende.IsChecked - printlog ("'/// - all states inverting ///") + printlog (" - all states inverting ") - if irgendwas(1) Then Grafiken.UnCheck Else Grafiken.Check - if irgendwas(2) Then Tabellen.UnCheck Else Tabellen.Check - if irgendwas(4) Then Kontrollfelder.UnCheck Else Kontrollfelder.Check - if irgendwas(5) Then Hintergrund.UnCheck Else Hintergrund.Check - if irgendwas(6) Then SchwarzDrucken.UnCheck Else SchwarzDrucken.Check + if bCheckboxStatus(1) Then Grafiken.UnCheck Else Grafiken.Check + if bCheckboxStatus(2) Then Kontrollfelder.UnCheck Else Kontrollfelder.Check + if bCheckboxStatus(3) Then Hintergrund.UnCheck Else Hintergrund.Check + if bCheckboxStatus(4) Then SchwarzDrucken.UnCheck Else SchwarzDrucken.Check - if irgendwas(9) Then Umgekehrt.UnCheck Else Umgekehrt.Check - if irgendwas(10) Then Prospekt.UnCheck Else Prospekt.Check + if bCheckboxStatus(5) Then Prospekt.UnCheck Else Prospekt.Check - if irgendwas(11) Then EinzelneDruckauftraege.UnCheck Else EinzelneDruckauftraege.Check - if irgendwas(12) Then AusDruckereinstellung.UnCheck Else AusDruckereinstellung.Check + if bCheckboxStatus(6) Then AusDruckereinstellung.UnCheck Else AusDruckereinstellung.Check if (Keine.IsChecked = True) Then NurNotizen.Check Else Keine.Check @@ -134,25 +106,22 @@ testcase tToolsOptionsHTMLPrint Call hFileSaveAsKill(gOfficepath + "user\work\printtest.html") Call hCloseDocument - printlog ("'/// - SO quit - start ///") + printlog (" - SO quit - start ") Call wOfficeRestart - printlog ("'/// - checking states ///") + printlog (" - checking states ") ToolsOptions Call hToolsOptions ( "HTML" , "PRINT" ) - if ( irgendwas(1) = Grafiken.IsChecked ) Then WarnLog "'Graphics' state changed" - if ( irgendwas(2) = Tabellen.IsChecked ) Then WarnLog "'Tables' state changed" - if ( irgendwas(4) = Kontrollfelder.IsChecked ) Then WarnLog "'Controls' state changed" - if ( irgendwas(5) = Hintergrund.IsChecked ) Then WarnLog "'Background' state changed" - if ( irgendwas(6) = SchwarzDrucken.IsChecked ) Then WarnLog "'Print black' state changed" + if ( bCheckboxStatus(1) = Grafiken.IsChecked ) Then WarnLog "#i108219#'Graphics' state changed" + if ( bCheckboxStatus(2) = Kontrollfelder.IsChecked ) Then WarnLog "'Controls' state changed" + if ( bCheckboxStatus(3) = Hintergrund.IsChecked ) Then WarnLog "'Background' state changed" + if ( bCheckboxStatus(4) = SchwarzDrucken.IsChecked ) Then WarnLog "'Print black' state changed" - if ( irgendwas(9) = Umgekehrt.IsChecked ) Then WarnLog "'Reversed' state changed" - if ( irgendwas(10)= Prospekt.IsChecked ) Then WarnLog "'Brochure' state changed" + if ( bCheckboxStatus(5)= Prospekt.IsChecked ) Then WarnLog "'Brochure' state changed" - if ( irgendwas(11)= EinzelneDruckauftraege.IsChecked ) Then WarnLog "'Create single print jobs' state changed" - if ( irgendwas(12)= AusDruckereinstellung.IsChecked ) Then WarnLog "'Paper tray from printer settings' state changed" + if ( bCheckboxStatus(6)= AusDruckereinstellung.IsChecked ) Then WarnLog "'Paper tray from printer settings' state changed" if ( bTempRadioBut(1) <> Keine.IsChecked ) Then WarnLog "'None' state changed (Bug#99202)" if ( bTempRadioBut(2) <> NurNotizen.IsChecked ) Then WarnLog "'Notes only' state changed (Bug#99202)" @@ -161,18 +130,15 @@ testcase tToolsOptionsHTMLPrint if ( Fax.GetSelIndex <> iTempListBox(1) ) Then warnlog "Fax state changed" - printlog ("'/// - all UnCheck -> o ///") + printlog (" - all UnCheck -> o ") Grafiken.UnCheck - Tabellen.UnCheck Kontrollfelder.UnCheck Hintergrund.UnCheck SchwarzDrucken.UnCheck - Umgekehrt.UnCheck Prospekt.UnCheck - EinzelneDruckauftraege.UnCheck AusDruckereinstellung.UnCheck if (NurNotizen.IsChecked = True) Then Dokumentende.Check Else NurNotizen.Check @@ -187,20 +153,17 @@ testcase tToolsOptionsHTMLPrint Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK - printlog ("'/// - check if all UnChecked ///") + printlog (" - check if all UnChecked ") ToolsOptions Call hToolsOptions ( "HTML" , "PRINT" ) if Grafiken.IsChecked Then WarnLog "'Graphics' x" - if Tabellen.IsChecked Then WarnLog "'Tables' x" if Kontrollfelder.IsChecked Then WarnLog "'Controls' x" if Hintergrund.IsChecked Then WarnLog "'Background' x" if SchwarzDrucken.IsChecked Then WarnLog "'Print black' x" - if Umgekehrt.IsChecked Then WarnLog "'Reversed' x" if Prospekt.IsChecked Then WarnLog "'Brochure' x" - if EinzelneDruckauftraege.IsChecked Then WarnLog "'Create single print jobs' x" if AusDruckereinstellung.IsChecked Then WarnLog "'Paper tray from printer settings' x" ' Is saved with document @@ -217,18 +180,15 @@ testcase tToolsOptionsHTMLPrint if ( Fax.GetSelIndex <> 1 ) Then WarnLog "Fax is not item 1" - Printlog ("'/// - all Check -> x ///") + Printlog (" - all Check -> x ") Grafiken.Check - Tabellen.Check Kontrollfelder.Check Hintergrund.Check SchwarzDrucken.Check - Umgekehrt.Check Prospekt.Check - EinzelneDruckauftraege.Check AusDruckereinstellung.Check if (Dokumentende.IsChecked = True) Then Seitenende.Check Else Dokumentende.Check @@ -243,20 +203,17 @@ testcase tToolsOptionsHTMLPrint Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK - printlog ("'/// - check if all Checked ///") + printlog (" - check if all Checked ") ToolsOptions Call hToolsOptions ( "HTML" , "PRINT" ) if not Grafiken.IsChecked Then WarnLog "'Graphics' o" - if not Tabellen.IsChecked Then WarnLog "'Tables' o" if not Kontrollfelder.IsChecked Then WarnLog "'Controls' o" if not Hintergrund.IsChecked Then WarnLog "'Background' o" if not SchwarzDrucken.IsChecked Then WarnLog "'Print black' o" - if not Umgekehrt.IsChecked Then WarnLog "'Reversed' o" if not Prospekt.IsChecked Then WarnLog "'Brochure' o" - if not EinzelneDruckauftraege.IsChecked Then WarnLog "'Create single print jobs' o" if not AusDruckereinstellung.IsChecked Then WarnLog "'Paper tray from printer settings' o" if ( bTempRadioBut(1) <> Keine.IsChecked ) Then WarnLog "'None' state changed" @@ -269,21 +226,18 @@ testcase tToolsOptionsHTMLPrint Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.Cancel - printlog ("'/// - restore states ///") + printlog (" - restore states ") ToolsOptions Call hToolsOptions ( "HTML" , "PRINT" ) - if ( irgendwas(1) = TRUE ) Then Grafiken.Check Else Grafiken.UnCheck - if ( irgendwas(2) = TRUE ) Then Tabellen.Check Else Tabellen.UnCheck - if ( irgendwas(4) = TRUE ) Then Kontrollfelder.Check Else Kontrollfelder.UnCheck - if ( irgendwas(5) = TRUE ) Then Hintergrund.Check Else Hintergrund.UnCheck - if ( irgendwas(6) = TRUE ) Then SchwarzDrucken.Check Else SchwarzDrucken.UnCheck + if ( bCheckboxStatus(1) = TRUE ) Then Grafiken.Check Else Grafiken.UnCheck + if ( bCheckboxStatus(2) = TRUE ) Then Kontrollfelder.Check Else Kontrollfelder.UnCheck + if ( bCheckboxStatus(3) = TRUE ) Then Hintergrund.Check Else Hintergrund.UnCheck + if ( bCheckboxStatus(4) = TRUE ) Then SchwarzDrucken.Check Else SchwarzDrucken.UnCheck - if ( irgendwas(9) = TRUE ) Then Umgekehrt.Check Else Umgekehrt.UnCheck - if ( irgendwas(10) = TRUE ) Then Prospekt.Check Else Prospekt.UnCheck + if ( bCheckboxStatus(5) = TRUE ) Then Prospekt.Check Else Prospekt.UnCheck - if ( irgendwas(11) = TRUE ) Then EinzelneDruckauftraege.Check Else EinzelneDruckauftraege.UnCheck - if ( irgendwas(12) = TRUE ) Then AusDruckereinstellung.Check Else AusDruckereinstellung.UnCheck + if ( bCheckboxStatus(7) = TRUE ) Then AusDruckereinstellung.Check Else AusDruckereinstellung.UnCheck try Fax.Select (iListBox(1)) @@ -332,9 +286,9 @@ testcase tToolsOptionsHTMLTable '(3) = Variabel Call hNewDocument - printlog ("'///- Tools/Options/HTML: Table ///") + printlog ("- Tools/Options/HTML: Table ") - printlog ("'/// - save states ///") + printlog (" - save states ") ToolsOptions Call hToolsOptions ("HTML","Table") @@ -349,7 +303,7 @@ testcase tToolsOptionsHTMLTable if ((bRadioBut(1) Xor bRadioBut(2) Xor bRadioBut(3)) = False) Then Warnlog (" RadioButtons have NO init state: " + bRadioBut(1) +", BugID: 83097") - printlog ("'/// - all states inverting ///") + printlog (" - all states inverting ") VerschiebenZeile.ToMax VerschiebenSpalte.ToMax @@ -373,11 +327,11 @@ testcase tToolsOptionsHTMLTable Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK - printlog ("'/// - SO quit - start ///") + printlog (" - SO quit - start ") Call wOfficeRestart - printlog ("'/// - checking states ///") + printlog (" - checking states ") ToolsOptions Call hToolsOptions ( "HTML" , "Table" ) @@ -393,7 +347,7 @@ testcase tToolsOptionsHTMLTable Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK - printlog ("'/// - all UnCheck -> o ///") + printlog (" - all UnCheck -> o ") ToolsOptions Call hToolsOptions ( "HTML" , "Table" ) @@ -405,7 +359,7 @@ testcase tToolsOptionsHTMLTable sTempMetricField(2) = VerschiebenSpalte.GetText sTempMetricField(3) = EinfuegenZeile.GetText sTempMetricField(4) = EinfuegenSpalte.GetText - printlog ("'/// More test ///'") + printlog (" More test ///'") VerschiebenZeile.More VerschiebenSpalte.More EinfuegenZeile.More @@ -428,7 +382,7 @@ testcase tToolsOptionsHTMLTable Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK - printlog ("'/// - check if all UnChecked ///") + printlog (" - check if all UnChecked ") ToolsOptions Call hToolsOptions ( "HTML" , "Table" ) @@ -441,7 +395,7 @@ testcase tToolsOptionsHTMLTable if ( bTempRadioBut(2) <> FixProportional.IsChecked) Then WarnLog "Behaviour of rows/columns : 'Fixed, proportional' state changed" if ( bTempRadioBut(3) <> Variabel.IsChecked ) Then WarnLog "Behaviour of rows/columns : 'Variable' state changed" - Printlog ("'/// - all Check -> x ///") + Printlog (" - all Check -> x ") VerschiebenZeile.ToMax VerschiebenSpalte.ToMax @@ -451,7 +405,7 @@ testcase tToolsOptionsHTMLTable sTempMetricField(2) = VerschiebenSpalte.GetText sTempMetricField(3) = EinfuegenZeile.GetText sTempMetricField(4) = EinfuegenSpalte.GetText - printlog ("'/// Less test ///'") + printlog (" Less test ///'") VerschiebenZeile.Less VerschiebenSpalte.Less EinfuegenZeile.Less @@ -474,7 +428,7 @@ testcase tToolsOptionsHTMLTable Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK - printlog ("'/// - check if all Checked ///") + printlog (" - check if all Checked ") ToolsOptions Call hToolsOptions ( "HTML" , "Table" ) @@ -487,7 +441,7 @@ testcase tToolsOptionsHTMLTable if ( bTempRadioBut(2) <> FixProportional.IsChecked) Then WarnLog "Behaviour of rows/columns : 'Fixed, proportional' state changed" if ( bTempRadioBut(3) <> Variabel.IsChecked ) Then WarnLog "Behaviour of rows/columns : 'Variable' state changed" - printlog ("'/// - restore states ///") + printlog (" - restore states ") VerschiebenZeile.SetText (sMetricField(1)) VerschiebenSpalte.SetText (sMetricField(2)) @@ -510,7 +464,7 @@ testcase tToolsOptionsHTMLTable1 '/// This testcase check for this bug /// Call hNewDocument - printlog ("'///- Tools/Options/Text document: Table ///") + printlog ("- Tools/Options/Text document: Table ") ToolsOptions Call hToolsOptions ("WRITER","Table") diff --git a/testautomation/writer/optional/includes/option/wr_o_1.inc b/testautomation/writer/optional/includes/option/wr_o_1.inc index e55ebbd73280..e20d47236dc5 100755 --- a/testautomation/writer/optional/includes/option/wr_o_1.inc +++ b/testautomation/writer/optional/includes/option/wr_o_1.inc @@ -441,18 +441,16 @@ testcase tToolsOptionsWriterView5 Call hToolsOptions ("WRITER","VIEW") option_value(1) = GrafikenUndObjekte.IsChecked - option_value(2) = Tabellen.IsChecked - option_value(3) = Zeichnungen.IsChecked - option_value(4) = Feldname.IsChecked - option_value(5) = Notizen.IsChecked + option_value(2) = Zeichnungen.IsChecked + option_value(3) = Feldname.IsChecked + option_value(4) = Notizen.IsChecked printlog ("'/// - all states inverting ///") if option_value(1) then GrafikenUndObjekte.UnCheck else GrafikenUndObjekte.Check - if option_value(2) then Tabellen.UnCheck else Tabellen.Check - if option_value(3) then Zeichnungen.UnCheck else Zeichnungen.Check - if option_value(4) then Feldname.UnCheck else Feldname.Check - if option_value(5) then Notizen.UnCheck else Notizen.Check + if option_value(2) then Zeichnungen.UnCheck else Zeichnungen.Check + if option_value(3) then Feldname.UnCheck else Feldname.Check + if option_value(4) then Notizen.UnCheck else Notizen.Check Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK @@ -465,11 +463,10 @@ testcase tToolsOptionsWriterView5 ToolsOptions Call hToolsOptions ( "WRITER" , "VIEW" ) - if ( option_value(1) = GrafikenUndObjekte.IsChecked ) then WarnLog "GrafikenUndObjekte state changed" - if ( option_value(2) = Tabellen.IsChecked ) then WarnLog "Tabellen state changed" - if ( option_value(3) = Zeichnungen.IsChecked ) then WarnLog "Zeichnungen state changed" - if ( option_value(4) = Feldname.IsChecked ) then WarnLog "Feldname state changed" - if ( option_value(5) = Notizen.IsChecked ) then WarnLog "Notizen state changed" + if ( option_value(1) = GrafikenUndObjekte.IsChecked ) then WarnLog "Graphics and objects state changed" + if ( option_value(2) = Zeichnungen.IsChecked ) then WarnLog "Zeichnungen state changed" + if ( option_value(3) = Feldname.IsChecked ) then WarnLog "Feldname state changed" + if ( option_value(4) = Notizen.IsChecked ) then WarnLog "Notizen state changed" Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK @@ -499,15 +496,13 @@ testcase tToolsOptionsWriterView6 Call hToolsOptions ("WRITER","VIEW") option_value(1) = GrafikenUndObjekte.IsChecked - option_value(2) = Tabellen.IsChecked - option_value(3) = Zeichnungen.IsChecked - option_value(4) = Feldname.IsChecked - option_value(5) = Notizen.IsChecked + option_value(2) = Zeichnungen.IsChecked + option_value(3) = Feldname.IsChecked + option_value(4) = Notizen.IsChecked printlog ("'/// - all states unchecked ///") GrafikenUndObjekte.UnCheck - Tabellen.UnCheck Zeichnungen.UnCheck Feldname.UnCheck Notizen.UnCheck @@ -523,18 +518,16 @@ testcase tToolsOptionsWriterView6 ToolsOptions Call hToolsOptions ( "WRITER" , "VIEW" ) - if GrafikenUndObjekte.IsChecked then WarnLog "GrafikenUndObjekte x" - if Tabellen.IsChecked then WarnLog "Tabellen x" + if GrafikenUndObjekte.IsChecked then WarnLog "Graphics and objects x" if Zeichnungen.IsChecked then WarnLog "Zeichnungen x" if Feldname.IsChecked then WarnLog "Feldname x" if Notizen.IsChecked then WarnLog "Notizen x" printlog ("'/// - restore states ///") if ( option_value(1) = TRUE ) Then GrafikenUndObjekte.Check Else GrafikenUndObjekte.UnCheck - if ( option_value(2) = TRUE ) Then Tabellen.Check Else Tabellen.UnCheck - if ( option_value(3) = TRUE ) Then Zeichnungen.Check Else Zeichnungen.UnCheck - if ( option_value(4) = TRUE ) Then Feldname.Check Else Feldname.UnCheck - if ( option_value(5) = TRUE ) Then Notizen.Check Else Notizen.UnCheck + if ( option_value(2) = TRUE ) Then Zeichnungen.Check Else Zeichnungen.UnCheck + if ( option_value(3) = TRUE ) Then Feldname.Check Else Feldname.UnCheck + if ( option_value(4) = TRUE ) Then Notizen.Check Else Notizen.UnCheck Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK @@ -564,15 +557,13 @@ testcase tToolsOptionsWriterView7 Call hToolsOptions ("WRITER","VIEW") option_value(1) = GrafikenUndObjekte.IsChecked - option_value(2) = Tabellen.IsChecked - option_value(3) = Zeichnungen.IsChecked - option_value(4) = Feldname.IsChecked - option_value(5) = Notizen.IsChecked + option_value(2) = Zeichnungen.IsChecked + option_value(3) = Feldname.IsChecked + option_value(4) = Notizen.IsChecked printlog ("'/// - all Check -> x ///") GrafikenUndObjekte.Check - Tabellen.Check Zeichnungen.Check Feldname.Check Notizen.Check @@ -588,8 +579,7 @@ testcase tToolsOptionsWriterView7 ToolsOptions hToolsOptions ( "WRITER" , "VIEW" ) - if true <> GrafikenUndObjekte.IsChecked then WarnLog "GrafikenUndObjekte o" - if true <> Tabellen.IsChecked then WarnLog "Tabellen." + if true <> GrafikenUndObjekte.IsChecked then WarnLog "Graphics and objects o" if true <> Zeichnungen.IsChecked then WarnLog "Zeichnungen o" if true <> Feldname.IsChecked then WarnLog "Feldname o" if true <> Notizen.IsChecked then WarnLog "Notizen o" diff --git a/testautomation/writer/optional/includes/option/wr_o_2.inc b/testautomation/writer/optional/includes/option/wr_o_2.inc index 78bff9f411ff..f677a5c39ed5 100755 --- a/testautomation/writer/optional/includes/option/wr_o_2.inc +++ b/testautomation/writer/optional/includes/option/wr_o_2.inc @@ -451,14 +451,12 @@ testcase tToolsOptionsWriterPrint1 ' sMetricField(i) and sTempMetricField(i) '(1) = Grafiken '(2) = Tabellen - '(3) = Zeichnungen '(4) = Kontrollfelder '(5) = Hintergrund '(6) = SchwarzDrucken ' '(7) = LinkeSeiten '(8) = RechteSeiten - '(9) = Umgekehrt '(10)= Prospekt ' '(11)= EinzelneDruckauftraege @@ -480,20 +478,18 @@ testcase tToolsOptionsWriterPrint1 Call hToolsOptions ("WRITER","PRINT") bCheckboxes(1) = Grafiken.IsChecked - bCheckboxes(2) = Tabellen.IsChecked - bCheckboxes(3) = Zeichnungen.IsChecked - bCheckboxes(4) = Kontrollfelder.IsChecked - bCheckboxes(5) = Hintergrund.IsChecked - bCheckboxes(6) = SchwarzDrucken.IsChecked + bCheckboxes(2) = Kontrollfelder.IsChecked + bCheckboxes(3) = Hintergrund.IsChecked + bCheckboxes(4) = SchwarzDrucken.IsChecked + bCheckboxes(5) = HiddenText.IsChecked + bCheckboxes(6) = TextPlaceholder.IsChecked bCheckboxes(7) = LinkeSeiten.IsChecked bCheckboxes(8) = RechteSeiten.IsChecked - bCheckboxes(9) = Umgekehrt.IsChecked - bCheckboxes(10)= Prospekt.IsChecked + bCheckboxes(9)= Prospekt.IsChecked - bCheckboxes(11)= EinzelneDruckauftraege.IsChecked - bCheckboxes(12)= AusDruckereinstellung.IsChecked - bCheckboxes(13)= LeereSeitenDrucken.IsChecked + bCheckboxes(10)= LeereSeitenDrucken.IsChecked + bCheckboxes(11)= AusDruckereinstellung.IsChecked iListBox(1) = Fax.GetSelText @@ -504,21 +500,19 @@ testcase tToolsOptionsWriterPrint1 printlog ("'/// - all states inverting ///") - if bCheckboxes(1) then Grafiken.UnCheck else Grafiken.Check - if bCheckboxes(2) then Tabellen.UnCheck else Tabellen.Check - if bCheckboxes(3) then Zeichnungen.UnCheck else Zeichnungen.Check - if bCheckboxes(4) then Kontrollfelder.UnCheck else Kontrollfelder.Check - if bCheckboxes(5) then Hintergrund.UnCheck else Hintergrund.Check - if bCheckboxes(6) then SchwarzDrucken.UnCheck else SchwarzDrucken.Check + if bCheckboxes(1) then Grafiken.UnCheck else Grafiken.Check + if bCheckboxes(2) then Kontrollfelder.UnCheck else Kontrollfelder.Check + if bCheckboxes(3) then Hintergrund.UnCheck else Hintergrund.Check + if bCheckboxes(4) then SchwarzDrucken.UnCheck else SchwarzDrucken.Check + if bCheckboxes(5) then HiddenText.UnCheck else HiddenText.Check + if bCheckboxes(6) then TextPlaceholder.UnCheck else TextPlaceholder.Check - if bCheckboxes(7) then LinkeSeiten.UnCheck else LinkeSeiten.Check - if bCheckboxes(8) then RechteSeiten.UnCheck else RechteSeiten.Check - if bCheckboxes(9) then Umgekehrt.UnCheck else Umgekehrt.Check - if bCheckboxes(10) then Prospekt.UnCheck else Prospekt.Check + if bCheckboxes(7) then LinkeSeiten.UnCheck else LinkeSeiten.Check + if bCheckboxes(8) then RechteSeiten.UnCheck else RechteSeiten.Check + if bCheckboxes(9) then Prospekt.UnCheck else Prospekt.Check - if bCheckboxes(11) then EinzelneDruckauftraege.UnCheck else EinzelneDruckauftraege.Check - if bCheckboxes(12) then AusDruckereinstellung.UnCheck else AusDruckereinstellung.Check - if bCheckboxes(13) then LeereSeitenDrucken.UnCheck else LeereSeitenDrucken.Check + if bCheckboxes(10) then LeereSeitenDrucken.UnCheck else LeereSeitenDrucken.Check + if bCheckboxes(11) then AusDruckereinstellung.UnCheck else AusDruckereinstellung.Check if (Keine.IsChecked = True) then NurNotizen.Check else Keine.Check @@ -574,21 +568,19 @@ testcase tToolsOptionsWriterPrint1 ToolsOptions Call hToolsOptions ( "WRITER" , "PRINT" ) - if ( bCheckboxes(1) = Grafiken.IsChecked ) then WarnLog "Grafiken state changed" - if ( bCheckboxes(2) = Tabellen.IsChecked ) then WarnLog "Tabellen state changed" - if ( bCheckboxes(3) = Zeichnungen.IsChecked ) then WarnLog "Zeichnungen state changed" - if ( bCheckboxes(4) = Kontrollfelder.IsChecked ) then WarnLog "Kontrollfelder state changed" - if ( bCheckboxes(5) = Hintergrund.IsChecked ) then WarnLog "Hintergrund state changed" - if ( bCheckboxes(6) = SchwarzDrucken.IsChecked ) then WarnLog "SchwarzDrucken state changed" + if ( bCheckboxes(1) = Grafiken.IsChecked ) then WarnLog "Grafiken state changed" + if ( bCheckboxes(2) = Kontrollfelder.IsChecked ) then WarnLog "Kontrollfelder state changed" + if ( bCheckboxes(3) = Hintergrund.IsChecked ) then WarnLog "Hintergrund state changed" + if ( bCheckboxes(4) = SchwarzDrucken.IsChecked ) then WarnLog "SchwarzDrucken state changed" + if ( bCheckboxes(5) = HiddenText.IsChecked ) then WarnLog "HiddenText state changed" + if ( bCheckboxes(6) = TextPlaceholder.IsChecked ) then WarnLog "TextPlaceholder state changed" if ( bCheckboxes(7) = LinkeSeiten.IsChecked ) then WarnLog "LinkeSeiten state changed" if ( bCheckboxes(8) = RechteSeiten.IsChecked ) then WarnLog "RechteSeiten state changed" - if ( bCheckboxes(9) = Umgekehrt.IsChecked ) then WarnLog "Umgekehrt state changed" - if ( bCheckboxes(10)= Prospekt.IsChecked ) then WarnLog "Prospekt state changed" + if ( bCheckboxes(9)= Prospekt.IsChecked ) then WarnLog "Prospekt state changed" - if ( bCheckboxes(11)= EinzelneDruckauftraege.IsChecked ) then WarnLog "EinzelneDruckauftraege state changed" - 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 ( bCheckboxes(10)= LeereSeitenDrucken.IsChecked ) then WarnLog "'Print automatically inserted blank pages' state changed" + if ( bCheckboxes(11)= AusDruckereinstellung.IsChecked ) then WarnLog "AusDruckereinstellung state changed" if ( Fax.GetSelIndex <> iTempListBox(1) ) Then warnlog "Fax state changed" @@ -613,18 +605,17 @@ testcase tToolsOptionsWriterPrint1 printlog ("'/// - all UnCheck -> o ///") Grafiken.UnCheck - Tabellen.UnCheck - Zeichnungen.UnCheck Kontrollfelder.UnCheck Hintergrund.UnCheck SchwarzDrucken.UnCheck + HiddenText.UnCheck + TextPlaceholder.UnCheck LinkeSeiten.UnCheck RechteSeiten.UnCheck - Umgekehrt.UnCheck Prospekt.UnCheck - EinzelneDruckauftraege.UnCheck + LeereSeitenDrucken.UnCheck AusDruckereinstellung.UnCheck if (NurNotizen.IsChecked = True) then Dokumentende.Check else NurNotizen.Check @@ -644,20 +635,19 @@ testcase tToolsOptionsWriterPrint1 ToolsOptions Call hToolsOptions ( "WRITER" , "PRINT" ) - if Grafiken.IsChecked then WarnLog "Grafiken x" - if Tabellen.IsChecked then WarnLog "Tabellen x" - if Zeichnungen.IsChecked then WarnLog "Zeichnungen x" - if Kontrollfelder.IsChecked then WarnLog "Kontrollfelder x" - if Hintergrund.IsChecked then WarnLog "Hintergrund x" - if SchwarzDrucken.IsChecked then WarnLog "SchwarzDrucken x" + if Grafiken.IsChecked then WarnLog "Grafiken is checked" + if Kontrollfelder.IsChecked then WarnLog "Kontrollfelder is checked" + if Hintergrund.IsChecked then WarnLog "Hintergrund is checked" + if SchwarzDrucken.IsChecked then WarnLog "SchwarzDrucken is checked" + if HiddenText.IsChecked then WarnLog "HiddenText is checked" + if TextPlaceholder.IsChecked then WarnLog "TextPlaceholder is checked" - if LinkeSeiten.IsChecked then WarnLog "LinkeSeiten x" - if RechteSeiten.IsChecked then WarnLog "RechteSeiten x" - if Umgekehrt.IsChecked then WarnLog "Umgekehrt x" - if Prospekt.IsChecked then WarnLog "Prospekt x" + if LinkeSeiten.IsChecked then WarnLog "LinkeSeiten is checked" + if RechteSeiten.IsChecked then WarnLog "RechteSeiten is checked" + if Prospekt.IsChecked then WarnLog "Prospekt is checked" - if EinzelneDruckauftraege.IsChecked then WarnLog "EinzelneDruckauftraege x" - if AusDruckereinstellung.IsChecked then WarnLog "AusDruckereinstellung x" + if LeereSeitenDrucken.IsChecked then WarnLog "LeereSeitenDrucken is checked" + if AusDruckereinstellung.IsChecked then WarnLog "AusDruckereinstellung is checked" if ( bTempRadioBut(1) <> Keine.IsChecked ) then WarnLog "Keine state changed" if ( bTempRadioBut(2) <> NurNotizen.IsChecked ) then WarnLog "NurNotizen state changed" @@ -669,18 +659,17 @@ testcase tToolsOptionsWriterPrint1 Printlog ("'/// - all Check -> x ///") Grafiken.Check - Tabellen.Check - Zeichnungen.Check Kontrollfelder.Check Hintergrund.Check SchwarzDrucken.Check + HiddenText.Check + TextPlaceholder.Check LinkeSeiten.Check RechteSeiten.Check - Umgekehrt.Check Prospekt.Check - EinzelneDruckauftraege.Check + LeereSeitenDrucken.Check AusDruckereinstellung.Check if (Dokumentende.IsChecked = True) then Seitenende.Check else Dokumentende.Check @@ -700,20 +689,19 @@ testcase tToolsOptionsWriterPrint1 ToolsOptions Call hToolsOptions ( "WRITER" , "PRINT" ) - if not Grafiken.IsChecked then WarnLog "Grafiken o" - if not Tabellen.IsChecked then WarnLog "Tabellen o" - if not Zeichnungen.IsChecked then WarnLog "Zeichnungen o" - if not Kontrollfelder.IsChecked then WarnLog "Kontrollfelder o" - if not Hintergrund.IsChecked then WarnLog "Hintergrund o" - if not SchwarzDrucken.IsChecked then WarnLog "SchwarzDrucken o" + if not Grafiken.IsChecked then WarnLog "Grafiken is unchecked" + if not Kontrollfelder.IsChecked then WarnLog "Kontrollfelder is unchecked" + if not Hintergrund.IsChecked then WarnLog "Hintergrund is unchecked" + if not SchwarzDrucken.IsChecked then WarnLog "SchwarzDrucken is unchecked" + if not HiddenText.IsChecked then WarnLog "HiddenText is unchecked " + if not TextPlaceholder.IsChecked then WarnLog "TextPlaceholder is unchecked" - if not LinkeSeiten.IsChecked then WarnLog "LinkeSeiten o" - if not RechteSeiten.IsChecked then WarnLog "RechteSeiten o" - if not Umgekehrt.IsChecked then WarnLog "Umgekehrt o" - if not Prospekt.IsChecked then WarnLog "Prospekt o" + if not LinkeSeiten.IsChecked then WarnLog "LinkeSeiten is unchecked" + if not RechteSeiten.IsChecked then WarnLog "RechteSeiten is unchecked" + if not Prospekt.IsChecked then WarnLog "Prospekt is unchecked" - if not EinzelneDruckauftraege.IsChecked then WarnLog "EinzelneDruckauftraege o" - if not AusDruckereinstellung.IsChecked then WarnLog "AusDruckereinstellung o" + if not LeereSeitenDrucken.IsChecked then WarnLog "LeereSeitenDrucken is unchecked" + if not AusDruckereinstellung.IsChecked then WarnLog "AusDruckereinstellung is unchecked" ' This state will be saved with the document if ( bTempRadioBut(1) <> Keine.IsChecked ) then WarnLog "Keine state changed" @@ -730,21 +718,19 @@ testcase tToolsOptionsWriterPrint1 ToolsOptions Call hToolsOptions ( "WRITER" , "PRINT" ) - if ( bCheckboxes(1) = TRUE ) then Grafiken.Check else Grafiken.UnCheck - if ( bCheckboxes(2) = TRUE ) then Tabellen.Check else Tabellen.UnCheck - if ( bCheckboxes(3) = TRUE ) then Zeichnungen.Check else Zeichnungen.UnCheck - if ( bCheckboxes(4) = TRUE ) then Kontrollfelder.Check else Kontrollfelder.UnCheck - if ( bCheckboxes(5) = TRUE ) then Hintergrund.Check else Hintergrund.UnCheck - if ( bCheckboxes(6) = TRUE ) then SchwarzDrucken.Check else SchwarzDrucken.UnCheck - - if ( bCheckboxes(7) = TRUE ) then LinkeSeiten.Check else LinkeSeiten.UnCheck - if ( bCheckboxes(8) = TRUE ) then RechteSeiten.Check else RechteSeiten.UnCheck - if ( bCheckboxes(9) = TRUE ) then Umgekehrt.Check else Umgekehrt.UnCheck - if ( bCheckboxes(10) = TRUE ) then Prospekt.Check else Prospekt.UnCheck - - if ( bCheckboxes(11) = TRUE ) then EinzelneDruckauftraege.Check else EinzelneDruckauftraege.UnCheck - if ( bCheckboxes(12) = TRUE ) then AusDruckereinstellung.Check else AusDruckereinstellung.UnCheck - if ( bCheckboxes(13) = TRUE ) then LeereSeitenDrucken.Check else LeereSeitenDrucken.UnCheck + if ( bCheckboxes(1) = TRUE ) then Grafiken.Check else Grafiken.Uncheck + if ( bCheckboxes(2) = TRUE ) then Kontrollfelder.Check else Kontrollfelder.UnCheck + if ( bCheckboxes(3) = TRUE ) then Hintergrund.Check else Hintergrund.Uncheck + if ( bCheckboxes(4) = TRUE ) then SchwarzDrucken.Check else SchwarzDrucken.UnCheck + if ( bCheckboxes(5) = TRUE ) then HiddenText.check else HiddenText.Uncheck + if ( bCheckboxes(6) = TRUE ) then TextPlaceholder.check else TextPlaceholder.Uncheck + + if ( bCheckboxes(7) = TRUE ) then LinkeSeiten.Check else LinkeSeiten.Uncheck + if ( bCheckboxes(8) = TRUE ) then RechteSeiten.Check else RechteSeiten.Uncheck + if ( bCheckboxes(9) = TRUE ) then Prospekt.Check else Prospekt.Uncheck + + if ( bCheckboxes(10) = TRUE ) then LeereSeitenDrucken.Check else LeereSeitenDrucken.UnCheck + if ( bCheckboxes(11) = TRUE ) then AusDruckereinstellung.Check else AusDruckereinstellung.UnCheck try Fax.Select (iListBox(1)) diff --git a/testautomation/writer/optional/includes/option/wr_o_4.inc b/testautomation/writer/optional/includes/option/wr_o_4.inc index deb98f579ce1..6a3ca9dd50f3 100755 --- a/testautomation/writer/optional/includes/option/wr_o_4.inc +++ b/testautomation/writer/optional/includes/option/wr_o_4.inc @@ -78,9 +78,9 @@ testcase tToolsOptionsWriterOther '- !!! -Current Document only- ist bei office beenden zu beachten!!! Call hNewDocument - printlog ("'///- Tools/Options/Writer: General ///") + printlog ("- Tools/Options/Writer: General ") - printlog ("'/// - save states ///") + printlog (" - save states ") ToolsOptions Call hToolsOptions ("WRITER","GENERAL") @@ -94,7 +94,7 @@ testcase tToolsOptionsWriterOther iMasseinheit = Masseinheit.GetSelIndex sTabAbstand = Tabulatorenabstand.GetText - printlog ("'/// - all states inverting ///") + printlog ("- all states inverting ") if irgendwas(2) Then Feldbefehle.UnCheck Else Feldbefehle.Check if Feldbefehle.IsChecked Then if irgendwas(3) Then Diagramme.UnCheck Else Diagramme.Check @@ -124,11 +124,11 @@ testcase tToolsOptionsWriterOther Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK - printlog ("'/// - SO quit - start ///") + printlog ("- SO quit - start ") Call wOfficeRestart - printlog ("'/// - checking states ///") + printlog ("- checking states ") ToolsOptions Call hToolsOptions ( "WRITER" , "GENERAL" ) @@ -144,7 +144,7 @@ testcase tToolsOptionsWriterOther Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK - printlog ("'/// - all UnCheck -> o ///") + printlog ("- all UnCheck -> o ") ToolsOptions Call hToolsOptions ( "WRITER" , "GENERAL" ) @@ -159,7 +159,7 @@ testcase tToolsOptionsWriterOther Masseinheit.Select (1) Tabulatorenabstand.ToMin sTemp = Tabulatorenabstand.GetText - printlog ("'/// More test ///'") + printlog ("More test ///'") Tabulatorenabstand.More if ( sTemp = Tabulatorenabstand.GetText ) Then WarnLog "Tabulatorenabstand More-Button not working; stemp1: "+sTemp + " =? (2) " +Tabulatorenabstand.GetText sTemp = Tabulatorenabstand.GetText @@ -167,7 +167,7 @@ testcase tToolsOptionsWriterOther Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK - printlog ("'/// - check if all UnChecked ///") + printlog ("- check if all UnChecked ") ToolsOptions Call hToolsOptions ( "WRITER" , "GENERAL" ) @@ -186,7 +186,7 @@ testcase tToolsOptionsWriterOther '--------------------------------------------------------------------------------- - printlog ("'/// check if tab stops get saved in document ///") + printlog ("- check if tab stops get saved in document ") Call hNewDocument ' set Default Tab Stop to 2,5cm @@ -240,7 +240,7 @@ testcase tToolsOptionsWriterOther Call hCloseDocument '--------------------------------------------------------------------------------- - Printlog ("'/// - all Check -> x ///") + Printlog ("- all Check -> x ") ToolsOptions Call hToolsOptions ("WRITER","GENERAL") @@ -264,7 +264,7 @@ testcase tToolsOptionsWriterOther Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK - printlog ("'/// - check if all Checked ///") + printlog ("- check if all Checked ") ToolsOptions Call hToolsOptions ( "WRITER" , "GENERAL" ) @@ -280,7 +280,7 @@ testcase tToolsOptionsWriterOther if ( Masseinheit.GetSelIndex <> iTemp ) Then WarnLog "Masseinheit is not item " + iTemp + " it's: " + Masseinheit.GetSelIndex if (LiberalMeasurement (sTemp,Tabulatorenabstand.GetText) <> TRUE ) Then WarnLog "Tabulatorenabstand is not " + sTemp + " it's: " + Tabulatorenabstand.GetText - printlog ("'/// - restore states ///") + printlog ("- restore states ") ' if ( irgendwas(1) = TRUE ) Then NurFuerAktuellesDokument.Check Else NurFuerAktuellesDokument.UnCheck if ( irgendwas(2) = TRUE ) Then Feldbefehle.Check Else Feldbefehle.UnCheck @@ -327,7 +327,7 @@ sub hGetAllOptionsWriterGeneralCaption fHoleTabPage2 = ConvertPath(gOfficePath + "user\work\opt2_" + iSprache + "." + gPlatGroup) '------------------------ - Printlog "'///(1/3) Get all items before selecting smth. ///" + Printlog "(1/3) Get all items before selecting smth. " ' put them in lsHoleTabPage and write them to 'user\work\opt__...' Call hNewDocument @@ -355,7 +355,7 @@ sub hGetAllOptionsWriterGeneralCaption ' ------------------------ - Printlog "'///(2/3) Select every ListItem & exit with OK ///" + Printlog "(2/3) Select every ListItem & exit with OK " ToolsOptions Call hToolsOptions ("WRITER","AutoCaption") Kontext "TabAutoCaption" @@ -381,7 +381,7 @@ sub hGetAllOptionsWriterGeneralCaption ExtrasOptionenDlg.OK '------------------------ - Printlog "'///(3/3) Get all items after selecting all ///" + Printlog "(3/3) Get all items after selecting all " ' put them in lsHoleTabPage2 and write them to 'user\work\opt2_...' ToolsOptions @@ -429,9 +429,9 @@ testcase tToolsOptionsWriterAutoCaption '/// !no more Listentries than 9, you have to update the allocation for the var's! ///' Call hNewDocument - printlog "'///- Tools/Options/Writer: AutoCaption ///" + printlog "- Tools/Options/Writer: AutoCaption " - printlog ("'/// - save states ///") + printlog ("- save states ") ToolsOptions Call hToolsOptions ("WRITER","AutoCaption") Kontext "TabAutoCaption" @@ -463,7 +463,7 @@ testcase tToolsOptionsWriterAutoCaption next i '-- just checking the checkboxes of 'ObjectList' - printlog ("'/// - uncheck all object - checkboxes ///") + printlog ("- uncheck all object - checkboxes ") for i=1 to NumberOfObjects ObjectList.Select (i) ObjectList.UnCheck @@ -471,7 +471,7 @@ testcase tToolsOptionsWriterAutoCaption Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK - printlog ("'/// - verify if all unchecked and check all ///") + printlog ("- verify if all unchecked and check all ") ToolsOptions Call hToolsOptions ("WRITER","AutoCaption") Kontext "TabAutoCaption" @@ -486,7 +486,7 @@ testcase tToolsOptionsWriterAutoCaption Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK - printlog ("'/// - verify all checkboxes are checked ///") + printlog ("- verify all checkboxes are checked ") ToolsOptions Call hToolsOptions ("WRITER","AutoCaption") Kontext "TabAutoCaption" @@ -498,10 +498,11 @@ testcase tToolsOptionsWriterAutoCaption end if next i - printlog ("'/// - change states ///") + printlog ("- change states ") '/// look if properties get saved for each list item for i=1 to NumberOfObjects ObjectList.Select (i) + printlog " - " & ObjectList.GetText if ObjectList.IsChecked Then if i <= 7 then Numbering.Select i CaptionSeparator.Settext "Caption Separator " & cstr(i) @@ -520,16 +521,12 @@ testcase tToolsOptionsWriterAutoCaption ApplyBorderAndShadow.Check case 4: Category.Select 5 - Position.Select 2 case 5: Category.Select 2 - Position.Select 1 case 6: Category.Select 3 - Position.Select 2 case 7: Category.Select 4 - Position.Select 1 case 8: Category.Select 5 if Numbering.GetItemCount > 7 then @@ -537,7 +534,6 @@ testcase tToolsOptionsWriterAutoCaption else Numbering.Select 4 end if - Position.Select 2 case 9: Category.Select 2 if Numbering.GetItemCount > 7 then @@ -545,7 +541,6 @@ testcase tToolsOptionsWriterAutoCaption else Numbering.Select 5 end if - Position.Select 1 end select vCategoryTmp(i) = Category.GetSelText @@ -556,17 +551,17 @@ testcase tToolsOptionsWriterAutoCaption Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK - printlog ("'/// - SO quit - start ///") + printlog ("- SO quit - start") Call wOfficeRestart - printlog ("'/// - checking states ///") + printlog ("- checking states ") ToolsOptions Call hToolsOptions ("WRITER","AutoCaption") Kontext "TabAutoCaption" for i=1 to NumberOfObjects - printlog "- checking: " & ObjectList.Gettext ObjectList.Select (i) + printlog " - " & ObjectList.GetText wait 500 if ObjectList.IsChecked Then if i <= 7 then @@ -632,31 +627,31 @@ testcase tToolsOptionsWriterAutoCaption end if case 4: - if Position.GetSelIndex <> 2 then - Warnlog "- 'Position' changed after restart" + if Position.IsEnabled = true then + Warnlog "- 'Position' should be disabled" else - printlog "- 'Position' => ok" + printlog "- 'Position' disabled => ok" end if case 5: - if Position.GetSelIndex <> 1 then - Warnlog "- 'Position' changed after restart" + if Position.IsEnabled = true then + Warnlog "- 'Position' should be disabled" else - printlog "- 'Position' => ok" + printlog "- 'Position' disabled => ok" end if case 6: - if Position.GetSelIndex <> 2 then - Warnlog "- 'Position' changed after restart" + if Position.IsEnabled = true then + Warnlog "- 'Position' should be disabled" else - printlog "- 'Position' => ok" + printlog "- 'Position' disabled => ok" end if case 7: - if Position.GetSelIndex <> 1 then - Warnlog "- 'Position' changed after restart" + if Position.IsEnabled = true then + Warnlog "- 'Position' should be disabled" else - printlog "- 'Position' => ok" + printlog "- 'Position' disabled => ok" end if case 8: @@ -674,10 +669,10 @@ testcase tToolsOptionsWriterAutoCaption end if end if - if Position.GetSelIndex <> 2 then - Warnlog "- 'Position' changed after restart" + if Position.IsEnabled = true then + Warnlog "- 'Position' should be disabled" else - printlog "- 'Position' => ok" + printlog "- 'Position' disabled => ok" end if case 9: @@ -695,10 +690,10 @@ testcase tToolsOptionsWriterAutoCaption end if end if - if Position.GetSelIndex <> 1 then - Warnlog "- 'Position' changed after restart" + if Position.IsEnabled = true then + Warnlog "- 'Position' should be disabled" else - printlog "- 'Position' => ok" + printlog "- 'Position' disabled => ok" end if end select @@ -710,7 +705,7 @@ testcase tToolsOptionsWriterAutoCaption Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK - printlog ("'/// - restore states ///") + printlog ("- restore states ") ToolsOptions Call hToolsOptions ("WRITER","AutoCaption") @@ -765,10 +760,10 @@ testcase tToolsOptionsWriterGeneral ' State is saved with document. Thats why I use 3 docs Call hNewDocument - printlog "'///- Extras / Optionen / Sonstiges / Verkn?pfungen aktualisieren ///" + printlog "- Extras / Optionen / Sonstiges / Verkn?pfungen aktualisieren " ToolsOptions Call hToolsOptions("WRITER","GENERAL") - printlog "'///- Update links when loading -> always ///" + printlog "- Update links when loading -> always " Immer.Check Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK @@ -796,7 +791,7 @@ testcase tToolsOptionsWriterGeneral ToolsOptions Call hToolsOptions("WRITER","GENERAL") if not Immer.IsChecked then Warnlog "Option 'always' has not been changed" - printlog "'///- Update links when loading -> On request ///" + printlog "- Update links when loading -> On request " AufNachfrage.Check Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK @@ -820,7 +815,7 @@ testcase tToolsOptionsWriterGeneral ToolsOptions Call hToolsOptions("WRITER","GENERAL") if not AufNachfrage.IsChecked then Warnlog "Option 'On request' has been changed" - printlog "'///- Update links when loading -> Never ///" + printlog "- Update links when loading -> Never " Nie.Check Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK @@ -873,7 +868,7 @@ endcase testcase tToolsOptionsWriterMailMerge Call hNewDocument - printlog ("'///- Tools/Options/Writer: Mail Merge ///") + printlog ("- Tools/Options/Writer: Mail Merge ") Kontext "Navigator" if Navigator.Exists then ViewNavigator ToolsOptions diff --git a/testautomation/writer/optional/includes/option/wr_o_a.inc b/testautomation/writer/optional/includes/option/wr_o_a.inc index 2f917d4961c1..ce8eea6178c3 100755 --- a/testautomation/writer/optional/includes/option/wr_o_a.inc +++ b/testautomation/writer/optional/includes/option/wr_o_a.inc @@ -59,15 +59,11 @@ testcase tToolsOptionsWriterPrint Call hToolsOptions("WRITER","PRINT") Grafiken.Check - Tabellen.Check - Zeichnungen.Check Kontrollfelder.Check Hintergrund.Check SchwarzDrucken.Check LinkeSeiten.Check RechteSeiten.Check - Umgekehrt.Check - Prospekt.UnCheck Seitenende.Check @@ -97,14 +93,11 @@ testcase tToolsOptionsWriterPrint Printlog " - uncheck everything" Grafiken.UnCheck - Tabellen.UnCheck - Zeichnungen.UnCheck Kontrollfelder.UnCheck Hintergrund.UnCheck SchwarzDrucken.UnCheck LinkeSeiten.Check ' that's so, otherwise there will be no printing RechteSeiten.Check ' that's so, otherwise there will be no printing - Umgekehrt.UnCheck Prospekt.UnCheck Keine.Check AusDruckereinstellung.UnCheck diff --git a/testautomation/writer/optional/w_fields.bas b/testautomation/writer/optional/w_fields.bas index 9d2240321158..3eb650c5ad0e 100644 --- a/testautomation/writer/optional/w_fields.bas +++ b/testautomation/writer/optional/w_fields.bas @@ -93,7 +93,8 @@ end sub sub LoadIncludeFiles use "global\system\includes\master.inc" - use "global\system\includes\gvariabl.inc" + use "global\system\includes\gvariabl.inc" + Call GetUseFiles gApplication = "WRITER" end Sub diff --git a/testautomation/writer/optional/w_insertgraphic.bas b/testautomation/writer/optional/w_insertgraphic.bas index 84402564098a..ba2014952921 100644 --- a/testautomation/writer/optional/w_insertgraphic.bas +++ b/testautomation/writer/optional/w_insertgraphic.bas @@ -131,6 +131,7 @@ end sub sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" + Call GetUseFiles gApplication = "WRITER" end sub diff --git a/testautomation/writer/required/includes/w_001a_.inc b/testautomation/writer/required/includes/w_001a_.inc index cbfd5de23047..1b33d5360606 100644 --- a/testautomation/writer/required/includes/w_001a_.inc +++ b/testautomation/writer/required/includes/w_001a_.inc @@ -1,582 +1,480 @@ -'************************************************************************** -'* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -'* -'* Copyright 2008 by Sun Microsystems, Inc. -'* -'* OpenOffice.org - a multi-platform office productivity suite -'* -'* $RCSfile: w_001a_.inc,v $ -'* -'* $Revision: 1.2 $ -'* -'* last change: $Author: vg $ $Date: 2008-08-18 12:40:41 $ -'* -'* This file is part of OpenOffice.org. -'* -'* OpenOffice.org is free software: you can redistribute it and/or modify -'* it under the terms of the GNU Lesser General Public License version 3 -'* only, as published by the Free Software Foundation. -'* -'* OpenOffice.org is distributed in the hope that it will be useful, -'* but WITHOUT ANY WARRANTY; without even the implied warranty of -'* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -'* GNU Lesser General Public License version 3 for more details -'* (a copy is included in the LICENSE file that accompanied this code). -'* -'* You should have received a copy of the GNU Lesser General Public License -'* version 3 along with OpenOffice.org. If not, see -'* <http://www.openoffice.org/license.html> -'* for a copy of the LGPLv3 License. -'* -'/************************************************************************ -'* -'* owner : helge.delfs@sun.com -'* -'* short description: Testcases for the Writer Required-test. -'* -'\*********************************************************************** - -sub w_001a_ - - printLog Chr(13) + "--------- File Menu (w_001a_.inc) ----------" - gApplication = "WRITER" - - Call tFileProperties - - Call tFileTemplatesOrganize - Call tFileTemplatesAddressbookSource - Call tFileTemplatesSave - Call tFileTemplatesEdit - - Call tFilePagePreview - Call tFilePrint - Call tFilePrinterSetup - - 'Writer Master Document - gApplication = "MASTERDOCUMENT" - Call tMasterDocFilePagePreview - gApplication = "WRITER" - -end sub - -'----------------------------------------------------------- - -testcase tFileProperties - PrintLog "- File / Properties" - - printlog " Open new document" - Call hNewDocument - - printlog " File / Properties" - FileProperties - - WaitSlot(5000) - Kontext - try - active.SetPage TabDokument - catch - Warnlog "Dialog 'FileProperties' not up! (Bug#99828)" - goto endsub - endcatch - - printlog " Switch to Tabpage 'General'" - Kontext "TabDokument" - Call DialogTest (TabDokument) - - printlog " Switch to Tabpage 'Description'" - Kontext - active.SetPage TabDokumentinfo - Kontext "TabDokumentinfo" - Call DialogTest (TabDokumentinfo) - - - QAErrorlog "#i95523# - FileProperties - Tabpage 'User Defined' has changed. - Adaption of testcases needed." - ' printlog " Switch to Tabpage 'User defined'" - ' Kontext - ' active.SetPage TabBenutzer - ' Kontext "TabBenutzer" - ' Call DialogTest ( TabBenutzer ) - - ' Wait 500 - - ' Infofelder.Click - ' printlog " Click 'Infofields'" - ' Kontext "InfonamenBearbeiten" - ' printlog " Close upcoming dialog with 'Cancel'" - ' Call DialogTest (InfonamenBearbeiten) - ' InfonamenBearbeiten.Cancel - - printlog " Switch to Tabpage 'Internet'" - Kontext - active.SetPage TabInternet - Kontext "TabInternet" - Call DialogTest (TabInternet) - - printlog " Switch to Tabpage 'Statistics' and close dialog" - Kontext - active.SetPage TabStatistik - Kontext "TabStatistik" - Call DialogTest (TabStatistik) - TabStatistik.Close - - Sleep 1 - printlog " Close active document" - Call hCloseDocument -endcase - -'----------------------------------------------------------- - -testcase tFileTemplatesOrganize - Dim i as integer - - PrintLog " Open new document." - Call hNewDocument - PrintLog " File / Templates / Organize" - FileTemplatesOrganize - Kontext "DVVerwalten" - For i = 1 to 50 - if DVVerwalten.Exists then - i = 51 - else - Sleep 5 - end if - next i - if Not DVVerwalten.Exists then - Warnlog "Dialog 'Template Management' not up !" - Call hCloseDocument - goto endsub - end if - wait 500 - PrintLog " Select first entry in left list of dialog 'Template Management' (should be 'My Templates')" - ListeLinks.Select 1 - ListeLinks.TypeKeys "<Home>" - Sleep 1 - Befehle.Click - wait 500 - PrintLog " Select 'Commands -> Import Template'" - Call hMenuSelectNr(3) - Wait 500 - PrintLog " Close Filedialog." - if gUseSysDlg = False then - Kontext "OeffnenDlg" - if OeffnenDlg.Exists then - OeffnenDlg.Cancel - else - Warnlog "FileOpen dialog not up!" - end if - end if - - PrintLog " Select 'Commands -> Printer Settings" - Kontext "DVVerwalten" - Sleep 1 - Befehle.Click - wait 500 - Call hMenuSelectNr(4) - - PrintLog " Cancel 'Printer-Setup' dialog" - Kontext "DruckerEinrichten" - if DruckerEinrichten.Exists then - DruckerEinrichten.Cancel - else - Warnlog "Printersettings dialog is not up!" - end if - - PrintLog " Select first entry in right list" - Kontext "DVVerwalten" - ListeRechts.Select 1 - - PrintLog " Select pushbutton 'File..'" - if WelcheDatei.IsEnabled then - WelcheDatei.Click - if gUseSysDlg = False then - PrintLog " Cancel Filedialog" - Kontext "OeffnenDlg" - OeffnenDlg.Cancel - end if - end if - - PrintLog " Select pushbutton 'Address Book'" - Kontext "DVVerwalten" - AddressBook.Click - Kontext "AddressbookSource" - PrintLog " Cancel Dialog 'Address Book-Assignment'" - if AddressbookSource.Exists then - AddressbookSource.Cancel - else - Warnlog "the Dialog ' Address Book Source' wasnt up!" - end if - - PrintLog " Close dialog" - Kontext "DVVerwalten" - DVVerwalten.Close - - PrintLog " Close active document." - Call hCloseDocument -endcase - -'----------------------------------------------------------- - -testcase tFileTemplatesAddressbookSource - - PrintLog " Open new document" - Call hNewDocument - - PrintLog " File / Templates /Address Book Source..." - UseBindings - FileTemplatesAddressbookSource - - WaitSlot(2000) - PrintLog " In 'Address Book Assignement' dialog click pushbutton 'Administrate'" - Kontext "AddressbookSource" - if AddressbookSource.Exists then - Call DialogTest (AddressbookSource) - Administrate.Click - Sleep 2 - PrintLog " Close 'Data Source Administration' with 'Cancel'" - Kontext "DatabaseProperties" - if Not DatabaseProperties.Exists then - Kontext "AddressSourceAutopilot" - if AddressSourceAutopilot.Exists then - AddressSourceAutopilot.Cancel - end if - Kontext "AddressbookSource" - AddressbookSource.Cancel - else - PrintLog " DatabaseProperties.SetPage TabConnection" - Kontext "TabConnection" - Call DialogTest ( TabConnection ) - Kontext "DatabaseProperties" - DatabaseProperties.Close - Kontext "AddressbookSource" - PrintLog " Close dialog" - AddressbookSource.Cancel - end if - end if - - printlog " Close active document" - Call hCloseDocument -endcase - -'----------------------------------------------------------- - -testcase tFileTemplatesSave - if gApplication = "MASTERDOCUMENT" then - qaErrorLog " tFileTemplatesSave has been disabled in Masterdocument." - goto endsub - end if - printlog "- File / Templates / Save" - Call hNewDocument - printlog " Open new document" - FileTemplatesSave - printlog " File / Templates / Save" - - Kontext "DokumentVorlagen" - Call DialogTest ( DokumentVorlagen ) - printlog " On 'Templates' dialog click 'Organizer'" - - Verwalten.Click - Kontext "DVVerwalten" - DVVerwalten.Close - printlog " Close dialog 'Template Management'" - - Kontext "DokumentVorlagen" - DokumentVorlagen.Cancel - printlog " Close 'Templates' dialog" - - printlog " Close active document" - Call hCloseDocument - gApplication = "WRITER" -endcase - -'----------------------------------------------------------- - -testcase tFileTemplatesEdit - printlog "- File / Templates / Edit" - - printlog " Open new document" - Call hNewDocument - printlog " File / Templates / Edit" - FileTemplatesEdit - - if gUseSysDlg = False then - printlog " Cancel Filedialog" - Kontext "OeffnenDlg" - OeffnenDlg.Cancel - end if - - printlog " Close active document" - Call hCloseDocument -endcase - -'----------------------------------------------------------- - -testcase tFilePagePreview - PrintLog "- File / Page Preview" - Dim gehtnicht as boolean - gehtnicht = FALSE - printlog " Open new document" - Select Case gApplication - Case "WRITER" - Call hNewDocument - - Case "MASTERDOCUMENT" - Call hNewDocument - - Case "HTML" - printlog "Not in Writer/Web!" - goto endsub - end select - - printlog " Enter some text in document" - Call wTypeKeys("Just a small change!") - printlog " File / Page Preview" - FilePageView - WaitSlot (1000) - Kontext "DocPageViewWriter" - if DocPageViewWriter.NotExists then - Warnlog "Page Preview is not coming up!" - Kontext "Active" - if Active.Exists then - if Active.GetRT = 304 then - Active.No - end if - end if - else - if gehtnicht=FALSE then - Kontext "PreviewObjectbar" - if PreviewObjectbar.Exists = False then Call hToolbarSelect("PagePreview", true) - printlog " Select 'Zoom 100%' in toolbar" - try - Massstab.Select 4 - catch - Warnlog "Unable to change Zoom factor in toolbar! (Bug#110498)" - endcatch - - printlog " Click 'Print Page Preview' in toolbar" - Kontext "PreviewObjectbar" - DruckenSeitenansicht.Click - Kontext "Active" - if Active.Exists then - QAErrorlog "No default printer!" - Active.ok - Sleep 1 - Kontext "DruckenDlg" - if DruckenDlg.Exists then DruckenDlg.Cancel - else - printlog " Close 'Print' dialog with cancel" - Kontext "DruckenDlg" - DruckenDlg.Cancel - end if - - printlog " Click 'Print options page preview' in toolbar" - Kontext "PreviewObjectbar" - Skalierung.Click - printlog " Close 'Print Options' dialog with cancel" - Kontext "DruckOptionen" - Call DialogTest ( DruckOptionen ) - DruckOptionen.Cancel - - printlog " Close Page Preview with button 'Close Preview' in toolbar" - Kontext "PreviewObjectbar" - SeitenansichtSchliessen.Click - else - Warnlog "Objectbar not addressable!" - end if - end if - printlog " Close active document" - Call hCloseDocument -endcase - -'----------------------------------------------------------- - -testcase tFilePrint - PrintLog " Open new document" - Call hNewDocument - - PrintLog " File / Print" - FilePrint - - Kontext "Active" - WaitSlot(1000) - if Active.Exists then - if Active.GetRT = 304 then - QAErrorlog "No Default Printer!" - Active.Ok - Kontext "DruckenDlg" - if DruckenDlg.Exists then DruckenDlg.Cancel - Call hCloseDocument - goto endsub - end if - end if - Kontext "DruckenDlg" - if DruckenDlg.Exists then - PrintLog " In printer dialog click 'Options'" - Zusaetze.Click - Sleep 1 - - Kontext "DruckerZusaetzeWriter" - PrintLog " Close 'Print options' with 'Cancel'" - DruckerZusaetzeWriter.Cancel - Kontext "DruckenDlg" - - if gPlatGroup = "unx" then - if NOT Eigenschaften.IsEnabled AND gPlatform = "osx" then - QAErrorlog "#i81545#-macport File -> Print|Printer Settings: Properties button disabled" - Kontext "DruckenDlg" - DruckenDlg.Cancel - Call hCloseDocument - goto endsub - end if - PrintLog " On Unix-Platforms select 'Properties" - Eigenschaften.Click - sleep (3) - Kontext "TabSPAPaper" - if NOT TabSPAPaper.Exists then - Kontext "TabSPADevice" - if NOT TabSPADevice.Exists then - Warnlog "#i88799# - Non functional options-button in Print-dialog." - else - Kontext - Active.Setpage TabSPAPaper - Kontext "TabSPAPaper" - Call DialogTest ( TabSPAPaper ) - - printlog( "ALLES WIRD GUT!" ) - Kontext - Active.Setpage TabSPADevice - Kontext "TabSPADevice" - Call DialogTest ( TabSPADevice ) - - PrintLog " Cancel Printer Properties' (only unix)" - TabSPADevice.Cancel - end if - else - Kontext - Active.Setpage TabSPAPaper - Kontext "TabSPAPaper" - Call DialogTest ( TabSPAPaper ) - - printlog( "ALLES WIRD GUT!" ) - Kontext - Active.Setpage TabSPADevice - Kontext "TabSPADevice" - Call DialogTest ( TabSPADevice ) - - PrintLog " Cancel Printer Properties' (only unix)" - TabSPADevice.Cancel - end if - end if - Kontext "DruckenDlg" - Call DialogTest ( DruckenDlg ) - PrintLog " Close 'Print' dialog" - DruckenDlg.Cancel - else - Warnlog "Print dialog is not up !" - end if - - PrintLog " Close active document" - Call hCloseDocument -endcase - -'----------------------------------------------------------- - -testcase tFilePrinterSetup - PrintLog " Open new document" - Call hNewDocument - - PrintLog " File / Printer Settings" - FilePrintersettings - Kontext "Active" - WaitSlot(1000) - if Active.Exists then - if Active.GetRT = 304 then - QAErrorLog "No Default Printer!" - Active.Ok - Sleep 2 - Kontext "DruckerEinrichten" - if DruckerEinrichten.Exists then - Call DialogTest ( DruckerEinrichten ) - DruckerEinrichten.Cancel - end if - end if - else - Kontext "DruckerEinrichten" - Call DialogTest ( DruckerEinrichten ) - DruckerEinrichten.Cancel - PrintLog " Cancel 'Printer Setup' dialog" - end if - PrintLog " Close active document" - Call hCloseDocument -endcase - -'----------------------------------------------------------- - -testcase tMasterDocFilePagePreview - PrintLog "- File / Page Preview" - Dim gehtnicht as boolean - gehtnicht = FALSE - gApplication = "MASTERDOCUMENT" - printlog " Open new document" - Call hNewDocument - - printlog " Enter some text in document" - Call wTypeKeys("Just a small change!") - printlog " File / Page Preview" - FilePageView - WaitSlot (1000) - Kontext "DocPageViewWriter" - if DocPageViewWriter.NotExists then - Warnlog "Page Preview is not coming up!" - Kontext "Active" - if Active.Exists then - if Active.GetRT = 304 then - Active.No - end if - end if - else - if gehtnicht=FALSE then - Kontext "PreviewObjectbar" - if PreviewObjectbar.Exists = False then Call hToolbarSelect("PagePreview", true) - printlog " Select 'Zoom 100%' in toolbar" - try - Massstab.Select 4 - catch - Warnlog "Unable to change Zoom factor in toolbar! (Bug#110498)" - endcatch - - printlog " Click 'Print Page Preview' in toolbar" - Kontext "PreviewObjectbar" - DruckenSeitenansicht.Click - Kontext "Active" - if Active.Exists then - QAErrorlog "No default printer!" - Active.ok - Sleep 1 - Kontext "DruckenDlg" - if DruckenDlg.Exists then DruckenDlg.Cancel - else - printlog " Close 'Print' dialog with cancel" - Kontext "DruckenDlg" - DruckenDlg.Cancel - end if - - printlog " Click 'Print options page preview' in toolbar" - Kontext "PreviewObjectbar" - Skalierung.Click - printlog " Close 'Print Options' dialog with cancel" - Kontext "DruckOptionen" - Call DialogTest ( DruckOptionen ) - DruckOptionen.Cancel - - printlog " Close Page Preview with button 'Close Preview' in toolbar" - Kontext "PreviewObjectbar" - SeitenansichtSchliessen.Click - else - Warnlog "Objectbar not addressable!" - end if - end if - - printlog " Close active document" - Call hCloseDocument - gApplication = "WRITER" -endcase +'encoding UTF-8 Do not remove or change this line!
+'**************************************************************************
+'* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+'*
+'* Copyright 2008 by Sun Microsystems, Inc.
+'*
+'* OpenOffice.org - a multi-platform office productivity suite
+'*
+'* $RCSfile: w_001a_.inc,v $
+'*
+'* $Revision: 1.2 $
+'*
+'* last change: $Author: vg $ $Date: 2008-08-18 12:40:41 $
+'*
+'* This file is part of OpenOffice.org.
+'*
+'* OpenOffice.org is free software: you can redistribute it and/or modify
+'* it under the terms of the GNU Lesser General Public License version 3
+'* only, as published by the Free Software Foundation.
+'*
+'* OpenOffice.org is distributed in the hope that it will be useful,
+'* but WITHOUT ANY WARRANTY; without even the implied warranty of
+'* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+'* GNU Lesser General Public License version 3 for more details
+'* (a copy is included in the LICENSE file that accompanied this code).
+'*
+'* You should have received a copy of the GNU Lesser General Public License
+'* version 3 along with OpenOffice.org. If not, see
+'* <http://www.openoffice.org/license.html>
+'* for a copy of the LGPLv3 License.
+'*
+'/************************************************************************
+'*
+'* owner : helge.delfs@sun.com
+'*
+'* short description: Testcases for the Writer Required-test.
+'*
+'\***********************************************************************
+
+sub w_001a_
+
+ printLog Chr(13) + "--------- File Menu (w_001a_.inc) ----------"
+ gApplication = "WRITER"
+
+ Call tFileProperties
+
+ Call tFileTemplatesOrganize
+ Call tFileTemplatesAddressbookSource
+ Call tFileTemplatesSave
+ Call tFileTemplatesEdit
+
+ Call tFilePagePreview
+ Call tPrintCommon()
+ Call tPrintGeneral()
+ Call tPrintApplication()
+ Call tPrintLayout()
+ Call tPrintOptions()
+ Call tFilePrinterSetup
+
+ 'Writer Master Document
+ gApplication = "MASTERDOCUMENT"
+ Call tMasterDocFilePagePreview
+ gApplication = "WRITER"
+
+end sub
+
+'-----------------------------------------------------------
+
+testcase tFileProperties
+ PrintLog "- File / Properties"
+
+ printlog " Open new document"
+ Call hNewDocument
+
+ printlog " File / Properties"
+ FileProperties
+
+ WaitSlot(5000)
+ Kontext
+ try
+ active.SetPage TabDokument
+ catch
+ Warnlog "Dialog 'FileProperties' not up! (Bug#99828)"
+ goto endsub
+ endcatch
+
+ printlog " Switch to Tabpage 'General'"
+ Kontext "TabDokument"
+ Call DialogTest (TabDokument)
+
+ printlog " Switch to Tabpage 'Description'"
+ Kontext
+ active.SetPage TabDokumentinfo
+ Kontext "TabDokumentinfo"
+ Call DialogTest (TabDokumentinfo)
+
+
+ QAErrorlog "#i95523# - FileProperties - Tabpage 'User Defined' has changed. - Adaption of testcases needed."
+ ' printlog " Switch to Tabpage 'User defined'"
+ ' Kontext
+ ' active.SetPage TabBenutzer
+ ' Kontext "TabBenutzer"
+ ' Call DialogTest ( TabBenutzer )
+
+ ' Wait 500
+
+ ' Infofelder.Click
+ ' printlog " Click 'Infofields'"
+ ' Kontext "InfonamenBearbeiten"
+ ' printlog " Close upcoming dialog with 'Cancel'"
+ ' Call DialogTest (InfonamenBearbeiten)
+ ' InfonamenBearbeiten.Cancel
+
+ printlog " Switch to Tabpage 'Internet'"
+ Kontext
+ active.SetPage TabInternet
+ Kontext "TabInternet"
+ Call DialogTest (TabInternet)
+
+ printlog " Switch to Tabpage 'Statistics' and close dialog"
+ Kontext
+ active.SetPage TabStatistik
+ Kontext "TabStatistik"
+ Call DialogTest (TabStatistik)
+ TabStatistik.Close
+
+ Sleep 1
+ printlog " Close active document"
+ Call hCloseDocument
+endcase
+
+'-----------------------------------------------------------
+
+testcase tFileTemplatesOrganize
+ Dim i as integer
+
+ PrintLog " Open new document."
+ Call hNewDocument
+ PrintLog " File / Templates / Organize"
+ FileTemplatesOrganize
+ Kontext "DVVerwalten"
+ For i = 1 to 50
+ if DVVerwalten.Exists then
+ i = 51
+ else
+ Sleep 5
+ end if
+ next i
+ if Not DVVerwalten.Exists then
+ Warnlog "Dialog 'Template Management' not up !"
+ Call hCloseDocument
+ goto endsub
+ end if
+ wait 500
+ PrintLog " Select first entry in left list of dialog 'Template Management' (should be 'My Templates')"
+ ListeLinks.Select 1
+ ListeLinks.TypeKeys "<Home>"
+ Sleep 1
+ Befehle.Click
+ wait 500
+ PrintLog " Select 'Commands -> Import Template'"
+ Call hMenuSelectNr(3)
+ Wait 500
+ PrintLog " Close Filedialog."
+ if gUseSysDlg = False then
+ Kontext "OeffnenDlg"
+ if OeffnenDlg.Exists then
+ OeffnenDlg.Cancel
+ else
+ Warnlog "FileOpen dialog not up!"
+ end if
+ end if
+
+ PrintLog " Select 'Commands -> Printer Settings"
+ Kontext "DVVerwalten"
+ Sleep 1
+ Befehle.Click
+ wait 500
+ Call hMenuSelectNr(4)
+
+ PrintLog " Cancel 'Printer-Setup' dialog"
+ Kontext "DruckerEinrichten"
+ if DruckerEinrichten.Exists then
+ DruckerEinrichten.Cancel
+ else
+ Warnlog "Printersettings dialog is not up!"
+ end if
+
+ PrintLog " Select first entry in right list"
+ Kontext "DVVerwalten"
+ ListeRechts.Select 1
+
+ PrintLog " Select pushbutton 'File..'"
+ if WelcheDatei.IsEnabled then
+ WelcheDatei.Click
+ if gUseSysDlg = False then
+ PrintLog " Cancel Filedialog"
+ Kontext "OeffnenDlg"
+ OeffnenDlg.Cancel
+ end if
+ end if
+
+ PrintLog " Select pushbutton 'Address Book'"
+ Kontext "DVVerwalten"
+ AddressBook.Click
+ Kontext "AddressbookSource"
+ PrintLog " Cancel Dialog 'Address Book-Assignment'"
+ if AddressbookSource.Exists then
+ AddressbookSource.Cancel
+ else
+ Warnlog "the Dialog ' Address Book Source' wasnt up!"
+ end if
+
+ PrintLog " Close dialog"
+ Kontext "DVVerwalten"
+ DVVerwalten.Close
+
+ PrintLog " Close active document."
+ Call hCloseDocument
+endcase
+
+'-----------------------------------------------------------
+
+testcase tFileTemplatesAddressbookSource
+
+ PrintLog " Open new document"
+ Call hNewDocument
+
+ PrintLog " File / Templates /Address Book Source..."
+ UseBindings
+ FileTemplatesAddressbookSource
+
+ WaitSlot(2000)
+ PrintLog " In 'Address Book Assignement' dialog click pushbutton 'Administrate'"
+ Kontext "AddressbookSource"
+ if AddressbookSource.Exists then
+ Call DialogTest (AddressbookSource)
+ Administrate.Click
+ Sleep 2
+ PrintLog " Close 'Data Source Administration' with 'Cancel'"
+ Kontext "DatabaseProperties"
+ if Not DatabaseProperties.Exists then
+ Kontext "AddressSourceAutopilot"
+ if AddressSourceAutopilot.Exists then
+ AddressSourceAutopilot.Cancel
+ end if
+ Kontext "AddressbookSource"
+ AddressbookSource.Cancel
+ else
+ PrintLog " DatabaseProperties.SetPage TabConnection"
+ Kontext "TabConnection"
+ Call DialogTest ( TabConnection )
+ Kontext "DatabaseProperties"
+ DatabaseProperties.Close
+ Kontext "AddressbookSource"
+ PrintLog " Close dialog"
+ AddressbookSource.Cancel
+ end if
+ end if
+
+ printlog " Close active document"
+ Call hCloseDocument
+endcase
+
+'-----------------------------------------------------------
+
+testcase tFileTemplatesSave
+ if gApplication = "MASTERDOCUMENT" then
+ qaErrorLog " tFileTemplatesSave has been disabled in Masterdocument."
+ goto endsub
+ end if
+ printlog "- File / Templates / Save"
+ Call hNewDocument
+ printlog " Open new document"
+ FileTemplatesSave
+ printlog " File / Templates / Save"
+
+ Kontext "DokumentVorlagen"
+ Call DialogTest ( DokumentVorlagen )
+ printlog " On 'Templates' dialog click 'Organizer'"
+
+ Verwalten.Click
+ Kontext "DVVerwalten"
+ DVVerwalten.Close
+ printlog " Close dialog 'Template Management'"
+
+ Kontext "DokumentVorlagen"
+ DokumentVorlagen.Cancel
+ printlog " Close 'Templates' dialog"
+
+ printlog " Close active document"
+ Call hCloseDocument
+ gApplication = "WRITER"
+endcase
+
+'-----------------------------------------------------------
+
+testcase tFileTemplatesEdit
+ printlog "- File / Templates / Edit"
+
+ printlog " Open new document"
+ Call hNewDocument
+ printlog " File / Templates / Edit"
+ FileTemplatesEdit
+
+ if gUseSysDlg = False then
+ printlog " Cancel Filedialog"
+ Kontext "OeffnenDlg"
+ OeffnenDlg.Cancel
+ end if
+
+ printlog " Close active document"
+ Call hCloseDocument
+endcase
+
+'-----------------------------------------------------------
+
+testcase tFilePagePreview
+ PrintLog "- File / Page Preview"
+ Dim gehtnicht as boolean
+ gehtnicht = FALSE
+ printlog " Open new document"
+ Select Case gApplication
+ Case "WRITER"
+ Call hNewDocument
+
+ Case "MASTERDOCUMENT"
+ Call hNewDocument
+
+ Case "HTML"
+ printlog "Not in Writer/Web!"
+ goto endsub
+ end select
+
+ printlog " Enter some text in document"
+ Call wTypeKeys("Just a small change!")
+ printlog " File / Page Preview"
+ FilePageView
+ WaitSlot (1000)
+ Kontext "DocPageViewWriter"
+ if DocPageViewWriter.NotExists then
+ Warnlog "Page Preview is not coming up!"
+ Kontext "Active"
+ if Active.Exists then
+ if Active.GetRT = 304 then
+ Active.No
+ end if
+ end if
+ else
+ if gehtnicht=FALSE then
+ Kontext "PreviewObjectbar"
+ if PreviewObjectbar.Exists = False then Call hToolbarSelect("PagePreview", true)
+ printlog " Select 'Zoom 100%' in toolbar"
+ try
+ Massstab.Select 4
+ catch
+ Warnlog "Unable to change Zoom factor in toolbar! (Bug#110498)"
+ endcatch
+
+ printlog " Click 'Print Page Preview' in toolbar"
+ Kontext "PreviewObjectbar"
+ DruckenSeitenansicht.Click
+ Kontext "Active"
+ if Active.Exists then
+ QAErrorlog "No default printer!"
+ Active.ok
+ Sleep 1
+ Kontext "Printing"
+ if Printing.Exists then Printing.Cancel
+ else
+ printlog " Close 'Print' dialog with cancel"
+ Kontext "Printing"
+ Printing.Cancel
+ end if
+
+ printlog " Close Page Preview with button 'Close Preview' in toolbar"
+ Kontext "PreviewObjectbar"
+ SeitenansichtSchliessen.Click
+ else
+ Warnlog "Objectbar not addressable!"
+ end if
+ end if
+ printlog " Close active document"
+ Call hCloseDocument
+endcase
+
+'-----------------------------------------------------------
+
+testcase tFilePrinterSetup
+ PrintLog " Open new document"
+ Call hNewDocument
+
+ PrintLog " File / Printer Settings"
+ FilePrintersettings
+ Kontext "Active"
+ WaitSlot(1000)
+ if Active.Exists then
+ if Active.GetRT = 304 then
+ QAErrorLog "No Default Printer!"
+ Active.Ok
+ Sleep 2
+ Kontext "DruckerEinrichten"
+ if DruckerEinrichten.Exists then
+ Call DialogTest ( DruckerEinrichten )
+ DruckerEinrichten.Cancel
+ end if
+ end if
+ else
+ Kontext "DruckerEinrichten"
+ Call DialogTest ( DruckerEinrichten )
+ DruckerEinrichten.Cancel
+ PrintLog " Cancel 'Printer Setup' dialog"
+ end if
+ PrintLog " Close active document"
+ Call hCloseDocument
+endcase
+
+'-----------------------------------------------------------
+
+testcase tMasterDocFilePagePreview
+ PrintLog "- File / Page Preview"
+ Dim gehtnicht as boolean
+ gehtnicht = FALSE
+ gApplication = "MASTERDOCUMENT"
+ printlog " Open new document"
+ Call hNewDocument
+
+ printlog " Enter some text in document"
+ Call wTypeKeys("Just a small change!")
+ printlog " File / Page Preview"
+ FilePageView
+ WaitSlot (1000)
+ Kontext "DocPageViewWriter"
+ if DocPageViewWriter.NotExists then
+ Warnlog "Page Preview is not coming up!"
+ Kontext "Active"
+ if Active.Exists then
+ if Active.GetRT = 304 then
+ Active.No
+ end if
+ end if
+ else
+ if gehtnicht=FALSE then
+ Kontext "PreviewObjectbar"
+ if PreviewObjectbar.Exists = False then Call hToolbarSelect("PagePreview", true)
+ printlog " Select 'Zoom 100%' in toolbar"
+ try
+ Massstab.Select 4
+ catch
+ Warnlog "Unable to change Zoom factor in toolbar! (Bug#110498)"
+ endcatch
+
+ printlog " Click 'Print Page Preview' in toolbar"
+ Kontext "PreviewObjectbar"
+ DruckenSeitenansicht.Click
+ Kontext "Active"
+ if Active.Exists then
+ QAErrorlog "No default printer!"
+ Active.ok
+ Sleep 1
+ Kontext "Printing"
+ if Printing.Exists then Printing.Cancel
+ else
+ printlog " Close 'Print' dialog with cancel"
+ Kontext "Printing"
+ Printing.Cancel
+ end if
+
+ printlog " Close Page Preview with button 'Close Preview' in toolbar"
+ Kontext "PreviewObjectbar"
+ SeitenansichtSchliessen.Click
+ else
+ Warnlog "Objectbar not addressable!"
+ end if
+ end if
+
+ printlog " Close active document"
+ Call hCloseDocument
+ gApplication = "WRITER"
+endcase
diff --git a/testautomation/writer/required/w_updt.bas b/testautomation/writer/required/w_updt.bas index 992a4cc9f194..a52335d47e37 100755 --- a/testautomation/writer/required/w_updt.bas +++ b/testautomation/writer/required/w_updt.bas @@ -58,7 +58,7 @@ sub main use "writer\required\includes\w_010_1.inc" use "writer\required\includes\w_011_.inc" use "writer\required\includes\w_020_.inc" - + Printlog "******* Ressource-Test Writer Document *******" Call wChangeDefaultView() @@ -89,7 +89,10 @@ sub LoadIncludeFiles use "global\system\includes\gvariabl.inc" use "global\required\includes\g_001.inc" use "global\required\includes\g_option.inc" ' global subroutines for Tools / Options + use "global\required\includes\g_printing.inc" use "global\tools\includes\optional\t_xml_filter1.inc" ' global routines for XML-functionality + use "global\tools\includes\optional\t_docfuncs.inc" + use "global\tools\includes\optional\t_control_objects.inc" gApplication = "WRITER" GetUseFiles () diff --git a/testautomation/writer/tools/includes/w_tools.inc b/testautomation/writer/tools/includes/w_tools.inc index 63e7e3a8ef7d..41d6b98eaeac 100755 --- a/testautomation/writer/tools/includes/w_tools.inc +++ b/testautomation/writer/tools/includes/w_tools.inc @@ -917,7 +917,6 @@ sub wOptionsUndo ( sOption$ ) WeichesScrollen.Uncheck ' Display GrafikenUndObjekte.Check - Tabellen.Check Zeichnungen.Check Feldname.Uncheck Notizen.Check @@ -981,20 +980,17 @@ sub wOptionsUndo ( sOption$ ) Call hToolsOptions("WRITER","Print") ' Contents Grafiken.Check - Tabellen.Check - Zeichnungen.Check Kontrollfelder.Check Hintergrund.Check SchwarzDrucken.Uncheck ' Pages LinkeSeiten.Check RechteSeiten.Check - Umgekehrt.Uncheck Prospekt.Uncheck ' Notes Keine.Check ' Other - EinzelneDruckauftraege.Uncheck + LeereSeitenDrucken.Check AusDruckereinstellung.Uncheck Fax.SetNoSelection end if |