diff options
| author | Philipp Lohmann [pl] <Philipp.Lohmann@Sun.COM> | 2010-01-14 19:11:13 +0100 |
|---|---|---|
| committer | Philipp Lohmann [pl] <Philipp.Lohmann@Sun.COM> | 2010-01-14 19:11:13 +0100 |
| commit | 044b3ebb513cbd89d8cb22fe61c1090e54d85c54 (patch) | |
| tree | e7111c8a9e02b3b8fcca29d8e39785fb27c2407f /testautomation/global/required | |
| parent | 18caeed1c7cacfd8690665307df268b7e79e86de (diff) | |
| parent | 5da890e767cac2ea2214edafde01c2a5fcb53a09 (diff) | |
rebase to DEV300_m69
Diffstat (limited to 'testautomation/global/required')
| -rw-r--r-- | testautomation/global/required/includes/g_customize.inc | 9 | ||||
| -rwxr-xr-x | testautomation/global/required/includes/g_option.inc | 6 |
2 files changed, 15 insertions, 0 deletions
diff --git a/testautomation/global/required/includes/g_customize.inc b/testautomation/global/required/includes/g_customize.inc index 29b6dec58c61..733f5028880c 100644 --- a/testautomation/global/required/includes/g_customize.inc +++ b/testautomation/global/required/includes/g_customize.inc @@ -108,6 +108,7 @@ testcase tToolsCustomize Kontext "TabCustomizeMenu" '/// Click button 'Command' ///' + sleep(1) Command.click printlog "opened second one" WaitSlot() @@ -123,6 +124,7 @@ testcase tToolsCustomize WaitSlot() Kontext "TabCustomizeMenu" '/// Click button 'Command' ///' + sleep(1) Command.click printlog "opened third one" WaitSlot() @@ -192,8 +194,10 @@ testcase tToolsCustomize waitslot Kontext "TabCustomizeToolbars" + sleep(1) '/// Click button 'Command' ///' Command.click + waitslot '/// Select the firste entry 'Rename' ///' hMenuSelectNr(1) '/// Dialog 'Name' comes up ///' @@ -206,7 +210,9 @@ testcase tToolsCustomize endif Kontext "TabCustomizeToolbars" + sleep(1) Command.click + waitslot hMenuSelectNr(1) Kontext "CustomizeToolbarsReName" call DialogTest (CustomizeToolbarsReName) @@ -217,7 +223,9 @@ testcase tToolsCustomize waitslot Kontext "TabCustomizeToolbars" '/// Click button 'Command' ///' + sleep(1) Command.click + waitslot '/// Select the fifth entry 'Change Icon' ///' hMenuSelectNr(5) '/// Dialog 'Change Icon' comes up ///' @@ -252,6 +260,7 @@ testcase tToolsCustomize WaitSlot() Kontext "TabCustomizeToolbars" '/// On Tab Page 'Customize Menus' click on Button 'Toolbar' ///' + sleep(1) MenuBtn.openMenu WaitSlot() hMenuSelectNr(1) diff --git a/testautomation/global/required/includes/g_option.inc b/testautomation/global/required/includes/g_option.inc index 515f37a83215..d590016bc8ba 100755 --- a/testautomation/global/required/includes/g_option.inc +++ b/testautomation/global/required/includes/g_option.inc @@ -699,6 +699,12 @@ testcase tToolsOptionsImprovementProgram printlog( "Update test for the tools/options dialog of the OOo Improvement Program" ) + if (gOOO AND NOT gOOoImprovementIsEnabled) then + 'In StarOffice this test should always work - but on OOo contributet builds the function is not available - only on OOo builds provided by Sun Microsystems + qaErrorlog ("This build does not participate in the OOo Improvement Program - test exit") + goto endsub + endif + dim cLogFile as string cLogFile = gOfficePath & "user\temp\feedback\Current.csv" cLogFile = convertpath( cLogFile ) |