diff options
author | Helge Delfs [hde] <hde@openoffice.org> | 2010-10-25 09:17:54 +0200 |
---|---|---|
committer | Helge Delfs [hde] <hde@openoffice.org> | 2010-10-25 09:17:54 +0200 |
commit | 8148effb2d279d07b22a19868e849e9be72f169d (patch) | |
tree | dac239aa00cc26580f5b94e87e50dbbb7aacb971 | |
parent | 841c2a6007cc9891177a480927e037d0736b1f40 (diff) | |
parent | 5981fd6a1e56e9505df1e06614e43447d2761f38 (diff) |
merge conflicts removed
-rw-r--r--[-rwxr-xr-x] | testautomation/framework/optional/includes/options_loadsave_general.inc | 103 | ||||
-rw-r--r--[-rwxr-xr-x] | testautomation/framework/optional/includes/options_ooo_colors.inc | 15 | ||||
-rw-r--r--[-rwxr-xr-x] | testautomation/framework/optional/includes/options_ooo_general.inc | 252 |
3 files changed, 249 insertions, 121 deletions
diff --git a/testautomation/framework/optional/includes/options_loadsave_general.inc b/testautomation/framework/optional/includes/options_loadsave_general.inc index 84c41e906df6..d320fb6a6d72 100755..100644 --- a/testautomation/framework/optional/includes/options_loadsave_general.inc +++ b/testautomation/framework/optional/includes/options_loadsave_general.inc @@ -63,6 +63,7 @@ testcase tLoadSaveGeneral printlog( " - " & DokumentTyp.getSelText) next i endif + for i=1 to AppCount Dokumenttyp.Select(i) lsSave(2+i) = Dokumenttyp.GetSelText @@ -70,18 +71,55 @@ testcase tLoadSaveGeneral next i printlog " - invert/change settings" - if lbSave(13) then BenutzerspezifischeEinstellungen.UnCheck else BenutzerspezifischeEinstellungen.Check - if lbSave(1) then DokumenteigenschaftenBearbeiten.Uncheck else DokumenteigenschaftenBearbeiten.Check - if lbSave(2) then Sicherungskopie.Uncheck else Sicherungskopie.Check - if lbSave(3) then AutomatischSpeichern.Uncheck else AutomatischSpeichern.Check + if lbSave(13) then + BenutzerspezifischeEinstellungen.UnCheck + else + BenutzerspezifischeEinstellungen.Check + endif + + if lbSave(1) then + DokumenteigenschaftenBearbeiten.Uncheck + else + DokumenteigenschaftenBearbeiten.Check + endif + + if lbSave(2) then + Sicherungskopie.Uncheck + else + Sicherungskopie.Check + endif + + if lbSave(3) then + AutomatischSpeichern.Uncheck + else + AutomatischSpeichern.Check + endif + if AutomatischSpeichern.IsChecked then lsSave(1) = Minuten.GetText Minuten.SetText "23" endif - if lbSave(10) then NoPrettyPrinting.Uncheck else NoPrettyPrinting.Check - if lbSave(11) then URLimDateisystem.Uncheck else URLimDateisystem.Check - if lbSave(12) then URLimInternet.Uncheck else URLimInternet.Check + + if lbSave(10) then + NoPrettyPrinting.Uncheck + else + NoPrettyPrinting.Check + endif + + if lbSave(11) then + URLimDateisystem.Uncheck + else + URLimDateisystem.Check + endif + + if lbSave(12) then + URLimInternet.Uncheck + else + URLimInternet.Check + endif + printlog( "Setting filters for documenttypes: Select third item from every list" ) + for i=1 to AppCount Dokumenttyp.Select(i) Filter.Select(3) @@ -90,8 +128,7 @@ testcase tLoadSaveGeneral printlog " - close options-dlg with OK" kontext "ExtrasOptionenDlg" - ExtrasOptionenDlg.OK - sleep(3) + hCloseDialog( ExtrasOptionenDlg, "ok" ) printlog " - exit/restart StarOffice" ExitRestartTheOffice @@ -103,15 +140,19 @@ testcase tLoadSaveGeneral if BenutzerspezifischeEinstellungen.IsChecked = lbSave ( 13 ) then Warnlog "'Load user setting with document' => changes not saved" endif + if DokumenteigenschaftenBearbeiten.IsChecked = lbSave ( 1 ) then Warnlog "'Edit document properties before saving' => changes not saved" endif + if Sicherungskopie.IsChecked = lbSave ( 2 ) then Warnlog "'Create backup copy' => changes not saved" endif + if AutomatischSpeichern.IsChecked = lbSave ( 3 ) then printlog "AutoSave => changes not saved" endif + if AutomatischSpeichern.IsChecked then if Minuten.GetText <> "23" then Warnlog "Minutes for AutoSave => changes not saved" @@ -120,18 +161,20 @@ testcase tLoadSaveGeneral if NoPrettyPrinting.IsChecked = lbSave ( 10 ) then Warnlog "no pretty printing => changes not saved" endif + if URLimDateisystem.IsChecked = lbSave ( 11 ) then Warnlog "URL: File system => changes not saved" endif + if URLimInternet.IsChecked = lbSave ( 12 ) then Warnlog "URL: Internet => changes not saved" endif - + printlog( "Verifying filters for documenttypes: Select third item from every list" ) for i=1 to AppCount Dokumenttyp.Select(i) - printlog( "Doctype: " & Dokumenttyp.getSelText() & " has filter: " & Filter.getSelText() ) - + printlog( "Doctype: " & Dokumenttyp.getSelText() & " has filter: " & Filter.getSelText() ) + if Filter.GetSelIndex <> 3 then warnlog( "#i79150# some options in Tools/Options->Load/Save->General are not saved" ) endif @@ -146,6 +189,7 @@ testcase tLoadSaveGeneral NoPrettyPrinting.Uncheck URLimDateisystem.Uncheck URLimInternet.Uncheck + for i=1 to AppCount Dokumenttyp.Select(i) Filter.Select(4) @@ -154,8 +198,7 @@ testcase tLoadSaveGeneral printlog " - close options-dlg with OK" kontext "extrasoptionendlg" - ExtrasOptionenDlg.OK - Sleep (1) + hCloseDialog( ExtrasOptionenDlg, "ok" ) printlog " - react on messageboxes for loosing settings after changing default-filters" kontext "FilterWarning" @@ -166,7 +209,7 @@ testcase tLoadSaveGeneral i = AppCount + 1 endif next i - Sleep (3) + WaitSlot() printlog " - check second changes" ToolsOptions @@ -175,27 +218,35 @@ testcase tLoadSaveGeneral if BenutzerspezifischeEinstellungen.IsChecked <> FALSE then Warnlog "'Load user setting with document' => changes not saved" endif + if DokumenteigenschaftenBearbeiten.IsChecked <> TRUE then Warnlog "'Edit document properties before saving' => changes not saved" endif + if Sicherungskopie.IsChecked <> FALSE then Warnlog "'Create backup copy' => changes not saved" endif + if AutomatischSpeichern.IsChecked <> TRUE then Warnlog "AutoSave => changes not saved" endif + if Minuten.GetText <> "1" then Warnlog "Minutes for AutoSave => changes not saved" endif + if NoPrettyPrinting.IsChecked <> FALSE then Warnlog "no pretty printing => changes not saved" endif + if URLimDateisystem.IsChecked <> FALSE then Warnlog "URL: File system => changes not saved" endif + if URLimInternet.IsChecked <> FALSE then Warnlog "URL: Internet => changes not saved" endif + for i=1 to AppCount Dokumenttyp.Select(i) if Filter.GetSelIndex <> 4 then @@ -207,26 +258,33 @@ testcase tLoadSaveGeneral if lbSave ( 13 ) = FALSE then BenutzerspezifischeEinstellungen.UnCheck else BenutzerspezifischeEinstellungen.Check endif + if lbSave ( 1 ) = FALSE then DokumenteigenschaftenBearbeiten.UnCheck else DokumenteigenschaftenBearbeiten.Check endif if lbSave ( 2 ) = FALSE then Sicherungskopie.Uncheck else Sicherungskopie.Check endif + AutomatischSpeichern.Check Minuten.SetText lsSave ( 1 ) + if lbSave ( 3 ) = FALSE then AutomatischSpeichern.Uncheck else AutomatischSpeichern.Check endif + if lbSave ( 10 ) = FALSE then NoPrettyPrinting.Uncheck else NoPrettyPrinting.Check endif + if lbSave ( 11 ) = FALSE then URLimDateisystem.UnCheck else URLimDateisystem.Check endif + if lbSave ( 12 ) = FALSE then URLimInternet.UnCheck else URLimInternet.Check endif + for i=1 to AppCount Dokumenttyp.Select(i) if Dokumenttyp.GetSelText <> lsSave ( 2 + i ) then @@ -236,8 +294,8 @@ testcase tLoadSaveGeneral next i kontext "ExtrasOptionenDlg" - ExtrasOptionenDlg.OK - Sleep (3) + hCloseDialog( ExtrasOptionenDlg, "ok" ) + printlog " - check settings" ToolsOptions @@ -246,29 +304,37 @@ testcase tLoadSaveGeneral if BenutzerspezifischeEinstellungen.IsChecked <> lbSave ( 13 ) then Warnlog "'Load user setting with document' => changes not saved" endif + if DokumenteigenschaftenBearbeiten.IsChecked <> lbSave ( 1 ) then Warnlog "'Edit document properties before saving' => changes not saved" endif + if Sicherungskopie.IsChecked <> lbSave ( 2 ) then Warnlog "'Create backup copy' => changes not saved" endif + if AutomatischSpeichern.IsChecked <> lbSave ( 3 ) then Warnlog "AutoSave => changes not saved" endif + if AutomatischSpeichern.IsChecked then if Minuten.GetText <> lsSave( 1 ) then Warnlog "Minutes for AutoSave => changes not saved" endif endif + if NoPrettyPrinting.IsChecked <> lbSave ( 10 ) then Warnlog "no pretty printing => changes not saved" endif + if URLimDateisystem.IsChecked <> lbSave ( 11 ) then Warnlog "URL: File system => changes not saved" endif + if URLimInternet.IsChecked <> lbSave ( 12 ) then Warnlog "URL: Internet => changes not saved" endif + for i=1 to AppCount Dokumenttyp.Select(i) if Dokumenttyp.GetSelText <> lsSave ( 2 + i ) then @@ -280,5 +346,6 @@ testcase tLoadSaveGeneral next i kontext "extrasoptionendlg" - ExtrasOptionenDlg.OK + hCloseDialog( ExtrasOptionenDlg, "ok" ) + endcase diff --git a/testautomation/framework/optional/includes/options_ooo_colors.inc b/testautomation/framework/optional/includes/options_ooo_colors.inc index 6d1db18179c2..f7c68095e198 100755..100644 --- a/testautomation/framework/optional/includes/options_ooo_colors.inc +++ b/testautomation/framework/optional/includes/options_ooo_colors.inc @@ -40,8 +40,8 @@ testcase tOOoColors dim currentColor(4) as String dim chColor(4) as String - const DEFAULT_COLOR_COUNT = 103 - const CHANGED_COLOR_COUNT = 104 + const DEFAULT_COLOR_COUNT = 99 + const CHANGED_COLOR_COUNT = 100 const USER_COLOR = "TT-Test-Color" myColor(1) = USER_COLOR @@ -106,8 +106,7 @@ testcase tOOoColors printlog( "Close the Tools/Options dialog with OK" ) Kontext "ExtrasOptionenDlg" - ExtrasOptionenDlg.OK - WaitSlot( 2000 ) + hCloseDialog( ExtrasOptionenDlg, "ok" ) else warnlog( "Tools/Options dialog not open" ) endif @@ -163,9 +162,7 @@ testcase tOOoColors printlog( "Close options dialog with OK" ) Kontext "ExtrasOptionenDlg" - ExtrasOptionenDlg.OK - WaitSlot( 2000 ) - + hCloseDialog( ExtrasOptionenDlg, "ok" ) else warnlog( "Tools/Options dialog not open" ) endif @@ -196,9 +193,7 @@ testcase tOOoColors printlog( "Close options dialog with OK" ) Kontext "ExtrasOptionenDlg" - ExtrasOptionenDlg.OK - WaitSlot( 2000 ) - + hCloseDialog( ExtrasOptionenDlg, "ok" ) else warnlog( "Tools/Options dialog not open" ) endif diff --git a/testautomation/framework/optional/includes/options_ooo_general.inc b/testautomation/framework/optional/includes/options_ooo_general.inc index c973feade8ae..311f5bf8543d 100755..100644 --- a/testautomation/framework/optional/includes/options_ooo_general.inc +++ b/testautomation/framework/optional/includes/options_ooo_general.inc @@ -33,99 +33,165 @@ testcase tOOoGeneral - dim lsSave (4) as String - dim lbSave (3) as Boolean - - hNewDocument - - ToolsOptions - hToolsOptions ( "StarOffice", "General" ) - - printlog " - save old data" - lsSave ( 1 ) = Zweistellig.GetText - lbSave ( 1 ) = Aktivieren.IsChecked - Aktivieren.Check - if gPlatgroup = "w95" then - lbSave (2) = StarOfficeDialogeBenutzen.IsChecked - end if - lbSave ( 3 ) = DruckenStatus.IsChecked - lsSave ( 3 ) = StyleSheet.GetSelText - - printlog " - invert/change data" - Zweistellig.SetText "1950" - Zuruecksetzen.Click - if gPlatgroup = "w95" then - if lbSave (2) = TRUE then StarOfficeDialogeBenutzen.Uncheck else StarOfficeDialogeBenutzen.Check - end if - If lbSave ( 3 ) = TRUE then DruckenStatus.Uncheck else DruckenStatus.Check - StyleSheet.Select 3 - - Kontext "ExtrasOptionenDlg" - - hCloseDialog( ExtrasOptionenDlg, "ok" ) - hCloseDocument - - printlog " - exit/restart StarOffice" - ExitRestartTheOffice - - printlog " - check data" - ToolsOptions - hToolsOptions ( "StarOffice", "General" ) - - if Zweistellig.GetText <> "1950" then Warnlog "Year ( 2 digits ) => changes not saved: '" + Zweistellig.GetText +"' #i29810" - if Aktivieren.IsChecked <> TRUE then Warnlog "Enable HelpAgent => changes not saved" - Zuruecksetzen.Click - if gPlatgroup = "w95" then - if StarOfficeDialogeBenutzen.IsChecked = lbSave (2) then Warnlog "Use StarOffice dialogs => changes not saved!" - end if - If DruckenStatus.IsChecked = lbSave ( 3 ) then Warnlog "Printing sets 'Document modified' status => changes not saved!" - - printlog " - 2. change data" - Zweistellig.SetText "1800" - DruckenStatus.UnCheck - - Kontext "ExtrasOptionenDlg" - hCloseDialog( ExtrasOptionenDlg, "ok" ) - - printlog " - check data" - ToolsOptions - hToolsOptions ( "StarOffice", "General" ) - - if Zweistellig.GetText <> "1800" then Warnlog "Year ( 2 digits ) => changes not saved : '" + Zweistellig.GetText +"'" - If DruckenStatus.IsChecked <> FALSE then Warnlog "Printing sets 'Document modified' status => changes not saved!" - if StyleSheet.GetSelIndex <> 3 then Warnlog "Style sheet for StarOffice Help => changes not saved!" - - printlog " - reset to saved data" - Zweistellig.SetText lsSave ( 1 ) - Aktivieren.Check - Zuruecksetzen.Click - if lbSave (1) = TRUE then Aktivieren.Check else Aktivieren.Uncheck - if gPlatgroup = "w95" then - if lbSave (2) = TRUE then StarOfficeDialogeBenutzen.Check else StarOfficeDialogeBenutzen.UnCheck - end if - If lbSave(3)= TRUE then DruckenStatus.Check else DruckenStatus.UnCheck - StyleSheet.Select lsSave(3) - - Kontext "ExtrasOptionenDlg" - hCloseDialog( ExtrasOptionenDlg, "ok" ) - - ToolsOptions - hToolsOptions ( "StarOffice", "General" ) - - printlog " - check the reset data" - if Zweistellig.GetText <> lsSave ( 1 ) then Warnlog "Year ( 2 digits ) => changes not saved" - if Aktivieren.IsChecked <> lbSave (1) then Warnlog "Enable HelpAgent => changes not saved" - Aktivieren.Check - Zuruecksetzen.Click - if lbSave (1) = TRUE then Aktivieren.Check else Aktivieren.Uncheck - if gPlatgroup = "w95" then - if StarOfficeDialogeBenutzen.IsChecked <> lbSave (2) then Warnlog "Use StarOffice dialogs => changes not saved!" - end if - If DruckenStatus.IsChecked <> lbSave(3) then Warnlog "Printing sets 'Document modified' status => changes not saved!" - if StyleSheet.GetSelText <> lsSave (3) then Warnlog "Style sheet for StarOffice Help => changes not saved!" - - Kontext "ExtrasOptionenDlg" - hCloseDialog( ExtrasOptionenDlg, "ok" ) + dim lsSave (4) as String + dim lbSave (3) as Boolean + + hNewDocument + + ToolsOptions + hToolsOptions ( "StarOffice", "General" ) + + printlog " - save old data" + lsSave ( 1 ) = Zweistellig.GetText + lbSave ( 1 ) = Aktivieren.IsChecked + Aktivieren.Check + + if gPlatgroup = "w95" then + lbSave (2) = StarOfficeDialogeBenutzen.IsChecked + endif + + lbSave ( 3 ) = DruckenStatus.IsChecked + lsSave ( 3 ) = StyleSheet.GetSelText + + printlog " - invert/change data" + Zweistellig.SetText "1950" + Zuruecksetzen.Click + + if gPlatgroup = "w95" then + if lbSave (2) then + StarOfficeDialogeBenutzen.Uncheck + else + StarOfficeDialogeBenutzen.Check + endif + endif + + If lbSave ( 3 ) then + DruckenStatus.Uncheck + else + DruckenStatus.Check + endif + + StyleSheet.Select 3 + + Kontext "ExtrasOptionenDlg" + hCloseDialog( ExtrasOptionenDlg, "ok" ) + hCloseDocument + + printlog " - exit/restart StarOffice" + ExitRestartTheOffice + + printlog " - check data" + ToolsOptions + hToolsOptions ( "StarOffice", "General" ) + + if Zweistellig.GetText <> "1950" then + Warnlog "#i29810# - Year ( 2 digits ) => changes not saved: " + Zweistellig.GetText + endif + + if not Aktivieren.IsChecked then + Warnlog "Enable HelpAgent => changes not saved" + endif + + Zuruecksetzen.Click + + if gPlatgroup = "w95" then + if StarOfficeDialogeBenutzen.IsChecked = lbSave (2) then + Warnlog "Use StarOffice dialogs => changes not saved!" + endif + endif + + If DruckenStatus.IsChecked = lbSave ( 3 ) then + Warnlog "Printing sets 'Document modified' status => changes not saved!" + endif + + printlog " - 2. change data" + Zweistellig.SetText "1800" + DruckenStatus.UnCheck + + Kontext "ExtrasOptionenDlg" + hCloseDialog( ExtrasOptionenDlg, "ok" ) + + printlog " - check data" + ToolsOptions + hToolsOptions ( "StarOffice", "General" ) + + if ( Zweistellig.GetText <> "1800" ) then + Warnlog( "#i29810# - Year ( 2 digits ) => changes not saved : " & Zweistellig.GetText() ) + endif + + If DruckenStatus.IsChecked then + Warnlog "Printing sets 'Document modified' status => changes not saved!" + endif + + if StyleSheet.GetSelIndex <> 3 then + Warnlog "Style sheet for StarOffice Help => changes not saved!" + endif + + printlog " - reset to saved data" + Zweistellig.SetText lsSave ( 1 ) + Aktivieren.Check + Zuruecksetzen.Click + + if lbSave (1) then + Aktivieren.Check + else + Aktivieren.Uncheck + endif + + if gPlatgroup = "w95" then + if lbSave (2) then + StarOfficeDialogeBenutzen.Check + else + StarOfficeDialogeBenutzen.UnCheck + endif + endif + + If lbSave(3) then + DruckenStatus.Check + else + DruckenStatus.UnCheck + endif + + StyleSheet.Select lsSave(3) + + Kontext "ExtrasOptionenDlg" + hCloseDialog( ExtrasOptionenDlg, "ok" ) + + ToolsOptions + hToolsOptions ( "StarOffice", "General" ) + + printlog " - check the reset data" + if Zweistellig.GetText <> lsSave ( 1 ) then + Warnlog "Year ( 2 digits ) => changes not saved" + endif + + if Aktivieren.IsChecked <> lbSave (1) then + Warnlog "Enable HelpAgent => changes not saved" + endif + + Aktivieren.Check + Zuruecksetzen.Click + + if lbSave (1) then + Aktivieren.Check else Aktivieren.Uncheck + endif + + if gPlatgroup = "w95" then + if StarOfficeDialogeBenutzen.IsChecked <> lbSave (2) then + Warnlog "Use StarOffice dialogs => changes not saved!" + endif + endif + + If DruckenStatus.IsChecked <> lbSave(3) then + Warnlog "Printing sets 'Document modified' status => changes not saved!" + endif + + if StyleSheet.GetSelText <> lsSave (3) then + Warnlog "Style sheet for StarOffice Help => changes not saved!" + endif + + Kontext "ExtrasOptionenDlg" + hCloseDialog( ExtrasOptionenDlg, "ok" ) endcase |