From 7ced687273e1d0439c240f7f5776928f2121931a Mon Sep 17 00:00:00 2001 From: Jens-Heiner Rechtien Date: Thu, 17 Sep 2009 10:45:27 +0000 Subject: [PATCH] CWS-TOOLING: integrate CWS jskhgpilot3 2009-09-10 skotti Branch merge - cws automationdev300m57cat0 into this one 2009-09-10 skotti #i104919 - stripped comments 2009-09-09 tb121644 #i104895# split options test into 2 files one for first.bas and the other for X_updt.bas'es 2009-09-09 tb121644 #i100286# add HElpId HID_OPTIONS_JAVA_LIST 2009-09-08 tb121644 #i103219 CB_KEEP_LIST -> CB_REMOVE_LIST; clean hid.lst 2009-09-08 tb121644 #i103219 revert of revert of change; clean hid.lst 2009-09-10 skotti Imported changes from CWS jskhgpilot2, they are needed 2009-09-09 skotti Merged jskhgpilot3 into this clone 2009-09-06 skotti Branch merge 2009-09-04 skotti #i104201# - Use hardware acceleration is now available on Windws. Sometimes 2009-09-04 skotti #i104201# - Use hardware acceleration is now available on Windws. Sometimes 2009-09-04 skotti #i104201# - Use hardware acceleration is now available on Windws. Sometimes 2009-09-02 skotti #i104201# - Warnlog to QAErrorlog 2009-09-02 skotti #i104487# - Supply warnlog 2009-09-01 skotti #i104201 - Switch off verbosity 2009-09-01 skotti #i104201 - More minor fixes, finally also solved the Hyperlink issue 2009-09-01 skotti Minor fixes 2009-08-31 skotti #i104201# - typo. Gargel 2009-08-31 skotti #i104201# - on some systems we just dont have antialiasing 2009-08-31 skotti #i104457# Disable verbosity in t_tools1.inc 2009-08-31 skotti #i104201# - Simplified test case with more hard coded numbers and fixed incorrect itemcount for StarOffice (which caused the tOOoColors test to fail) 2009-08-28 skotti Rebase 2009-08-28 skotti #i104487# - Attempt to fix hyperlink dialog 2009-08-25 skotti #i104487# Added WaitSlot() which appears to solve the problem on Windows 2009-08-25 skotti Merge von cws jskhgpilot2 2009-07-31 skotti #i96753 - added just another 500ms wait - sad, that is 2009-07-31 skotti #i96753 - cleanup, documentation 2009-07-31 skotti #i96753 - fix 2009-07-31 skotti #i96753 - OK, another approach for testing on different hardware... 2009-07-31 skotti #i96753 - small adjustments, back to .click() method 2009-07-29 skotti #i96753 - invented new dynamic function to deal with the menubutton which - as a nice sideefect allows to disable all sleep() statements within the test. This is good for -330 seconds of sleeping and in combination with a few optimizations makes the test run less than 20 minutes, about 8 minutes faster than before 2009-07-28 skotti #i96753 - use MenuBtn.OpenMenu() instead of .click() as this appears to work better and is used in other places successfully as well 2009-07-28 skotti #i103065 - fileopen dialog shows Mercurial and SVN directories which must be skipped 2009-07-28 skotti #i103065 - Added mercurial hidden directory to the excludes list in global routine 2009-07-28 skotti Rebase oder so... 2009-07-28 skotti #i96753 - insert wait statements 2009-09-09 skotti #i104919# - Add a WaitSlot() to gain stability on slow systems 2009-09-09 skotti #i104910# - Changed Accelerator from ALT+o to ALT+n for german localization 2009-09-08 skotti #i104887# - Moved files from required to optional including inc-files. Updated paths and moved non-project files to LoadIncludeFiles section --- .../ch2_chart_data_dlg_impress.bas | 3 ++- .../ch2_flexible_source_range_selection.bas | 12 ++++++++---- .../includes/ch2_flexible_source_range_selection.inc | 0 .../ch2_flexible_source_range_selection01.inc | 0 testautomation/global/input/accelerators.txt | 2 +- .../includes/optional/t_extension_manager_tools.inc | 1 + 6 files changed, 12 insertions(+), 6 deletions(-) rename testautomation/chart2/{required => optional}/ch2_chart_data_dlg_impress.bas (97%) mode change 100755 => 100644 rename testautomation/chart2/{required => optional}/ch2_flexible_source_range_selection.bas (95%) rename testautomation/chart2/{required => optional}/includes/ch2_flexible_source_range_selection.inc (100%) mode change 100755 => 100644 rename testautomation/chart2/{required => optional}/includes/ch2_flexible_source_range_selection01.inc (100%) mode change 100755 => 100644 diff --git a/testautomation/chart2/required/ch2_chart_data_dlg_impress.bas b/testautomation/chart2/optional/ch2_chart_data_dlg_impress.bas old mode 100755 new mode 100644 similarity index 97% rename from testautomation/chart2/required/ch2_chart_data_dlg_impress.bas rename to testautomation/chart2/optional/ch2_chart_data_dlg_impress.bas index a33bc2c72d6d..6f27a7a6e4d9 --- a/testautomation/chart2/required/ch2_chart_data_dlg_impress.bas +++ b/testautomation/chart2/optional/ch2_chart_data_dlg_impress.bas @@ -38,7 +38,8 @@ '\************************************************************************************************ sub main - use "chart2\required\includes\ch2_datadialogue.inc" + use "chart2\optional\includes\ch2_datadialogue.inc" + Call hStatusIn("Chart2", "ch2_chart_data_dlg_impress.bas") printlog "--------------------------------------------" printlog "C h a r t D a t a D i a l o g Updatetest" diff --git a/testautomation/chart2/required/ch2_flexible_source_range_selection.bas b/testautomation/chart2/optional/ch2_flexible_source_range_selection.bas similarity index 95% rename from testautomation/chart2/required/ch2_flexible_source_range_selection.bas rename to testautomation/chart2/optional/ch2_flexible_source_range_selection.bas index 91c205c19996..d3db18d82355 100644 --- a/testautomation/chart2/required/ch2_flexible_source_range_selection.bas +++ b/testautomation/chart2/optional/ch2_flexible_source_range_selection.bas @@ -38,10 +38,10 @@ '\*********************************************************************** sub main - use "chart2\required\includes\ch2_flexible_source_range_selection.inc" - use "chart2\required\includes\ch2_flexible_source_range_selection01.inc" - use "chart2\tools\ch_tools_common.inc" - use "chart2\tools\ch_tools_chart_type.inc" + + use "chart2\optional\includes\ch2_flexible_source_range_selection.inc" + use "chart2\optional\includes\ch2_flexible_source_range_selection01.inc" + Call hStatusIn("Chart2", "ch2_flexible_source_range_selection.bas") printlog "----------------------------------------------" printlog "Updatetest for Flexible Source Range Selection" @@ -66,6 +66,10 @@ end sub sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" + + use "chart2\tools\ch_tools_common.inc" + use "chart2\tools\ch_tools_chart_type.inc" + Call GetUseFiles gApplication = "CALC" end sub diff --git a/testautomation/chart2/required/includes/ch2_flexible_source_range_selection.inc b/testautomation/chart2/optional/includes/ch2_flexible_source_range_selection.inc old mode 100755 new mode 100644 similarity index 100% rename from testautomation/chart2/required/includes/ch2_flexible_source_range_selection.inc rename to testautomation/chart2/optional/includes/ch2_flexible_source_range_selection.inc diff --git a/testautomation/chart2/required/includes/ch2_flexible_source_range_selection01.inc b/testautomation/chart2/optional/includes/ch2_flexible_source_range_selection01.inc old mode 100755 new mode 100644 similarity index 100% rename from testautomation/chart2/required/includes/ch2_flexible_source_range_selection01.inc rename to testautomation/chart2/optional/includes/ch2_flexible_source_range_selection01.inc diff --git a/testautomation/global/input/accelerators.txt b/testautomation/global/input/accelerators.txt index 96cdd4028572..1f1d88214986 100755 --- a/testautomation/global/input/accelerators.txt +++ b/testautomation/global/input/accelerators.txt @@ -151,7 +151,7 @@ it=mod2 t da-DK=mod2 v sv=mod2 v pl-PL=mod2 n -de=mod2 o +de=mod2 n pt-BR=mod2 q ja-JP=mod2 u ko-KR=mod2 u diff --git a/testautomation/global/tools/includes/optional/t_extension_manager_tools.inc b/testautomation/global/tools/includes/optional/t_extension_manager_tools.inc index f207ede20952..2dfc30ad52a8 100755 --- a/testautomation/global/tools/includes/optional/t_extension_manager_tools.inc +++ b/testautomation/global/tools/includes/optional/t_extension_manager_tools.inc @@ -339,6 +339,7 @@ function hExtensionRemoveGUI( cExtensionName as string ) as integer if ( Active.exists( 3 ) ) then printlog( Active.getText() ) Active.OK() + WaitSlot() else warnlog( CFN & "Expected confirmation dialog is missing" ) endif