From f6d3ed5a642ec165583b4adb9c69b61e9c3f120e Mon Sep 17 00:00:00 2001 From: Thorsten Bosbach Date: Mon, 19 Jul 2010 18:08:34 +0200 Subject: #i113248 fix tablecontrol test --- .../framework/optional/f_basic_gridcontrol.bas | 13 ++----- .../optional/includes/basic_gridcontrol.inc | 40 ++++++++++++--------- .../framework/optional/input/gridcontrol.odt | Bin 12600 -> 14075 bytes 3 files changed, 26 insertions(+), 27 deletions(-) mode change 100755 => 100644 testautomation/framework/optional/f_basic_gridcontrol.bas mode change 100755 => 100644 testautomation/framework/optional/includes/basic_gridcontrol.inc diff --git a/testautomation/framework/optional/f_basic_gridcontrol.bas b/testautomation/framework/optional/f_basic_gridcontrol.bas old mode 100755 new mode 100644 index 74ee57c52c5d..697618e7fc65 --- 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 old mode 100755 new mode 100644 index 7f914ba9dafc..6406bb1844c8 --- 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 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/input/gridcontrol.odt b/testautomation/framework/optional/input/gridcontrol.odt index 46be0c44a065..2f467b3f2852 100755 Binary files a/testautomation/framework/optional/input/gridcontrol.odt and b/testautomation/framework/optional/input/gridcontrol.odt differ -- cgit v1.2.3 From 81918f1f5bbfefd265b7f40f338b33738f331f7a Mon Sep 17 00:00:00 2001 From: Thorsten Bosbach Date: Tue, 20 Jul 2010 16:25:06 +0200 Subject: #i113290# again teps --- .../optional/includes/global/export_graphic.inc | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/testautomation/graphics/optional/includes/global/export_graphic.inc b/testautomation/graphics/optional/includes/global/export_graphic.inc index e1d1479f5ee1..9e84a29e555b 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 + -- cgit v1.2.3 From 5ca73b3ec7a7d7f1356f778b7348283d646c1e00 Mon Sep 17 00:00:00 2001 From: "Oliver Craemer [oc]" Date: Wed, 21 Jul 2010 09:49:41 +0200 Subject: #i113305#: [Automation] changing warnlog to qaerrorlog for greenstate in Spreadsheet --- testautomation/chart2/optional/includes/loadsave/ch2_xml_format.inc | 2 +- testautomation/spreadsheet/required/includes/c_upd_filemenu.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) mode change 100644 => 100755 testautomation/chart2/optional/includes/loadsave/ch2_xml_format.inc diff --git a/testautomation/chart2/optional/includes/loadsave/ch2_xml_format.inc b/testautomation/chart2/optional/includes/loadsave/ch2_xml_format.inc old mode 100644 new mode 100755 index 0cf868bacaaf..e2c8d2b2d69c --- a/testautomation/chart2/optional/includes/loadsave/ch2_xml_format.inc +++ b/testautomation/chart2/optional/includes/loadsave/ch2_xml_format.inc @@ -235,7 +235,7 @@ testcase tCompareXMLFormatLoad if SAXGetAttributeValue("chart:values-cell-range-address") = "Sheet1.A1: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") + qaerrorlog "#i100780#: The cell range is not Sheet1.A1:A2, it is " & SaxGetAttributeValue("chart:values-cell-range-address") endif ' DEBUG: printlog "I'm here: " & SAXGetElementName '/// Close the XML editor. diff --git a/testautomation/spreadsheet/required/includes/c_upd_filemenu.inc b/testautomation/spreadsheet/required/includes/c_upd_filemenu.inc index ad543b5c97f7..7b1573675668 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 -- cgit v1.2.3 From 9bf26a65bb1b2b3a2ed71c76705bfc571e2e568a Mon Sep 17 00:00:00 2001 From: "Oliver Craemer [oc]" Date: Mon, 26 Jul 2010 09:09:13 +0200 Subject: #i113305#: [Automation] changing warnlog to qaerrorlog for greenstate in Spreadsheet --- testautomation/chart2/optional/includes/wizard/ch2_lvl1_wizard.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testautomation/chart2/optional/includes/wizard/ch2_lvl1_wizard.inc b/testautomation/chart2/optional/includes/wizard/ch2_lvl1_wizard.inc index 6bcf3399796d..623410381fe0 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 -- cgit v1.2.3 From 68ad606715002d9acd1ccfbfdfc5bf72d15b8bc3 Mon Sep 17 00:00:00 2001 From: "Oliver Craemer [oc]" Date: Mon, 26 Jul 2010 14:08:20 +0200 Subject: #i113305#: [Automation] changing warnlog to qaerrorlog for greenstate in Spreadsheet --- .../chart2/optional/includes/loadsave/ch2_xml_format.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/testautomation/chart2/optional/includes/loadsave/ch2_xml_format.inc b/testautomation/chart2/optional/includes/loadsave/ch2_xml_format.inc index e2c8d2b2d69c..864e74c95f29 100755 --- 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 - qaerrorlog "#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. -- cgit v1.2.3 From c3885f7ae33c36988accb45bd154f10deac19e3a Mon Sep 17 00:00:00 2001 From: "Marc Neumann [msc]" Date: Mon, 26 Jul 2010 14:20:11 +0200 Subject: automationooo330m1: #113339# disable mozilla test on mac --- .../optional/includes/wiz_DatabaseWizard.inc | 32 ++++++++++++---------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/testautomation/dbaccess/optional/includes/wiz_DatabaseWizard.inc b/testautomation/dbaccess/optional/includes/wiz_DatabaseWizard.inc index bd25224ba429..e5528ceebc0d 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 '------------------------------------------------------------------------- -- cgit v1.2.3 From 064a54918200a0584422f16b3dc28b5b0859be6e Mon Sep 17 00:00:00 2001 From: "Joerg Skottke [jsk]" Date: Wed, 28 Jul 2010 16:35:16 +0200 Subject: automationooo330m1: #i110184# - Excluded test due to failure to load documents containing macros using API call/Slot --- testautomation/framework/optional/includes/security_macrosecurity.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/testautomation/framework/optional/includes/security_macrosecurity.inc b/testautomation/framework/optional/includes/security_macrosecurity.inc index 1c9d360da9e6..ed588b817ff6 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\" -- cgit v1.2.3