diff options
author | Ivo Hinkelmann <ihi@openoffice.org> | 2010-08-26 13:56:27 +0200 |
---|---|---|
committer | Ivo Hinkelmann <ihi@openoffice.org> | 2010-08-26 13:56:27 +0200 |
commit | 06e9bb47b0d5f6d9521f50f98978c47fc1302dd6 (patch) | |
tree | 709681b81ef68550471c3b4271e50ae79fb51318 | |
parent | 18d51bbac7f12c58c82588223f4a38085e1627c8 (diff) | |
parent | a1615ed8a913ea0d35d8368425f5cbe0b77d9d8c (diff) |
CWS-TOOLING: integrate CWS automationooo330m5
Notes
split repo tag: testing_ooo/OOO330_m6
5 files changed, 36 insertions, 12 deletions
diff --git a/testautomation/dbaccess/optional/includes/db_Mozilla.inc b/testautomation/dbaccess/optional/includes/db_Mozilla.inc index 45cf9456d290..236b6a5e79ed 100755 --- a/testautomation/dbaccess/optional/includes/db_Mozilla.inc +++ b/testautomation/dbaccess/optional/includes/db_Mozilla.inc @@ -32,22 +32,35 @@ '\*********************************************************************** sub db_Mozilla - ' Information for this test under - ' http://wiki.services.openoffice.org/wiki/Database_Automatic_Testing#Testing_the_mozilla_Address_book - - if fCreateMozillaAddressbookDatasource(gOfficePath + ConvertPath("user/work/TT_Mozilla.odb")) then - - tQueryAddressbook(gOfficePath + ConvertPath("user/work/TT_Mozilla.odb")) - tSortAddressbook(gOfficePath + ConvertPath("user/work/TT_Mozilla.odb")) - else + if(gPlatform = "osx") then + ' on Mac platform the Mozilla address book is not available + ' so I call only the testcases to satisfied the database tQueryAddressbook("") tSortAddressbook("") + else + + ' Information for this test under + ' http://wiki.services.openoffice.org/wiki/Database_Automatic_Testing#Testing_the_mozilla_Address_book + + if fCreateMozillaAddressbookDatasource(gOfficePath + ConvertPath("user/work/TT_Mozilla.odb")) then + + tQueryAddressbook(gOfficePath + ConvertPath("user/work/TT_Mozilla.odb")) + tSortAddressbook(gOfficePath + ConvertPath("user/work/TT_Mozilla.odb")) + else + tQueryAddressbook("") + tSortAddressbook("") + endif endif end sub '------------------------------------------------------------------------- testcase tQueryAddressbook( sFileName ) + if(gPlatform = "osx") then + printlog "mozilla address book not available on Mac" + goto endsub + endif + if ( not fOpenDatabase(sFileName) ) then warnlog "Database can't be open" printlog "May be you find a solution under http://wiki.services.openoffice.org/wiki/Database_Automatic_Testing#Testing_the_mozilla_Address_book" @@ -86,6 +99,11 @@ endcase '------------------------------------------------------------------------- testcase tSortAddressbook( sFileName ) + if(gPlatform = "osx") then + printlog "mozilla address book not available on Mac" + goto endsub + endif + Dim sRecordCount as String '/// open the database file created in the bas file diff --git a/testautomation/framework/required/includes/window_functions.inc b/testautomation/framework/required/includes/window_functions.inc index 6917639d30f8..008248a1c57d 100755 --- a/testautomation/framework/required/includes/window_functions.inc +++ b/testautomation/framework/required/includes/window_functions.inc @@ -196,9 +196,6 @@ end sub testcase tCheckWindowTitle( sApplication as string, sReference as string ) - if ( sApplication = "soffice" ) then - - printlog( "Update test for the office window titles" ) ' This is a Testtool-only problem that the product name is not displayed diff --git a/testautomation/graphics/required/includes/impress/im_003_.inc b/testautomation/graphics/required/includes/impress/im_003_.inc index 685a9d7e69cd..0eec59322e25 100644 --- a/testautomation/graphics/required/includes/impress/im_003_.inc +++ b/testautomation/graphics/required/includes/impress/im_003_.inc @@ -216,6 +216,9 @@ testcase tiViewToolbar_1 printlog "open application " Call hNewDocument + + printlog "use the empty layout" + call sSelectEmptyLayout printlog "Insert->Graphic... : global\input\graf_inp\desp.bmp " hUseAsyncSlot( "InsertGraphicsFromFile" ) diff --git a/testautomation/graphics/required/includes/impress/im_004_.inc b/testautomation/graphics/required/includes/impress/im_004_.inc index 02587ea83df9..2c55bc4c2f13 100644 --- a/testautomation/graphics/required/includes/impress/im_004_.inc +++ b/testautomation/graphics/required/includes/impress/im_004_.inc @@ -49,6 +49,7 @@ testcase tiInsertSlideExpandSummary Kontext "DocumentImpressOutlineView" printlog "Type 2 rows " DocumentImpressOutlineView.TypeKeys "Herbert<Return>Rudi" + sleep(1) printlog "View->Master View->Drawing View " ViewWorkspaceDrawingView WaitSlot() diff --git a/testautomation/writer/optional/includes/loadsave/w_loadsave.inc b/testautomation/writer/optional/includes/loadsave/w_loadsave.inc index 7454f733665d..e4871e78f400 100644 --- a/testautomation/writer/optional/includes/loadsave/w_loadsave.inc +++ b/testautomation/writer/optional/includes/loadsave/w_loadsave.inc @@ -52,6 +52,7 @@ testcase tExportAllReadableFormatsIntoODF Dim SavedCorrectly as Boolean Dim sExportFilter as string Dim sExportFile as string + Dim sExceptionFile as string Dim i as Integer WorkDirectory = ( ConvertPath ( gOfficePath + "user\work\" + gPlatgroup + "\export\")) @@ -77,8 +78,12 @@ testcase tExportAllReadableFormatsIntoODF For i = 1 to listCount(ImportFileList()) printlog "- " & i & ". load: " & ImportFileList(i) sExportFile = ImportFileList(i) + sExceptionFile = DateiExtract ( sExportFile ) + printlog sExceptionFile if GetExtention ( sExportFile ) = "psw" then - QAErrorlog "#i102221#Pocket Word filter puts General I/O Error" + QAErrorlog "#i102221#Pocket Word filter puts General I/O Error" + elseif LCase( sExceptionFile ) = "swdos.txt" then + QAErrorlog "#i114062#General I/O error loading StarWriter DOS file" else Call hFileOpen ( ImportFileList(i) ) printlog "- done" |