merged DEV300

testautomation/framework/optional/includes/CJK_FeatureSwitchTest_1.inc

@@ -346,7 +346,8 @@ testcase tWriterUIChangesTest7
             Kontext "RubyDialog"
             DialogClose.Click
             Sleep 2
-            QAErrorlog "#i40913# Something wrong in menu format/Ruby when Asian Language support is off"
+            '#i40913# 
+            warnlog "Something wrong in menu format/Ruby when Asian Language support is off"
         catch
         endcatch
     end if
@@ -398,25 +399,29 @@ testcase tWriterUIChangesTest8
 
         try
             FormatChangeCaseHalfWidth
-            QAErrorlog "#i43434# Something wrong in submenu format/change case -> Half width when Asian Language support is off"
+            '#i43434# 
+            warnlog "Something wrong in submenu format/change case -> Half width when Asian Language support is off"
         catch
         endcatch
 
         try
             FormatChangeCaseFullWidth
-            QAErrorlog "#i43434# Something wrong in submenu format/change case -> Full width when Asian Language support is off"
+            '#i43434# 
+            warnlog "Something wrong in submenu format/change case -> Full width when Asian Language support is off"
         catch
         endcatch
 
         try
             FormatChangeCaseHiragana
-            QAErrorlog "#i43434# Something wrong in submenu format/change case -> Hiragana when Asian Language support is off"
+            '#i43434# 
+            warnlog "Something wrong in submenu format/change case -> Hiragana when Asian Language support is off"
         catch
         endcatch
 
         try
             FormatChangeCaseKatagana
-            QAErrorlog "#i43434# Something wrong in submenu format/change case -> Katagana when Asian Language support is off"
+            '#i43434# 
+            warnlog "Something wrong in submenu format/change case -> Katagana when Asian Language support is off"
         catch
         endcatch
     end if
@@ -740,4 +745,4 @@ function hSystemHasAsianLocale() as boolean
     case else           : hSystemHasAsianLocale() = false
     end select
 
-end function
+end function
\ No newline at end of file

testautomation/framework/optional/includes/configuration.inc

@@ -44,7 +44,8 @@ sub sToolsCustomizeKeyboardFunction
     for i = 0 to a
         
         if ( i = 7 and gtSysName = "Solaris x86" ) then
-            qaerrorlog( "#i62423# Solaris: Crash when opening new database" )
+            '#i62423# 
+            warnlog( "Solaris: Crash when opening new database" )
         else
             gApplication = aApplication(i)
             tToolsCustomizeKeyboardFunction(lList())
@@ -87,6 +88,7 @@ testcase tToolsCustomizeKeyboardFunction(lList())
     dim i92080 as string
     dim i96322 as string
     dim i100037 as string
+    dim i115370 as string
     
     i60617 = ".uno:ContinueNumbering"
     i43969 = ".uno:MacroOrganizer"
@@ -94,12 +96,13 @@ testcase tToolsCustomizeKeyboardFunction(lList())
     i80850 = ".uno:ToggleFormula.uno:AssignMacro"
     i84982 = ".uno:FontDialogForParagraph"
     i84983 = ".uno:DBNewReportWithPreSelection"
-	i87950 = ".uno:DBMigrateScripts"
-	i87951 = ".uno:DeleteAllNotes.uno:DeleteAuthor.uno:DeleteNote.uno:HideAllNotes.uno:HideAuthor.uno:HideNote"
-	i87952 = ".uno:InsertApplet"
-	i92080 = ".uno:SaveGraphic"
-	i96322 = ".uno:ActivateStyleApply"
-	i100037 = ".uno:AcceptTracedChange, .uno:DeleteComment, .uno:RejectTracedChange, .uno:ReplyNote, .uno:TaskPaneInsertPage, .uno:ValidityReference"
+    i87950 = ".uno:DBMigrateScripts"
+    i87951 = ".uno:DeleteAllNotes.uno:DeleteAuthor.uno:DeleteNote.uno:HideAllNotes.uno:HideAuthor.uno:HideNote"
+    i87952 = ".uno:InsertApplet"
+    i92080 = ".uno:SaveGraphic"
+    i96322 = ".uno:ActivateStyleApply"
+    i100037 = ".uno:AcceptTracedChange, .uno:DeleteComment, .uno:RejectTracedChange, .uno:ReplyNote, .uno:TaskPaneInsertPage, .uno:ValidityReference"
+    i115370 = ".uno:TaskPaneInsertPage"
     
     Call hNewDocument
     sleep 2
@@ -130,53 +133,8 @@ testcase tToolsCustomizeKeyboardFunction(lList())
                     if (((mid(sTemp2,d+1,1)<>" ")AND(abs(asc(mid(sTemp2,d+1,1)))<128)) AND (abs(asc(mid(sTemp2,d-1,1)))<128))then
                         listAppend(lList(),sTemp2)
                         bErrorFound = false
-                        if (inStr(i60617,sTemp2)>0) then
-                            WarnLog "#i60617# ("+c+"/"+a+"/"+b+"): Provide real Name for Function: '"+sTemp+"'::'"+sTemp2+"'"
-                            bErrorFound = true
-                        endif
-                        if (inStr(sTemp2,i64346)>0) then
-                            WarnLog "#i64346# ("+c+"/"+a+"/"+b+"): Provide real Name for Function: '"+sTemp+"'::'"+sTemp2+"'"
-                            bErrorFound = true
-                        endif
-                        if (inStr(i43969,sTemp2)>0) then
-                            WarnLog "#i41265# ("+c+"/"+a+"/"+b+"): Provide real Name for Function: '"+sTemp+"'::'"+sTemp2+"'"
-                            bErrorFound = true
-                        endif
-                        if (inStr(i80850,sTemp2)>0) then
-                            WarnLog "#i80850# ("+c+"/"+a+"/"+b+"): Provide real Name for Function: '"+sTemp+"'::'"+sTemp2+"'"
-                            bErrorFound = true
-                        endif
-                        if (inStr(i84982,sTemp2)>0) then
-                            WarnLog "#i84982# ("+c+"/"+a+"/"+b+"): Provide real Name for Function: '"+sTemp+"'::'"+sTemp2+"'"
-                            bErrorFound = true
-                        endif
-                        if (inStr(i84983,sTemp2)>0) then
-                            WarnLog "#i84983# ("+c+"/"+a+"/"+b+"): Provide real Name for Function: '"+sTemp+"'::'"+sTemp2+"'"
-                            bErrorFound = true
-                        endif
-                        if (inStr(i87950,sTemp2)>0) then
-                            WarnLog "#i87950# ("+c+"/"+a+"/"+b+"): Provide real Name for Function: '"+sTemp+"'::'"+sTemp2+"'"
-                            bErrorFound = true
-                        endif
-                        if (inStr(i87951,sTemp2)>0) then
-                            WarnLog "#i87951# ("+c+"/"+a+"/"+b+"): Provide real Name for Function: '"+sTemp+"'::'"+sTemp2+"'"
-                            bErrorFound = true
-                        endif
-                        if (inStr(i87952,sTemp2)>0) then
-                            warnLog "#i87952# ("+c+"/"+a+"/"+b+"): Provide real Name for Function: '"+sTemp+"'::'"+sTemp2+"'"
-                            bErrorFound = true
-                        endif
-                        if (inStr(i92080,sTemp2)>0) then
-                            WarnLog "#i92080# ("+c+"/"+a+"/"+b+"): Provide real Name for Function: '"+sTemp+"'::'"+sTemp2+"'"
-                            bErrorFound = true
-                        endif
-                        if (inStr(i96322,sTemp2)>0) then
-                            WarnLog "#i96322# ("+c+"/"+a+"/"+b+"): Provide real Name for Function: '"+sTemp+"'::'"+sTemp2+"'"
-                            bErrorFound = true
-                        endif
-                        
-                        if (inStr(i100037,sTemp2)>0) then
-                            WarnLog "#i100037# ("+c+"/"+a+"/"+b+"): Provide real Name for Function: '"+sTemp+"'::'"+sTemp2+"'"
+                        if (inStr(i115370,sTemp2)>0) then
+                            qaerrorlog "#i115370# ("+c+"/"+a+"/"+b+"): Provide real Name for Function: '"+sTemp+"'::'"+sTemp2+"'"
                             bErrorFound = true
                         endif
                         if ( not bErrorFound ) then

testautomation/framework/optional/includes/options_loadsave_general.inc

@@ -176,7 +176,8 @@ testcase tLoadSaveGeneral
         printlog( "Doctype: " & Dokumenttyp.getSelText() & " has filter: " & Filter.getSelText() )
 
         if Filter.GetSelIndex <> 3 then
-            warnlog( "#i79150# some options in Tools/Options->Load/Save->General are not saved" )
+            '#i79150# 
+            warnlog( "Some options in Tools/Options->Load/Save->General are not saved" )
         endif
     next i
 

testautomation/framework/optional/includes/options_ooo_colors.inc

@@ -40,8 +40,8 @@ testcase tOOoColors
     dim currentColor(4) as String
     dim chColor(4)      as String
     
-    const DEFAULT_COLOR_COUNT = 99
-    const CHANGED_COLOR_COUNT = 100
+    const DEFAULT_COLOR_COUNT = 100
+    const CHANGED_COLOR_COUNT = DEFAULT_COLOR_COUNT +1
     const USER_COLOR = "TT-Test-Color"
     
     myColor(1) = USER_COLOR
@@ -66,10 +66,8 @@ testcase tOOoColors
         printlog( "Check the number of currently registered colors - cancel test on error" )
         Kontext "TabFarben"
         if ( Farbe.GetItemCount() <> DEFAULT_COLOR_COUNT ) then
-            warnlog( "The number of colors has changed, stopping test" )
-            printlog( "Expected: " & DEFAULT_COLOR_COUNT )
-            printlog( "Found...: " & Farbe.getItemCount() )
-            printlog( "Close the Tools/Options dialog with OK" )
+            warnlog "The number of colors has changed, stopping test; Expected: " & DEFAULT_COLOR_COUNT & "; Found...: " & Farbe.getItemCount() 
+            printlog "Close the Tools/Options dialog with OK" 
             Kontext "ExtrasOptionenDlg"
             ExtrasOptionenDlg.OK
             WaitSlot( 2000 )

testautomation/framework/optional/includes/options_ooo_general.inc

@@ -85,7 +85,8 @@ testcase tOOoGeneral
     hToolsOptions ( "StarOffice", "General" )
 
     if Zweistellig.GetText <> "1950" then
-        Warnlog "#i29810# - Year ( 2 digits ) => changes not saved: " + Zweistellig.GetText
+        '#i29810# 
+        Warnlog "Year ( 2 digits ) => changes not saved: " + Zweistellig.GetText
     endif
 
     if not Aktivieren.IsChecked then
@@ -116,7 +117,8 @@ testcase tOOoGeneral
     hToolsOptions ( "StarOffice", "General" )
 
     if ( Zweistellig.GetText <> "1800" ) then
-        Warnlog( "#i29810# - Year ( 2 digits ) => changes not saved : " & Zweistellig.GetText() )
+        '#i29810# 
+        Warnlog( "Year ( 2 digits ) => changes not saved : " & Zweistellig.GetText() )
     endif
 
     If DruckenStatus.IsChecked  then

testautomation/global/required/includes/g_printing.inc

@@ -172,7 +172,8 @@ testcase tPrintGeneral()
             else
                 warnlog( "Pages setting disabled" )
             endif
-            
+
+            cb_test( PrintReverse, false, "" )
             'Selection.check()
             'AllPages.check()
             
@@ -485,7 +486,6 @@ testcase tPrintOptions()
         printlog( "Controls common for all applications" )
         cb_test( PrintToFile, false, "" )
         cb_test( PrintAsSingleJobs, false, "" )        
-        cb_test( PrintReverse, false, "" )
         
         printlog( "Application specific controls" )    
         select case( gApplication )

testautomation/global/system/includes/iniinfo.inc

@@ -115,17 +115,33 @@ sub GetIniInformation
     end if
     '--------
 
-   call GetTheInstallationType            ' gNetzInst and gNetzOfficePath will be set if StarOffice is a Network-Installation
-   gOfficeBasisPath = getOfficeBasisPath()
-   gOOoStartupTimeOut = fgetOOoStartupTimeOut()
-   gOOoShutdownTimeOut = fgetOOoShutdownTimeOut()
-   call sCheckValgrindStatus()
-    ' set a global path for custom scripts, like basepath, but outside of current environment
-   gPrivateEnvironmentLocation = getIniValue(gTesttoolIni, "PrivateEnvironment", "Current")
+    call GetTheInstallationType            ' gNetzInst and gNetzOfficePath will be set if StarOffice is a Network-Installation
+    gOfficeBasisPath = getOfficeBasisPath()
+    gOOoStartupTimeOut = fgetOOoStartupTimeOut()
+    gOOoShutdownTimeOut = fgetOOoShutdownTimeOut()
+    call sCheckValgrindStatus()
+    ' set a global path for custom scripts outside of current environment
+    gPrivateEnvironmentLocation = getIniValue(gTesttoolIni, "PrivateEnvironment", "Current")
     if (gPrivateEnvironmentLocation <> "" AND gPrivateEnvironmentLocation <> ".") then
-        if NOT fileExists(gPrivateEnvironmentLocation) then
-            qaErrorLog "[PrivateEnvironment] defined in: '"+gTesttoolIni+"', but the path '"+gPrivateEnvironmentLocation+"'does not exist!"
-            gPrivateEnvironmentLocation = ""
+        ' check if the gPrivateEnvironmentLocation path exists
+        if fileExists(gPrivateEnvironmentLocation) then
+            ' check if the path ends with a path sign and add the path sign if not
+            if (Right(gPrivateEnvironmentLocation,1) <> gPathSigne) then
+                gPrivateEnvironmentLocation = gPrivateEnvironmentLocation & gPathSigne
+            endif
+        else
+            ' check if the gTesttoolPath plus the gPrivateEnvironmentLocation path exists
+            ' f.e. this is for a relative path
+            if fileExists(gTesttoolPath & gPrivateEnvironmentLocation) then
+                gPrivateEnvironmentLocation = gTesttoolPath & gPrivateEnvironmentLocation
+                ' check if the path ends with a path sign and add the path sign if not
+                if (Right(gPrivateEnvironmentLocation,1) <> gPathSigne) then
+                    gPrivateEnvironmentLocation = gPrivateEnvironmentLocation & gPathSigne
+                endif
+            else
+                qaErrorLog "[PrivateEnvironment] defined in: '" & gTesttoolIni & "', but the path '" & gPrivateEnvironmentLocation & "'does not exist!"
+                gPrivateEnvironmentLocation = ""
+            endif
         end if
     else
        gPrivateEnvironmentLocation = ""

testautomation/global/win/dial_d_h.win

@@ -264,6 +264,7 @@ Synchronisieren sym:sw:PushButton:DLG_SYNC_BTN:BTN_SYNC
 Zeichensatzliste sym:sc:ListBox:RID_SCDLG_IMPORTOPT:LB_FONT
 Feldtrenner sym:sc:ComboBox:RID_SCDLG_IMPORTOPT:ED_FIELDSEP
 Texttrenner sym:sc:ComboBox:RID_SCDLG_IMPORTOPT:ED_TEXTSEP
+QuoteAll sym:sc:CheckBox:RID_SCDLG_IMPORTOPT:CB_QUOTEALL
 Zeichensatz sym:sc:ListBox:RID_SCDLG_IMPORTOPT:DDLB_FONT
 FixedWidth sym:sc:CheckBox:RID_SCDLG_IMPORTOPT:CB_FIXEDWIDTH
 SaveAsShown sym:sc:CheckBox:RID_SCDLG_IMPORTOPT:CB_SAVESHOWN

testautomation/global/win/edia_p_s.win

@@ -150,6 +150,7 @@ PageCount .HelpID:vcl:PrintDialog:NumPagesText
 PartsToPrint .HelpID:vcl:PrintDialog:PageContentType:ListBox
 SlidesPerPage .HelpID:vcl:PrintDialog:SlidesPerPage:ListBox
 ArrangeSlides .HelpID:vcl:PrintDialog:SlidesPerPageOrder:ListBox            
+PrintReverse .HelpID:vcl:PrintDialog:OptPage:ToReverse
 
 *TabApplication .HelpID:vcl:PrintDialog:TabPage:AppPage
 PrintPageBackground .HelpID:vcl:PrintDialog:PrintPageBackground:CheckBox
@@ -197,7 +198,6 @@ BrochurePageSides .HelpID:vcl:PrintDialog:PrintProspectInclude:ListBox
 *TabOptions .HelpID:vcl:PrintDialog:OptPage
 PrintToFile .HelpID:vcl:PrintDialog:OptPage:ToFile
 PrintAsSingleJobs .HelpID:vcl:PrintDialog:OptPage:SingleJobs
-PrintReverse .HelpID:vcl:PrintDialog:OptPage:ToReverse
 PaperTrayFromPrefs .HelpID:vcl:PrintDialog:PrintPaperFromSetup:CheckBox        
 
 *PurchaseStarOffice sym:TAB_HID_LICENSING_DIALOG

testautomation/math/optional/includes/m_101_.inc

@@ -280,7 +280,8 @@ testcase tFilePassword
       if Passwort.isEnabled then
          if NOT((instr(sTemp,gMathFilter) = 1)OR(instr(sTemp," (.sxm)") > 1)) then 
              if (4=i) then
-                warnlog "#i112895# (" + i + "/" + x +"): '"+sTemp+"' Password Checkbox: Enabled"
+                '#i112895#
+                warnlog "(" + i + "/" + x +"): '"+sTemp+"' Password Checkbox: Enabled"
              else
                 warnlog "(" + i + "/" + x +"): '"+sTemp+"' Password Checkbox: Enabled"
             endif

testautomation/math/optional/includes/m_105.inc

@@ -408,7 +408,8 @@ testcase tToolsCatalog
                     SymboleMath.close
                 catch
                     if ((2=i)AND(11=j))then
-                        warnlog "#i42011# Expected: Timeout on closing Tools->Catalog with this character. (" + i + "/" + iSymbolSets + ")(" + j + "/" + x(i) + ")"
+                        '#i42011# 
+                        warnlog "Expected: Timeout on closing Tools->Catalog with this character. (" + i + "/" + iSymbolSets + ")(" + j + "/" + x(i) + ")"
                     else
                         warnlog "Not Expected! Timeout on closing Tools->Catalog with this character. (" + i + "/" + iSymbolSets + ")(" + j + "/" + x(i) + ")"
                     endif
@@ -452,8 +453,8 @@ testcase tToolsCatalog
             next j
         next i
 
-    if (listCount(lAllSymbols()) <> 106) then
-        warnlog "There have to be 106 Symbols, but there are: " + listCount(lAllSymbols())
+    if (listCount(lAllSymbols()) <> 108) then
+        warnlog "There have to be 108 Symbols, but there are: " + listCount(lAllSymbols())
     endif
     ' TODO: check sAllSymbols for not allowed characters!
     listCopy(lAllSymbols(),lAllSymbolsSort())
@@ -570,7 +571,8 @@ testcase tToolsCatalogNew
                     try
                         SymbolSet.select "TBOnewSymbolSet"
                     catch
-                        qaerrorlog "#i64504# Symbol set name is not saved on exiting OOo"
+                        'i64504
+                        qaerrorlog "Symbol set name is not saved on exiting OOo"
                         SymbolSet.select ""
                     endcatch
                     SymbolSet.setText "TBOnewSymbolSet"

testautomation/math/required/includes/m_001_.inc

@@ -205,7 +205,8 @@ testcase tmFilePassword
     if ( SpeichernDlg.exists( 2 ) ) then
         Dateiname.SetText Datei$
         if (Passwort.IsChecked <> TRUE) then
-            Warnlog "#i36015# Password has to be checked! :-("
+            '#i36015# 
+            Warnlog "Password has to be checked! :-("
             Passwort.Check
             printlog "will be forced checked no!"
         endif
@@ -255,7 +256,8 @@ testcase tmFilePassword
     Kontext "SpeichernDlg"
     Dateiname.SetText Datei$
     if (Passwort.IsChecked <> TRUE) then
-        Warnlog "#i36015# Password has to be checked! :-("
+        '#i36015# 
+        Warnlog "Password has to be checked! :-("
         Passwort.Check
         printlog "will be forced checked no!"
     endif

testautomation/math/required/includes/m_005_.inc

@@ -298,7 +298,8 @@ testcase tToolsExtensionManager
                             ExtensionSoftwareLicenseAgreement.CANCEL
                     kontext
                     if active.exists(5) then
-                    	qaerrorlog "#i73307# Alzheimer feature extension licensing '" + active.getText + "'"
+                        '#i73307# 
+                    	warnlog "Alzheimer feature extension licensing '" + active.getText + "'"
                     	active.ok
                     endif
                 endif

testautomation/math/required/includes/m_007_.inc

@@ -121,7 +121,8 @@ testcase tmHelpContents
           Printlog "HelpAbout: '" + HelpAbout.GetItemCount +"'"
       catch
           Index.Click
-          qaErrorLog "#i55563# Used Index Button"
+          '#i55563# 
+          warnlog "Used Index Button"
           Printlog "HelpAbout: '" + HelpAbout.GetItemCount +"'"
       endcatch
       try

testautomation/spreadsheet/required/includes/c_upd_filemenu.inc

@@ -40,6 +40,7 @@
 ' #1 tFileRecentDocuments
 ' #1 tFileClose
 ' #1 tFileSave
+' #1 tFileSaveAsCSV
 ' #1 tFileSaveAsDBF
 ' #1 tFileVersions
 ' #1 tFilePagePreview
@@ -59,6 +60,7 @@ sub c_upd_filemenu
     Call tFileRecentDocuments
     Call tFileClose
     Call tFileSave
+    Call tFileSaveAsCSV
     Call tFileSaveAsDBF
     Call tFileVersions
     Call tFilePagePreview
@@ -547,6 +549,68 @@ endcase
 
 '-----------------------------------------------------------
 
+testcase tFileSaveAsCSV
+
+    Dim UIFilter as string
+    Dim bStatus as boolean
+
+    Printlog " Open new Spreadsheet document"
+    Call hNewDocument
+    Printlog " Fill two cells (10, Test)"
+    Kontext "DocumentCalc"
+    DocumentCalc.Typekeys "10 <TAB> Test <RETURN>"
+    Printlog " Open 'SaveAs' dialog"
+    FileSaveAs
+    Kontext "SpeichernDlg"
+    Printlog " Enter filename 'csv-Test_update'"
+    DateiName.SetText "csv-Test_update"
+    Printlog " Choose file typ CSV"
+    UIFilter = hGetUIFiltername ( "Text - txt - csv (StarCalc)" )
+    bStatus = hSelectUIFilter ( UIFilter )
+    if ( not bStatus ) then
+        warnlog "Filter not found"
+        SpeichernDlg.Cancel
+        Call hCloseDocument
+        goto endsub
+    end if
+    Printlog " Click on Save button"
+    Speichern.click
+    Printlog " Commit overwrite warning if file already exists"
+    Kontext
+    if Active.exists(2) then
+        Active.Yes
+    end if
+    Printlog " Check alien file format warning"
+    Kontext "AlienWarning"
+    if AlienWarning.exists(2) then
+    Printlog "  Commit if exists"
+        AlienWarning.OK
+    else
+        warnlog "Alien file format warning is missing -> Check this out!"
+    end if
+    Printlog " Check existence of export encoding dialog"
+    Kontext "ExportCalc"
+    Call DialogTest (ExportCalc)
+    printlog " Verify that Quote All is disabled by default"
+    if QuoteAll.IsChecked then
+        warnlog " Option Quote All is checked but shouldn't"
+    end if
+    Printlog " Accept dialog by OK"
+    ExportCalc.OK
+    Kontext
+    if Active.exists(2) then
+        Printlog Active.GetText
+        Active.OK
+    else
+        warnlog " Messagebox that only the current sheet is saved is missing"
+    end if
+    Printlog " Close document"
+    Call hCloseDocument
+
+endcase
+
+'-----------------------------------------------------------
+
 testcase tFileSaveAsDBF
 
     Dim UIFilter as string