CWS-TOOLING: integrate CWS chartuseability01

2009-09-07 17:26:44 +0200 iha  r275906 : CWS-TOOLING: rebase CWS chartuseability01 to trunk@275801 (milestone: DEV300:m57)
2009-08-27 13:48:16 +0200 iha  r275481 : #7049# listbox to select chart elements
2009-08-27 11:54:53 +0200 iha  r275464 : #i58163# #i69422# #i102820# enhance chart context menu
2009-08-26 16:49:58 +0200 iha  r275435 : #i102820# added missing case 'floor'
2009-08-26 15:33:51 +0200 iha  r275427 : #i102820# make 'insert legend' work properly
2009-08-25 16:35:00 +0200 ufi  r275369 : i104087
2009-08-25 15:12:17 +0200 iha  r275360 : #i104087# 'Object Properties' -> 'Format Selection'
2009-08-25 15:11:31 +0200 iha  r275359 : #i104087# 'Object Properties' -> 'Format Selection'
2009-08-25 15:11:15 +0200 iha  r275358 : #i104087# 'Object Properties' -> 'Format Selection'
2009-08-25 11:57:43 +0200 iha  r275344 : #i104087# changed behavior of insert menu
2009-08-18 12:53:54 +0200 oc  r275093 : #i104082,104086,104089# multiple changes because of changed chartUI
2009-08-10 16:46:17 +0200 ufi  r274824 : i104083 i104087 i104090
2009-08-07 14:04:34 +0200 iha  r274763 : #7049# listbox to select chart elements
2009-08-07 13:06:05 +0200 iha  r274760 : #7049# listbox to select chart elements
2009-08-07 13:05:06 +0200 iha  r274759 : #7049# listbox to select chart elements
2009-08-07 12:32:31 +0200 iha  r274756 : #i58163# #i69422# #i102820# enhance chart context menu
2009-08-07 12:31:54 +0200 iha  r274755 : #i58163# #i69422# #i102820# enhance chart context menu
2009-08-06 19:00:48 +0200 iha  r274742 : #i103593# make insert menu behavior selection dependent
2009-08-06 19:00:14 +0200 iha  r274741 : #i103593# make insert menu behavior selection dependent
2009-08-06 15:34:01 +0200 iha  r274731 : #i58163# #i69422# #i102820# enhance chart context menu
2009-08-06 14:39:20 +0200 iha  r274728 : #i86146# ease adding R-squared value with an equation
2009-08-06 14:37:02 +0200 iha  r274727 : #i86146# ease adding R-squared value with an equation
2009-08-06 13:37:54 +0200 iha  r274724 : #i86146# ease adding R-squared value with an equation
2009-08-06 13:37:15 +0200 iha  r274723 : #i86146# ease adding R-squared value with an equation
2009-08-06 13:04:27 +0200 iha  r274722 : #i103593# make insert menu behavior selection dependent
2009-08-06 13:03:35 +0200 iha  r274721 : #i103593# make insert menu behavior selection dependent
2009-08-05 18:26:31 +0200 iha  r274693 : #i104033# inconsistent wording 'error indicator' <-> 'error bar'
2009-08-05 16:51:45 +0200 iha  r274688 : #i104028# rename font tabpage 'Characters'->'Font'
2009-08-05 16:30:21 +0200 iha  r274685 : #i58163# #i69422# #i102820# enhance chart context menu
2009-08-05 15:34:11 +0200 iha  r274680 : #i58163# #i69422# #i102820# enhance chart context menu
2009-08-05 15:32:43 +0200 iha  r274679 : #i58163# #i69422# #i102820# enhance chart context menu
2009-08-05 15:31:26 +0200 iha  r274678 : #i58163# #i69422# #i102820# enhance chart context menu
2009-08-05 15:17:51 +0200 iha  r274676 : #i58163# #i69422# #i102820# enhance chart context menu
2009-08-05 15:16:22 +0200 iha  r274675 : #i58163# #i69422# #i102820# enhance chart context menu
2009-08-05 14:58:59 +0200 iha  r274674 : #7049# listbox to select chart elements
2009-08-05 14:33:54 +0200 iha  r274669 : #7049# listbox to select chart elements
2009-08-05 14:22:17 +0200 iha  r274665 : #7049# listbox to select chart elements
2009-08-05 13:21:05 +0200 iha  r274656 : #i102820# offer insertion of several elements in context menu also if nothing is selected
2009-08-05 11:56:06 +0200 iha  r274647 : #7049# listbox to select chart elements
2009-08-05 11:43:40 +0200 iha  r274645 : #7049# listbox to select chart elements
2009-07-24 19:46:50 +0200 iha  r274318 : #i58163# #i69422# #i102820# enhance chart context menu
2009-07-24 16:23:13 +0200 iha  r274313 : #i58163# #i69422# #i102820# enhance chart context menu
2009-07-24 16:13:22 +0200 iha  r274311 : #i58163# #i69422# #i102820# enhance chart context menu

5 files changed, 76 insertions, 80 deletions

diff --git a/testautomation/chart2/required/includes/ch2_datadialogue.inc b/testautomation/chart2/required/includes/ch2_datadialogue.inc
index bfc99dc16d66..cc13cd2dee0b 100755
--- a/testautomation/chart2/required/includes/ch2_datadialogue.inc
+++ b/testautomation/chart2/required/includes/ch2_datadialogue.inc
@@ -63,7 +63,7 @@ testcase tChartDataDialogueButtons
         DocumentChart.OpenContextMenu
         '/// Select the third entry
         printlog "Select the third entry"
-        hMenuSelectNr (3)
+        hMenuSelectNr (6)
         sleep (1)
         Kontext "Diagramdata"
         call DialogTest ( Diagramdata )
@@ -240,7 +240,7 @@ testcase tChartDataDialogueFieldsUndo
         DocumentChart.OpenContextMenu
         '/// Select third entry
         printlog "Select third entry"
-        hMenuSelectNr (3)
+        hMenuSelectNr (6)
         sleep (1)
         Kontext "Diagramdata"
         call DialogTest ( Diagramdata )
@@ -308,7 +308,7 @@ testcase tChartDataDialogueFieldsUndo
         DocumentChart.OpenContextMenu
         '/// Select third entry
         printlog "Select third entry"
-        hMenuSelectNr (3)        
+        hMenuSelectNr (6)        
         sleep (1)
         Kontext "Diagramdata"
         '/// Inside the Tables: Press the 'TAB'-key 14 times.
diff --git a/testautomation/chart2/required/includes/ch2_format.inc b/testautomation/chart2/required/includes/ch2_format.inc
index e03a0bd5d194..64f42270ae2d 100755
--- a/testautomation/chart2/required/includes/ch2_format.inc
+++ b/testautomation/chart2/required/includes/ch2_format.inc
@@ -70,30 +70,39 @@ testcase tFormatObjectProperties
     if fSelectFirstOLE = 0 then        
         printlog "Edit / Object / Edit"
         EditObjectEdit        
-        printlog "Move to third object in Chart using TAB key (data series)"
-        Kontext "DocumentChart"
-        DocumentChart.TypeKeys "<TAB>" , 3        
-        printlog "Invoke Format::ObjectProperties"
-        FormatObjectProperties        
-        printlog "Select tab page Aligment"
+		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 <> 7 then
-            warnlog "Edit::Properties on a data series should have 7 tab pages but has " & iCountTabPg & "."            
+        if iCountTabPg <> 4 then
+            warnlog "Edit::Properties on a data series should have 4 tab pages but has " & iCountTabPg & "."            
         else             
-            printlog "Edit::Properties on a data series has 7 tab pages."
+            printlog "Edit::Properties on a data series has 4 tab pages."
         endif
-        Active.SetPage TabDataSeriesLabels
-        '/// Check if tab page series labels exists
-        Kontext "TabDataSeriesLabels"
-        call DialogTest ( TabDataSeriesLabels )
+        Active.SetPage TabDataSeriesOptions
         '/// Check if tab page data series options exists
-        Kontext
-		Active.SetPage TabDataSeriesOptions
         Kontext "TabDataSeriesOptions"
-        call DialogTest ( TabDataSeriesOptions )        
+        call DialogTest ( TabDataSeriesOptions )
+        '/// Check if tab page area exists
+        Kontext
+		Active.SetPage TabArea
+        Kontext "TabArea"
+        call DialogTest ( TabArea )
+		'/// Check if tab page transparency exists
+        Kontext
+		Active.SetPage TabTransparency
+        Kontext "TabTransparency"
+        call DialogTest ( TabTransparency )
+		'/// Check if tab page borders exists
+        Kontext
+		Active.SetPage TabFormatChartBorders
+        Kontext "TabFormatChartBorders"
+        call DialogTest ( TabFormatChartBorders )
         '/// Close dialog with Cancel-button
-        TabDataSeriesOptions.Cancel
+        TabFormatChartBorders.Cancel
         '/// Close document
         Kontext "DocumentCalc"
         DocumentCalc.TypeKeys "<Escape>"
@@ -138,25 +147,24 @@ testcase tFormatObjectPropertiesPieChart
             Call hCloseDocument
             goto endsub
         endif        
-        '/// Move to third object in Chart using TAB key (data series)
-        Kontext "DocumentChart"
-        DocumentChart.TypeKeys "<TAB>" , 3
-        '/// Invoke Format::ObjectProperties
-        FormatObjectProperties
+        '/// Move to data series in Chart
+		call fChartSelectElement (5)
+		printlog "Open the properties dialog by using the FormatSelection button in the toolbar"
+		FormatSelection.Click   
         '/// Select tab page Aligment
         Kontext
         iCountTabPg = Active.GetPageCount
-        if iCountTabPg <> 7 then
-            warnlog "Edit::Properties on a data series of a pie chart should have 7 tab pages but has " & iCountTabPg & "."
+        if iCountTabPg <> 4 then
+            warnlog "Edit::Properties on a data series of a pie chart should have 4 tab pages but has " & iCountTabPg & "."
         else
-            printlog "Edit::Properties on a data series on a pie chart has 7 tab pages."
+            printlog "Edit::Properties on a data series on a pie chart has 4 tab pages."
         endif
-        Active.SetPage TabChartPieOpetions
+        Active.SetPage TabChartPieOptions
         '/// Check if tab page Options exists
-        Kontext "TabChartPieOpetions"
-        call DialogTest ( TabChartPieOpetions )        
+        Kontext "TabChartPieOptions"
+        call DialogTest ( TabChartPieOptions )        
         '/// Close dialog with Cancel-button
-        TabChartPieOpetions.Cancel
+        TabChartPieOptions.Cancel
         '/// Close document
         Kontext "DocumentCalc"
         DocumentCalc.TypeKeys "<ESCAPE>"
diff --git a/testautomation/chart2/required/includes/ch2_insert.inc b/testautomation/chart2/required/includes/ch2_insert.inc
index 526d430d6e2a..fae0eadaa83c 100755
--- a/testautomation/chart2/required/includes/ch2_insert.inc
+++ b/testautomation/chart2/required/includes/ch2_insert.inc
@@ -220,12 +220,9 @@ testcase tInsertTrendLines
    call fSelectFirstOLE
    '/// Invoke Edit::Object::Edit to enter Inplace Mode
    EditObjectEdit
-   '/// Invoke Insert::TrendLines
-   if fInvokeTrendLinesDialog() > 0 then
-       warnlog "Something went wrong trying to invoke Trend Lines dialog -> Check this out!"
-       Call hCloseDocument
-       goto endsub
-   endif
+   Kontext "DocumentChart"
+   printlog "Insert TrendLines"
+   InsertTrendlines
    '/// Check existence of dialog
    Kontext "InsertTrendlinesDialog"
    Call DialogTest ( InsertTrendlinesDialog )
diff --git a/testautomation/chart2/required/includes/ch2_insert_ctl.inc b/testautomation/chart2/required/includes/ch2_insert_ctl.inc
index 3a72c13a3e59..4049907a4cff 100644
--- a/testautomation/chart2/required/includes/ch2_insert_ctl.inc
+++ b/testautomation/chart2/required/includes/ch2_insert_ctl.inc
@@ -61,14 +61,14 @@ testcase tTitleTextDirection
     printlog "Select the first OLE object in the document."
     call fSelectFirstOLE
     printlog "Edit / Object / Edit"    
-    EditObjectEdit       
-    Kontext "DocumentChart"
-    printlog "Type in the Chart document <TAB>"
-    DocumentChart.TypeKeys "<TAB>"
-    printlog "Format / Object properties"
-    FormatObjectProperties
+    EditObjectEdit
+	Kontext "DocumentChart"
+	printlog "Select the Main Title by using the ChartElememtSelectorListBox in the toolbar (4th entry)"
+    call fChartSelectElement (4)
+    printlog "Open the properties dialog by using the FormatSelection button in the toolbar"
+    FormatSelection.Click
     Kontext
-    printlog "Select the tab page alignment"    
+    printlog "Select the tab page Alignment"    
     Active.SetPage TabFormatChartTitleAlignment
     Kontext "TabFormatChartTitleAlignment"
     call DialogTest(TabFormatChartTitleAlignment)
@@ -172,13 +172,13 @@ testcase tDataSeriesTextDirection
     bCTLSupBefore = ActiveDeactivateCTLSupport(TRUE)
     call fSelectFirstOLE
     printlog "Select the first OLE object"
-    EditObjectEdit
     printlog "Edit / Object Edit"
-    Kontext "DocumentChart"
-    printlog "Type thrice in the Chart document <TAB>"
-    DocumentChart.TypeKeys "<TAB>" , 3
-    printlog "Format / Object properties"
-    FormatObjectProperties
+    EditObjectEdit
+    printlog "Select DataSeries A by toolbar selectorbox"
+	call fChartSelectElement (8) 
+	printlog "Insert DataLabels"
+	Kontext "DocumentChart"
+	InsertDataLabels
     Kontext
     Active.Setpage TabDataSeriesLabels
     Kontext "TabDataSeriesLabels"    
@@ -299,36 +299,27 @@ testcase tEquationTextDirection
     call fSelectFirstOLE    
     printlog "Edit / Object Edit"
     EditObjectEdit    
-    Kontext "DocumentChart"
-    printlog "Type thrice in the Chart document <TAB>"
-    DocumentChart.TypeKeys "<TAB>" , 3
-    printlog "Press F3-key to enter the data series."
-    DocumentChart.TypeKeys "<F3>"    
+    printlog "Select DataSeries A by toolbar selectorbox"
+	call fChartSelectElement (8) 
+	Kontext "DocumentChart"
     if fInvokeTrendLinesDialog() > 0 then
         warnlog "Something went wrong trying to invoke Trend Lines dialog -> Check this out!"
         Call hCloseDocument
         goto endsub
     endif   
-    Kontext "InsertTrendlinesDialog"
-    Call DialogTest(InsertTrendlinesDialog)
+    Kontext "TabTrendLineType"
+    Call DialogTest(TabTrendLineType)
     printlog "Select Linear radio-button"
     Linear.Check
     printlog "Check Show Equation check-box"
     ShowEquation.Check
     printlog "Leave the dialog with OK"
-    InsertTrendlinesDialog.OK
+    TabTrendLineType.OK
     Kontext "DocumentChart"
-	printlog "Leave Chart by ESC and reenter Chart"
-	DocumentChart.TypeKeys "<ESC>" , 2
-	call fSelectFirstOLE
-	EditObjectEdit
-	Kontext "DocumentChart"
-	printlog "Type <TAB> thrice in the Chart document, press F3 and <TAB> to select the equation"
-	DocumentChart.TypeKeys "<TAB>" , 3
-	DocumentChart.TypeKeys "<F3>" 
-    DocumentChart.TypeKeys "<TAB>"
+    printlog "Select Equation by toolbar selectorbox"
+	call fChartSelectElement (10)
     printlog "Format / Object properties"
-    FormatObjectProperties
+    FormatSelection.Click
     Kontext 
     printlog "Count the numbers of tab pages. It should be 7 in CTL mode."
     if Active.GetPageCount <> 7 then
@@ -372,13 +363,13 @@ testcase tDataPointTextDirection
     printlog "Select the first OLE object"
     EditObjectEdit
     printlog "Edit / Object Edit"
-    Kontext "DocumentChart"
-    printlog "Type thrice in the Chart document <TAB>"
-    DocumentChart.TypeKeys "<TAB>" , 3
+    printlog "Select DataSeries A by toolbar selectorbox"
+	call fChartSelectElement (8) 
+	Kontext "DocumentChart"
     printlog "Press F3-key to enter the data series."
     DocumentChart.TypeKeys "<F3>"
-    printlog "Format / Object properties"
-    FormatObjectProperties
+    printlog "Insert / DataLabels"
+    InsertDataLabels
     Kontext
     Active.Setpage TabDataPointLabels
     Kontext "TabDataPointLabels"    
diff --git a/testautomation/chart2/required/includes/ch2_menu.inc b/testautomation/chart2/required/includes/ch2_menu.inc
index 50da9027a05d..5d6105f0f458 100644
--- a/testautomation/chart2/required/includes/ch2_menu.inc
+++ b/testautomation/chart2/required/includes/ch2_menu.inc
@@ -149,7 +149,7 @@ testcase tMainMenu
         printlog "check if there are 6 items in the FORMAT/AXIS menu."
         DocumentCalc.UseMenu
         hMenuSelectNr(5) ' FORMAT
-        hMenuSelectNr(5) ' AXIS        
+        hMenuSelectNr(6) ' AXIS        
         iCount = hMenuItemGetCount()        
         if (iCount <> 6) then
             warnlog "There should 6 items in the FORMAT/AXIS menu but there are " + iCount + " items."
@@ -158,7 +158,7 @@ testcase tMainMenu
         printlog "check if there are 7 items in the FORMAT/GRID menu."
         DocumentCalc.UseMenu
         hMenuSelectNr(5) ' FORMAT
-        hMenuSelectNr(6) ' GRID        
+        hMenuSelectNr(7) ' GRID        
         iCount = hMenuItemGetCount()        
         if (iCount <> 7) then
             warnlog "There should 7 items in the FORMAT/GRID menu but there are " + iCount + " items."
@@ -173,12 +173,12 @@ testcase tMainMenu
             warnlog "There should 8 items in the FORMAT/Title menu but there are " + iCount + " items."
         end if
 
-        printlog "check if there are 13 items in the TOOLS menu."        
+        printlog "check if there are 4 items in the TOOLS menu."        
         DocumentCalc.UseMenu 
-        hMenuSelectNr(5)        
+        hMenuSelectNr(6)        
         iCount = hMenuItemGetCount()
-        if (iCount <> 13) then
-            warnlog "There should 13 items in the tools menu but there are " + iCount + " items."
+        if (iCount <> 4) then
+            warnlog "There should 4 items in the tools menu but there are " + iCount + " items."
         end if
         call hMenuClose()