jl154: Local merge

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.

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

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
 '-------------------------------------------------------------------------

testautomation/extensions/optional/includes/location.inc

@@ -61,14 +61,15 @@ testcase tExtensionLocation
         warnlog( "Macro execution warning is missing" )
     endif
 
-    irc = hMacroOrganizerRunMacro( MACRO_NAME )
-    if ( irc = 0 ) then
-        warnlog( "No macro with the given name could be found, aborting" )
-        kontext "Makro"
-        if ( Makro.exists() ) then
-            Makro.close()
-        endif
+    hMacroOrganizerRunMacro( MACRO_NAME )
+
+    kontext "Makro"
+    if ( Makro.exists( 1 ) ) then
+        warnlog( "Macro was not executed")
+        Makro.close()
         goto endsub
+    else
+        printlog( "Macro was executed")
     endif
 
     kontext "active"
@@ -84,11 +85,8 @@ testcase tExtensionLocation
         warnlog( "No messagebox displayed, please check that the macro is executed" )
     endif
 
-    irc = hExtensionAddGUI( cWorkPath & EXTENSION_NAME , "verbose,InstallForUser" )
-    irc = hMacroOrganizerRunMacro( MACRO_NAME )
-    if ( irc = 0 ) then
-        warnlog( "No macro with the given name could be found" )
-    endif
+    hExtensionAddGUI( cWorkPath & EXTENSION_NAME , "verbose,InstallForUser" )
+    hMacroOrganizerRunMacro( MACRO_NAME )
 
     kontext "active"
     if ( active.exists( 2 ) ) then

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

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
 
 

testautomation/framework/optional/includes/security_macrosecurity.inc

@@ -57,8 +57,6 @@ testcase tMacroSecurityLevels( cFileFormat )
     dim cWorkFile as string
         cWorkFile = gTesttoolPath & "framework\optional\input\BasicDocs\"
         cWorkFile = cWorkFile & "basic" & hGetSuffix( cFileFormat )
-        cWorkFile = convertpath( cWorkFile )
-        cWorkFile = convertToURL( cWorkFile )
 
     dim iSecLevel as integer
 

testautomation/framework/required/includes/topten.inc

@@ -33,6 +33,16 @@
 
 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
     
@@ -59,7 +69,8 @@ end sub
 '*******************************************************************************
 
 testcase Top_ten_test
-    dim sUserWorkDirectory as string
+
+    dim sUserWorkDirectory as string
     dim sFilename_native as String
     dim sFilename_export as String
     dim sFilter_native as string

testautomation/framework/required/includes/window_functions.inc

@@ -201,6 +201,13 @@ testcase tCheckWindowTitle( sApplication as string, sReference as string )
 
     printlog( "Update test for the office window titles" )
 
+    ' This is a Testtool-only problem that the product name is not displayed
+    ' after calling hCloseDocument() on the last document.
+    if ( sApplication = "soffice" ) then
+        qaerrorlog( "#i113760# - Product name missing for backing window" )
+        goto endsub
+    endif
+
     const BASIC_MODULE = "tCheckWindowTitle"
     const STRING_NOT_FOUND = 0
     const STRING_LEFTMOST  = 1

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
+

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