Commits

Anonymous committed 8aaf9f7 Merge

merge with automationdev300m102cat0

  • Participants
  • Parent commits c3eed4e, 2b76545

Comments (0)

Files changed (25)

File testautomation/chart2/optional/ch2_data_series.bas

+'encoding UTF-8  Do not remove or change this line!
+'**************************************************************************
+' DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+'
+' Copyright 2000, 2010 Oracle and/or its affiliates.
+'
+' OpenOffice.org - a multi-platform office productivity suite
+'
+' This file is part of OpenOffice.org.
+'
+' OpenOffice.org is free software: you can redistribute it and/or modify
+' it under the terms of the GNU Lesser General Public License version 3
+' only, as published by the Free Software Foundation.
+'
+' OpenOffice.org is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY; without even the implied warranty of
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+' GNU Lesser General Public License version 3 for more details
+' (a copy is included in the LICENSE file that accompanied this code).
+'
+' You should have received a copy of the GNU Lesser General Public License
+' version 3 along with OpenOffice.org.  If not, see
+' <http://www.openoffice.org/license.html>
+' for a copy of the LGPLv3 License.
+'*
+'/************************************************************************
+'*
+'* owner : oliver.craemer@oracle.com
+'*
+'* short description : Function test for Data Series functions in chart
+'*
+'\************************************************************************************************
+
+sub main
+    use "chart2\tools\ch_tools_common.inc"
+    use "chart2\tools\ch_tools_chart_type.inc"
+    use "chart2\tools\ch_tools_select.inc"
+    use "chart2\optional\includes\ch2_lvl1_data_series1.inc"
+    
+    Call hStatusIn("Chart2", "ch2_data_series.bas")
+
+        printlog "----------------------------------------"
+        printlog "   C h a r t 2   D a t a   S e r i e s  "        
+        printlog "----------------------------------------"
+        printLog Chr(13) + "-----------  Options  ------------"
+        Call tPlotMissingValuesBar
+        Call tPlotMissingValuesLine        
+   Call hStatusOut  
+end sub
+'
+'-------------------------------------------------------------------------------
+'
+sub LoadIncludeFiles
+    use "global\tools\includes\optional\t_set_standard_controls.inc"         
+    use "global\system\includes\master.inc"
+    use "global\system\includes\gvariabl.inc"
+    Call GetUseFiles 
+    gApplication = "CALC"
+end sub
+

File testautomation/chart2/optional/includes/ch2_lvl1_data_series1.inc

+'encoding UTF-8  Do not remove or change this line!
+'**************************************************************************
+' DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+'
+' Copyright 2000, 2010 Oracle and/or its affiliates.
+'
+' OpenOffice.org - a multi-platform office productivity suite
+'
+' This file is part of OpenOffice.org.
+'
+' OpenOffice.org is free software: you can redistribute it and/or modify
+' it under the terms of the GNU Lesser General Public License version 3
+' only, as published by the Free Software Foundation.
+'
+' OpenOffice.org is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY; without even the implied warranty of
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+' GNU Lesser General Public License version 3 for more details
+' (a copy is included in the LICENSE file that accompanied this code).
+'
+' You should have received a copy of the GNU Lesser General Public License
+' version 3 along with OpenOffice.org.  If not, see
+' <http://www.openoffice.org/license.html>
+' for a copy of the LGPLv3 License.
+'*
+'/************************************************************************
+'*
+'* owner : oliver.craemer@oracle.com
+'*
+'* short description : Data Series dialog test cases
+'*
+'************************************************************************
+'*
+' #1 tPlotMissingValuesBar
+' #1 tPlotMissingValuesLine
+'*
+'\************************************************************************
+
+testcase tPlotMissingValuesBar
+    Dim iCountTabPg as integer    
+    iCountTabPg = 0   
+    Dim iTestRadio as integer
+    iTestRadio = 99
+    printlog "Load simple chart document"
+    
+    if fLoadVerySimpleChartAndSaveLocal() > 0 then
+        warnlog "Loading test document seems to have failed -> Check this out!"
+        goto endsub
+    endif
+    printlog "Go one row down"
+    Kontext "DocumentCalc"
+    DocumentCalc.TypeKeys "<DOWN>"
+    printlog "Insert / Rows to insert one empty row in the data series"
+    InsertRowsCalc    
+    printlog "Select chart using navigator"
+    if fSelectFirstOLE = 0 then        
+        printlog "Edit / Object / Edit"
+        EditObjectEdit        
+        printlog "Select DataSeries A by toolbar selectorbox"
+	call fChartSelectElement (8)
+	printlog "Open the properties dialog by using the FormatSelection button in the toolbar"
+	FormatSelection.Click
+        printlog "Select tab page Options"
+        Kontext
+        iCountTabPg = Active.GetPageCount
+        if iCountTabPg <> 4 then
+            warnlog "Edit / Properties on a data series should have 4 tab pages but has " & iCountTabPg & "."
+        endif
+        Active.SetPage TabDataSeriesOptions        
+        Kontext "TabDataSeriesOptions"
+        call DialogTest ( TabDataSeriesOptions )        
+        printlog "Verify that 'Leave gap' is checked (default)"
+        if NOT LeaveGap.IsChecked then
+            warnlog "'Leave gap' should be the default setting in bar charts!"
+        endif
+        printlog "Check that 'ContinueLine' is disabled"
+        if ContinueLine.IsEnabled then
+            warnlog "Continue Line radio button is enabled but should not in bar charts!"
+        endif                                       
+        printlog "Select 'AssumeZero' and close the dialog with OK"
+        iTestRadio = fSetRadioButton(AssumeZero)
+        if iTestRadio = 2 then
+            warnlog "Assume Zero radio button was not checked."
+            elseif iTestRadio = 11 then
+            warnlog "Assume Zero radio button is not visible."
+            elseif iTestRadio = 12 then
+            warnlog "Assume Zero radio button is not enabled."
+        endif                       
+        Kontext
+        printlog "Clicking OK"         
+        TabDataSeriesOptions.OK
+        printlog "Invoke Format / Object Properties"
+        FormatSelection
+        Kontext
+        Active.SetPage TabDataSeriesOptions        
+        Kontext "TabDataSeriesOptions"        
+        printlog "Check if 'AssumeZero' is selected"
+        if NOT AssumeZero.IsChecked then
+            warnlog "'AssumeZero' should be selected."
+        endif
+        TabDataSeriesOptions.Cancel                
+    else
+        warnlog "It was not possible to select the chart object!"
+    endif
+    printlog "Close document"
+    Call hCloseDocument
+endcase
+'
+'-------------------------------------------------------------------------
+'
+testcase tPlotMissingValuesLine
+    Dim iCountTabPg as integer    
+    iCountTabPg = 0
+    Dim iTestRadio as integer
+    iTestRadio = 99
+    
+    printlog "Load simple chart document"
+    
+    if fLoadVerySimpleChartAndSaveLocal() > 0 then
+        warnlog "Loading test document seems to have failed -> Check this out!"
+        goto endsub
+    endif
+    printlog "Go one row down"
+    Kontext "DocumentCalc"
+    DocumentCalc.TypeKeys "<DOWN>"
+    printlog "Insert / Rows to insert one empty row in the data series"
+    InsertRowsCalc    
+    printlog "Select chart using navigator"
+    if fSelectFirstOLE = 0 then        
+        printlog "Edit / Object / Edit"
+        EditObjectEdit
+        if fInvokeChartTypeDialog <> 0 then
+            warnlog "Impossible to invike the chart type dialog!"
+            goto endsub
+        endif
+        if fSetChartType("line") <> 0 then
+            warnlog "Selecting chart type 'line' failed!"
+            goto endsub            
+        end if
+        if fSetChartTypeVariant(2) <> 0 then
+            warnlog "Selecting chart type 'line' variant 2 failed!"
+            goto endsub            
+        end if        
+        if fCloseChartTypeDialogOK <> 0 then
+            warnlog "Closing Chart Type dialog with OK failed!"
+            goto endsub            
+        end if
+        printlog "Select DataSeries A by toolbar selectorbox"
+        call fChartSelectElement (8)
+        printlog "Invoke Format / Object Properties"
+        FormatSelection.Click
+        printlog "Select tab page Options"
+        Kontext
+        iCountTabPg = Active.GetPageCount
+        if iCountTabPg <> 2 then
+            warnlog "Edit / Properties on a data series of a line chart should have 2 tab pages but has " & iCountTabPg & "."
+        endif
+        Active.SetPage TabDataSeriesOptions        
+        Kontext "TabDataSeriesOptions"
+        call DialogTest ( TabDataSeriesOptions )        
+        printlog "Verify that 'Leave gap' is checked (default)"
+        if NOT LeaveGap.IsChecked then
+            warnlog "'Leave gap' should be the default setting in line charts!"
+        endif
+        printlog "Select 'AssumeZero' and close the dialog with OK"
+        iTestRadio = fSetRadioButton(AssumeZero)
+        if iTestRadio = 2 then
+            warnlog "Assume Zero radio button was not checked."
+            elseif iTestRadio = 11 then
+            warnlog "Assume Zero radio button is not visible."
+            elseif iTestRadio = 12 then
+            warnlog "Assume Zero radio button is not enabled."
+        endif                               
+        Kontext
+        printlog "Clicking OK"         
+        TabDataSeriesOptions.OK
+        printlog "Invoke Format / Object Properties"
+        FormatSelection
+        Kontext
+        Active.SetPage TabDataSeriesOptions        
+        Kontext "TabDataSeriesOptions"        
+        printlog "Check if 'AssumeZero' is selected"
+        if NOT AssumeZero.IsChecked then
+            warnlog "'AssumeZero' should be selected."
+        endif
+        printlog "Select 'ContinueLine' and close the dialog with OK"
+        iTestRadio = 99
+        iTestRadio = fSetRadioButton(ContinueLine)
+        if iTestRadio = 2 then
+            warnlog "Continue Line radio button was not checked."
+            elseif iTestRadio = 11 then
+            warnlog "Continue Line radio button is not visible."
+            elseif iTestRadio = 12 then
+            warnlog "Continue Line radio button is not enabled."
+        endif                                       
+        Kontext
+        TabDataSeriesOptions.OK
+        printlog "Invoke Format / Object Properties"
+        FormatSelection
+        Kontext
+        Active.SetPage TabDataSeriesOptions        
+        Kontext "TabDataSeriesOptions"                
+        printlog "Check if 'ContinueLine' is selected"
+        if NOT ContinueLine.IsChecked then
+            warnlog "'ContinueLine' should be selected."
+        endif                
+        printlog "Close dialog with Cancel-button"
+        TabDataSeriesOptions.Cancel
+    else
+        warnlog "It was not possible to select the chart object!"
+    endif
+    printlog "Close document"
+    Call hCloseDocument        
+endcase

File testautomation/chart2/optional/includes/ch2_lvl1a.inc

     printlog " Verify that the drawbar is visible"
     Kontext "DrawBar"
 
-    qaerrorlog "#i107003# disabled because of bug in toolbars"
-    '    if Not DrawBar.Exists then
-    '    	Call hToolbarSelect("Drawing", true)
-    '    endif
+    if Not DrawBar.Exists then
+        warnlog "Drawbar is not enabled"
+        Kontext "DocumentCalc"
+        DocumentCalc.TypeKeys "<Escape>"
+        printlog " Close document"
+        Call hCloseDocument
+        goto endsub
+'    	Call hToolbarSelect("Drawing", true)
+    endif
 
     printlog " Insert a shape to the chart by <STRG-RETURN>"
     Kontext "DocumentChart"

File testautomation/chart2/optional/includes/wizard/ch2_lvl1_wizard.inc

     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."
+        warnlog "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
             warnlog "Data range wasn't correctly preserved after save and reload and does not caontain $A$2:$E$13."
         endif
         if instr ( sControlString , "$A$17:$E$17" ) = 0 Then
-            warnlog "#i72241# - Data range wasn't correctly preserved after save and reload and does not contain $A$17:$E$17."        
+            warnlog "Data range wasn't correctly preserved after save and reload and does not contain $A$17:$E$17."        
         endif        
         printlog "Check that radio button 'rows' is checked"
         if NOT Rows.IsChecked then
         endif        
         printlog "Check that 'First column as label' checkbox is checked."
         if NOT FirstColumnAsLabel.IsChecked then
-            warnlog "#i72241# - Check box 'First column as label' (enabled) wasn't preserved after save and reload."
+            warnlog "Check box 'First column as label' (enabled) wasn't preserved after save and reload."
         endif
     else
         warnlog "Tab page 'Data Range' not visible!"
                 sControlString = RangeFor.GetText
                 printlog "'Range for name' is: " & sControlString
                 if instr ( sControlString , "$A$17" ) = 0 Then
-                    warnlog "#i72241# - 'Range for name' wasn't correctly preserved after save and reload."
+                    warnlog "'Range for name' wasn't correctly preserved after save and reload."
                 else                    
                     printlog "Select 'Y-Values' in Data Ranges list on the right."
                     if fSetListBoxByItem ( DataRanges , 2 ) > 0 then
         if instr ( sControlString , "$A$19" ) = 0 Then
             warnlog "'Categories' wasn't correctly preserved after save and reload."
         endif
-        printlog "Leave tab page data series with CANCEL" 
+        printlog "Leave tab page data series with CANCEL"
         TabChartTypeDataSeries.Cancel
     else
         warnlog "Tab page Data Series was not up!"
             warnlog "Data range wasn't correctly preserved after save and reload: $A$19"
         endif
         if instr ( sControlString , "$B$13:$C$16" ) = 0 Then
-           QAErrorlog "#i100780#Data range wasn't correctly preserved after save and reload: $B$13:$C$16"
+           QAErrorlog "Data range wasn't correctly preserved after save and reload: $B$13:$C$16"
         endif
         if instr ( sControlString , "$C$12" ) = 0 Then
             warnlog "Data range wasn't correctly preserved after save and reload: $E$1:$F$13"

File testautomation/chart2/required/includes/ch2_toolbars.inc

     EditObjectEdit
     printlog " Verify that the drawbar is visible"
     Kontext "DrawBar"
-    
-    qaerrorlog "#i107003# disabled because of bug in toolbars"
-'    if Not DrawBar.Exists then 
+   
+    if Not DrawBar.Exists then 
+        warnlog "Drawbar is not enabled"
+        Kontext "DocumentCalc"
+        DocumentCalc.TypeKeys "<Escape>"
+        printlog " Close document"
+        Call hCloseDocument
+        goto endsub
 '    	Call hToolbarSelect("Drawing", true)
-'    endif
+    endif
 
     printlog " Check if all items on drawbar are available"
     if DrawBar.GetItemCount <> 16 then

File testautomation/chart2/tools/ch_tools_common.inc

File contents unchanged.

File testautomation/framework/optional/includes/basic_gridcontrol.inc

 '\******************************************************************************
 
 testcase tGridcontrolLoad
-    const MACRO_NAME = "Show"
     const FILE_NAME  = "framework/optional/input/gridcontrol.odt"
 
     dim i as integer
     call hFileOpenLocally( gTestToolPath & FILE_NAME )
 
     printlog "Start the macro, that performs the test"
-    hExecMacro( MACRO_NAME )
     
+    Kontext "ShowGridcontrol"
+    ' FAILS IF DOCUMENT IS READONLY....
+        ShowGridcontrol.typeKeys "<space>"
     Kontext "GridControlDialog"
     if GridControlDialog.exists(5) then
         for i=1 to gridcontrolcontrol.getcolumncount

File testautomation/framework/optional/includes/basic_macros.inc

         printlog( "Select the last item in the treelist" )
         kontext "Makro"
         hSelectTheLastNode( MakroAus )
-
+        WaitSlot(2000)
         printlog( "Delete the new module" )
         Loeschen.Click()
 

File testautomation/framework/optional/input/gridcontrol.odt

Binary file modified.

File testautomation/global/sid/e_all.sid

 ViewToolbarsCustomize .uno:ConfigureDialog
 ViewToolbarsPreviewbar .uno:AvailableToolbars?Toolbar:string=previewbar
 ViewToolbarsDrawObjectbar .uno:AvailableToolbars?Toolbar:string=drawobjectbar
+ViewToolbarsReset SYM:.cmd:RestoreVisibility
 
 ' **** Writer
 ViewRuler .uno:Ruler

File testautomation/global/system/includes/gvariabl.inc

 Global gErrorSum as Integer         '///+ gErrorSum : last value of errors in a test
 Global gWarningSum as Integer       '///+ gWarningSum : last value of warnings in a test
 Global gQaErrorSum as Integer       '///+ gQaErrorSum : last value of qaErrors in a test
+Global gAssertionSum as Integer     '///+ gAssertionSum : last value of Assertions in a test
 Global gStatusDuration              '///+ gStatusDuration : starting time to get at the end the duration of a test
 Global gTestcaseStart as Date       '///+ gTestCaseDuration : starting time of the testcase
 Global glsStatusPage (32000) as String  '///+ glsStatusPage () : list for the output in the status-page

File testautomation/global/system/includes/status.inc

     gErrorSum = getErrorCount()      ' not 0! if you run 2-times status in/out in one bas-file!
     gWarningSum = getWarningCount()
     gQaErrorSum = getQaErrorCount()
+    gAssertionSum = 0
     
     ' make sure we have everything to update the status-Database.
     gDatabasePath = getDatabasePath(privateDatabasePath)
     PrintLog Chr(13) + "* - End of the test - *"
     Printlog "Date : " + Date() + "   Time: " + Time()
     Printlog "Duration : " + sLocalTestDuration
+    ' Output assertion count message only in nonpro version
+    if (NOT isProduct) then
+        if (gAssertionSum > 0) then
+            warnlog " ** " + gAssertionSum + " Assertions"
+        else
+            printlog " ** " + gAssertionSum + " Assertions"
+        endif
+    endif
+end sub
+
+sub hGetNonproAssertions(sName as string, sDuration as string)
+    Dim sResultFilePath as string
+    dim fList(15000) as string
+    dim i, a as integer
+    dim aCount as integer
+    dim x
+    dim soutput as string
+    dim xlist(15000) as string
+
+    if (bDebugVersion = true) then
+        'Get the path to the RESULT directory and put resultfile into array
+        sResultFilePath = GetIniValue (gTesttoolIni, gTTProfileName , "LogBaseDir") + gPathSigne + Left(gTestname, Len(gTestname)-4) + ".res"
+        listRead(fList, sResultFilePath, "UTF8")
+        for i=1 to listcount(fList(0))
+            'Go through whole file, but only last testrun counts
+            if (left(fList(i),1,1) = "0") then
+                'Line starting with 0 indicates start of new testrun: reset counters
+                aCount=0
+                listalldelete(xlist())
+            endif 
+            if (left(fList(i),1,1) = "6") then
+                'Assertion found like:
+                '5;~global\system\includes\master.inc;533;12;65535;"Dial
+                '0   1: file                          2:Line        5:Text
+                x = split(fList(i), ";")
+                aCount=aCount+1
+                sOutput =          sName _
+                        + Chr(9) + sDuration _
+                        + Chr(9) + "4" _
+                        + Chr(9) + mid(fRemoveLineBreaks(x(5)),2, len(fRemoveLineBreaks(x(5)))-2) _
+                        + Chr(9) + x(2) _
+                        + Chr(9) + "No Revision found" _
+                        + Chr(9) + fgetFileName(x(1)) _
+                        + Chr(9) 
+                ListAppend (xlist(), sOutput)
+            endif 
+        next i
+        'Update global message list
+        for i = gAssertionSum +1 to listcount(xlist)
+            ListAppend (glsStatusPage(), xlist(i))
+        next i
+        'Update global assertion counter
+        gAssertionSum = aCount 
+    endif 
 end sub
 
 sub hStatusAddTestcase()
     '///+ duration => the duration of the testcase
 
     sTestcaseDuration = wielange(gTestcaseStart, 1)     '(2)
-    sTestcaseStart    = convertDateToDatabase(gTestcaseStart) + " " + convertTimeToDatabase(gTestcaseStart) ' TODO: ask HDE/TBO
+    sTestcaseStart    = convertDateToDatabase(gTestcaseStart) + " " + convertTimeToDatabase(gTestcaseStart)
     
     sTCname = GetTestcaseName  ' testtool basic command
         iCut = Instr ( sTCname, "(" )
     endif
     
     ' generate status line for testcase and append to global array
-    '/// iErrorLevel: 0: no faults; 1: Warning; 2: Error; 3: qaError ///'
+    '/// iErrorLevel: 0: no faults; 1: Warning; 2: Error; 3: qaError; 4: Assertion ///'
     iErrorLevel = -1
 'D    printlog "Iall: " + iAllErrorCount + " W:" + iWarningCount + " E: " + iErrorCount
     for i = 0 to iAllErrorCount
     gErrorSum = getErrorCount()
     gQaErrorSum = getQaErrorCount()
     gWarningSum = getWarningCount()
+    hGetNonproAssertions(sTCname, sTestcaseDuration) ' workaround to get assertions count
 end sub
 
 sub hStatusWriteOutputFirstFile ()
     dim sTemp as string
     dim sFileName as string
     dim slVersion() as string
+    dim iDebug as integer
     dim ilVersion as integer
     dim sVersionCWS as string
     dim iPosA as integer
     '///+ 13 cws name => if it is the master: 'Master' else the name of the childworkspace
     '///+ 14 source tree => 
     '///+ 15 product => 
-    '///+ 16 builder => 
+    '///+ 16 debug => 
     '///+ 17 checksum => 
     '///+ data => 
 
         sUsername = gReturnAddress
     endif
 
+    if (isProduct()) then
+        iDebug = 0
+    else
+        iDebug = 1
+    endif
+
     ListAppend ( lTestrun(), "fileformat=0.2"             )
     ListAppend ( lTestrun(), "product=" + sProduct        )
     ListAppend ( lTestrun(), "sourcetree=" + sSource      )
     ListAppend ( lTestrun(), "testname=" + gTestName      )                        '(10) ' generated in hStatusIn
     ListAppend ( lTestrun(), "cws=" + sVersionCWS         )
     ListAppend ( lTestrun(), "ooolanguage=" + iSprache    )                        '(9)
+    ListAppend ( lTestrun(), "debug=" + iDebug            )                        
     ListAppend ( lTestrun(), "checksum=" + "")
 '    ListAppend ( lTestrun(), "data=" + )
     

File testautomation/global/win/dial_d_h.win

 Vorlagenliste sym:SFX2_HID_TEMPLATE_FMT
 Gruppenliste sym:SFX2_HID_TEMPLATE_FILTER
 
-*GridControlDialogStarter ACTIVE
-ShowGridcontrol sym:showGridcontrol
+*ShowGridcontrol sym:showgridcontrol
 
 *GridControlDialog sym:gridcontroldialog
 gridcontrolcontrol sym:gridcontrolself

File testautomation/global/win/etab_a_d.win

 ToolbarContents sym:CUI_HID_SVX_CONFIG_TOOLBAR_CONTENTS
 ResetBtn sym:SFX2_HID_TABDLG_RESET_BTN
  
+*TabCustomProperties sym:SFX2_HID_TP_CUSTOMPROPERTIES
+Properties sym:SFX2_HID_CTRL_CUSTOMPROPERTIES
+Add sym:sfx2:PushButton:TP_CUSTOMPROPERTIES:BTN_ADD
+
 *TabDatabaseField sym:extensions:TabPage:RID_PAGE_OPTION_DBFIELD
 YesSaveIt sym:extensions:RadioButton:RID_PAGE_OPTION_DBFIELD:RB_STOREINFIELD_YES
 NoValueForm sym:extensions:RadioButton:RID_PAGE_OPTION_DBFIELD:RB_STOREINFIELD_NO

File testautomation/graphics/required/includes/global/id_001.inc

    Kontext "TabDokumentInfo"
    Call DialogTest ( TabDokumentInfo )
 
-   qaerrorlog "#i95523#"
-   'Kontext
-   'active.SetPage TabBenutzer
-   'Kontext "TabBenutzer"
-   'Call DialogTest ( TabBenutzer )
-   'Infofelder.Click
-   '   Kontext "InfonamenBearbeiten"
-   '   Call DialogTest (InfonamenBearbeiten)
-   'InfonamenBearbeiten.Cancel
+    Kontext
+    '/// select tabpage 'Security' ///'
+    active.SetPage TabSecurityProperties
+    Kontext "TabSecurityProperties"
+    Call DialogTest ( TabSecurityProperties)
+
+    Kontext
+    '/// select tabpage 'User defined' ///'
+    active.SetPage TabCustomProperties
+    Kontext "TabCustomProperties"
+    Call DialogTest ( TabCustomProperties )
 
    Kontext
    active.SetPage TabInternet

File testautomation/math/required/includes/m_001_.inc

     Call DialogTest ( TabDokumentInfo )
 
     Kontext
+    '/// select tabpage 'Security' ///'
+    active.SetPage TabSecurityProperties
+    Kontext "TabSecurityProperties"
+    Call DialogTest ( TabSecurityProperties)
+
+    Kontext
+    '/// select tabpage 'User defined' ///'
+    active.SetPage TabCustomProperties
+    Kontext "TabCustomProperties"
+    Call DialogTest ( TabCustomProperties )
+
+    Kontext
     '/// select tabpage 'Internet' ///'
     active.SetPage TabInternet
     Kontext "TabInternet"
     Call DialogTest (TabInternet)
+
     hCloseDialog( TabInternet, "cancel" )
     '/// close application ///'
     Call hCloseDocument
 
-    qaerrorlog "#i95523# Custom Properties is not controlable by VCL TestTool Application"
-    goto endsub
-
-    Kontext
-    '/// select tabpage 'User defined' ///'
-    active.SetPage TabBenutzer
-    Kontext "TabBenutzer"
-    Call DialogTest ( TabBenutzer )
-    '/// click button 'info fields' ///'
-    Infofelder.Click
-    Kontext "InfonamenBearbeiten"
-    Call DialogTest (InfonamenBearbeiten)
-    '/// close dialog 'edit field names' ///'
-    hCloseDialog( InfoNamenBearbeiten, "cancel" )
 endcase
 
 testcase tmFilePrinterSetting

File testautomation/spreadsheet/optional/includes/so7pp1/c_so7_pp1_iz.inc

         sleep(2)
         Kontext
         if Active.exists(2) then
-            if gPlatGroup = "w95" then
-                warnlog "REGRESSION! #i41751# - Saving after Cut&Paste of OLE fails on windows!"
-            else
-                warnlog "OOPS, found unexpected MsgBox -> Check this out!"
-            end if
+            warnlog "OOPS, found unexpected MsgBox -> Check this out!"
             Active.OK
             call hCloseDocument
             goto endsub
     try
         printlog "OK, there are still " & GetDocumentCount & " documents open"
     catch
-        warnlog "Probably the office did crash -> #I21036#"
+        warnlog "Probably the office did crash"
         goto endsub
     endcatch
 

File testautomation/spreadsheet/required/includes/c_upd_filemenu.inc

     Kontext
     if Active.exists(2) then
         printlog " "
-        warnlog "#i87325# - Unexpected messagebox"
+        warnlog "Unexpected messagebox"
         Printlog Active.GetText
         Printlog " "
         Active.OK

File testautomation/spreadsheet/required/includes/c_upd_insertmenu.inc

             Kontext "SelectionMath"
             call DialogTest (SelectionMath)
         catch
-            qaerrorlog "#i93427# Math Selection Dialog is not available"
+            warnlog "Math Selection Dialog is not available"
         endcatch
     end if
     '/// Close Formular with 'Esc'

File testautomation/spreadsheet/required/includes/c_upd_viewmenu.inc

     TabCustomizeMenu.Cancel
     '/// Reset toolbars by 'View - Toolbars -  Reset'
     printlog " Reset toolbars by 'View - Toolbars -  Reset'"
+    Kontext "DocumentCalc"
+    DocumentCalc.UseMenu 'Selecting Menubar
+    hMenuSelectNr(3) 'Using third entry on Menubar (VIEW)
+    hMenuSelectNr(3) 'Using third entry on menu (TOOLBARS)
+    hMenuFindSelect(22, true, 22) 'Using last entry on menu (RESET)
 '    ViewToolbarsReset
-    qaerrorlog "Reset not possible because of #i84544"
     '/// Close document
     printlog " Close starting document"
     call hCloseDocument

File testautomation/writer/required/includes/w_001a_.inc

     Kontext "TabDokumentinfo"
     Call DialogTest (TabDokumentinfo)
 
+    Kontext
+    printlog " Switch to Tabpage 'Security'"
+    active.SetPage TabSecurityProperties
+    Kontext "TabSecurityProperties"
+    Call DialogTest ( TabSecurityProperties)
+    printlog " Click button 'Protect...'"
+    Protect.click
+    kontext "PasswordDLG"
+    Call DialogTest (PasswordDLG)
+    printlog " Cancel dialog 'Password'"
+    PasswordDLG.cancel
 
-    Warnlog "#i95523# - FileProperties - Tabpage 'User Defined' has changed. - Adaption of testcases needed."
-    '    printlog " Switch to Tabpage 'User defined'"
-    '    Kontext
-    '    active.SetPage TabBenutzer
-    '    Kontext "TabBenutzer"
-    '    Call DialogTest ( TabBenutzer )
-
-    '    Wait 500
-
-    '    Infofelder.Click
-    '    printlog " Click 'Infofields'"
-    '    Kontext "InfonamenBearbeiten"
-    '    printlog " Close upcoming dialog with 'Cancel'"
-    '    Call DialogTest (InfonamenBearbeiten)
-    '    InfonamenBearbeiten.Cancel
+    Kontext
+    printlog " Switch to Tabpage 'User defined'"
+    active.SetPage TabCustomProperties
+    Kontext "TabCustomProperties"
+    Call DialogTest ( TabCustomProperties )
 
     printlog " Switch to Tabpage 'Internet'"
     Kontext

File testautomation/writer/required/includes/w_002_.inc

             printlog( "Check for <Imagemap changed> messagebox (should not appear)" )
             kontext "Active"
             if ( Active.exists( 1 ) ) then
-                Warnlog( "<imagemap changed> message displayed." )
+                Warnlog( "#i117432#<imagemap changed> message displayed." )
                 printlog( Active.getText )
                 Active.no()
             else

File testautomation/writer/required/w_updt.bas

-'encoding UTF-8  Do not remove or change this line!
-'**************************************************************************
-' DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-' 
-' Copyright 2000, 2010 Oracle and/or its affiliates.
-'
-' OpenOffice.org - a multi-platform office productivity suite
-'
-' This file is part of OpenOffice.org.
-'
-' OpenOffice.org is free software: you can redistribute it and/or modify
-' it under the terms of the GNU Lesser General Public License version 3
-' only, as published by the Free Software Foundation.
-'
-' OpenOffice.org is distributed in the hope that it will be useful,
-' but WITHOUT ANY WARRANTY; without even the implied warranty of
-' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-' GNU Lesser General Public License version 3 for more details
-' (a copy is included in the LICENSE file that accompanied this code).
-'
-' You should have received a copy of the GNU Lesser General Public License
-' version 3 along with OpenOffice.org.  If not, see
-' <http://www.openoffice.org/license.html>
-' for a copy of the LGPLv3 License.
-'
-'/************************************************************************
-'*
-'* owner : helge.delfs@oracle.com
-'*
-'* short description : Ressource-Test Writer Document
-'*
-'\******************************************************************
-
-sub main
-    use "writer\tools\includes\w_tools.inc"                  		' global subroutines for Writer-application
-    use "writer\tools\includes\w_tool1.inc"                  		' global subroutines for Writer-application
-    use "writer\tools\includes\w_tool2.inc"                  		' global subroutines for Writer-application
-
-    use "writer\required\includes\w_001_.inc"
-    use "writer\required\includes\w_001a_.inc"
-    use "writer\required\includes\w_001b_.inc"
-    use "writer\required\includes\w_002_.inc"
-    use "writer\required\includes\w_003_.inc"
-    use "writer\required\includes\w_004_.inc"
-    use "writer\required\includes\w_004b_.inc"
-    use "writer\required\includes\w_005_.inc"
-    use "writer\required\includes\w_005b_.inc"
-    use "writer\required\includes\w_006_.inc"
-    use "writer\required\includes\w_007_.inc"
-    use "writer\required\includes\w_008_.inc"
-    use "writer\required\includes\w_009_.inc"
-    use "writer\required\includes\w_010_.inc"
-    use "writer\required\includes\w_010_1.inc"
-    use "writer\required\includes\w_011_.inc"
-    use "writer\required\includes\w_020_.inc"
-    
-    Printlog "******* Ressource-Test Writer Document *******"
-
-    Call wChangeDefaultView()
-
-    Call hStatusIn ( "writer", "w_updt.bas" )
-    Call w_001_              ' Menu File
-    Call w_001a_             ' Menu File
-    Call w_001b_             ' Menu File
-    Call w_002_              ' Menu Edit
-    Call w_003_              ' Menu View
-    Call w_004_              ' Menu Insert
-    Call w_004b_             ' Menu Insert
-    Call w_005_              ' Menu Format
-    Call w_005b_             ' Menu Format (2)
-    Call w_006_              ' Menu Table
-    Call w_007_              ' Menu Tools
-    Call w_008_              ' Menu Window
-    Call w_009_              ' Menu Help
-    Call w_010_              ' Objectbar
-    Call w_010_1             ' Objectbar. Part 2
-    Call w_011_              ' Rest of Objectbar
-    Call w_020_              ' Toolbar
-    Call hStatusOut
-
-end sub
-
-sub LoadIncludeFiles
-    use "global\system\includes\master.inc"
-    use "global\system\includes\gvariabl.inc"
-    use "global\required\includes\g_001.inc"
-    use "global\required\includes\g_option.inc"                	' global subroutines for Tools / Options
-    use "global\required\includes\g_printing.inc"
-    use "global\required\includes\g_findbar.inc"
-    use "global\tools\includes\optional\t_xml_filter1.inc"       ' global routines for XML-functionality
-    use "global\tools\includes\optional\t_docfuncs.inc"
-    use "global\tools\includes\optional\t_control_objects.inc"
-
-    gApplication   = "WRITER"
-    GetUseFiles ()
-end sub

File testautomation/writer/required/w_updt_1.bas

+'encoding UTF-8  Do not remove or change this line!
+'**************************************************************************
+' DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+' 
+' Copyright 2000, 2010 Oracle and/or its affiliates.
+'
+' OpenOffice.org - a multi-platform office productivity suite
+'
+' This file is part of OpenOffice.org.
+'
+' OpenOffice.org is free software: you can redistribute it and/or modify
+' it under the terms of the GNU Lesser General Public License version 3
+' only, as published by the Free Software Foundation.
+'
+' OpenOffice.org is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY; without even the implied warranty of
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+' GNU Lesser General Public License version 3 for more details
+' (a copy is included in the LICENSE file that accompanied this code).
+'
+' You should have received a copy of the GNU Lesser General Public License
+' version 3 along with OpenOffice.org.  If not, see
+' <http://www.openoffice.org/license.html>
+' for a copy of the LGPLv3 License.
+'
+'/************************************************************************
+'*
+'* owner : helge.delfs@oracle.com
+'*
+'* short description : Ressource-Test Writer Document Part 1 / 2
+'*
+'\******************************************************************
+
+sub main
+    use "writer\tools\includes\w_tools.inc"                  		' global subroutines for Writer-application
+    use "writer\tools\includes\w_tool1.inc"                  		' global subroutines for Writer-application
+    use "writer\tools\includes\w_tool2.inc"                  		' global subroutines for Writer-application
+
+    use "writer\required\includes\w_001_.inc"
+    use "writer\required\includes\w_001a_.inc"
+    use "writer\required\includes\w_001b_.inc"
+    use "writer\required\includes\w_002_.inc"
+    use "writer\required\includes\w_003_.inc"
+    use "writer\required\includes\w_004_.inc"
+    use "writer\required\includes\w_004b_.inc"
+    use "writer\required\includes\w_005_.inc"
+    use "writer\required\includes\w_005b_.inc"
+    
+    Printlog "******* Ressource-Test Writer Document Part 1 / 2 *******"
+
+    Call wChangeDefaultView()
+
+    Call hStatusIn ( "writer", "w_updt_1.bas" )
+    Call w_001_              ' Menu File
+    Call w_001a_             ' Menu File
+    Call w_001b_             ' Menu File
+    Call w_002_              ' Menu Edit
+    Call w_003_              ' Menu View
+    Call w_004_              ' Menu Insert
+    Call w_004b_             ' Menu Insert
+    Call w_005_              ' Menu Format
+    Call w_005b_             ' Menu Format (2)
+    Call hStatusOut
+
+end sub
+
+sub LoadIncludeFiles
+    use "global\system\includes\master.inc"
+    use "global\system\includes\gvariabl.inc"
+    use "global\required\includes\g_001.inc"
+    use "global\required\includes\g_printing.inc"
+    use "global\tools\includes\optional\t_xml_filter1.inc"       ' global routines for XML-functionality
+    use "global\tools\includes\optional\t_docfuncs.inc"
+    use "global\tools\includes\optional\t_control_objects.inc"
+
+    gApplication   = "WRITER"
+    GetUseFiles ()
+end sub

File testautomation/writer/required/w_updt_2.bas

+'encoding UTF-8  Do not remove or change this line!
+'**************************************************************************
+' DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+' 
+' Copyright 2000, 2010 Oracle and/or its affiliates.
+'
+' OpenOffice.org - a multi-platform office productivity suite
+'
+' This file is part of OpenOffice.org.
+'
+' OpenOffice.org is free software: you can redistribute it and/or modify
+' it under the terms of the GNU Lesser General Public License version 3
+' only, as published by the Free Software Foundation.
+'
+' OpenOffice.org is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY; without even the implied warranty of
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+' GNU Lesser General Public License version 3 for more details
+' (a copy is included in the LICENSE file that accompanied this code).
+'
+' You should have received a copy of the GNU Lesser General Public License
+' version 3 along with OpenOffice.org.  If not, see
+' <http://www.openoffice.org/license.html>
+' for a copy of the LGPLv3 License.
+'
+'/************************************************************************
+'*
+'* owner : helge.delfs@oracle.com
+'*
+'* short description : Ressource-Test Writer Document Part 2 / 2
+'*
+'\******************************************************************
+
+sub main
+    use "writer\tools\includes\w_tools.inc"                  		' global subroutines for Writer-application
+    use "writer\tools\includes\w_tool1.inc"                  		' global subroutines for Writer-application
+    use "writer\tools\includes\w_tool2.inc"                  		' global subroutines for Writer-application
+
+    use "writer\required\includes\w_006_.inc"
+    use "writer\required\includes\w_007_.inc"
+    use "writer\required\includes\w_008_.inc"
+    use "writer\required\includes\w_009_.inc"
+    use "writer\required\includes\w_010_.inc"
+    use "writer\required\includes\w_010_1.inc"
+    use "writer\required\includes\w_011_.inc"
+    use "writer\required\includes\w_020_.inc"
+    
+    Printlog "******* Ressource-Test Writer Document Part 2 / 2 *******"
+
+    Call wChangeDefaultView()
+
+    Call hStatusIn ( "writer", "w_updt_2.bas" )
+    Call w_006_              ' Menu Table
+    Call w_007_              ' Menu Tools
+    Call w_008_              ' Menu Window
+    Call w_009_              ' Menu Help
+    Call w_010_              ' Objectbar
+    Call w_010_1             ' Objectbar. Part 2
+    Call w_011_              ' Rest of Objectbar
+    Call w_020_              ' Toolbar
+    Call hStatusOut
+
+end sub
+
+sub LoadIncludeFiles
+    use "global\system\includes\master.inc"
+    use "global\system\includes\gvariabl.inc"
+    use "global\required\includes\g_option.inc"                	' global subroutines for Tools / Options
+    use "global\required\includes\g_findbar.inc"
+    use "global\tools\includes\optional\t_docfuncs.inc"
+    use "global\tools\includes\optional\t_control_objects.inc"
+
+    gApplication   = "WRITER"
+    GetUseFiles ()
+end sub