diff options
| author | Joerg Skottke [jsk] <jsk@openoffice.org> | 2010-07-08 10:41:00 +0200 |
|---|---|---|
| committer | Joerg Skottke [jsk] <jsk@openoffice.org> | 2010-07-08 10:41:00 +0200 |
| commit | aa1d824ff9d9339cad9afadf0a750cff0f1354ea (patch) | |
| tree | d3d3702d733a210cf5a3e6d083dca5dc1c0f93ca /testautomation | |
| parent | automationdev300m84: #i112935 - Removed the invalid issue-ids from the test t... (diff) | |
| download | core-aa1d824ff9d9339cad9afadf0a750cff0f1354ea.tar.gz core-aa1d824ff9d9339cad9afadf0a750cff0f1354ea.zip | |
automationdev300m84: #i112887 - The method used to close the hyperlink dialog was wrong. Another CWS brought the possibility to assign HIDs to tabpages so this can now be used. The HyperlinkDialog now has three buttons: ApplyButton, CloseButton and BackButton which can be accessed directly via the dialogs context. Requires a minor change to edia_d_h.win. Furthermore t_tools3.inc had a modification regarding the for-next loop's exit value and the test tInsertHyperlink was modified.
Diffstat (limited to 'testautomation')
| -rwxr-xr-x | testautomation/global/tools/includes/required/t_tools3.inc | 2 | ||||
| -rwxr-xr-x | testautomation/global/win/edia_d_h.win | 3 | ||||
| -rwxr-xr-x | testautomation/writer/required/includes/w_002_.inc | 7 |
3 files changed, 8 insertions, 4 deletions
diff --git a/testautomation/global/tools/includes/required/t_tools3.inc b/testautomation/global/tools/includes/required/t_tools3.inc index f52010f086e4..987a6ded6bb6 100755 --- a/testautomation/global/tools/includes/required/t_tools3.inc +++ b/testautomation/global/tools/includes/required/t_tools3.inc @@ -1142,7 +1142,7 @@ function hClickButton( oButton as object ) as integer ' Total time used iTime = iRetries * DELAY - if ( iRetries = MAX_RETRIES ) then iTime = RC_TIMEOUT + if ( iRetries >= MAX_RETRIES ) then iTime = RC_TIMEOUT if ( GVERBOSE ) then printlog( CFN & "Exit with rc=" & iTime ) hClickButton() = iTime diff --git a/testautomation/global/win/edia_d_h.win b/testautomation/global/win/edia_d_h.win index 35869e0c2b72..d36515d0599e 100755 --- a/testautomation/global/win/edia_d_h.win +++ b/testautomation/global/win/edia_d_h.win @@ -503,3 +503,6 @@ 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 +CloseButton HID_ICCDIALOG_CANCEL_BTN +ApplyButton HID_ICCDIALOG_OK_BTN +BackButton HID_ICCDIALOG_BACK_BTN
\ No newline at end of file diff --git a/testautomation/writer/required/includes/w_002_.inc b/testautomation/writer/required/includes/w_002_.inc index d19c563526ce..d4b6952840b2 100755 --- a/testautomation/writer/required/includes/w_002_.inc +++ b/testautomation/writer/required/includes/w_002_.inc @@ -948,8 +948,9 @@ testcase tEditHyperlink PrintLog "Click 'Apply'" Uebernehmen.Click + kontext "HyperlinkDialog" PrintLog "Close Hyperlink dialog" - hCloseDialog( Hyperlink, "close" ) + hClickButton( CloseButton ) else warnlog( "Dialog <Hyperlink> did not open" ) hCloseDocument() @@ -972,8 +973,8 @@ testcase tEditHyperlink PrintLog "Edit / Hyperlink has to be enabled" if ( hUseAsyncSlot( "EditHyperlink" ) > -1 ) then - Kontext "Hyperlink" - hCloseDialog( Hyperlink, "close" ) + kontext "HyperlinkDialog" + hClickButton( CloseButton ) else warnlog( "Slot <EditHyperlink> could not be called" ) endif |