Commits

Anonymous committed 63ed881

CWS-TOOLING: integrate CWS qaerrorlogfixes1_DEV300

Comments (0)

Files changed (65)

testautomation/chart2/required/includes/ch2_flexible_source_range_selection.inc

 testcase tDataRangeWizardCalc
     dim sDataRange as string
     dim sInputFile as string
-    sInputFile = convertpath(gTestToolPath & "chart2/required/input/ch_flexrange01.ods")
-
-    '/// Open test document gtesttoolpath/chart2/required/input/ch_flexrange01.ods
+    sInputFile = convertpath(gTestToolPath & "chart2/required/input/ch_flexrange01.ods")    
     printlog "Open test document gtesttoolpath/chart2/required/input/ch_flexrange01.ods"
     if fOpenTestDocumentAndInsertChart(sInputFile) then
         Kontext "ChartType"    
-        '///Choose the Chart type <i>bar</i> (should be the second in the top-down list)
         printlog "Choose the Chart type <i>bar</i> (should be the second in the top-down list)"
         if fSetChartType( "bar" ) > 0 then
             warnlog "Something went wrong setting chart type to BAR."
             call hCloseDocument
             goto endsub
         endif    
-        '///Switch to tabpage Data Range
         printlog "Switch to tabpage Data Range"
         Kontext "ChartWizard"
         GoNext.Click            
         Kontext "TabChartTypeDataRange"
         call DialogTest ( TabChartTypeDataRange )    
-        '///Check that the data range in edit field has the value $ChartFlexRange.$B$3:$E$6
-        printlog "heck that the data range in edit field has the value $ChartFlexRange.$B$3:$E$6"        
+        printlog "Check that the data range in edit field has the value $ChartFlexRange.$B$3:$E$6"        
         Kontext "TabChartTypeDataRange"
         sDataRange = DataRange.GetText
         if sDataRange <> "$ChartFlexRange.$B$3:$E$6" then
         else
             printlog "    Datarange is correct"
         endif    
-        '///Check if -Data series in rows- is enabled
         printlog "Check if -Data series in rows- is enabled"
         if Rows.IsEnabled then
             printlog "    Data series in rows is enabled" 
         else
             warnlog "Data series in rows is disabled"
-        endif            
-        '///Check if -Data series in columns- is enabled and chosen
-        printlog "Check if -Data series in columns- is enabled and chosen"
+        endif                    
+        printlog "Check if Data series in columns- is enabled and chosen"
         if Columns.IsEnabled then
             printlog "    Data series in columns is enabled"
             if Columns.IsChecked then
         else
             warnlog "Data series in columns is disabled"
         endif    
-        '///Check if -First row as label- is enabled and checked
         printlog "Check if -First row as label- is enabled and checked"
         if FirstRowAsLabel.IsEnabled then
             printlog "    First row as label is enabled"
         else
             warnlog "First row as label is disabled"
         endif    
-        '///Check if -First column as label- is enabled and not checked
         printlog "Check if -First column as label- is enabled and not checked"
         if FirstColumnAsLabel.IsEnabled then
             printlog "    First column as label is enabled"
             endif
         else
             warnlog "First column as label is disabled"
-        endif    
-        '///Press button Range Chooser
+        endif            
         printlog "Press button Range Chooser"
-        SelectDataRange.Click    
-        '///Enter invalid range $ChartFlexRange.$B$3:$E$0 and close Range Chooser
+        SelectDataRange.Click            
         printlog "Enter invalid range $ChartFlexRange.$B$3:$E$0 and close Range Chooser"    
         Kontext "AcceptOrRejectChangesArea"
         AreaEditField.SetText "$ChartFlexRange.$B$3:$E$0"
-        ShrinkButton.Click    
-        '///Check if -Data series in rows- is disabled
+        ShrinkButton.Click            
         printlog "Check if -Data series in rows- is disabled"
         Kontext "TabChartTypeDataRange"
         if NOT Rows.IsEnabled then
             printlog "    Data series in rows is disabled" 
         else
             warnlog "Data series in rows is enabled, but should be disabled"
-        endif    
-        '///Check if -Data series in columns- is disabled
+        endif            
         printlog "Check if -Data series in columns- is disabled"
         if NOT Columns.IsEnabled then
             printlog "    Data series in columns is disabled" 
         else
             warnlog "Data series in columns is enabled, but should be disabled"
-        endif   
-        '///Check if -First row as label- is disabled
+        endif           
         printlog "Check if -First row as label- is disabled"
         if NOT FirstRowAsLabel.IsEnabled then
             printlog "    First row as label is disabled" 
         else
             warnlog "First row as label is enabled, but should be disabled"
-        endif    
-        '///Check if -First column as label- is disabled
+        endif            
         printlog "Check if -First column as label- is disabled"
         if NOT FirstColumnAsLabel.IsEnabled then
             printlog "    First Column as label is disabled" 
         else
             warnlog "First Column as label is enabled, but should be disabled"
-        endif    
-        '///Check if Back, Next and Finish does not work
+        endif            
         printlog "Check if Back, Next and Finish does not work"
         Kontext "ChartWizard"
         GoBack.Click
             warnlog "Back button is not functionless"
             Kontext "ChartWizard"
             GoNext.Click
-        endif        
-        '///Enter valid range $ChartFlexRange.$B$3:$E$6
+        endif                
         printlog "Enter valid range $ChartFlexRange.$B$3:$E$6"
         Kontext "TabChartTypeDataRange"
-        DataRange.SetText "$ChartFlexRange.$B$3:$E$6"    
-        '///Check if -Data series in rows- is enabled
+        DataRange.SetText "$ChartFlexRange.$B$3:$E$6"            
         printlog "Check if -Data series in rows- is enabled"
         if Rows.IsEnabled then
             printlog "    Data series in rows is enabled" 
         else
             warnlog "Data series in rows is disabled"
-        endif            
-        '///Check if -Data series in columns- is enabled and chosen
+        endif                    
         printlog "Check if -Data series in columns- is enabled and chosen"
         if Columns.IsEnabled then
             printlog "    Data series in columns is enabled"
             endif
         else
             warnlog "Data series in rows is disabled"
-        endif    
-        '///Check if -First row as label- is enabled and checked
+        endif            
         printlog "Check if -First row as label- is enabled and checked"
         if FirstRowAsLabel.IsEnabled then
             printlog "    First row as label is enabled"
             endif
         else
             warnlog "First row as label is disabled"
-        endif    
-        '///Check if -First column as label- is enabled and not checked
+        endif            
         printlog "Check if -First column as label- is enabled and not checked"
         if FirstColumnAsLabel.IsEnabled then
             printlog "    First column as label is enabled"
             endif
         else
             warnlog "First column as label is disabled"
-        endif    
-        '///Press Cancel button
+        endif            
         printlog "Press Cancel button"
         Kontext "ChartWizard"
-        ChartWizard.Cancel    
-        '///Close document
+        ChartWizard.Cancel            
         printlog "Close document"
         Call hCloseDocument
     else
     dim sDataRanges as string
     dim sRangeFor as string
     dim sCategories as string
-    sInputFile = convertpath(gTestToolPath & "chart2/required/input/ch_flexrange02.ods")
-    '///Open test document <i>gTestToolPath</i>/chart2/required/input/ch_flexrange02.ods
+    sInputFile = convertpath(gTestToolPath & "chart2/required/input/ch_flexrange02.ods")    
     printlog "Open test document gTestToolPath/chart2/required/input/ch_flexrange02.ods"    
-    if fOpenTestDocumentAndInsertChart(sInputFile) then
-        '///Choose the Chart type <i>XY (SCATTER)</i> (should be the second in the top-down list)
+    if fOpenTestDocumentAndInsertChart(sInputFile) then        
         Kontext "ChartType"
         printlog "Choose the Chart type XY (SCATTER) (should be the second in the top-down list)"
         if fSetChartType( "xy" ) > 0 then
             call hCloseDocument
             goto endsub
         endif        
-        Kontext "ChartWizard"
-        '/// Click on Next button
+        Kontext "ChartWizard"        
         printlog "Click on Next button"
-        GoNext.Click
-        '/// Click on Next button
+        GoNext.Click        
         printlog "Click on Next button"        
         GoNext.Click
         Kontext "TabChartTypeDataSeries"
             call hCloseDocument            
             goto endsub
         endif        
-        call DialogTest ( TabChartTypeDataSeries )            
-        '///Check if the data series listbox is enabled and contains three entries
+        call DialogTest ( TabChartTypeDataSeries )                    
         printlog "Check if the data series listbox is enabled and contains three entries"
         iDataSeries = DataSeries.GetItemCount
         if iDataSeries = 3 then
             printlog "    All 3 data series are available"
         else
             warnlog "There are " & iDataSeries & " data series instead of 3"
-        endif        
-        '///Check if the ADD button is enabled and click the button
+        endif                
         printlog "Check if the ADD button is enabled and click the button"
         if AddButton.IsEnabled then
             printlog "    ADD button is enabled"
             AddButton.Click
         else
             warnlog "ADD button is not enabled"
-        endif            
-        '///Check if there are now four entries in the data series listbox
+        endif                    
         printlog "Check if there are now four entries in the data series listbox"
         iDataSeries = DataSeries.GetItemCount
         if iDataSeries = 4 then
             printlog "    Adding a data series was successfull"
         else
             warnlog "There are " & iDataSeries & " data series instead of 4"
-        endif        
-        '///Check if the second data series was added below the highlighted one
+        endif                
         printlog "Check if the second data series was added below the highlighted one"
         if DataSeries.GetSelIndex = 2 then
             printlog "    The new data series was inserted below the highlighted (first) one"
         else
             warnlog "The new dataseries was not inserted below the highlighted one"
-        endif        
-        '///Check if the REMOVE button is enabled and click the button
+        endif                
         printlog "Check if the REMOVE button is enabled and click the button"
         if RemoveButton.IsEnabled then
             printlog "    REMOVE button is enabled"
             RemoveButton.Click
         else
             warnlog "REMOVE button is not enabled"
-        endif        
-        '///Check if there are now 3 entries in the data series listbox
+        endif                
         printlog "Check if there are now 3 entries in the data series listbox"
         iDataSeries = DataSeries.GetItemCount
         if iDataSeries = 3 then
             printlog "    Removing a data series was successfull"
         else
             warnlog "There are " & iDataSeries & " data series instead of 3"
-        endif        
-        '///Use UP button and verify that it it disabled on first entry
+        endif                
         printlog "Use UP button on last data series and verify that it it disabled on first entry"
         DataSeries.Select(3)
         if MoveUp.IsEnabled then
-            printlog "    The MoveUp button is enabled"
-            '/// Click on Move Up button twice."
+            printlog "    The MoveUp button is enabled"            
             printlog "Click on Move Up button twice."
             MoveUp.Click
             MoveUp.Click
             endif
         else
             warnlog "Moving data series was not successfull"
-        endif        
-        '///Use DOWN button and verify that it is disabled on last entry
+        endif                
         printlog "Use DOWN button and verify that it is disabled on last entry"
         DataSeries.Select(1)
         if MoveDown.IsEnabled then
-            printlog "    The MoveDown button is enabled"
-            '/// Click Move Down button twice
+            printlog "    The MoveDown button is enabled"            
             printlog "Click Move Down button twice"
             MoveDown.Click
             MoveDown.Click
             endif
         else
             warnlog "Moving data series was not successfull"
-        endif        
-        '///Select first entry in Data Ranges
+        endif                
         printlog "Select first entry in Data Ranges"
-        DataRanges.Select(1)        
-        '///Verify that the range matches the one in edit field
+        DataRanges.Select(1)                
         printlog "Verify that the range matches the one in edit field"
         'GetSelText(line,column) is a new parameter since CWS:SRC680gh13
         'Instead of 1,2 there must be 1,4 used becqause there are two invisible
             printlog "    Both ranges are matching"
         else
             warnlog "The ranges does not match: " & sDataRanges & sRangeFor
-        endif        
-        '///Select second entry in Data Ranges
+        endif                
         printlog "Select second entry in Data Ranges"
-        DataRanges.Select 2
-        
-        '///Check that the range in the edit field has changed, too.
+        DataRanges.Select(2)                
         printlog "Check that the range in the edit field has changed, too."
         'GetSelText(line,column) is a new parameter since CWS:SRC680gh13
         'Instead of 1,2 there must be 1,4 used becqause there are two invisible
             printlog "    Both ranges are matching"
         else
             warnlog "The ranges does not match" & sDataRanges & sRangeFor
-        endif        
-        '///Change the range in edit field
+        endif                
         printlog "Change the range in edit field"
-        RangeFor.SetText "$ChartFlexRange.$D$5:$D$6;$ChartFlexRange.$D$8"            
-        '///Check that the range in Data Ranges has changed, too
+        RangeFor.SetText "$ChartFlexRange.$D$5:$D$6;$ChartFlexRange.$D$8"                    
         printlog "Check that the range in Data Ranges has changed, too"
         'GetSelText(line,column) is a new parameter since CWS:SRC680gh13
         'Instead of 1,2 there must be 1,4 used becqause there are two invisible
            printlog "    The data range has also changed"
         else
             warnlog "The data range has not changed"
-        endif        
-        '///Click on Range Chooser and change the range
+        endif                
         printlog "Click on Range Chooser and change the range"
         SelectRange.Click
-        Kontext "AcceptOrRejectChangesArea"
-        '/// Enter $ChartFlexRange.$D$5:$D$6 in edit field
+        Kontext "AcceptOrRejectChangesArea"        
         printlog "Enter $ChartFlexRange.$D$5:$D$6 in edit field"
-        AreaEditField.SetText "$ChartFlexRange.$D$5:$D$6"
-        '/// Click on Shirnk button
+        AreaEditField.SetText "$ChartFlexRange.$D$5:$D$6"        
         printlog "Click on Shirnk button"
-        ShrinkButton.Click            
-        '///Check if the range in the Data ranges has been changed
+        ShrinkButton.Click                    
         printlog "Check if the range in Data ranges has changed"
         Kontext "TabChartTypeDataSeries"
         'GetSelText(line,column) is a new parameter since CWS:SRC680gh13
            printlog "    The data range has also changed"
         else
             warnlog "The data range has not changed"
-        endif        
-        '///Edit range for Data Labels
-        printlog "Edit range for Data Labels"
-        '/// Set text $ChartFlexRange.$C$15:$C$16 in categories
+        endif                
+        printlog "Edit range for Data Labels"        
         printlog "Set text $ChartFlexRange.$C$15:$C$16 in categories"
         Categories.SetText "$ChartFlexRange.$C$15:$C$16"
-        sCategories = Categories.GetText
-        '/// Validate the changes have not been modified
+        sCategories = Categories.GetText        
         printlog "Validate the changes have not been modified"
         if sCategories = "$ChartFlexRange.$C$15:$C$16" then
             printlog "    The range has been modified"
         else
             warnlog "Modifiing the range was not successfull"
-        endif        
-        '///Click on Range Chooser and change the range
+        endif                
         printlog "Click on Range Chooser and change the range"
         SelectCategories.Click
-        Kontext "AcceptOrRejectChangesArea"
-        '/// Set text $ChartFlexRange.$C$5:$C$6 in the edit field
+        Kontext "AcceptOrRejectChangesArea"        
         printlog "Set text $ChartFlexRange.$C$5:$C$6 in the edit field"
-        AreaEditField.SetText "$ChartFlexRange.$C$5:$C$6"
-        '/// Click on Shrink button
+        AreaEditField.SetText "$ChartFlexRange.$C$5:$C$6"        
         printlog "Click on Shrink button"
-        ShrinkButton.Click        
-        '///Verify that the range is taken
+        ShrinkButton.Click                
         printlog "Verify that the range is taken"
         Kontext "TabChartTypeDataSeries"
         sCategories = Categories.GetText
             printlog "    The range has been modified"
         else
             warnlog "Modifiing the range was not successfull"
-        endif        
-        '///Enter invalid range $ChartFlexRange.$C$5:$C$
+        endif                
         printlog "Enter invalid range $ChartFlexRange.$C$5:$C$"        
         Categories.SetText "$ChartFlexRange.$C$5:$C$"                        
-        Kontext "ChartWizard"
-        '/// Click on the Back button
+        Kontext "ChartWizard"       
         printlog "Click on the Back button"
         GoBack.Click
         Kontext "TabChartTypeDataSeries"
             warnlog "Back button is not functionless"
             Kontext "ChartWizard"
             GoNext.Click
-        endif        
-        '///Enter $ChartFlexRange.$C$5:$C$6 - a valid range
+        endif                
         printlog "Enter $ChartFlexRange.$C$5:$C$6 - a valid range"
-        Categories.SetText "$ChartFlexRange.$C$5:$C$6"        
-        '///Press Range Chooser for Data Lables
+        Categories.SetText "$ChartFlexRange.$C$5:$C$6"                
         printlog "Press Range Chooser"
-        SelectCategories.Click        
-        '/// Press <END>-key
+        SelectCategories.Click                
         printlog "Press <END>-key"        
         Kontext "AcceptOrRejectChangesArea"
-        AreaEditField.TypeKeys "<END>"        
-        '///Enter a semicolon and the second range $ChartFlexRange.$C$8
+        AreaEditField.TypeKeys "<END>"                
         printlog "Enter a semicolon and the second range $ChartFlexRange.$C$8"
-        AreaEditField.TypeKeys ";$ChartFlexRange.$C$8"        
-        '///Close Range Chooser
+        AreaEditField.TypeKeys ";$ChartFlexRange.$C$8"                
         printlog "Close Range Chooser"
-        ShrinkButton.Click        
-        '///Verify that there is a multiple range
+        ShrinkButton.Click                
         printlog "Verify that there is a multiple range"
         Kontext "TabChartTypeDataSeries"
         sCategories = Categories.GetText
             printlog "    The range has been modified to a multiple range"
         else
             warnlog "Modifiing the range was not successfull"
-        endif        
-        '///Press Cancel button
+        endif                
         printlog "Press Cancel button"
         Kontext "ChartWizard"
-        ChartWizard.Cancel        
-        '///Close document
+        ChartWizard.Cancel                
         printlog "Close document"
         Call hCloseDocument
     else
 testcase tDataRangeDialogCalc
     dim sDataRange as string
     dim sInputFile as string
-    sInputFile = convertpath(gTestToolPath & "chart2/required/input/ch_flexrange03.ods" )
-
-    '///Open test document <i>gTestToolPath</i>/chart2/required/input/ch_flexrange03.ods
+    sInputFile = convertpath(gTestToolPath & "chart2/required/input/ch_flexrange03.ods" )    
     printlog "Open test document gTestToolPath/chart2/required/input/ch_flexrange03.ods"        
-    if fOpenTestDocumentAndSelectDataRange(sInputFile) then    
-        '///Check data range in edit field is $ChartFlexRange.$D$4:$G$6;$ChartFlexRange.$C$5:$G$6;$ChartFlexRange.$C$4
+    if fOpenTestDocumentAndSelectDataRange(sInputFile) then            
         printlog "Check if the data range in edit field is $ChartFlexRange.$D$4:$G$6;$ChartFlexRange.$C$5:$G$6;$ChartFlexRange.$C$4"
         Kontext "TabChartTypeDataRange"
         sDataRange = DataRange.GetText
             warnlog "This is not the expected datarange, it is " & sDataRange & " but should be $ChartFlexRange.$C$4:$G$6" 
         else
             printlog "    Datarange is correct"
-        endif    
-        '///Check if -Data series in columns- is enabled
+        endif            
         printlog "Check if -Data series in columns- is enabled"
         if Columns.IsEnabled then
             printlog "    Data series in columns is enabled" 
         else
             warnlog "Data series in columns is disabled"
-        endif            
-        '///Check if -Data series in rows- is enabled and chosen
+        endif                    
         printlog "Check if -Data series in columns- is enabled and chosen"
         if Rows.IsEnabled then
             printlog "    Data series in rows is enabled"
             endif
         else
             warnlog "Data series in rows is disabled"
-        endif    
-        '///Check if -First row as label- is enabled and checked
+        endif            
         printlog "Check if -First row as label- is enabled and checked"
         if FirstRowAsLabel.IsEnabled then
             printlog "    First row as label is enabled"
             endif
         else
             warnlog "First row as label is disabled"
-        endif    
-        '///Check if -First column as label- is enabled and checked
+        endif            
         printlog "Check if -First column as label- is enabled and checked"
         if FirstColumnAsLabel.IsEnabled then
             printlog "    First column as label is enabled"
             endif
         else
             warnlog "First column as label is disabled"
-        endif    
-        '///Press button Range Chooser
+        endif            
         printlog "Press button Range Chooser"
-        SelectDataRange.Click    
-        '///Enter an $ChartFlexRange.$B$3:$E$0 in Range Chooser and close Range Chooser
+        SelectDataRange.Click            
         printlog "Enter $ChartFlexRange.$B$3:$E$0 in Range Chooser and close Range Chooser"    
         Kontext "AcceptOrRejectChangesArea"
         AreaEditField.SetText "$ChartFlexRange.$B$3:$E$0"
-        ShrinkButton.Click    
-        '///Check if -Data series in rows- is disabled
+        ShrinkButton.Click            
         printlog "Check if -Data series in rows- is disabled"
         Kontext "TabChartTypeDataRange"
         if NOT Rows.IsEnabled then
             printlog "    Data series in rows is disabled" 
         else
             warnlog "Data series in rows is enabled, but should be disabled"
-        endif    
-        '///Check if -Data series in columns- is disabled
+        endif            
         printlog "Check if -Data series in columns- is disabled"
         if NOT Columns.IsEnabled then
             printlog "    Data series in columns is disabled" 
         else
             warnlog "Data series in columns is enabled, but should be disabled"
-        endif    
-        '///Check if -First row as label- is disabled
+        endif            
         printlog "Check if -First row as label- is disabled"
         if NOT FirstRowAsLabel.IsEnabled then
             printlog "    First row as label is disabled" 
         else
             warnlog "First row as label is enabled, but should be disabled"
-        endif    
-        '///Check if -First column as label- is disabled
+        endif            
         printlog "Check if -First column as label- is disabled"
         if NOT FirstColumnAsLabel.IsEnabled then
             printlog "    First Column as label is disabled" 
         else
             warnlog "First Column as label is enabled, but should be disabled"
-        endif    
-        '///Check that OK button is disabled
+        endif            
         printlog "Check if OK button is disabled"
         try
             Kontext "TabChartTypeDataRange"
             goto endsub
         catch
             printlog "    The OK button is disabled"
-        endcatch    
-        '///Enter a valid multiple range
+        endcatch            
         printlog "Enter a valid range"
         Kontext "TabChartTypeDataRange"
-        DataRange.SetText "$ChartFlexRange.$C$4:$G$6;$ChartFlexRange.$C$8:$G$8"    
-        '///Check if -Data series in columns- is enabled
+        DataRange.SetText "$ChartFlexRange.$C$4:$G$6;$ChartFlexRange.$C$8:$G$8"            
         printlog "Check if -Data series in columns- is enabled"
         if Columns.IsEnabled then
             printlog "    Data series in columns is enabled" 
         else
             warnlog "Data series in columns is disabled"
-        endif            
-        '///Check if -Data series in rows- is enabled and chosen
+        endif                    
         printlog "Check if -Data series in columns- is enabled and chosen"
         if Rows.IsEnabled then
             printlog "    Data series in rows is enabled"
             endif
         else
             warnlog "Data series in rows is disabled"
-        endif    
-        '///Check if -First row as label- is enabled and checked
+        endif            
         printlog "Check if -First row as label- is enabled and checked"
         if FirstRowAsLabel.IsEnabled then
             printlog "    First row as label is enabled"
             endif
         else
             warnlog "First row as label is disabled"
-        endif    
-        '///Check if -First column as label- is enabled and checked
+        endif            
         printlog "Check if -First column as label- is enabled and checked"
         if FirstColumnAsLabel.IsEnabled then
             printlog "    First column as label is enabled"
             endif
         else
             warnlog "First column as label is disabled"
-        endif    
-        '///Press Cancel button
+        endif            
         printlog "Press Cancel button"
         Kontext "TabChartTypeDataRange"
-        TabChartTypeDataRange.Cancel    
-        '///Close document
+        TabChartTypeDataRange.Cancel            
         printlog "Close document"
         Call hCloseDocument
     else
     dim sDataRanges as string
     dim sRangeFor as string
     dim sCategories as string
-    sInputFile = convertpath(gTestToolPath & "chart2/required/input/ch_flexrange04.ods")
-    '///Open test document <i>gTestToolPath</i>/chart2/required/input/ch_flexrange04.ods
+    sInputFile = convertpath(gTestToolPath & "chart2/required/input/ch_flexrange04.ods")    
     printlog "Open test document gTestToolPath/chart2/required/input/ch_flexrange04.ods"    
     if fOpenTestDocumentAndSelectDataRange(sInputFile) then
-        Kontext
-        '///Switch to tabpage Data Series
+        Kontext        
         Active.SetPage TabChartTypeDataSeries
-        Kontext "TabChartTypeDataSeries"
-        '///Check if the data series listbox is enabled and contains one entry
+        Kontext "TabChartTypeDataSeries"        
         printlog "Check if the data series listbox is enabled and contains one entry"
         iDataSeries = DataSeries.GetItemCount
         if iDataSeries = 1 then
             printlog "    One data serie is available"
         else
             warnlog "There are " & iDataSeries & " data series instead of 1"
-        endif        
-        '///Check if the ADD button is enabled and click the button
+        endif                
         printlog "Check if the ADD button is enabled and click the button"
         if AddButton.IsEnabled then
             printlog "    ADD button is enabled"
             AddButton.Click
         else
             warnlog "ADD button is not enabled"
-        endif        
-        '///Check if there are now two entries in the data series listbox
+        endif                
         printlog "Check if there are now two entries in the data series listbox"
         iDataSeries = DataSeries.GetItemCount
         if iDataSeries = 2 then
             printlog "    Adding a data series was successfull"
         else
             warnlog "There are " & iDataSeries & " data series instead of 2"
-        endif        
-        '///Check if the new data series was added below the highlighted one
+        endif                
         printlog "Check if the new data series was added below the highlighted one"
         if DataSeries.GetSelIndex = 2 then
             printlog "    The new data series was inserted below the highlighted (first) one"
         else
             warnlog "The new dataseries was not inserted below the highlighted one"
-        endif        
-        '///Use UP button and verify that it it disabled on first entry
+        endif                
         printlog "Use UP button on last data series and verify that it it disabled on first entry"
         DataSeries.Select(2)
         if MoveUp.IsEnabled then
             endif
         else
             warnlog "Moving data series was not successfull"
-        endif        
-        '///Use DOWN button and verify that it is disabled on last entry
+        endif                
         printlog "Use DOWN button and verify that it is disabled on last entry"
         DataSeries.Select(1)
         if MoveDown.IsEnabled then
             endif
         else
             warnlog "Moving data series was not successfull"
-        endif        
-        '///Check if the REMOVE button is enabled and click the button
+        endif                
         printlog "Check if the REMOVE button is enabled and click the button"
         if RemoveButton.IsEnabled then
             printlog "    REMOVE button is enabled"
             RemoveButton.Click
         else
             warnlog "REMOVE button is not enabled"
-        endif        
-        '///Check if there are now one entry in the data series listbox
+        endif                
         printlog "Check if there are now one entry in the data series listbox"
         iDataSeries = DataSeries.GetItemCount
         if iDataSeries = 1 then
             printlog "    Removing a data series was successfull"
         else
             warnlog "There are " & iDataSeries & " data series instead of 1"
-        endif        
-        '///Select first entry in Data Ranges
+        endif                
         printlog "Select first entry in Data Ranges"
-        DataRanges.Select(1)            
-        '///Verify that the range for NAME matches the one in edit field
+        DataRanges.Select(1)                    
         printlog "Verify that the range for NAME matches the one in edit field"
         'GetSelText(line,column) is a new parameter since CWS:SRC680gh13
         'Instead of 1,2 there must be 1,4 used becqause there are two invisible
             printlog "    Both ranges are matching"
         else
             warnlog "The ranges does not match: " & sDataRanges & sRangeFor
-        endif        
-        '///Select second entry in Data Ranges
+        endif                
         printlog "Select second entry in Data Ranges"
-        DataRanges.Select(2)        
-        '///Check that the range in the edit field has changed too
+        DataRanges.Select(2)                
         printlog "Check that the range in the edit field has changed too"
         'GetSelText(line,column) is a new parameter since CWS:SRC680gh13
         'Instead of 1,2 there must be 1,4 used becqause there are two invisible
             printlog "    Both ranges are matching"
         else
             warnlog "The ranges does not match" & sDataRanges & sRangeFor
-        endif        
-        '///Change the range in edit field
+        endif                
         printlog "Change the range in edit field"
-        RangeFor.SetText "$ChartFlexRange.$D$5:$D$10"            
-        '///Check that the range in Data Ranges has changed too
+        RangeFor.SetText "$ChartFlexRange.$D$5:$D$10"                    
         printlog "Check that the range in Data Ranges has changed too"
         'GetSelText(line,column) is a new parameter since CWS:SRC680gh13
         'Instead of 1,2 there must be 1,4 used becqause there are two invisible
            printlog "    The data range has also changed"
         else
             warnlog "The data range has not changed"
-        endif    
-        '///Click on Range Chooser and change the range
+        endif            
         printlog "Click on Range Chooser and change the range"
         SelectRange.Click
         Kontext "AcceptOrRejectChangesArea"
         AreaEditField.SetText "$ChartFlexRange.$D$5:$D$12"
-        ShrinkButton.Click            
-        '///Check if the range in the Data ranges has changed
+        ShrinkButton.Click                    
         printlog "Check if the range in Data ranges has changed"
         Kontext "TabChartTypeDataSeries"
         'GetSelText(line,column) is a new parameter since CWS:SRC680gh13
            printlog "    The data range has also changed"
         else
             warnlog "The data range has not changed"
-        endif    
-        '///Edit range for Categories
+        endif            
         printlog "Edit range for Categories"
         Categories.SetText "$ChartFlexRange.$B$5:$B$10"
         sCategories = Categories.GetText
             printlog "    The range has been modified"
         else
             warnlog "Modifiing the range was not successfull"
-        endif        
-        '///Click on Range Chooser and change the range to $ChartFlexRange.$B$5:$B$12
+        endif                
         printlog "Click on Range Chooser and change the range to $ChartFlexRange.$B$5:$B$12"
         SelectCategories.Click
         Kontext "AcceptOrRejectChangesArea"
         AreaEditField.SetText "$ChartFlexRange.$B$5:$B$12"
-        ShrinkButton.Click        
-        '///Verify that the range is taken
+        ShrinkButton.Click                
         printlog "Verify that the range is taken"
         Kontext "TabChartTypeDataSeries"
         sCategories = Categories.GetText
             printlog "    The range has been modified"
         else
             warnlog "Modifiing the range was not successfull"
-       endif        
-        '///Enter $ChartFlexRange.$B$5:$B$ as an invalid range
+       endif                
         printlog "Enter $ChartFlexRange.$B$5:$B$ as an invalid range"
-        Categories.SetText "$ChartFlexRange.$B$5:$B$"        
-        '///Check that the OK button does not work
+        Categories.SetText "$ChartFlexRange.$B$5:$B$"                
         printlog "Check that the OK button does not work"
         try
             Kontext "TabChartTypeDataSeries"
             goto endsub
         catch
             printlog "    The OK button is disabled"
-        endcatch        
-        '///Enter as valid range $ChartFlexRange.$B$5:$B$12
+        endcatch                
         printlog "Enter as valid range $ChartFlexRange.$B$5:$B$12"
         Kontext "TabChartTypeDataSeries"
-        Categories.SetText "$ChartFlexRange.$B$5:$B$12"        
-        '///Press Range Chooser
+        Categories.SetText "$ChartFlexRange.$B$5:$B$12"                
         printlog "Press Range Chooser"
-        SelectCategories.Click        
-        '///Move cursor to the end
+        SelectCategories.Click                
         printlog "Move cursor to the end"
         Kontext "AcceptOrRejectChangesArea"
-        AreaEditField.TypeKeys "<END>"        
-        '///Enter a semicolon and the second range $ChartFlexRange.$B$14
+        AreaEditField.TypeKeys "<END>"                
         printlog "Enter a semicolon and the second range $ChartFlexRange.$B$14"
-        AreaEditField.TypeKeys ";$ChartFlexRange.$B$14"        
-        '///Close Range Chooser
+        AreaEditField.TypeKeys ";$ChartFlexRange.$B$14"                
          printlog "Close Range Chooser"
-        ShrinkButton.Click        
-        '///Verify that there is a multiple range 
+        ShrinkButton.Click                 
         printlog "Verify that there is a multiple range"
         Kontext "TabChartTypeDataSeries"
         sCategories = Categories.GetText
             printlog "    The range has been modified to a multiple range"
         else
             warnlog "Modifiing the range was not successfull"
-        endif        
-        '///Press Cancel button
+        endif                
         printlog "Press Cancel button"
         Kontext "TabChartTypeDataSeries"
-        TabChartTypeDataSeries.Cancel        
-        '///Close document
+        TabChartTypeDataSeries.Cancel                
         printlog "Close document"
         Call hCloseDocument
     else
         warnlog "It was not possible to open the test document."
     endif
 endcase
-'
-'-------------------------------------------------------------------------
-'
-function fOpenTestDocumentAndInsertChart(sInputFile as string) as BOOLEAN
-    fOpenTestDocumentAndInsertChart = FALSE
-    call hFileOpen(sInputFile)
-    sleep(2)
-    Call sMakeReadOnlyDocumentEditable()    
-    Kontext "DocumentCalc"
-    '/// Type <STRG+HOME>
-    printlog "Type <STRG+HOME>"    
-    DocumentCalc.TypeKeys "<MOD1 HOME>"
-    '/// Type twice <RIGHT> cursor key
-    printlog "Type twice <RIGHT> cursor key"
-    DocumentCalc.TypeKeys "<RIGHT>" , 2
-    '/// Type thrice <DOWN> cursor key
-    printlog "Type thrice <DOWN> cursor key"
-    DocumentCalc.TypeKeys "<DOWN>" , 3    
-    '/// Menu Insert chart to open chart wizard
-    printlog "Menu Insert chart to open chart wizard"    
-    InsertChart
-    try
-        WaitSlot()
-        fOpenTestDocumentAndInsertChart = TRUE
-    catch        
-        fOpenTestDocumentAndInsertChart = FALSE
-    endcatch
-end function
 

testautomation/chart2/required/includes/ch2_format.inc

 '-------------------------------------------------------------------------------
 '
 testcase tFormatArrangement
-    QAErrorLog "#i63017# - Should be only enabled to sort data curves; testcase has to be designed."    
+    dim sInputFile as string            
+    dim iLoop as integer
+    sInputFile = convertpath(gTestToolPath & "chart2/required/input/ch_flexrange01.ods")
+    printlog "Open test document gtesttoolpath/chart2/required/input/ch_flexrange01.ods"            
+    if fOpenTestDocumentAndInsertChart(sInputFile) then
+        Kontext "ChartType"    
+        printlog "Choose the Chart type 'bar' (should be the second in the top-down list)"
+        if fSetChartType( "bar" ) > 0 then
+            warnlog "Something went wrong setting chart type to BAR. Testcase aborted"            
+            Kontext "ChartWizard"            
+            ChartWizard.Cancel
+            call hCloseDocument
+            goto endsub
+        endif            
+        Kontext "ChartWizard"
+        printlog "Press OK button"
+        ChartWizard.OK                    
+        Kontext "DocumentChart"
+        printlog "Type twice <TAB> to select a data series to enable the menu entry."
+        DocumentChart.TypeKeys "<TAB>", 2, TRUE                        
+        Kontext "DocumentCalc"
+        DocumentCalc.UseMenu
+        printlog "Select 'Format' entry in main menu"
+        hMenuSelectNr(5) ' FORMAT
+        printlog "Select 'Arrangement' entry in 'Format'-menu"
+        hMenuSelectNr(3) ' ARRANGEMENT                                  
+        printlog "Select enabled 'Send Backward' entry."
+        hMenuSelectNr(2)
+        Kontext "DocumentCalc"
+        DocumentCalc.UseMenu
+        printlog "Select 'Format' entry in main menu again"
+        hMenuSelectNr(5) ' FORMAT
+        printlog "Select 'Arrangement' entry in 'Format'-menu"
+        hMenuSelectNr(3) ' ARRANGEMENT                                  
+        printlog "Select now enabled 'Bring Forward' entry."
+        hMenuSelectNr(1)                            
+        printlog "Close document"
+        Call hCloseDocument
+    else
+        warnlog "It was not possible to open the test document."
+    endif    
 endcase
 '
 '-------------------------------------------------------------------------------

testautomation/chart2/required/includes/ch2_insert.inc

 '
 '-------------------------------------------------------------
 '
-testcase tInsertSpecialCharacter
-   qaErrorLog "#125905# - Insert / SpecialCharacter doesn't work corrcetly in title dialog."   
+testcase tInsertSpecialCharacter   
+    printlog "Load simple chart document"
+    if fLoadVerySimpleChartAndSaveLocal() > 0 then
+        warnlog "Loading test document seems to have failed -> Check this out!"
+        goto endsub
+    endif   
+    printlog "Select chart using navigator"
+    call fSelectFirstOLE   
+    printlog "Invoke Edit::Object::Edit to enter Inplace Mode"
+    EditObjectEdit   
+    printlog "Invoke Insert::Titles"
+    if fInvokeTitlesDialog() > 0 then
+        warnlog "Something went wrong trying to invoke Titles dialog -> Check this out! (Previous log may help you)"
+        Call hCloseDocument
+        goto endsub
+    endif    
+    Kontext "InsertTitleDialog"
+    if fSetTitle(MainTitle , "Test title") = 0 then
+        Kontext "InsertTitleDialog"
+        InsertTitleDialog.OK
+        Kontext "DocumentChart"
+        printlog "Type <TAB> to select the title"
+        DocumentChart.TypeKeys "<TAB>" , TRUE
+        DocumentChart.UseMenu
+        printlog "Select menu 'Insert'"
+        hMenuSelectNr(4) 'INSERT
+        printlog "Select menu item 'Special Character'."
+        hMenuSelectNr(9) 'SPECIAL CHARACTER
+        printlog "Close the 'Insert Special Character'-dialog."
+        Kontext "Sonderzeichen"
+        Call Dialogtest( Sonderzeichen )
+        Sonderzeichen.CANCEL
+    else
+        warnlog "It was not possible to set the title. Test aborted!"
+        Kontext "InsertTitleDialog"
+        InsertTitleDialog.Cancel
+    endif
+    Call hCloseDocument   
 endcase
 

testautomation/chart2/required/includes/ch2_menu.inc

         
         printlog "check if there are 9 items in the INSERT menu."
         DocumentCalc.UseMenu 
-        hMenuSelectNr(4)       
+        hMenuSelectNr(4) 'INSERT       
         iCount = hMenuItemGetCount()
         if (iCount <> 9) then
             warnlog "There should 9 items in the INSERT menu but there are " + iCount + " items."
         printlog "check if there are 2 items in the FORMAT/ARRANGEMENT menu."
         DocumentCalc.UseMenu
         hMenuSelectNr(5) ' FORMAT
-        hMenuSelectNr(3) ' AXIS        
+        hMenuSelectNr(3) ' ARRANGEMENT        
         iCount = hMenuItemGetCount()        
         if (iCount <> 2) then
             warnlog "There should 2 items in the FORMAT/ARRANGEMENT menu but there are " + iCount + " items."

testautomation/chart2/tools/ch_tools_common.inc

 ' #1 fLoadVerySimpleChartAndSaveLocal       ' Load file with a very simple chart and save it loacally
 ' #1 fConvertChartTo3D                      ' Function to invoke the 'Insert::Titles...' dialog
 ' #1 fOpenTestDocumentAndSelectDataRange    ' Opens a test document and executes FormatDataRange
+' #1 fOpenTestDocumentAndInsertChart        ' Opens a test document and selects a data range at a specific position
 '*
 '\************************************************************************************************
 
     call DialogTest ( TabChartTypeDataRange )        
     fOpenTestDocumentAndSelectDataRange = TRUE
 end function
+'
+'-------------------------------------------------------------------------
+'
+function fOpenTestDocumentAndInsertChart(sInputFile as string) as BOOLEAN
+    fOpenTestDocumentAndInsertChart = FALSE
+    call hFileOpen(sInputFile)
+    sleep(2)
+    Call sMakeReadOnlyDocumentEditable()    
+    Kontext "DocumentCalc"    
+    printlog "Type <STRG+HOME>"    
+    DocumentCalc.TypeKeys "<MOD1 HOME>"    
+    printlog "Type twice <RIGHT> cursor key"
+    DocumentCalc.TypeKeys "<RIGHT>" , 2    
+    printlog "Type thrice <DOWN> cursor key"
+    DocumentCalc.TypeKeys "<DOWN>" , 3        
+    printlog "Menu Insert chart to open chart wizard"    
+    InsertChart
+    try
+        WaitSlot()
+        fOpenTestDocumentAndInsertChart = TRUE
+    catch        
+        fOpenTestDocumentAndInsertChart = FALSE
+    endcatch
+end function

testautomation/extensions/optional/includes/display_name.inc

 
 testcase tExtensionDisplayName
 
+    if ( gISOLang <> "en-US" ) then
+        qaerrorlog( "Test is not locale-safe, en-US only" )
+        goto endsub
+    endif
+
     '///<h1>Extension display names</h1>
     '///<u><pre>Synopsis</pre></u>Since CWS jl76 a possibility exists to give an extension a name which
     '///+ differs from the filename to be displayed in the extension manager.<br>

testautomation/extensions/optional/includes/publisher.inc

 
     '///<h1>Extension publisher and release notes</h1>
 
+    if ( gISOLang <> "en-US" ) then
+        qaerrorlog( "Test does not handle translated strings, aborting" )
+        goto endsub
+    endif
+
     '///<u><pre>Synopsis</pre></u>With CWS jl76 extensions can bring a link to the extension 
     '///+ publisher and the release notes which are displayed in the online update dialog
     '///+ for extensions - if provided. Otherwise these fields are not visible.<br>
     try
         ToolsPackageManager
     catch
-        warnlog( "#i84786# UNopkg processes block UI" )
+        warnlog( "#i84786# Unopkg processes block UI" )
     endcatch
     
     '///+<li>Wait about 5 seconds - the &quot;Live-Deployment&quot; needs time to strike.</li>

testautomation/framework/optional/f_extras_templatefileopen.bas

 
 sub main
 
-    use "framework\optional\includes\extras_file_open.inc"
+   use "framework\optional\includes\extras_file_open.inc"
 
-    hSetMacroSecurityAPI( GC_MACRO_SECURITY_LEVEL_LOW )
+   hSetMacroSecurityAPI( GC_MACRO_SECURITY_LEVEL_LOW )
    
-    call hStatusIn( "framework", "f_extras_templatefileopen.bas" )
-    call tOpenObjectsWithFileDialog( "TEMPLATES" )
-    call hStatusOut
+   call hStatusIn( "framework", "f_extras_templatefileopen.bas" )
+   call tOpenObjectsWithFileDialog( "TEMPLATES" )
+   call hStatusOut
    
-    hSetMacroSecurityAPI( GC_MACRO_SECURITY_LEVEL_DEFAULT )
+   hSetMacroSecurityAPI( GC_MACRO_SECURITY_LEVEL_DEFAULT )
 
 end sub
 
 
 sub LoadIncludeFiles
 
-    use "global\system\includes\master.inc"
-    use "global\system\includes\gvariabl.inc"
+   use "global\system\includes\master.inc"
+   use "global\system\includes\gvariabl.inc"
 
-    use "global\tools\includes\optional\t_docfuncs.inc"
-    use "global\tools\includes\optional\t_filetools.inc"
-    use "global\tools\includes\optional\t_security_tools.inc"
-    use "global\tools\includes\optional\t_listfuncs.inc"   
+   use "global\tools\includes\optional\t_docfuncs.inc"
+   use "global\tools\includes\optional\t_filetools.inc"
+   use "global\tools\includes\optional\t_security_tools.inc"
+   use "global\tools\includes\optional\t_listfuncs.inc"
 
-    use "framework\tools\includes\apicalls.inc"
-    use "framework\tools\includes\template_tools.inc"
+   use "framework\tools\includes\apicalls.inc"
+   use "framework\tools\includes\template_tools.inc"
 
-    gApplication = "WRITER"
-    GetUseFiles
+   gApplication = "WRITER"
+   GetUseFiles
    
 end sub
 

testautomation/framework/optional/includes/basic_formcontrols.inc

         
         '///+<li>Select every control, open its properties and verify its name, close properties</li>
         for iCurrentControl = 1 to ICONTROLCOUNT
-        
-            hSelectControl( iCurrentControl )
-            hOpenPropertyBrowser()
-            sCurrentControl = lsControlNames( iCurrentControl )
-            hPBGetControlName( sCurrentControl )
-            hClosePropertyBrowser()
+
+            if ( instr( gtSysName, "Solaris" ) > 0 ) then
+                qaerrorlog( "Skipping frame control on Solaris" )
+            else
+                hSelectControl( iCurrentControl )
+                hOpenPropertyBrowser()
+                sCurrentControl = lsControlNames( iCurrentControl )
+                hPBGetControlName( sCurrentControl )
+                hClosePropertyBrowser()
+            endif
             
         next iCurrentControl
         

testautomation/framework/optional/includes/basic_issues.inc

     hTestActive( "12D687", 1 )
     hTestActive( "4553207", 1 )
 
-    printlog( "" )    
-    printlog( " ---------- i81674 ------------ " )
-    hInsertMacroFromFile( "i81674" )
-    hIDERunMacro()
-    hTestActive( "250", 1 )
-    hTestActive( "Yes", 1 )
-    hTestActive( "True", 1 )
-    hTestActive( "On", 1 )
+    if ( gISOLang = "en-US" ) then
+        printlog( "" )    
+        printlog( " ---------- i81674 ------------ " )
+        hInsertMacroFromFile( "i81674" )
+        hIDERunMacro()
+        hTestActive( "250", 1 )
+        hTestActive( "Yes", 1 )
+        hTestActive( "True", 1 )
+        hTestActive( "On", 1 )
+    endif
     
     printlog( "" )
     printlog( " ---------- i80532 ------------ " )

testautomation/framework/optional/includes/basic_vba-compat_import_disabled.inc

     printlog( "Verify position of the document node" )
     MakroAus.select( cNodeCount + DOCUMENT_POSITION_OFFSET )
     if ( MakroAus.getSelText() <> "vba-test" ) then
-        warnlog( "The document node is not at the expected position" )
+        qaerrorlog( "The document node is not at the expected position" )
     endif
     
     for iCurrentModule = 2 to 7

testautomation/framework/optional/includes/basic_vba-compat_import_enabled.inc

     printlog( "Verify position of the document node" )
     MakroAus.select( cNodeCount + DOCUMENT_POSITION_OFFSET )
     if ( MakroAus.getSelText() <> "vba-test" ) then
-        warnlog( "The document node is not at the expected position" )
+        qaerrorlog( "The document node is not at the expected position" )
     endif
     
     for iCurrentModule = 2 to 3

testautomation/framework/optional/includes/basic_vba-compat_import_nothing.inc

     printlog( "Verify position of the document node" )
     MakroAus.select( cNodeCount + DOCUMENT_POSITION_OFFSET )
     if ( MakroAus.getSelText() <> "vba-test" ) then
-        warnlog( "The document node is not at the expected position" )
+        qaerrorlog( "The document node is not at the expected position" )
     endif
     
     printlog( "Select the last node, this should be the standard Library for the document" )

testautomation/framework/optional/includes/extras_file_open.inc

 
 testcase tOpenObjectsWithFileDialog( cCategory as string )
 
-    const CFN = "tOpenObjectsWithFileDialog::"
+    const CFN = "tOpenObjectsWithFileDialog::"   
 
     '///<h1>Open all templates using the File-Open dialog</h1>
     '///<i>Retrieve the templates out of ..\share\template\-directory</i><br>
     dim bSkipFile as boolean      ' turns true if file is to be skipped
     dim brc as boolean            ' some multi purpose boolan returncode
     dim cOfficePath as string
-    
+
     ' the path where the samples/templates are located, verify function params
     ' note that for some time the suffixes for the different filetypes are changed,
     ' so we have separate names for samples and templates.
         
-    cOfficePath = mid( gOfficeBasisPath, len( gNetzOfficePath ) + 1 )
+    if ( FileExists( gOfficeBasisPath ) ) then
+        cOfficePath = gOfficeBasisPath
+    else
+        cOfficePath = mid( gOfficeBasisPath, len( gNetzOfficePath ) + 1 )
+    endif
     printlog( "Using: " & cOfficePath )
     
     select case cCategory
-    case "SAMPLES"    : sRootPath = cOfficePath & "share\samples"
-                        sRootPathFallback = "/opt/openoffice.org/basis3.0/share/samples"
+    case "SAMPLES"    : sRootPath = cOfficePath & "share\samples\" & gISOLang
+                        sRootPathFallback = "/opt/openoffice.org/basis3.0/share/samples/" & gISOLang
                         sFIlter   = "*.od*"
-    case "TEMPLATES"  : sRootPath = cOfficePath & "share\template"
-                        sRootPathFallback = "/opt/openoffice.org/basis3.0/share/template"
+    case "TEMPLATES"  : sRootPath = cOfficePath & "share\template\" & gISOLang
+                        sRootPathFallback = "/opt/openoffice.org/basis3.0/share/template/" & gISOLang
                         sFilter   = "*.ot*"
     case default
         warnlog( CFN & "Invalid category passed to function" )
     printlog( "Using filter: " & sFilter   )
     GetAllFileList ( sRootPath, sFilter, lsFile() )
     hListDelete( lsFile(), 1 )
-    iTemplateCount = listCount( lsFile() )
-    for iCurrentTemplate = 1 to iTemplateCount
+
+    ' Remove .lock-files
+    iTemplateCount   = listCount( lsFile() )
+    iCurrentTemplate = 1
+    while( iCurrentTemplate <= iTemplateCount ) 
         if ( instr( lsFile( iCurrentTemplate ), "~lock." ) > 0 ) then
-            qaerrorlog( "There are lock-files in the shared layer. They will be removed" )
-            kill( lsFile( iCurrentTemplate ) )
             hListDelete( lsFile(), iCurrentTemplate )
+            iTemplateCount = iTemplateCount - 1
+        else
+            iCurrentTemplate = iCurrentTemplate + 1
         endif
-    next iCurrentTemplate
-    
-    
+    wend
+
+    ' do not test wizard related files
+    iTemplateCount   = listCount( lsFile() )
+    iCurrentTemplate = 1
+    while( iCurrentTemplate <= iTemplateCount ) 
+        if ( instr( lsFile( iCurrentTemplate ), "wizard" ) > 0 ) then
+            hListDelete( lsFile(), iCurrentTemplate )
+            iTemplateCount = iTemplateCount - 1
+        else
+            iCurrentTemplate = iCurrentTemplate + 1
+        endif
+    wend
+
     hListPrint ( lsFile() , "" , "" )
     if ( listcount( lsfile() ) = 1 ) then
         if ( gProductName = "OpenOffice.org" ) then

testautomation/framework/optional/includes/scripting_organizers.inc

 
 testcase tScriptingOrganizers( iDialog as integer )
 
+    if ( instr( gtSysName , "Solaris" ) > 0 ) then
+	qaerrorlog( "#i93502# JavaScript organizer broken" )
+        goto endsub
+    endif
+
     '///<H1>Test scripting-organizers</H1>
     ' 1 = BeanShell (.bsh)
     ' 2 = JavaScript (.js)

testautomation/global/sid/e_all.sid

 'FormatStandardChart SID_SET_DEFAULT
 FormatObjectProperties .uno:DiagramObjects
 FormatPositionAndSizeChart .uno:TransformDialog
-FormatChartWizard .uno:AutoFormat
-FormatChartType .uno:DiagramType
-FormatDataRanges .uno:DataRanges
-Format3DView .uno:View3D
-FormatChartArea .uno:DiagramArea
-FormatChartWall .uno:DiagramWall
-FormatChartFloor .uno:DiagramFloor
+FormatArrangement .uno:ArrangeRow
+FormatArrangementForward .uno:Forward
+FormatArrangementBackward .uno:Backward
+FormatTitle .uno:ChartTitleMenu
 FormatTitleMainTitle .uno:MainTitle
 FormatTitleSubTitle .uno:SubTitle
 FormatTitleX_Axis .uno:XTitle
 FormatTitleY_Axis .uno:YTitle
 FormatTitleZ_Axis .uno:ZTitle
+FormatTitleSecondaryX_Axis .uno:SecondaryXTitle
+FormatTitleSecondaryY_Axis .uno:SecondaryYTitle
 FormatTitleAllTitles .uno:AllTitles
+FormatAxis .uno:DiagramAxisMenu
 FormatAxisXAxis .uno:DiagramAxisX
 FormatAxisYAxis .uno:DiagramAxisY
 FormatAxisZAxis .uno:DiagramAxisZ
 FormatAxisSecondaryXAxis .uno:DiagramAxisA
 FormatAxisSecondaryYAxis .uno:DiagramAxisB
 FormatAxisAllAxes .uno:DiagramAxisAll
+FormatGrid .uno:DiagramGridMenu
 FormatGridXAxisMainGrid .uno:DiagramGridYMain
 FormatGridYAxisMainGrid .uno:DiagramGridXMain
 FormatGridZAxisMainGrid .uno:DiagramGridZMain
 FormatGridZAxisMinorGrid .uno:DiagramGridZHelp
 FormatGridAllAxisGrids .uno:DiagramGridAll
 FormatLegend .uno:Legend
-
+FormatChartWall .uno:DiagramWall
+FormatChartFloor .uno:DiagramFloor
+FormatChartArea .uno:DiagramArea
+FormatChartType .uno:DiagramType
+FormatDataRanges .uno:DataRanges
+Format3DView .uno:View3D
 ' **** Math
 FormatFonts SID_FONT
 FormatFontSize SID_FONTSIZE

testautomation/global/tools/includes/optional/t_filetools.inc

                     printlog( CFN & "MSG (" & iActives & "): closed with Cancel" )
                     bSkip = true
                 catch
-                    printlog( CFN & "Missed - this dialog has no Cancel button (create new document)" )
+                    printlog( CFN & "Missed - this dialog has no OK button (create new document)" )
+                    active.ok()
                 endcatch
 
                 if ( not bSkip ) then                

testautomation/graphics/optional/includes/global/export_graphic.inc

 '*
 '\******************************************************************************
 testcase tEPS
+    
+    dim x as integer
+    dim i as integer
+    dim sFilter as string
+    dim sExt as string
 
-   dim x as integer
-   dim i as integer
-   dim sFilter as string
-   dim sExt as string
+    sFilter = "EPS - Encapsulated PostScript (.eps)"
+    sExt = ".eps"
 
-   sFilter = "EPS - Encapsulated PostScript (.eps)"
-   sExt = ".eps"
-
-   '/// open the document
+    open the document
    hFileOpen ConvertPath ( gTesttoolPath + "graphics\required\input\graphicexport."+ExtensionString)
 
    if hCallExport (OutputGrafikTBO , sFilter ) = TRUE then
       Kontext "EPSOptionen"
       if EPSOptionen.Exists (2) then
-      '/// check if all properties have the right count, and depend on each other ///'
+      printlog "check if all properties have the right count, and depend on each other"
       ' they do not affect annything, i can check (TBO)
       ' VorschauTIF.Check
       '  InterchangeEPSI.Check
             if (LZWKodierung.IsEnabled <> TRUE) then warnlog " :-("
             if (Keine.IsEnabled <> TRUE) then warnlog " :-("
             ' if (TextEinstellungen.IsEnabled <> TRUE) then warnlog " :-("
-         '/// 'Color Resolution' listbox contains eight items ///'
+         printlog "'Color Resolution' listbox contains eight items"
          ' x = TextEinstellungen.GetItemCount
          ' if x <> 2 then warnlog "'TextEinstellungen' Count is wrong; should:2, is:" + x
          ' for i = 1 to x
          ' sleep 1
          ' Printlog " - " + i + ": '" +TextEinstellungen.GetSelText + "'"
          ' next i
-         '/// leave dialog with cancel -> there has to be no file created! ///'
+         printlog "leave dialog with cancel -> there has to be no file created!"
          EPSOptionen.Cancel
          sleep 5
          if ( dir(OutputGrafikTBO+sExt) = "") then ' inspired by bug #99932 Graphic is exported though cancel is pressed
          Active.OK
       end if
    end if
-   Printlog "'/// now save it realy and load the file afterwards ///'"
+   printlog " now save it realy and load the file afterwards"
    if hCallExport (OutputGrafikTBO , sFilter ) = TRUE then
       Kontext "EPSOptionen"
       if EPSOptionen.Exists (2) then
-      '  TextEinstellungen.select 2
+      printlog "TextEinstellungen.select 2"
          EPSOptionen.OK
          sleep 5
       endif
 
    call hCloseDocument
 
-endcase
+endcase 'tEPS
 '-------------------------------------------------------------------------
 testcase tPCT
 
    sFilter = "PCT - Mac Pict (.pct;.pict)"
    sExt = ".pct"
 
-   '/// open the document
+   printlog " open the document
    sDocument = ConvertPath ( gTesttoolPath + "graphics\required\input\graphicexport."+ExtensionString)
    hFileOpen sDocument
 
    if hCallExport (OutputGrafikTBO , sFilter ) = TRUE then
       Kontext "PICTOptionen"
       if PICTOptionen.Exists (2) then
-      '/// check if all properties have the right count, and depend on each other ///'
+      printlog "check if all properties have the right count, and depend on each other"
          Original.Check
             if Breite.IsEnabled then warnlog " :-("
             if Hoehe.IsEnabled then warnlog " :-("
          Groesse.Check
             Breite.More
             Hoehe.Less
-         '/// leave dialog with cancel -> there has to be no file created! ///'
+         printlog "leave dialog with cancel -> there has to be no file created!"
          PICTOptionen.Cancel
          sleep 5
-         if ( dir(OutputGrafikTBO+sExt) = "") then ' inspired by bug #99932 Graphic is exported though cancel is pressed
+         if ( dir(OutputGrafikTBO+sExt) = "") then
             Printlog "Ok :-)"
          else
             warnlog "Dialog was canceled, but file got saved, too :-(  - i35177"
          Active.OK
       end if
    end if
-   Printlog "'/// now save it realy and load the file afterwards ///'"
+   printlog " now save it realy and load the file afterwards"
    if hCallExport (OutputGrafikTBO , sFilter ) = TRUE then
       Kontext "PICTOptionen"
       if PICTOptionen.Exists (2) then
       Call hGrafikEinfuegen ( OutputGrafikTBO+sExt )
    endif
    hCloseDocument ()
-   Printlog "'/// now save a SELECTION in ORIGINAL SIZE and load the file afterwards ///'"
+   printlog " now save a SELECTION in ORIGINAL SIZE and load the file afterwards"
    hFileOpen (sDocument)
    sleep (10)
 
-    ' check if the document is writable
+    printlog "check if the document is writable"
     if fIsDocumentWritable = false then
-        ' make the document writable and check if it's succesfull
+        printlog "make the document writable and check if it's succesfull"
         if fMakeDocumentWritable = false then
             warnlog "The document can't be make writeable. Test stopped."
             goto endsub
       endif
    endif
    hCloseDocument ()
-   Printlog "'/// now CREATE a rectangle, select it, save it in SIZE and load the file afterwards ///'"
+   printlog " now CREATE a rectangle, select it, save it in SIZE and load the file afterwards"
    hNewDocument()
    hRechteckErstellen ( 10, 10, 30, 40 )
    if hCallExport (OutputGrafikTBO + "2" , sFilter, TRUE ) = TRUE then
          Groesse.Check
             Breite.SetText "9"
             Hoehe.SetText "9"
-            Groesse.Check 'Check "Size" one more time to make the change go through"
+            Groesse.Check 
+            printlog "Check 'Size' one more time to make the change go through"
             sx1 = Breite.GetText
             sY = Hoehe.GetText
          PICTOptionen.OK
 
    call hCloseDocument
 
-endcase
+endcase 'tPCT
 '-------------------------------------------------------------------------------
 testcase tPBM
 
    sFilter = "PBM - Portable Bitmap (.pbm)"
    sExt = ".pbm"
 
-   '/// open the document
+   printlog "Open the document"
    hFileOpen (ConvertPath ( gTesttoolPath + "graphics\required\input\graphicexport."+ExtensionString ))
 
-   '/// save it ///'
+   printlog "Save it"
    if hCallExport (OutputGrafikTBO , sFilter ) = TRUE then
       Kontext "PBMOptionen"
       if PBMOptionen.Exists (2) then
 
    call hCloseDocument
 
-endcase
+endcase 'tPBM
 '-------------------------------------------------------------------------------
 testcase tPGM
 
    sFilter = "PGM - Portable Graymap (.pgm)"
    sExt = ".pgm"
 
-   '/// open the document
+   printlog "Open the document"
    hFileOpen (ConvertPath ( gTesttoolPath + "graphics\required\input\graphicexport."+ExtensionString  ))
 
-   '/// save it ///'
+   printlog "Save it"
    if hCallExport (OutputGrafikTBO , sFilter ) = TRUE then
       Kontext "PGMOptionen"
       if PGMOptionen.Exists (2) then
 
    call hCloseDocument
 
-endcase
+endcase 'tPGM
 '-------------------------------------------------------------------------------
 testcase tPPM
 
    sFilter = "PPM - Portable Pixelmap (.ppm)"
    sExt = ".ppm"
 
-   '/// open the document
+   printlog "Open the document"
    hFileOpen (ConvertPath ( gTesttoolPath + "graphics\required\input\graphicexport."+ExtensionString  ))
 
-   '/// save it ///'
+   printlog "Save it"
    if hCallExport (OutputGrafikTBO , sFilter ) = TRUE then
       Kontext "PPMOptionen"
       if PPMOptionen.Exists (2) then
 
    call hCloseDocument
 
-endcase
+endcase 'tPPM
 '------------------------------------------------------------------------------
 testcase tRAS
 
     sFilter = "RAS - Sun Raster Image (.ras)"
     sExt = ".ras"
     
-     '/// open the document
+     printlog "Open the document"
    hFileOpen (ConvertPath ( gTesttoolPath + "graphics\required\input\graphicexport."+ExtensionString ))
 
-   '/// save it ///'
+   printlog "Save it"
    if hCallExport (OutputGrafikTBO , sFilter ) = TRUE then
       if ( dir(OutputGrafikTBO+sExt) <> "") then
          Printlog "Ok :-) Saved as: '" + OutputGrafikTBO+sExt + "'"
 
    call hCloseDocument
 
-endcase
+endcase 'tRAS
 '------------------------------------------------------------------------------
 testcase tTIFF
 
     sFilter = "TIFF - Tagged Image File Format (.tif;.tiff)"
     sExt = ".tif"
     
-     '/// open the document
+     printlog "Open the document"
    hFileOpen (ConvertPath ( gTesttoolPath + "graphics\required\input\graphicexport."+ExtensionString ))
 
-   '/// save it ///'
+   printlog "Save it"
    if hCallExport (OutputGrafikTBO , sFilter ) = TRUE then
       if ( dir(OutputGrafikTBO+sExt) <> "") then
          Printlog "Ok :-) Saved as: '" + OutputGrafikTBO+sExt + "'"
 
    call hCloseDocument
 
-endcase
+endcase 'tTIFF
 '------------------------------------------------------------------------------
 testcase tXPM
 
     sFilter = "XPM - X PixMap (.xpm)"
     sExt = ".xpm"
     
-     '/// open the document
+     printlog "Open the document"
    hFileOpen (ConvertPath ( gTesttoolPath + "graphics\required\input\graphicexport."+ExtensionString ))
 
-   '/// save it ///'
+   printlog "save it"
    if hCallExport (OutputGrafikTBO , sFilter ) = TRUE then
       if ( dir(OutputGrafikTBO+sExt) <> "") then
          Printlog "Ok :-) Saved as: '" + OutputGrafikTBO+sExt + "'"
 
    call hCloseDocument
 
-endcase
+endcase 'tXPM
 '-------------------------------------------------------------------------------
 testcase tGIF