diff options
Diffstat (limited to 'testautomation/framework/tools')
16 files changed, 23 insertions, 41 deletions
diff --git a/testautomation/framework/tools/includes/CJK_tools.inc b/testautomation/framework/tools/includes/CJK_tools.inc index 38664ef78501..38664ef78501 100755..100644 --- a/testautomation/framework/tools/includes/CJK_tools.inc +++ b/testautomation/framework/tools/includes/CJK_tools.inc diff --git a/testautomation/framework/tools/includes/customize_tools.inc b/testautomation/framework/tools/includes/customize_tools.inc index 9fbdb6928b08..0237990a3166 100755..100644 --- a/testautomation/framework/tools/includes/customize_tools.inc +++ b/testautomation/framework/tools/includes/customize_tools.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@oracle.com +'* owner : gregor.hartmann@oracle.com '* '* short description : Tools to ease the use of the ToolsCustomize-Dialog '* diff --git a/testautomation/framework/tools/includes/fileoperations.inc b/testautomation/framework/tools/includes/fileoperations.inc index 061f9f606f48..1ba484df58af 100755..100644 --- a/testautomation/framework/tools/includes/fileoperations.inc +++ b/testautomation/framework/tools/includes/fileoperations.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@oracle.com +'* owner : gregor.hartmann@oracle.com '* '* short description : check the internal file dialog ( extended tests ) '* diff --git a/testautomation/framework/tools/includes/formcontrols.inc b/testautomation/framework/tools/includes/formcontrols.inc index 6755ed2a2cdd..7271347e10eb 100755..100644 --- a/testautomation/framework/tools/includes/formcontrols.inc +++ b/testautomation/framework/tools/includes/formcontrols.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ ' ** -' ** owner : joerg.skottke@oracle.com +' ** owner : gregor.hartmann@oracle.com ' ** ' ** short description : Tools to draw and select form controls in basic-ide ' ** diff --git a/testautomation/framework/tools/includes/help_tools.inc b/testautomation/framework/tools/includes/help_tools.inc index 9c81084952df..7b17d4fe37ed 100755..100644 --- a/testautomation/framework/tools/includes/help_tools.inc +++ b/testautomation/framework/tools/includes/help_tools.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@oracle.com +'* owner : gregor.hartmann@oracle.com '* '* short description : Replacements for routines in t_lists.inc adds some '* diff --git a/testautomation/framework/tools/includes/i18n_tools.inc b/testautomation/framework/tools/includes/i18n_tools.inc index f918b1fe5076..aa0e141a45f3 100755..100644 --- a/testautomation/framework/tools/includes/i18n_tools.inc +++ b/testautomation/framework/tools/includes/i18n_tools.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@oracle.com +'* owner : gregor.hartmann@oracle.com '* '* short description : Tools to ease working with language dependent strings/values '* diff --git a/testautomation/framework/tools/includes/options_tools.inc b/testautomation/framework/tools/includes/options_tools.inc index 4f7a05154795..4f7a05154795 100755..100644 --- a/testautomation/framework/tools/includes/options_tools.inc +++ b/testautomation/framework/tools/includes/options_tools.inc diff --git a/testautomation/framework/tools/includes/pbrowser_tools.inc b/testautomation/framework/tools/includes/pbrowser_tools.inc index a6a089150a96..391c1a3c2456 100755..100644 --- a/testautomation/framework/tools/includes/pbrowser_tools.inc +++ b/testautomation/framework/tools/includes/pbrowser_tools.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@oracle.com +'* owner : gregor.hartmann@oracle.com '* '* short description : Tools for working with the property browser for formcontrols '* diff --git a/testautomation/framework/tools/includes/private_environment.inc b/testautomation/framework/tools/includes/private_environment.inc index af81110b3f18..40851aa8bc1a 100755..100644 --- a/testautomation/framework/tools/includes/private_environment.inc +++ b/testautomation/framework/tools/includes/private_environment.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@oracle.com +'* owner : gregor.hartmann@oracle.com '* '* short description : Tools to ease working with private environment '* diff --git a/testautomation/framework/tools/includes/scriptorganizer_tools.inc b/testautomation/framework/tools/includes/scriptorganizer_tools.inc index 8cf067913d64..52503af25bd6 100755..100644 --- a/testautomation/framework/tools/includes/scriptorganizer_tools.inc +++ b/testautomation/framework/tools/includes/scriptorganizer_tools.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@oracle.com +'* owner : gregor.hartmann@oracle.com '* '* short description : Test scripting-organizers / document-attached scripts '* diff --git a/testautomation/framework/tools/includes/spadmin_tools.inc b/testautomation/framework/tools/includes/spadmin_tools.inc index 77cbdf61a44b..ad41ccf017d3 100755..100644 --- a/testautomation/framework/tools/includes/spadmin_tools.inc +++ b/testautomation/framework/tools/includes/spadmin_tools.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@oracle.com +'* owner : gregor.hartmann@oracle.com '* '* short description : helper functions for SPAdmin '* diff --git a/testautomation/framework/tools/includes/template_tools.inc b/testautomation/framework/tools/includes/template_tools.inc index c9d1e94fa16f..20881f3fb85e 100755..100644 --- a/testautomation/framework/tools/includes/template_tools.inc +++ b/testautomation/framework/tools/includes/template_tools.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@oracle.com +'* owner : gregor.hartmann@oracle.com '* '* short description : Helper functions to ease usage of templates '* @@ -254,11 +254,14 @@ function hSelectDocumentObject( iTitle as integer , iMode as integer ) as string '///<u>Input</u>: '///<ol> '///+<li>Index of the folder to be selected on the categories-pane (integer)</li> + '///<ul> + '///+<li>Valid positive index</li> + '///</ul> '///+<li>Mode in which to open the template (integer)</li> '///<ul> '///+<li>0 = Do not open the object, just return its name</li> '///+<li>1 = Open a new document based on the selected Template</li> - '///+<li>2 = edit the template</li> + '///+<li>2 = edit the template (unsupported)</li> '///</ul> '///</ol> '///<u>Returns</u>: @@ -267,32 +270,12 @@ function hSelectDocumentObject( iTitle as integer , iMode as integer ) as string '///</ul> '///<u>Description</u>: '///<ul> - '///+<li>Verify function parameter iMode</li> - - if ( ( iMode < 0 ) or ( iMode > 2 ) ) then - warnlog( CFN & "Invalid function parameter iMode: " & iMode ) - hSelectDocumentObject() = "" - exit function - endif dim cTitle as string dim brc as boolean dim iObjectCount as integer Kontext "TemplateAndDocuments" - '///+<li>Verify the function parameter iTitle > 0</li> - if ( iTitle < 1 ) then - warnlog( CFN & "Invalid function parameter iTitle: " & iTitle ) - hSelectDocumentObject() = "" - exit function - endif - - '///+<li>Verify that the index is not too large</li> - if ( iTitle > FileList.getItemCount() ) then - warnlog( CFN & "Invalid function parameter iTitle: " & iTitle ) - hSelectDocumentObject() = "" - exit function - endif '///+<li>Get the title of the selected object</li> cTitle = hGetFileFolderName( iTitle ) @@ -315,9 +298,7 @@ function hSelectDocumentObject( iTitle as integer , iMode as integer ) as string kontext "TemplateAndDocuments" if ( TemplateAndDocuments.exists() ) then '///+<li>If yes: Try to determine if it is a new folder</li> - brc = hIsObjectAFolder( iObjectCount ) - - if ( brc ) then + if ( hIsObjectAFolder( iObjectCount ) ) then hSelectDocumentObject() = "Folder" exit function endif @@ -326,12 +307,13 @@ function hSelectDocumentObject( iTitle as integer , iMode as integer ) as string catch endcatch - hFileWait() - hHandleActivesOnLoad( 2, false ) - hHandleInitialDialogs() + case 2 : warnlog( "Unsupported option: Edit template" ) end select + hFileWait() + hHandleActivesOnLoad( 2, false ) + brc = hHandleInitialDialogs() '///+<li>If all initial dialogs were handled correctly, return the title</li> if ( brc ) then diff --git a/testautomation/framework/tools/includes/toolbar_tools.inc b/testautomation/framework/tools/includes/toolbar_tools.inc index 66c6c27982d0..d3539abf8a37 100755..100644 --- a/testautomation/framework/tools/includes/toolbar_tools.inc +++ b/testautomation/framework/tools/includes/toolbar_tools.inc @@ -25,7 +25,7 @@ ' '/************************************************************************ '* -'* owner : joerg.skottke@oracle.com +'* owner : gregor.hartmann@oracle.com '* '* short description : global update test (Standardbar) '* diff --git a/testautomation/framework/tools/includes/webtools.inc b/testautomation/framework/tools/includes/webtools.inc index 424ace8c959e..7904c4532de1 100755..100644 --- a/testautomation/framework/tools/includes/webtools.inc +++ b/testautomation/framework/tools/includes/webtools.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@oracle.com +'* owner : gregor.hartmann@oracle.com '* '* short description : Tools to ease working with web functionality '* diff --git a/testautomation/framework/tools/includes/window_tools.inc b/testautomation/framework/tools/includes/window_tools.inc index 93a09ccf533d..649935dd574a 100755..100644 --- a/testautomation/framework/tools/includes/window_tools.inc +++ b/testautomation/framework/tools/includes/window_tools.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@oracle.com +'* owner : gregor.hartmann@oracle.com '* '* short description : Tools to handle windows/frames '* diff --git a/testautomation/framework/tools/includes/wizards.inc b/testautomation/framework/tools/includes/wizards.inc index 380f84141d34..a32a77f4518f 100755..100644 --- a/testautomation/framework/tools/includes/wizards.inc +++ b/testautomation/framework/tools/includes/wizards.inc @@ -25,7 +25,7 @@ ' '/****************************************************************************** '* -'* owner : joerg.skottke@oracle.com +'* owner : gregor.hartmann@oracle.com '* '* short description : helper functions for the wizards '* |