diff options
author | Kurt Zenker <kz@openoffice.org> | 2010-08-18 12:17:07 +0200 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2010-08-18 12:17:07 +0200 |
commit | 655e1a07f54336567bdeb4d21d9cff22adb0bb58 (patch) | |
tree | 407878a0defee5c5449a0444cc7eb7c2ed17bed9 /testautomation/framework/required/includes | |
parent | d729b859bad52772256f0ae5cb66e5d1d7dbbfff (diff) | |
parent | ac1cb06ae68cf0bf980a3ccb709e376af9a20121 (diff) |
CWS-TOOLING: integrate CWS automationooo330m3
Diffstat (limited to 'testautomation/framework/required/includes')
3 files changed, 26 insertions, 28 deletions
diff --git a/testautomation/framework/required/includes/basic_dialog_i18n.inc b/testautomation/framework/required/includes/basic_dialog_i18n.inc index 3c95be08a9d6..162f0cc040cd 100755 --- a/testautomation/framework/required/includes/basic_dialog_i18n.inc +++ b/testautomation/framework/required/includes/basic_dialog_i18n.inc @@ -49,6 +49,7 @@ testcase tUpdtBasicDialogI18n printlog( "Click Manage Languages on ToolsCollectionBar") kontext "ToolsCollectionBar" if ( ToolsCollectionBar.exists( DIALOG_DEFAULT_TIMEOUT ) ) then + wait( 500 ) hClickButton( ManageLanguage ) else warnlog( "<ToolsCollectionBar> is not open, is the test environment dirty?" ) diff --git a/testautomation/framework/required/includes/smoketest.inc b/testautomation/framework/required/includes/smoketest.inc index 24ef362a1bf1..d4e327a21ad7 100755 --- a/testautomation/framework/required/includes/smoketest.inc +++ b/testautomation/framework/required/includes/smoketest.inc @@ -33,6 +33,10 @@ testcase tSmokeTest + if ( not hCheckForBinfilters() ) then + goto endsub + endif + printlog( "Smoketest (10er-Test) from Release Engineering" ) dim sLocation as string dim i,x,a as integer diff --git a/testautomation/framework/required/includes/topten.inc b/testautomation/framework/required/includes/topten.inc index 8f5cb30fb99e..fdfdb49fec97 100755 --- a/testautomation/framework/required/includes/topten.inc +++ b/testautomation/framework/required/includes/topten.inc @@ -35,35 +35,28 @@ sub topten ' we need the binary filters (.sxw etc.) for this test but beginning with ' OOo 3.3 these are optional - try - hGetSuffix( "569" ) - catch - warnlog( "Optional legacy filters package is not installed" ) - printlog( "Please restart the setup to install the missing filters" ) - exit sub - endcatch - - gApplication = "WRITER" - call Top_ten_test - - gApplication = "CALC" - call Top_ten_test - - gApplication = "IMPRESS" - call Top_ten_test - - gApplication = "DRAW" - call Top_ten_test - - gApplication = "MATH" - call Top_ten_test - - gApplication = "HTML" - call Top_ten_test - - gApplication = "MASTERDOCUMENT" - call Top_ten_test + if ( hCheckForBinfilters() ) then + gApplication = "WRITER" + call Top_ten_test + gApplication = "CALC" + call Top_ten_test + + gApplication = "IMPRESS" + call Top_ten_test + + gApplication = "DRAW" + call Top_ten_test + + gApplication = "MATH" + call Top_ten_test + + gApplication = "HTML" + call Top_ten_test + + gApplication = "MASTERDOCUMENT" + call Top_ten_test + endif end sub '******************************************************************************* |