diff options
Diffstat (limited to 'testautomation')
| -rwxr-xr-x | testautomation/global/win/edia_d_h.win | 1 | ||||
| -rw-r--r-- | testautomation/graphics/optional/includes/global/id_002.inc | 74 | ||||
| -rw-r--r-- | testautomation/graphics/optional/includes/global/id_004.inc | 23 | ||||
| -rw-r--r-- | testautomation/graphics/required/includes/global/id_002.inc | 53 | ||||
| -rw-r--r-- | testautomation/graphics/required/includes/global/id_004.inc | 22 | ||||
| -rwxr-xr-x[-rw-r--r--] | testautomation/spreadsheet/required/includes/c_upd_insertmenu.inc | 270 | ||||
| -rw-r--r-- | testautomation/writer/optional/includes/undo/w_undo_history_3.inc | 37 | ||||
| -rwxr-xr-x | testautomation/writer/required/includes/w_002_.inc | 7 | ||||
| -rwxr-xr-x | testautomation/writer/required/includes/w_004_.inc | 73 |
9 files changed, 306 insertions, 254 deletions
diff --git a/testautomation/global/win/edia_d_h.win b/testautomation/global/win/edia_d_h.win index 11c76c491ae4..35869e0c2b72 100755 --- a/testautomation/global/win/edia_d_h.win +++ b/testautomation/global/win/edia_d_h.win @@ -502,3 +502,4 @@ Custom sc:RadioButton:RID_SCDLG_TEXT_IMPORT_OPTIONS:RB_CUSTOM CustomLanguage sc:ListBox:RID_SCDLG_TEXT_IMPORT_OPTIONS:LB_CUSTOM_LANG DetectSpecialNumbers sc:CheckBox:RID_SCDLG_TEXT_IMPORT_OPTIONS:BTN_CONVERT_DATE +*HyperlinkDialog HID_HYPERLINK_DIALOG diff --git a/testautomation/graphics/optional/includes/global/id_002.inc b/testautomation/graphics/optional/includes/global/id_002.inc index adb86d600c97..feca54dac85e 100644 --- a/testautomation/graphics/optional/includes/global/id_002.inc +++ b/testautomation/graphics/optional/includes/global/id_002.inc @@ -393,40 +393,48 @@ endcase testcase tiEditHyperlink hNewDocument InsertHyperlink - WaitSlot (5000) - Kontext "Hyperlink" - Auswahl.MouseDown 50, 5 - Auswahl.MouseUp 50, 5 - Auswahl.typekeys "<PAGEDOWN><PAGEUP>" - Auswahl.typekeys "<TAB>" - sleep 3 - Kontext "TabHyperlinkInternet" - - 'Workaround to get rid of a Focusing-problem... - NameText.Typekeys "alal <RETURN>" - NameText.Typekeys "<MOD1 A><DELETE>" - TabHyperlinkInternet.Typekeys "<TAB>", 6 - TabHyperlinkInternet.Typekeys "<LEFT>", 3 - 'End of workaround... - - Internet.Check 'Just to make sure the radio-button is addressable. - ZielUrl.Settext "http://www.liegerad-fahrer.de" - Kontext "Hyperlink" - Uebernehmen.Click - Hyperlink.Close - hTypeKeys "<TAB><F2>" - EditSelectAll - try - EditHyperlinkDraw + + kontext "HyperlinkDialog" + if ( HyperlinkDialog.exists( 2 ) ) then Kontext "Hyperlink" - if Hyperlink.Exists then - Hyperlink.Close - else - Warnlog "- Hyperlinkdialog not up" - end if - catch - Warnlog "- Not able to edit Hyperlink!" - endcatch + Auswahl.MouseDown 50, 5 + Auswahl.MouseUp 50, 5 + Auswahl.typekeys "<PAGEDOWN><PAGEUP>" + Auswahl.typekeys "<TAB>" + sleep( 1 ) + Kontext "TabHyperlinkInternet" + + 'Workaround to get rid of a Focusing-problem... + NameText.Typekeys "alal <RETURN>" + NameText.Typekeys "<MOD1 A><DELETE>" + TabHyperlinkInternet.Typekeys "<TAB>", 6 + TabHyperlinkInternet.Typekeys "<LEFT>", 3 + 'End of workaround... + + Internet.Check 'Just to make sure the radio-button is addressable. + ZielUrl.Settext "http://www.liegerad-fahrer.de" + + Uebernehmen.Click() + + kontext "HyperlinkDialog" + HyperlinkDialog.Close() + + hTypeKeys "<TAB><F2>" + EditSelectAll + try + EditHyperlinkDraw + Kontext "HyperlinkDialog" + if ( HyperlinkDialog.Exists( 1 ) ) then + HyperlinkDialog.Close() + else + Warnlog "- Hyperlinkdialog not up" + end if + catch + Warnlog "- Not able to edit Hyperlink!" + endcatch + else + warnlog( "Failed to open <HyperlinkDialog>" ) + endif Call hCloseDocument endcase diff --git a/testautomation/graphics/optional/includes/global/id_004.inc b/testautomation/graphics/optional/includes/global/id_004.inc index d7cd809c3199..ff1317ce5d01 100644 --- a/testautomation/graphics/optional/includes/global/id_004.inc +++ b/testautomation/graphics/optional/includes/global/id_004.inc @@ -122,17 +122,18 @@ testcase tiInsertSpecialCharacter endcase testcase tiInsertHyperlink + Call hNewDocument InsertHyperlink - WaitSlot (5000) - Kontext "Hyperlink" - if Hyperlink.exists (5) then + + kontext "HyperlinkDialog" + if ( HyperlinkDialog.exists( 2 ) ) then + + Kontext "TabHyperlinkInternet" Auswahl.MouseDown 50, 5 Auswahl.MouseUp 50, 5 Auswahl.typekeys "<PAGEDOWN><PAGEUP>" Auswahl.typekeys "<TAB>" - sleep 3 - Kontext "TabHyperlinkInternet" 'Workaround to get rid of a Focusing-problem... NameText.Typekeys "alal <RETURN>" @@ -142,12 +143,14 @@ testcase tiInsertHyperlink 'End of workaround... Internet.Check - ZielUrl.Settext "http://mahler" - Kontext "Hyperlink" - Uebernehmen.Click - Hyperlink.Close + ZielUrl.SetText( "http://www.nowhere.com" ) + Uebernehmen.Click() + + kontext "HyperlinkDialog" + HyperlinkDialog.Close() + else - warnlog "Failed to open hyperlink ??!!" + warnlog "Failed to open <HyperlinkDialog>" end if Call hCloseDocument endcase diff --git a/testautomation/graphics/required/includes/global/id_002.inc b/testautomation/graphics/required/includes/global/id_002.inc index 5dffb99307b7..5880fc968806 100644 --- a/testautomation/graphics/required/includes/global/id_002.inc +++ b/testautomation/graphics/required/includes/global/id_002.inc @@ -515,27 +515,35 @@ testcase tiEditHyperlink Call sSelectEmptyLayout printlog " Insert->Hyperlink" InsertHyperlink - WaitSlot (5000) - Kontext "Hyperlink" + + kontext "HyperlinkDialog" + if ( HyperlinkDialog.exists( 2 ) ) then + + Kontext "Hyperlink" Auswahl.MouseDown 50, 5 Auswahl.MouseUp 50, 5 Auswahl.typekeys "<PAGEDOWN><PAGEUP>" Auswahl.typekeys "<TAB>" - sleep 3 + sleep 1 + Kontext "TabHyperlinkInternet" + printlog "Workaround to get rid of a Focusing-problem..." + NameText.Typekeys "alal <RETURN>" + NameText.Typekeys "<MOD1 A><DELETE>" + TabHyperlinkInternet.Typekeys "<TAB>", 6 + TabHyperlinkInternet.Typekeys "<LEFT>", 3 + printlog "End of workaround" + + Internet.Check + ZielUrl.SetText( "http://www.liegerad-fahrer.de" ) - printlog "Workaround to get rid of a Focusing-problem..." - NameText.Typekeys "alal <RETURN>" - NameText.Typekeys "<MOD1 A><DELETE>" - TabHyperlinkInternet.Typekeys "<TAB>", 6 - TabHyperlinkInternet.Typekeys "<LEFT>", 3 - printlog "End of workaround" - - Internet.Check 'Just to make sure the radio-button is addressable. - ZielUrl.Settext "http://www.liegerad-fahrer.de" - Kontext "Hyperlink" - Uebernehmen.Click - Hyperlink.Close + Uebernehmen.Click() + + kontext "HyperlinkDialog" + HyperlinkDialog.Close() + else + warnlog( "Failed to open <HyperlinkDialog>" ) + endif printlog " presupposition to enable edit->hyperlink: <TAB><F2><STRG+a>" hTypeKeys "<TAB>" hTypeKeys "<F2>" @@ -544,13 +552,14 @@ testcase tiEditHyperlink try printlog " Edit->Hyperlink " EditHyperlinkDraw - Kontext "Hyperlink" - if Hyperlink.Exists then - printlog " close dialog 'Hyperlink'" - Hyperlink.Close - else - Warnlog "- Hyperlinkdialog not up" - end if + + Kontext "HyperlinkDialog" + if ( HyperlinkDialog.Exists( 2 ) ) then + printlog " close dialog 'Hyperlink'" + HyperlinkDialog.Close() + else + Warnlog "- Hyperlinkdialog not up" + end if catch Warnlog "- Not able to edit Hyperlink!" endcatch diff --git a/testautomation/graphics/required/includes/global/id_004.inc b/testautomation/graphics/required/includes/global/id_004.inc index 1255372784ce..e6f154f169c8 100644 --- a/testautomation/graphics/required/includes/global/id_004.inc +++ b/testautomation/graphics/required/includes/global/id_004.inc @@ -158,15 +158,16 @@ testcase tiInsertHyperlink Call hNewDocument printlog "Insert->Hyperlink " InsertHyperlink - WaitSlot (5000) - Kontext "Hyperlink" - if Hyperlink.exists (5) then + + kontext "HyperlinkDialog" + if ( HyperlinkDialog.exists( 2 ) ) then + + Kontext "TabHyperlinkInternet" + Auswahl.MouseDown 50, 5 Auswahl.MouseUp 50, 5 Auswahl.typekeys "<PAGEDOWN><PAGEUP>" Auswahl.typekeys "<TAB>" - sleep 3 - Kontext "TabHyperlinkInternet" printlog "Workaround to get rid of a Focusing-problem..." NameText.Typekeys "alal <RETURN>" @@ -176,10 +177,13 @@ testcase tiInsertHyperlink printlog "End of workaround..." Internet.Check - ZielUrl.Settext "http://mahler" - Kontext "Hyperlink" - Uebernehmen.Click - Hyperlink.Close + ZielUrl.Settext "http://www.nowhere.com" + + Uebernehmen.Click() + + kontext "HyperlinkDialog" + HyperlinkDialog.Close() + else warnlog "Failed to open hyperlink ??!!" end if diff --git a/testautomation/spreadsheet/required/includes/c_upd_insertmenu.inc b/testautomation/spreadsheet/required/includes/c_upd_insertmenu.inc index 7c779b341a08..be27490e3b18 100644..100755 --- a/testautomation/spreadsheet/required/includes/c_upd_insertmenu.inc +++ b/testautomation/spreadsheet/required/includes/c_upd_insertmenu.inc @@ -395,139 +395,145 @@ testcase tInsertHyperlink '/// Open 'Hyperlink' – dialog via 'Insert – Hyperlink' printlog " Open 'Hyperlink' – dialog via 'Insert – Hyperlink'" InsertHyperlink - WaitSlot( 5000 ) + + kontext "HyperlinkDialog" + if ( HyperlinkDialog.exists( 2 ) ) then - Kontext "Hyperlink" - '/// Switch to category 'Internet' (first one) - printlog " Switch to category 'Internet'" - Auswahl.TypeKeys "<HOME>" - '/// Choose 'Web' - printlog " Choose 'Web'" - Kontext "TabHyperlinkInternet" - internet.check - Call DialogTest ( TabHyperlinkInternet,1 ) - '/// Click on 'Target in Document' – button (the target dialog appears) - printlog " Click on 'Target in Document' – button (the target dialog appears)" - Target.Click - Kontext "ZielImDokument" - Call DialogTest ( ZielImDokument ) - '/// Close 'Target' – dialog with 'Close' - printlog " Close 'Target' – dialog with 'Close'" - ZielImDokument.Close - Kontext "TabHyperlinkInternet" - '/// Choose 'FTP' - printlog " Choose 'FTP'" - FTP.check - Call DialogTest ( TabHyperlinkInternet,2 ) - '/// Check that the 'Target' – button is disabled - printlog " Check that the 'Target' – button is disabled" - if Target.IsEnabled then - warnlog "The target button is enabled, but should be disabled" - end if - '/// Check option 'Anonymous User' - printlog " Check option 'Anonymous User'" - AnonymerBenutzer.Check - '/// Check that 'Login Name' is disabled - printlog " Check that 'Login Name' is disabled" - if Loginname.IsEnabled then - warnlog "The Loginname is enabled, but should be disabled" - end if - '/// Chose 'Telnet' - printlog " Chose 'Telnet'" - Telnet.check - Call DialogTest ( TabHyperlinkInternet,3 ) - '/// Check that the 'Target' – button is disabled - printlog " Check that the 'Target' – button is disabled" - if Target.IsEnabled then - warnlog "The target button is enabled, but should be disabled" - end if - '/// Switch to category 'Mail & News' - Kontext "Hyperlink" - Auswahl.TypeKeys "<DOWN>" - Kontext "TabHyperlinkMailUndNews" - Call DialogTest ( TabHyperlinkMailUndNews ) - '/// Click twice on 'Data Source' – button to turn on / off the databasebeamer - printlog " Click twice on 'Data Source' – button to turn on / off the databasebeamer" - Adressbuch.click - Adressbuch.click - '/// Check option 'Mail' - printlog " Check option 'Mail'" - EMail.check - '/// Check that the editfield for 'Receiver' is enabled - printlog " Check that the editfield for 'Receiver' is enabled" - if not Receiver.IsEnabled then - warnlog "Receiver is disabled but should be enabled" - end if - '/// Check that the editfield for 'Subject' is enabled - printlog " Check that the editfield for 'Subject' is enabled" - if not Betreff.IsEnabled then - warnlog "Subject is disabled but should be enabled" - end if - '/// Check option 'News' - printlog " Check option 'News'" - News.check - '/// Check that the editfield for 'Subject' is disabled - printlog " Check that the editfield for 'Subject' is disabled" - if Betreff.IsEnabled then - warnlog "Subject is enabled but should be disabled" - end if - '/// Switch to category Document - printlog " Switch to category Document" - Kontext "Hyperlink" - Auswahl.TypeKeys "<DOWN>" - Kontext "TabHyperlinkDokument" - Call DialogTest ( TabHyperlinkDokument ) - '/// Enter 'Test' in 'Path' - printlog " Enter 'Test' in 'Path'" - Path.TypeKeys "Test" - '/// Click on 'Open' – button - printlog " Click on 'Open' – button" - DateiOeffnen.click - Kontext "OeffnenDlg" - '/// Close 'Open' – dialog with 'Cancel' - printlog " Close 'Open' – dialog with 'Cancel'" - OeffnenDlg.Cancel - Kontext "TabHyperlinkDokument" - '/// Click on 'Target in Document' – button (the target dialog appears) - printlog " Click on 'Target in Document' – button (the target dialog appears)" - Target.click - Kontext "ZielImDokument" - '/// Close 'Target' – dialog with 'Close' - printlog " Close 'Target' – dialog with 'Close'" - ZielImDokument.close - Kontext "Hyperlink" - '/// Switch to category 'New Document' - printlog " Switch to category 'New Document'" - Auswahl.TypeKeys "<DOWN>" - Kontext "TabHyperlinkNeuesDokument" - Call DialogTest ( TabHyperlinkNeuesDokument ) - '/// Check 'Edit Now' - printlog " Click 'Edit Now'" - SofortBearbeiten.check - '/// Check 'Edit Later' - printlog " Click 'Edit Later'" - SpaeterBearbeiten.check - '/// Click on 'Select Path' – button - printlog " Click on 'Select Path' – button" - Pfad.click - Kontext "OeffnenDlg" - '/// Close 'Select Path' – dialog with 'Cancel' - printlog " Close 'Select Path' – dialog with 'Cancel'" - OeffnenDlg.Cancel - Kontext "TabHyperlinkNeuesDokument" - '/// Check that the 'Frame' listbox has items - printlog " Check that the 'Frame' listbox has items" - if Frame.GetItemCount < 1 then - warnlog "The Frame combobox is empty" - end if - '/// Check that the 'Form' listbox has 2 entries - printlog " Check that the 'Form' listbox has 2 entries" - if Form.GetItemCount <> 2 then - warnlog "The Form combobox has not 2 items" - end if - '/// Close 'Hyperlink' – dialog with 'Close' - printlog " Close 'Hyperlink' – dialog with 'Close'" - TabHyperlinkNeuesDokument.Cancel + Kontext "Hyperlink" + '/// Switch to category 'Internet' (first one) + printlog " Switch to category 'Internet'" + Auswahl.TypeKeys "<HOME>" + '/// Choose 'Web' + printlog " Choose 'Web'" + Kontext "TabHyperlinkInternet" + internet.check + Call DialogTest ( TabHyperlinkInternet,1 ) + '/// Click on 'Target in Document' – button (the target dialog appears) + printlog " Click on 'Target in Document' – button (the target dialog appears)" + Target.Click + Kontext "ZielImDokument" + Call DialogTest ( ZielImDokument ) + '/// Close 'Target' – dialog with 'Close' + printlog " Close 'Target' – dialog with 'Close'" + ZielImDokument.Close + Kontext "TabHyperlinkInternet" + '/// Choose 'FTP' + printlog " Choose 'FTP'" + FTP.check + Call DialogTest ( TabHyperlinkInternet,2 ) + '/// Check that the 'Target' – button is disabled + printlog " Check that the 'Target' – button is disabled" + if Target.IsEnabled then + warnlog "The target button is enabled, but should be disabled" + end if + '/// Check option 'Anonymous User' + printlog " Check option 'Anonymous User'" + AnonymerBenutzer.Check + '/// Check that 'Login Name' is disabled + printlog " Check that 'Login Name' is disabled" + if Loginname.IsEnabled then + warnlog "The Loginname is enabled, but should be disabled" + end if + '/// Chose 'Telnet' + printlog " Chose 'Telnet'" + Telnet.check + Call DialogTest ( TabHyperlinkInternet,3 ) + '/// Check that the 'Target' – button is disabled + printlog " Check that the 'Target' – button is disabled" + if Target.IsEnabled then + warnlog "The target button is enabled, but should be disabled" + end if + '/// Switch to category 'Mail & News' + Kontext "Hyperlink" + Auswahl.TypeKeys "<DOWN>" + Kontext "TabHyperlinkMailUndNews" + Call DialogTest ( TabHyperlinkMailUndNews ) + '/// Click twice on 'Data Source' – button to turn on / off the databasebeamer + printlog " Click twice on 'Data Source' – button to turn on / off the databasebeamer" + Adressbuch.click + Adressbuch.click + '/// Check option 'Mail' + printlog " Check option 'Mail'" + EMail.check + '/// Check that the editfield for 'Receiver' is enabled + printlog " Check that the editfield for 'Receiver' is enabled" + if not Receiver.IsEnabled then + warnlog "Receiver is disabled but should be enabled" + end if + '/// Check that the editfield for 'Subject' is enabled + printlog " Check that the editfield for 'Subject' is enabled" + if not Betreff.IsEnabled then + warnlog "Subject is disabled but should be enabled" + end if + '/// Check option 'News' + printlog " Check option 'News'" + News.check + '/// Check that the editfield for 'Subject' is disabled + printlog " Check that the editfield for 'Subject' is disabled" + if Betreff.IsEnabled then + warnlog "Subject is enabled but should be disabled" + end if + '/// Switch to category Document + printlog " Switch to category Document" + Kontext "Hyperlink" + Auswahl.TypeKeys "<DOWN>" + Kontext "TabHyperlinkDokument" + Call DialogTest ( TabHyperlinkDokument ) + '/// Enter 'Test' in 'Path' + printlog " Enter 'Test' in 'Path'" + Path.TypeKeys "Test" + '/// Click on 'Open' – button + printlog " Click on 'Open' – button" + DateiOeffnen.click + Kontext "OeffnenDlg" + '/// Close 'Open' – dialog with 'Cancel' + printlog " Close 'Open' – dialog with 'Cancel'" + OeffnenDlg.Cancel + Kontext "TabHyperlinkDokument" + '/// Click on 'Target in Document' – button (the target dialog appears) + printlog " Click on 'Target in Document' – button (the target dialog appears)" + Target.click + Kontext "ZielImDokument" + '/// Close 'Target' – dialog with 'Close' + printlog " Close 'Target' – dialog with 'Close'" + ZielImDokument.close + Kontext "Hyperlink" + '/// Switch to category 'New Document' + printlog " Switch to category 'New Document'" + Auswahl.TypeKeys "<DOWN>" + Kontext "TabHyperlinkNeuesDokument" + Call DialogTest ( TabHyperlinkNeuesDokument ) + '/// Check 'Edit Now' + printlog " Click 'Edit Now'" + SofortBearbeiten.check + '/// Check 'Edit Later' + printlog " Click 'Edit Later'" + SpaeterBearbeiten.check + '/// Click on 'Select Path' – button + printlog " Click on 'Select Path' – button" + Pfad.click + Kontext "OeffnenDlg" + '/// Close 'Select Path' – dialog with 'Cancel' + printlog " Close 'Select Path' – dialog with 'Cancel'" + OeffnenDlg.Cancel + Kontext "TabHyperlinkNeuesDokument" + '/// Check that the 'Frame' listbox has items + printlog " Check that the 'Frame' listbox has items" + if Frame.GetItemCount < 1 then + warnlog "The Frame combobox is empty" + end if + '/// Check that the 'Form' listbox has 2 entries + printlog " Check that the 'Form' listbox has 2 entries" + if Form.GetItemCount <> 2 then + warnlog "The Form combobox has not 2 items" + end if + '/// Close 'Hyperlink' – dialog with 'Close' + printlog " Close 'Hyperlink' – dialog with 'Close'" + kontext "HyperlinkDialog" + HyperlinkDialog.Close() + else + warnlog( "Failed to open <HyperlinkDialog>" ) + endif '/// Close document printlog " Close starting document" call hCloseDocument diff --git a/testautomation/writer/optional/includes/undo/w_undo_history_3.inc b/testautomation/writer/optional/includes/undo/w_undo_history_3.inc index 2a5471733642..64b69a512a42 100644 --- a/testautomation/writer/optional/includes/undo/w_undo_history_3.inc +++ b/testautomation/writer/optional/includes/undo/w_undo_history_3.inc @@ -119,13 +119,19 @@ testcase tUndoHyperlink Call hNewDocument '/// Insert / Hyperlink as Text InsertHyperlink - Call wEinfuegenHyperlink(1) - ZielURL.Settext "www.sun.com" - Form.Select 1 - Kontext "Hyperlink" - Uebernehmen.Click - Hyperlink.Close '/// string in Undo-list has to be: "Insert Hyperlink") + kontext "HyperlinkDialog" + if ( HyperlinkDialog.exists( 2 ) ) then + Call wEinfuegenHyperlink(1) + ZielURL.SetText "www.sun.com" + Form.Select 1 + Uebernehmen.Click() + + kontext "HyperlinkDialog" + HyperlinkDialog.Close() + else + warnlog( "Unable to open <HyperlinkDialog>" ) + endif Call CheckUndoStringInUndoList ( 10, "InsertHyperlink" ) Call wTypeKeys "<Return>" @@ -133,12 +139,19 @@ testcase tUndoHyperlink '/// Insert / Hyperlink as Button printlog "- Insert hyperlink as Button" InsertHyperlink - Call wEinfuegenHyperlink(1) - ZielURL.Settext "www.sun.com" - Form.Select 2 - Kontext "Hyperlink" - Uebernehmen.Click - Hyperlink.Close + + kontext "HyperlinkDialog" + if ( HyperlinkDialog.exists( 2 ) ) then + Call wEinfuegenHyperlink(1) + ZielURL.Settext "www.sun.com" + Form.Select 2 + Kontext "Hyperlink" + Uebernehmen.Click + kontext "HyperlinkDialog" + HyperlinkDialog.Close + else + warnlog( "Unable to open <HyperlinkDialog>" ) + endif '/// string in Undo-list has to be: "insert URL Button") Call CheckUndoStringInUndoList ( 10, "InsertHyperlinkButton" ) diff --git a/testautomation/writer/required/includes/w_002_.inc b/testautomation/writer/required/includes/w_002_.inc index 089b779b4adf..d19c563526ce 100755 --- a/testautomation/writer/required/includes/w_002_.inc +++ b/testautomation/writer/required/includes/w_002_.inc @@ -931,12 +931,13 @@ testcase tEditHyperlink PrintLog "Insert / Hyperlink" InsertHyperlink - Kontext "Hyperlink" - if ( Hyperlink.exists( 2 ) ) then + kontext "HyperlinkDialog" + if ( HyperlinkDialog.exists( 2 ) ) then + PrintLog "Insert / Hyperlink" Call wEinfuegenHyperlink(1) - Kontext "TabHyperlinkInternet" + Kontext "TabHyperlinkInternet" printlog( "Check <Internet>" ) Internet.Check() diff --git a/testautomation/writer/required/includes/w_004_.inc b/testautomation/writer/required/includes/w_004_.inc index cff995f4e50e..89e64f23f875 100755 --- a/testautomation/writer/required/includes/w_004_.inc +++ b/testautomation/writer/required/includes/w_004_.inc @@ -320,46 +320,53 @@ testcase tInsertHyperlink printlog "- Internet" printlog " Insert / Hyperlink" InsertHyperlink - printlog " In 'Hyperlink' dialog step through all pages" - Call wEinfuegenHyperlink(1) - Call DialogTest ( TabHyperlinkInternet ) - Kontext "Hyperlink" - printlog "- Mail & News" - Call wEinfuegenHyperlink(2) - wait 500 - Call DialogTest ( TabHyperlinkMailUndNews ) + kontext "HyperlinkDialog" + if ( HyperlinkDialog.exists( 2 ) ) then - Kontext "Hyperlink" - printlog "- Document" - Call wEinfuegenHyperlink(3) - wait 500 - Call DialogTest ( TabHyperlinkDokument ) - - DateiOeffnen.Click + printlog " In 'Hyperlink' dialog step through all pages" + Call wEinfuegenHyperlink(1) + Call DialogTest ( TabHyperlinkInternet ) + + Kontext "Hyperlink" + printlog "- Mail & News" + Call wEinfuegenHyperlink(2) + wait 500 + Call DialogTest ( TabHyperlinkMailUndNews ) + + Kontext "Hyperlink" + printlog "- Document" + Call wEinfuegenHyperlink(3) + wait 500 + Call DialogTest ( TabHyperlinkDokument ) + + DateiOeffnen.Click + + Kontext "OeffnenDlg" + if ( OeffnenDlg.exists( 1 ) ) then + OeffnenDlg.Cancel + else + warnlog( "Dialog <OeffnenDlg> is not available" ) + endif + + Kontext "Hyperlink" + printlog "- New Document" + Call wEinfuegenHyperlink(4) + wait 500 + Call DialogTest ( TabHyperlinkNeuesDokument ) - Kontext "OeffnenDlg" - if ( OeffnenDlg.exists( 1 ) ) then + Pfad.Click + Sleep 1 + Kontext "OeffnenDlg" OeffnenDlg.Cancel + + printlog " Close 'Hyperlink' dialog" + kontext "HyperlinkDialog" + HyperlinkDialog.Close else - warnlog( "Dialog <OeffnenDlg> is not available" ) + warnlog( "Unable to open <HyperlinkDialog>" ) endif - Kontext "Hyperlink" - printlog "- New Document" - Call wEinfuegenHyperlink(4) - wait 500 - Call DialogTest ( TabHyperlinkNeuesDokument ) - - Pfad.Click - Sleep 1 - Kontext "OeffnenDlg" - OeffnenDlg.Cancel - - Kontext "TabHyperlinkNeuesDokument" - TabHyperlinkNeuesDokument.Cancel - printlog " Close 'Hyperlink' dialog" - printlog " Close active document" Call hCloseDocument endcase |