diff options
author | Ivo Hinkelmann <ihi@openoffice.org> | 2010-08-03 15:52:34 +0200 |
---|---|---|
committer | Ivo Hinkelmann <ihi@openoffice.org> | 2010-08-03 15:52:34 +0200 |
commit | 2719d50de4f3f53fb283c7e7ee11fc7f69797716 (patch) | |
tree | 87a859c3f16e93629d353579d3f31633aad8338d | |
parent | 5021698508beac3fcf1ce9c76f0e489cc2dfc1f1 (diff) | |
parent | 064a54918200a0584422f16b3dc28b5b0859be6e (diff) |
CWS-TOOLING: integrate CWS automationooo330m1
Notes
split repo tag: testing_ooo/OOO330_m3
-rw-r--r-- | testautomation/chart2/optional/includes/loadsave/ch2_xml_format.inc | 8 | ||||
-rwxr-xr-x | testautomation/chart2/optional/includes/wizard/ch2_lvl1_wizard.inc | 2 | ||||
-rwxr-xr-x | testautomation/dbaccess/optional/includes/wiz_DatabaseWizard.inc | 32 | ||||
-rw-r--r--[-rwxr-xr-x] | testautomation/framework/optional/f_basic_gridcontrol.bas | 13 | ||||
-rw-r--r--[-rwxr-xr-x] | testautomation/framework/optional/includes/basic_gridcontrol.inc | 40 | ||||
-rwxr-xr-x | testautomation/framework/optional/includes/security_macrosecurity.inc | 2 | ||||
-rwxr-xr-x | testautomation/framework/optional/input/gridcontrol.odt | bin | 12600 -> 14075 bytes | |||
-rw-r--r-- | testautomation/graphics/optional/includes/global/export_graphic.inc | 22 | ||||
-rwxr-xr-x | testautomation/spreadsheet/required/includes/c_upd_filemenu.inc | 2 |
9 files changed, 58 insertions, 63 deletions
diff --git a/testautomation/chart2/optional/includes/loadsave/ch2_xml_format.inc b/testautomation/chart2/optional/includes/loadsave/ch2_xml_format.inc index fee95afb3f8e..ef61dc36e704 100644 --- a/testautomation/chart2/optional/includes/loadsave/ch2_xml_format.inc +++ b/testautomation/chart2/optional/includes/loadsave/ch2_xml_format.inc @@ -221,10 +221,10 @@ testcase tCompareXMLFormatLoad SAXSeekElement("chart:plot-area") '/// If the attribute value of 'table:cell-range-address' is 'Sheet1.A1:Sheet1.B2' '///+ the second characteristics validation has been passed. - if SAXGetAttributeValue("table:cell-range-address") = "Sheet1.A1:B2" then + if SAXGetAttributeValue("table:cell-range-address") = "Sheet1.A1:Sheet1.B2" then printlog "The cell range for chart:plot-area is correct" else - warnlog "#i100780#: The cell range is not Sheet1.A1:B2, it is " & SaxGetAttributeValue("table:cell-range-address") + warnlog "The cell range is not Sheet1.A1:Sheet1.B2, it is " & SaxGetAttributeValue("table:cell-range-address") endif printlog "Seek for chart:series" printlog " |-chart:series" @@ -232,10 +232,10 @@ testcase tCompareXMLFormatLoad SAXSeekElement("chart:series") '/// If the attribute valie of 'chart:values-cell-range-address' is Sheet1.A1:Sheet1.A2'' '///+ the hird characteristics validation has been passed. - if SAXGetAttributeValue("chart:values-cell-range-address") = "Sheet1.A1:A2" then + if SAXGetAttributeValue("chart:values-cell-range-address") = "Sheet1.A1:Sheet1.A2" then printlog "The cell range for chart:series is correct" else - warnlog "#i100780#: The cell range is not Sheet1.A1:A2, it is " & SaxGetAttributeValue("chart:values-cell-range-address") + warnlog "The cell range is not Sheet1.A1:Sheet1.A2, it is " & SaxGetAttributeValue("chart:values-cell-range-address") endif ' DEBUG: printlog "I'm here: " & SAXGetElementName '/// Close the XML editor. diff --git a/testautomation/chart2/optional/includes/wizard/ch2_lvl1_wizard.inc b/testautomation/chart2/optional/includes/wizard/ch2_lvl1_wizard.inc index 357fa89c4393..f87f915ea7f4 100755 --- a/testautomation/chart2/optional/includes/wizard/ch2_lvl1_wizard.inc +++ b/testautomation/chart2/optional/includes/wizard/ch2_lvl1_wizard.inc @@ -199,7 +199,7 @@ testcase tCreateNew3DChart endif printlog "Check that 3D look is 'simple' (=default)" if Scheme3D.GetSelIndex <> 1 then - warnlog "#i112522# - Default 3D Look ('simple') has not been preserved after save and reload." + qaerrorlog "#i112522# - Default 3D Look ('simple') has not been preserved after save and reload." endif printlog "Check that 3D shape 'cone' is selected" if BarColumnShape.GetSelIndex <> 3 Then diff --git a/testautomation/dbaccess/optional/includes/wiz_DatabaseWizard.inc b/testautomation/dbaccess/optional/includes/wiz_DatabaseWizard.inc index df9026ba2dd9..5be669dc1081 100755 --- a/testautomation/dbaccess/optional/includes/wiz_DatabaseWizard.inc +++ b/testautomation/dbaccess/optional/includes/wiz_DatabaseWizard.inc @@ -208,23 +208,27 @@ endcase '------------------------------------------------------------------------- testcase tMozilla - if ( fCreateMozillaAddressbookDatasource(gOfficePath + "user/work/tt_mozilla.odb") = true) then - if ( fOpendatabase(gOfficePath + "user/work/tt_mozilla.odb") = true) then - Kontext "ContainerView" - ViewTables - else - warnlog "mozilla database could not be open." + if(gPlatform = "osx") then + qaerrorlog "Mozilla address book not supported under Mac." + else + if ( fCreateMozillaAddressbookDatasource(gOfficePath + "user/work/tt_mozilla.odb") = true) then + if ( fOpendatabase(gOfficePath + "user/work/tt_mozilla.odb") = true) then + Kontext "ContainerView" + ViewTables + else + warnlog "mozilla database could not be open." + endif + else + qaerrorlog "mozilla database could not be created. Maybe you have no mozilla installed." + Kontext "MessageBox" + if (MessageBox.exists(1)) then + MessageBox.OK + endif endif - else - qaerrorlog "mozilla database could not be created. Maybe you have no mozilla installed." - Kontext "MessageBox" - if (MessageBox.exists(1)) then - MessageBox.OK - endif + ' try to close the database + call fCloseDatabase(false) endif - ' try to close the database - call fCloseDatabase(false) endcase '------------------------------------------------------------------------- diff --git a/testautomation/framework/optional/f_basic_gridcontrol.bas b/testautomation/framework/optional/f_basic_gridcontrol.bas index 963482253438..b1084f577751 100755..100644 --- a/testautomation/framework/optional/f_basic_gridcontrol.bas +++ b/testautomation/framework/optional/f_basic_gridcontrol.bas @@ -32,26 +32,17 @@ '\****************************************************************************** sub main - use "framework\optional\includes\basic_gridcontrol.inc" - call hStatusIn ("framework", "f_basic_gridcontrol.bas") - - hSetMacroSecurityAPI( GC_MACRO_SECURITY_LEVEL_LOW ) + printlog "Load Document with gridcontrol" call tGridcontrolLoad hSetMacroSecurityAPI( GC_MACRO_SECURITY_LEVEL_DEFAULT ) - - call hStatusOut() - + call hStatusOut end sub sub LoadIncludeFiles - use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" - - use "global\tools\includes\optional\t_treelist_tools.inc" - gApplication = "WRITER" call GetUseFiles() end sub diff --git a/testautomation/framework/optional/includes/basic_gridcontrol.inc b/testautomation/framework/optional/includes/basic_gridcontrol.inc index 181bd2aa9b1f..5cfbc4e0b879 100755..100644 --- a/testautomation/framework/optional/includes/basic_gridcontrol.inc +++ b/testautomation/framework/optional/includes/basic_gridcontrol.inc @@ -32,22 +32,28 @@ '\****************************************************************************** testcase tGridcontrolLoad - - const MACRO_NAME = "VclTestTool" - const MACRO_NOT_FOUND = 0 - const FILE_NAME = "framework/optional/input/gridcontrol.odt" - - dim iPos as integer + dim sLocation as string + dim i,x,a as integer + dim sTemp as string + dim lFiles(200) as string + dim bTemp as boolean + dim iError, iOK as integer - printlog( "Open the test document: " & FILE_NAME ) - call hFileOpen( gTestToolPath & FILE_NAME ) + sLocation = "framework/optional/include/basic_gridcontrol.inc::" - printlog( "Open the <Run Macro> dialog" ) - ToolsMacrosRunMacro + hSetMacroSecurityAPI( GC_MACRO_SECURITY_LEVEL_LOW ) - printlog( "Find the document, its library and the test macro, run the macro" ) - Kontext "ScriptSelector" - if ( ScriptSelector.exists( 10 ) ) then + printlog "Open the test document" + call hFileOpen(convertPath(gTestToolPath + "framework/optional/input/gridcontrol.odt")) + printlog "Security dialog might come up" + kontext "SecurityWarning" + if SecurityWarning.exists(5) then + printlog "Allow to run macros" + SecurityWarning.ok + endif + call sleep 1 + call sMakeReadOnlyDocumentEditable + call sleep 1 printlog "Start the macro, that performs the test" Kontext "GridControlDialogStarter" @@ -96,9 +102,11 @@ testcase tGridcontrolLoad warnlog "Gridcontrol Dialog did not come up after pressing button" endif - printlog( "Test exit, cleanup" ) - hFileCloseAll() - + printlog "clean up" + printlog "Close the document, else an error about the navigator will be thrown" + if getDocumentcount > 0 then + call hCloseDocument() + endif endcase diff --git a/testautomation/framework/optional/includes/security_macrosecurity.inc b/testautomation/framework/optional/includes/security_macrosecurity.inc index 93b4811de44f..2b6a05d9fcca 100755 --- a/testautomation/framework/optional/includes/security_macrosecurity.inc +++ b/testautomation/framework/optional/includes/security_macrosecurity.inc @@ -51,6 +51,8 @@ end sub testcase tMacroSecurityLevels( cFileFormat ) printlog( "Check macro execution behavior for all macro security levels" ) + warnlog( "#i110184# - Documentbound macros not executed when loaded via API" ) + goto endsub dim cWorkFile as string cWorkFile = gTesttoolPath & "framework\optional\input\BasicDocs\" diff --git a/testautomation/framework/optional/input/gridcontrol.odt b/testautomation/framework/optional/input/gridcontrol.odt Binary files differindex 46be0c44a065..2f467b3f2852 100755 --- a/testautomation/framework/optional/input/gridcontrol.odt +++ b/testautomation/framework/optional/input/gridcontrol.odt diff --git a/testautomation/graphics/optional/includes/global/export_graphic.inc b/testautomation/graphics/optional/includes/global/export_graphic.inc index fd2cf45f9800..3fe39632521c 100644 --- a/testautomation/graphics/optional/includes/global/export_graphic.inc +++ b/testautomation/graphics/optional/includes/global/export_graphic.inc @@ -32,16 +32,13 @@ '\****************************************************************************** testcase tEPS - dim x as integer dim i as integer - const sFilter = "EPS - Encapsulated PostScript (.eps)" const sExt = ".eps" printlog "open the document" hFileOpen( gTesttoolPath + "graphics\required\input\graphicexport." + ExtensionString ) - if ( hCallExport ( OutputGrafikTBO , sFilter ) ) then Kontext "EPSOptionen" if ( EPSOptionen.Exists( 2 ) ) then @@ -71,21 +68,18 @@ testcase tEPS ' next i printlog "leave dialog with cancel -> there has to be no file created!" hCloseDialog( EPSOptionen, "cancel" ) - if ( FileExists( OutputGrafikTBO+sExt ) ) then ' inspired by bug #99932 Graphic is exported though cancel is pressed warnlog "Dialog was canceled, but file got saved, too :-( - i35177" endif else warnlog( "No export options dialog was displayed" ) end if - Kontext "Active" if Active.Exists(2) then Warnlog "'" + sFilter + "' has a problem" Active.OK end if end if - printlog( "Save the file" ) if ( hCallExport( OutputGrafikTBO, sFilter ) ) then @@ -96,13 +90,14 @@ testcase tEPS else warnlog( "No export options dialog was displayed" ) endif - printlog( "Close file and re-insert graphics into new document" ) - hInsertGraphicsToNewFile( OutputGrafikTBO + sExt ) ' local helper function, see bottom of this file + if ( lcase( gPlatform ) <> "osx" ) then + hInsertGraphicsToNewFile( OutputGrafikTBO + sExt ) ' local helper function, see bottom of this file + else + qaErrorLog "#i100253# crash on MacOS X 10.4" + endif endif - call hCloseDocument - endcase 'tEPS '------------------------------------------------------------------------- testcase tPCT @@ -538,26 +533,21 @@ end function '******************************************************************************* function hWaitForOutputFile( sOutputFile as string ) as boolean - const FILE_WRITE_TIMEOUT = 30 dim iWait as integer : iWait = 0 for iWait = 1 to FILE_WRITE_TIMEOUT - ' File found if ( FileExists( sOutputFile ) ) then hWaitForOutputFile() = true exit function endif - ' Timeout if ( iWait = FILE_WRITE_TIMEOUT ) then hWaitForOutputFile() = false exit function endif - wait( 1000 ) - next iWait - end function + diff --git a/testautomation/spreadsheet/required/includes/c_upd_filemenu.inc b/testautomation/spreadsheet/required/includes/c_upd_filemenu.inc index 296387d64f93..ea76f2689bdd 100755 --- a/testautomation/spreadsheet/required/includes/c_upd_filemenu.inc +++ b/testautomation/spreadsheet/required/includes/c_upd_filemenu.inc @@ -357,7 +357,7 @@ endcase testcase tFileRecentDocuments if gPlatform = "lin" then - warnlog "#110649# Due to bug this testcase is not available" + qaerrorlog "#110649# Due to bug this testcase is not available" goto endsub end if |